Debian Codegraph @

contrib/cfengine/cfengine-2.2.10/0004-Rerun-autotools.patch

raw
1 From bf5e1b92892d8117626b3ded86b03e31ce78f028 Mon Sep 17 00:00:00 2001
2 From: Mark A. Grondona <[email protected]>
3 Date: Tue, 8 Jun 2010 16:11:44 -0700
4 Subject: [PATCH 4/5] Rerun autotools
5
6 ---
7 INSTALL | 370 +++-
8 Makefile.in | 277 ++-
9 aclocal.m4 | 1244 +++++++++-
10 compile | 21 +-
11 config.guess | 1030 +++++----
12 config.sub | 480 +++-
13 configure | 6806 +++++++++++++++++++++++++++++++++++----------------
14 contrib/Makefile.in | 171 +-
15 depcomp | 220 ++-
16 doc/Makefile.in | 343 ++-
17 doc/mdate-sh | 141 +-
18 doc/texinfo.tex | 4075 ++++++++++++++++++++++++-------
19 inputs/Makefile.in | 131 +-
20 install-sh | 677 ++++--
21 missing | 227 ++-
22 mkinstalldirs | 168 ++-
23 pub/Makefile.in | 126 +-
24 src/Makefile.in | 664 +++---
25 ylwrap | 245 ++-
26 19 files changed, 12670 insertions(+), 4746 deletions(-)
27
28 diff --git a/INSTALL b/INSTALL
29 index 902a8cf..7d1c323 100644
30 --- a/INSTALL
31 +++ b/INSTALL
32 @@ -1,59 +1,80 @@
33 -Basic Installation
34 -==================
35 +Installation Instructions
36 +*************************
37
38 - Cfengine depends on two packages. You should install up to date
39 - versions of these first.
40 +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
41 +2006, 2007, 2008, 2009 Free Software Foundation, Inc.
42
43 - Berkeley Database obtainable from http://www.sleepycat.com
44 - OpenSSL obtainable from http://www.openssl.org
45 + Copying and distribution of this file, with or without modification,
46 +are permitted in any medium without royalty provided the copyright
47 +notice and this notice are preserved. This file is offered as-is,
48 +without warranty of any kind.
49
50 - Some operating systems with package managers will already contain
51 - packages for these libraries.
52 - If you use MacOS X you need to download and install a copy of
53 - BerkeleyDB, as well as a copy of the OpenSSL header files.
54 +Basic Installation
55 +==================
56
57 - These are generic installation instructions.
58 + Briefly, the shell commands `./configure; make; make install' should
59 +configure, build, and install this package. The following
60 +more-detailed instructions are generic; see the `README' file for
61 +instructions specific to this package. Some packages provide this
62 +`INSTALL' file but do not implement all of the features documented
63 +below. The lack of an optional feature in a given package is not
64 +necessarily a bug. More recommendations for GNU packages can be found
65 +in *note Makefile Conventions: (standards)Makefile Conventions.
66
67 The `configure' shell script attempts to guess correct values for
68 various system-dependent variables used during compilation. It uses
69 those values to create a `Makefile' in each directory of the package.
70 It may also create one or more `.h' files containing system-dependent
71 definitions. Finally, it creates a shell script `config.status' that
72 -you can run in the future to recreate the current configuration, a file
73 -`config.cache' that saves the results of its tests to speed up
74 -reconfiguring, and a file `config.log' containing compiler output
75 -(useful mainly for debugging `configure').
76 +you can run in the future to recreate the current configuration, and a
77 +file `config.log' containing compiler output (useful mainly for
78 +debugging `configure').
79 +
80 + It can also use an optional file (typically called `config.cache'
81 +and enabled with `--cache-file=config.cache' or simply `-C') that saves
82 +the results of its tests to speed up reconfiguring. Caching is
83 +disabled by default to prevent problems with accidental use of stale
84 +cache files.
85
86 If you need to do unusual things to compile the package, please try
87 to figure out how `configure' could check whether to do them, and mail
88 diffs or instructions to the address given in the `README' so they can
89 -be considered for the next release. If at some point `config.cache'
90 -contains results you don't want to keep, you may remove or edit it.
91 +be considered for the next release. If you are using the cache, and at
92 +some point `config.cache' contains results you don't want to keep, you
93 +may remove or edit it.
94
95 - The file `configure.in' is used to create `configure' by a program
96 -called `autoconf'. You only need `configure.in' if you want to change
97 -it or regenerate `configure' using a newer version of `autoconf'.
98 + The file `configure.ac' (or `configure.in') is used to create
99 +`configure' by a program called `autoconf'. You need `configure.ac' if
100 +you want to change it or regenerate `configure' using a newer version
101 +of `autoconf'.
102
103 -The simplest way to compile this package is:
104 + The simplest way to compile this package is:
105
106 1. `cd' to the directory containing the package's source code and type
107 - `./configure' to configure the package for your system. If you're
108 - using `csh' on an old version of System V, you might need to type
109 - `sh ./configure' instead to prevent `csh' from trying to execute
110 - `configure' itself.
111 + `./configure' to configure the package for your system.
112
113 - Running `configure' takes awhile. While running, it prints some
114 - messages telling which features it is checking for.
115 + Running `configure' might take a while. While running, it prints
116 + some messages telling which features it is checking for.
117
118 2. Type `make' to compile the package.
119
120 3. Optionally, type `make check' to run any self-tests that come with
121 - the package.
122 + the package, generally using the just-built uninstalled binaries.
123
124 4. Type `make install' to install the programs and any data files and
125 - documentation.
126 + documentation. When installing into a prefix owned by root, it is
127 + recommended that the package be configured and built as a regular
128 + user, and only the `make install' phase executed with root
129 + privileges.
130
131 - 5. You can remove the program binaries and object files from the
132 + 5. Optionally, type `make installcheck' to repeat any self-tests, but
133 + this time using the binaries in their final installed location.
134 + This target does not install anything. Running this target as a
135 + regular user, particularly if the prior `make install' required
136 + root privileges, verifies that the installation completed
137 + correctly.
138 +
139 + 6. You can remove the program binaries and object files from the
140 source code directory by typing `make clean'. To also remove the
141 files that `configure' created (so you can compile the package for
142 a different kind of computer), type `make distclean'. There is
143 @@ -62,26 +83,283 @@ The simplest way to compile this package is:
144 all sorts of other programs in order to regenerate files that came
145 with the distribution.
146
147 -OpenSSL Problem
148 + 7. Often, you can also type `make uninstall' to remove the installed
149 + files again. In practice, not all packages have tested that
150 + uninstallation works correctly, even though it is required by the
151 + GNU Coding Standards.
152 +
153 + 8. Some packages, particularly those that use Automake, provide `make
154 + distcheck', which can by used by developers to test that all other
155 + targets like `make install' and `make uninstall' work correctly.
156 + This target is generally not run by end users.
157 +
158 +Compilers and Options
159 =====================
160
161 -If you see error messages of the follwing type when upgrading OpenSSL:
162 + Some systems require unusual options for compilation or linking that
163 +the `configure' script does not know about. Run `./configure --help'
164 +for details on some of the pertinent environment variables.
165 +
166 + You can give `configure' initial values for configuration parameters
167 +by setting variables in the command line or in the environment. Here
168 +is an example:
169 +
170 + ./configure CC=c99 CFLAGS=-g LIBS=-lposix
171 +
172 + *Note Defining Variables::, for more details.
173 +
174 +Compiling For Multiple Architectures
175 +====================================
176 +
177 + You can compile the package for more than one kind of computer at the
178 +same time, by placing the object files for each architecture in their
179 +own directory. To do this, you can use GNU `make'. `cd' to the
180 +directory where you want the object files and executables to go and run
181 +the `configure' script. `configure' automatically checks for the
182 +source code in the directory that `configure' is in and in `..'. This
183 +is known as a "VPATH" build.
184 +
185 + With a non-GNU `make', it is safer to compile the package for one
186 +architecture at a time in the source code directory. After you have
187 +installed the package for one architecture, use `make distclean' before
188 +reconfiguring for another architecture.
189 +
190 + On MacOS X 10.5 and later systems, you can create libraries and
191 +executables that work on multiple system types--known as "fat" or
192 +"universal" binaries--by specifying multiple `-arch' options to the
193 +compiler but only a single `-arch' option to the preprocessor. Like
194 +this:
195 +
196 + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
197 + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
198 + CPP="gcc -E" CXXCPP="g++ -E"
199 +
200 + This is not guaranteed to produce working output in all cases, you
201 +may have to build one architecture at a time and combine the results
202 +using the `lipo' tool if you have problems.
203 +
204 +Installation Names
205 +==================
206 +
207 + By default, `make install' installs the package's commands under
208 +`/usr/local/bin', include files under `/usr/local/include', etc. You
209 +can specify an installation prefix other than `/usr/local' by giving
210 +`configure' the option `--prefix=PREFIX', where PREFIX must be an
211 +absolute file name.
212 +
213 + You can specify separate installation prefixes for
214 +architecture-specific files and architecture-independent files. If you
215 +pass the option `--exec-prefix=PREFIX' to `configure', the package uses
216 +PREFIX as the prefix for installing programs and libraries.
217 +Documentation and other data files still use the regular prefix.
218 +
219 + In addition, if you use an unusual directory layout you can give
220 +options like `--bindir=DIR' to specify different values for particular
221 +kinds of files. Run `configure --help' for a list of the directories
222 +you can set and what kinds of files go in them. In general, the
223 +default for these options is expressed in terms of `${prefix}', so that
224 +specifying just `--prefix' will affect all of the other directory
225 +specifications that were not explicitly provided.
226 +
227 + The most portable way to affect installation locations is to pass the
228 +correct locations to `configure'; however, many packages provide one or
229 +both of the following shortcuts of passing variable assignments to the
230 +`make install' command line to change installation locations without
231 +having to reconfigure or recompile.
232 +
233 + The first method involves providing an override variable for each
234 +affected directory. For example, `make install
235 +prefix=/alternate/directory' will choose an alternate location for all
236 +directory configuration variables that were expressed in terms of
237 +`${prefix}'. Any directories that were specified during `configure',
238 +but not in terms of `${prefix}', must each be overridden at install
239 +time for the entire installation to be relocated. The approach of
240 +makefile variable overrides for each directory variable is required by
241 +the GNU Coding Standards, and ideally causes no recompilation.
242 +However, some platforms have known limitations with the semantics of
243 +shared libraries that end up requiring recompilation when using this
244 +method, particularly noticeable in packages that use GNU Libtool.
245 +
246 + The second method involves providing the `DESTDIR' variable. For
247 +example, `make install DESTDIR=/alternate/directory' will prepend
248 +`/alternate/directory' before all installation names. The approach of
249 +`DESTDIR' overrides is not required by the GNU Coding Standards, and
250 +does not work on platforms that have drive letters. On the other hand,
251 +it does better at avoiding recompilation issues, and works well even
252 +when some directory options were not specified in terms of `${prefix}'
253 +at `configure' time.
254 +
255 +Optional Features
256 +=================
257 +
258 + If the package supports it, you can cause programs to be installed
259 +with an extra prefix or suffix on their names by giving `configure' the
260 +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
261 +
262 + Some packages pay attention to `--enable-FEATURE' options to
263 +`configure', where FEATURE indicates an optional part of the package.
264 +They may also pay attention to `--with-PACKAGE' options, where PACKAGE
265 +is something like `gnu-as' or `x' (for the X Window System). The
266 +`README' should mention any `--enable-' and `--with-' options that the
267 +package recognizes.
268 +
269 + For packages that use the X Window System, `configure' can usually
270 +find the X include and library files automatically, but if it doesn't,
271 +you can use the `configure' options `--x-includes=DIR' and
272 +`--x-libraries=DIR' to specify their locations.
273 +
274 + Some packages offer the ability to configure how verbose the
275 +execution of `make' will be. For these packages, running `./configure
276 +--enable-silent-rules' sets the default to minimal output, which can be
277 +overridden with `make V=1'; while running `./configure
278 +--disable-silent-rules' sets the default to verbose, which can be
279 +overridden with `make V=0'.
280 +
281 +Particular systems
282 +==================
283 +
284 + On HP-UX, the default C compiler is not ANSI C compatible. If GNU
285 +CC is not installed, it is recommended to use the following options in
286 +order to use an ANSI C compiler:
287 +
288 + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
289 +
290 +and if that doesn't work, install pre-built binaries of GCC for HP-UX.
291 +
292 + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
293 +parse its `<wchar.h>' header file. The option `-nodtk' can be used as
294 +a workaround. If GNU CC is not installed, it is therefore recommended
295 +to try
296 +
297 + ./configure CC="cc"
298 +
299 +and if that doesn't work, try
300 +
301 + ./configure CC="cc -nodtk"
302 +
303 + On Solaris, don't put `/usr/ucb' early in your `PATH'. This
304 +directory contains several dysfunctional programs; working variants of
305 +these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
306 +in your `PATH', put it _after_ `/usr/bin'.
307 +
308 + On Haiku, software installed for all users goes in `/boot/common',
309 +not `/usr/local'. It is recommended to use the following options:
310 +
311 + ./configure --prefix=/boot/common
312 +
313 +Specifying the System Type
314 +==========================
315 +
316 + There may be some features `configure' cannot figure out
317 +automatically, but needs to determine by the type of machine the package
318 +will run on. Usually, assuming the package is built to be run on the
319 +_same_ architectures, `configure' can figure that out, but if it prints
320 +a message saying it cannot guess the machine type, give it the
321 +`--build=TYPE' option. TYPE can either be a short name for the system
322 +type, such as `sun4', or a canonical name which has the form:
323 +
324 + CPU-COMPANY-SYSTEM
325 +
326 +where SYSTEM can have one of these forms:
327 +
328 + OS
329 + KERNEL-OS
330 +
331 + See the file `config.sub' for the possible values of each field. If
332 +`config.sub' isn't included in this package, then this package doesn't
333 +need to know the machine type.
334 +
335 + If you are _building_ compiler tools for cross-compiling, you should
336 +use the option `--target=TYPE' to select the type of system they will
337 +produce code for.
338 +
339 + If you want to _use_ a cross compiler, that generates code for a
340 +platform different from the build platform, you should specify the
341 +"host" platform (i.e., that on which the generated programs will
342 +eventually be run) with `--host=TYPE'.
343 +
344 +Sharing Defaults
345 +================
346 +
347 + If you want to set default values for `configure' scripts to share,
348 +you can create a site shell script called `config.site' that gives
349 +default values for variables like `CC', `cache_file', and `prefix'.
350 +`configure' looks for `PREFIX/share/config.site' if it exists, then
351 +`PREFIX/etc/config.site' if it exists. Or, you can set the
352 +`CONFIG_SITE' environment variable to the location of the site script.
353 +A warning: not all `configure' scripts look for a site script.
354 +
355 +Defining Variables
356 +==================
357 +
358 + Variables not defined in a site shell script can be set in the
359 +environment passed to `configure'. However, some packages may run
360 +configure again during the build, and the customized values of these
361 +variables may be lost. In order to avoid this problem, you should set
362 +them in the `configure' command line, using `VAR=value'. For example:
363 +
364 + ./configure CC=/usr/local2/bin/gcc
365 +
366 +causes the specified `gcc' to be used as the C compiler (unless it is
367 +overridden in the site shell script).
368 +
369 +Unfortunately, this technique does not work for `CONFIG_SHELL' due to
370 +an Autoconf bug. Until the bug is fixed you can use this workaround:
371 +
372 + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
373 +
374 +`configure' Invocation
375 +======================
376 +
377 + `configure' recognizes the following options to control how it
378 +operates.
379 +
380 +`--help'
381 +`-h'
382 + Print a summary of all of the options to `configure', and exit.
383 +
384 +`--help=short'
385 +`--help=recursive'
386 + Print a summary of the options unique to this package's
387 + `configure', and exit. The `short' variant lists options used
388 + only in the top level, while the `recursive' variant lists options
389 + also present in any nested packages.
390 +
391 +`--version'
392 +`-V'
393 + Print the version of Autoconf used to generate the `configure'
394 + script, and exit.
395 +
396 +`--cache-file=FILE'
397 + Enable the cache: use and save the results of the tests in FILE,
398 + traditionally `config.cache'. FILE defaults to `/dev/null' to
399 + disable caching.
400 +
401 +`--config-cache'
402 +`-C'
403 + Alias for `--cache-file=config.cache'.
404 +
405 +`--quiet'
406 +`--silent'
407 +`-q'
408 + Do not print messages saying which checks are being made. To
409 + suppress all normal output, redirect it to `/dev/null' (any error
410 + messages will still be shown).
411
412 -dso_dlfcn.c: undefined reference to `dlsym'
413 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x31d):dso_dlfcn.c: undefined reference to `dlerror'
414 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x3bf): In function `dlfcn_bind_var':
415 -dso_dlfcn.c: undefined reference to `dlsym'
416 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x43b):dso_dlfcn.c: undefined reference to `dlerror'
417 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x4a7): In function `dlfcn_unload':
418 -dso_dlfcn.c: undefined reference to `dlclose'
419 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x563): In function `dlfcn_load':
420 -dso_dlfcn.c: undefined reference to `dlopen'
421 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x5c9):dso_dlfcn.c: undefined reference to `dlclose'
422 -/usr/local/ssl/lib/libcrypto.a(dso_dlfcn.o)(.text+0x5fe):dso_dlfcn.c: undefined reference to `dlerror'
423 -collect2: ld returned 1 exit status
424 -make[2]: *** [cfagent] Error 1
425 +`--srcdir=DIR'
426 + Look for the package's source code in directory DIR. Usually
427 + `configure' can determine that directory automatically.
428
429 +`--prefix=DIR'
430 + Use DIR as the installation prefix. *note Installation Names::
431 + for more details, including other options available for fine-tuning
432 + the installation locations.
433
434 -Then you should make sure that you rebuilt *with* shared libraries and without static libcrypto.a libraries. Rename or remove /usr/local/ssl/lib/libcrypto.a and recompile. The libdl functions are apparently only available from shared libraries.
435 +`--no-create'
436 +`-n'
437 + Run the configure checks, but stop before creating any output
438 + files.
439
440 +`configure' also accepts some other, not widely useful, options. Run
441 +`configure --help' for more details.
442
443 diff --git a/Makefile.in b/Makefile.in
444 index 04784e7..3c776f3 100644
445 --- a/Makefile.in
446 +++ b/Makefile.in
447 @@ -1,8 +1,9 @@
448 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
449 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
450 # @configure_input@
451
452 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
453 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
454 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
455 +# Inc.
456 # This Makefile.in is free software; the Free Software Foundation
457 # gives unlimited permission to copy and/or distribute it,
458 # with or without modifications, as long as this notice is preserved.
459 @@ -16,8 +17,9 @@
460
461 VPATH = @srcdir@
462 pkgdatadir = $(datadir)/@PACKAGE@
463 -pkglibdir = $(libdir)/@PACKAGE@
464 pkgincludedir = $(includedir)/@PACKAGE@
465 +pkglibdir = $(libdir)/@PACKAGE@
466 +pkglibexecdir = $(libexecdir)/@PACKAGE@
467 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
468 install_sh_DATA = $(install_sh) -c -m 644
469 install_sh_PROGRAM = $(install_sh) -c
470 @@ -49,6 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
471 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
472 CONFIG_HEADER = $(top_builddir)/src/conf.h
473 CONFIG_CLEAN_FILES =
474 +CONFIG_CLEAN_VPATH_FILES =
475 SOURCES =
476 DIST_SOURCES =
477 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
478 @@ -63,22 +66,64 @@ am__vpath_adj = case $$p in \
479 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
480 *) f=$$p;; \
481 esac;
482 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
483 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
484 +am__install_max = 40
485 +am__nobase_strip_setup = \
486 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
487 +am__nobase_strip = \
488 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
489 +am__nobase_list = $(am__nobase_strip_setup); \
490 + for p in $$list; do echo "$$p $$p"; done | \
491 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
492 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
493 + if (++n[$$2] == $(am__install_max)) \
494 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
495 + END { for (dir in files) print dir, files[dir] }'
496 +am__base_list = \
497 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
498 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
499 am__installdirs = "$(DESTDIR)$(docdir)"
500 -docDATA_INSTALL = $(INSTALL_DATA)
501 DATA = $(doc_DATA)
502 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
503 distclean-recursive maintainer-clean-recursive
504 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
505 + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
506 + distdir dist dist-all distcheck
507 ETAGS = etags
508 CTAGS = ctags
509 -DIST_SUBDIRS = pub src contrib inputs doc
510 +DIST_SUBDIRS = pub libltdl src contrib inputs doc
511 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
512 distdir = $(PACKAGE)-$(VERSION)
513 top_distdir = $(distdir)
514 am__remove_distdir = \
515 - { test ! -d $(distdir) \
516 - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
517 - && rm -fr $(distdir); }; }
518 + { test ! -d "$(distdir)" \
519 + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
520 + && rm -fr "$(distdir)"; }; }
521 +am__relativize = \
522 + dir0=`pwd`; \
523 + sed_first='s,^\([^/]*\)/.*$$,\1,'; \
524 + sed_rest='s,^[^/]*/*,,'; \
525 + sed_last='s,^.*/\([^/]*\)$$,\1,'; \
526 + sed_butlast='s,/*[^/]*$$,,'; \
527 + while test -n "$$dir1"; do \
528 + first=`echo "$$dir1" | sed -e "$$sed_first"`; \
529 + if test "$$first" != "."; then \
530 + if test "$$first" = ".."; then \
531 + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
532 + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
533 + else \
534 + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
535 + if test "$$first2" = "$$first"; then \
536 + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
537 + else \
538 + dir2="../$$dir2"; \
539 + fi; \
540 + dir0="$$dir0"/"$$first"; \
541 + fi; \
542 + fi; \
543 + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
544 + done; \
545 + reldir="$$dir2"
546 DIST_ARCHIVES = $(distdir).tar.gz
547 GZIP_ENV = --best
548 distuninstallcheck_listfiles = find . -type f -print
549 @@ -86,6 +131,7 @@ distcleancheck_listfiles = find . -type f -print
550 ACLOCAL = @ACLOCAL@
551 AMTAR = @AMTAR@
552 AR = @AR@
553 +ARGZ_H = @ARGZ_H@
554 AUTOCONF = @AUTOCONF@
555 AUTOHEADER = @AUTOHEADER@
556 AUTOMAKE = @AUTOMAKE@
557 @@ -116,6 +162,7 @@ GETCONF = @GETCONF@
558 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
559 GREP = @GREP@
560 HOSTNAME = @HOSTNAME@
561 +INCLTDL = @INCLTDL@
562 INSTALL = @INSTALL@
563 INSTALL_DATA = @INSTALL_DATA@
564 INSTALL_PROGRAM = @INSTALL_PROGRAM@
565 @@ -128,13 +175,25 @@ LDFLAGS = @LDFLAGS@
566 LEX = @LEX@
567 LEXLIB = @LEXLIB@
568 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
569 +LIBADD_DL = @LIBADD_DL@
570 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
571 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
572 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
573 +LIBLTDL = @LIBLTDL@
574 LIBOBJS = @LIBOBJS@
575 LIBS = @LIBS@
576 LIBTOOL = @LIBTOOL@
577 LIB_SELINUX = @LIB_SELINUX@
578 LIPO = @LIPO@
579 LN_S = @LN_S@
580 +LTDLDEPS = @LTDLDEPS@
581 +LTDLINCL = @LTDLINCL@
582 +LTDLOPEN = @LTDLOPEN@
583 LTLIBOBJS = @LTLIBOBJS@
584 +LT_CONFIG_H = @LT_CONFIG_H@
585 +LT_DLLOADERS = @LT_DLLOADERS@
586 +LT_DLPREOPEN = @LT_DLPREOPEN@
587 +MAINT = @MAINT@
588 MAKEINFO = @MAKEINFO@
589 MKDIR_P = @MKDIR_P@
590 NEED_SETGID = @NEED_SETGID@
591 @@ -206,6 +265,8 @@ libexecdir = @libexecdir@
592 localedir = @localedir@
593 localstatedir = @localstatedir@
594 lt_ECHO = @lt_ECHO@
595 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
596 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
597 mandir = @mandir@
598 mkdir_p = @mkdir_p@
599 oldincludedir = @oldincludedir@
600 @@ -216,6 +277,8 @@ psdir = @psdir@
601 sbindir = @sbindir@
602 sharedstatedir = @sharedstatedir@
603 srcdir = @srcdir@
604 +subdirs = @subdirs@
605 +sys_symbol_underscore = @sys_symbol_underscore@
606 sysconfdir = @sysconfdir@
607 target = @target@
608 target_alias = @target_alias@
609 @@ -227,7 +290,8 @@ top_builddir = @top_builddir@
610 top_srcdir = @top_srcdir@
611 @BUILD_DOC_FALSE@DOC_DIR =
612 @BUILD_DOC_TRUE@DOC_DIR = doc
613 -SUBDIRS = pub src contrib inputs $(DOC_DIR)
614 +ACLOCAL_AMFLAGS = "-I m4"
615 +SUBDIRS = pub libltdl src contrib inputs $(DOC_DIR)
616 EXTRA_DIST = acconfig.h doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README LICENSE
617 doc_DATA = README ChangeLog INSTALL NEWS
618
619 @@ -262,19 +326,19 @@ all: all-recursive
620 .SUFFIXES:
621 am--refresh:
622 @:
623 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
624 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
625 @for dep in $?; do \
626 case '$(am__configure_deps)' in \
627 *$$dep*) \
628 - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
629 - cd $(srcdir) && $(AUTOMAKE) --gnu \
630 + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
631 + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
632 && exit 0; \
633 exit 1;; \
634 esac; \
635 done; \
636 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
637 - cd $(top_srcdir) && \
638 - $(AUTOMAKE) --gnu Makefile
639 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
640 + $(am__cd) $(top_srcdir) && \
641 + $(AUTOMAKE) --gnu Makefile
642 .PRECIOUS: Makefile
643 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
644 @case '$?' in \
645 @@ -289,10 +353,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
646 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
647 $(SHELL) ./config.status --recheck
648
649 -$(top_srcdir)/configure: $(am__configure_deps)
650 - cd $(srcdir) && $(AUTOCONF)
651 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
652 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
653 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
654 + $(am__cd) $(srcdir) && $(AUTOCONF)
655 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
656 + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
657 +$(am__aclocal_m4_deps):
658
659 mostlyclean-libtool:
660 -rm -f *.lo
661 @@ -301,24 +366,27 @@ clean-libtool:
662 -rm -rf .libs _libs
663
664 distclean-libtool:
665 - -rm -f libtool
666 + -rm -f libtool config.lt
667 install-docDATA: $(doc_DATA)
668 @$(NORMAL_INSTALL)
669 test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
670 - @list='$(doc_DATA)'; for p in $$list; do \
671 + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
672 + for p in $$list; do \
673 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
674 - f=$(am__strip_dir) \
675 - echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
676 - $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
677 + echo "$$d$$p"; \
678 + done | $(am__base_list) | \
679 + while read files; do \
680 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
681 + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
682 done
683
684 uninstall-docDATA:
685 @$(NORMAL_UNINSTALL)
686 - @list='$(doc_DATA)'; for p in $$list; do \
687 - f=$(am__strip_dir) \
688 - echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
689 - rm -f "$(DESTDIR)$(docdir)/$$f"; \
690 - done
691 + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
692 + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
693 + test -n "$$files" || exit 0; \
694 + echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
695 + cd "$(DESTDIR)$(docdir)" && rm -f $$files
696
697 # This directory's subdirectories are mostly independent; you can cd
698 # into them and run `make' without going through this Makefile.
699 @@ -327,7 +395,7 @@ uninstall-docDATA:
700 # (which will cause the Makefiles to be regenerated when you run `make');
701 # (2) otherwise, pass the desired values on the `make' command line.
702 $(RECURSIVE_TARGETS):
703 - @failcom='exit 1'; \
704 + @fail= failcom='exit 1'; \
705 for f in x $$MAKEFLAGS; do \
706 case $$f in \
707 *=* | --[!k]*);; \
708 @@ -344,7 +412,7 @@ $(RECURSIVE_TARGETS):
709 else \
710 local_target="$$target"; \
711 fi; \
712 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
713 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
714 || eval $$failcom; \
715 done; \
716 if test "$$dot_seen" = "no"; then \
717 @@ -352,7 +420,7 @@ $(RECURSIVE_TARGETS):
718 fi; test -z "$$fail"
719
720 $(RECURSIVE_CLEAN_TARGETS):
721 - @failcom='exit 1'; \
722 + @fail= failcom='exit 1'; \
723 for f in x $$MAKEFLAGS; do \
724 case $$f in \
725 *=* | --[!k]*);; \
726 @@ -378,16 +446,16 @@ $(RECURSIVE_CLEAN_TARGETS):
727 else \
728 local_target="$$target"; \
729 fi; \
730 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
731 + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
732 || eval $$failcom; \
733 done && test -z "$$fail"
734 tags-recursive:
735 list='$(SUBDIRS)'; for subdir in $$list; do \
736 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
737 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
738 done
739 ctags-recursive:
740 list='$(SUBDIRS)'; for subdir in $$list; do \
741 - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
742 + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
743 done
744
745 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
746 @@ -395,14 +463,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
747 unique=`for i in $$list; do \
748 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
749 done | \
750 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
751 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
752 END { if (nonempty) { for (i in files) print i; }; }'`; \
753 mkid -fID $$unique
754 tags: TAGS
755
756 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
757 $(TAGS_FILES) $(LISP)
758 - tags=; \
759 + set x; \
760 here=`pwd`; \
761 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
762 include_option=--etags-include; \
763 @@ -414,7 +482,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
764 list='$(SUBDIRS)'; for subdir in $$list; do \
765 if test "$$subdir" = .; then :; else \
766 test ! -f $$subdir/TAGS || \
767 - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
768 + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
769 fi; \
770 done; \
771 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
772 @@ -423,36 +491,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
773 done | \
774 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
775 END { if (nonempty) { for (i in files) print i; }; }'`; \
776 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
777 + shift; \
778 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
779 test -n "$$unique" || unique=$$empty_fix; \
780 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
781 - $$tags $$unique; \
782 + if test $$# -gt 0; then \
783 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
784 + "$$@" $$unique; \
785 + else \
786 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
787 + $$unique; \
788 + fi; \
789 fi
790 ctags: CTAGS
791 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
792 $(TAGS_FILES) $(LISP)
793 - tags=; \
794 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
795 unique=`for i in $$list; do \
796 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
797 done | \
798 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
799 END { if (nonempty) { for (i in files) print i; }; }'`; \
800 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
801 + test -z "$(CTAGS_ARGS)$$unique" \
802 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
803 - $$tags $$unique
804 + $$unique
805
806 GTAGS:
807 here=`$(am__cd) $(top_builddir) && pwd` \
808 - && cd $(top_srcdir) \
809 - && gtags -i $(GTAGS_ARGS) $$here
810 + && $(am__cd) $(top_srcdir) \
811 + && gtags -i $(GTAGS_ARGS) "$$here"
812
813 distclean-tags:
814 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
815
816 distdir: $(DISTFILES)
817 $(am__remove_distdir)
818 - test -d $(distdir) || mkdir $(distdir)
819 + test -d "$(distdir)" || mkdir "$(distdir)"
820 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
821 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
822 list='$(DISTFILES)'; \
823 @@ -468,38 +541,55 @@ distdir: $(DISTFILES)
824 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
825 if test -d $$d/$$file; then \
826 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
827 + if test -d "$(distdir)/$$file"; then \
828 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
829 + fi; \
830 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
831 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
832 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
833 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
834 fi; \
835 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
836 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
837 else \
838 - test -f $(distdir)/$$file \
839 - || cp -p $$d/$$file $(distdir)/$$file \
840 + test -f "$(distdir)/$$file" \
841 + || cp -p $$d/$$file "$(distdir)/$$file" \
842 || exit 1; \
843 fi; \
844 done
845 - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
846 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
847 if test "$$subdir" = .; then :; else \
848 test -d "$(distdir)/$$subdir" \
849 || $(MKDIR_P) "$(distdir)/$$subdir" \
850 || exit 1; \
851 - distdir=`$(am__cd) $(distdir) && pwd`; \
852 - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
853 - (cd $$subdir && \
854 + fi; \
855 + done
856 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
857 + if test "$$subdir" = .; then :; else \
858 + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
859 + $(am__relativize); \
860 + new_distdir=$$reldir; \
861 + dir1=$$subdir; dir2="$(top_distdir)"; \
862 + $(am__relativize); \
863 + new_top_distdir=$$reldir; \
864 + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
865 + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
866 + ($(am__cd) $$subdir && \
867 $(MAKE) $(AM_MAKEFLAGS) \
868 - top_distdir="$$top_distdir" \
869 - distdir="$$distdir/$$subdir" \
870 + top_distdir="$$new_top_distdir" \
871 + distdir="$$new_distdir" \
872 am__remove_distdir=: \
873 am__skip_length_check=: \
874 + am__skip_mode_fix=: \
875 distdir) \
876 || exit 1; \
877 fi; \
878 done
879 - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
880 + -test -n "$(am__skip_mode_fix)" \
881 + || find "$(distdir)" -type d ! -perm -755 \
882 + -exec chmod u+rwx,go+rx {} \; -o \
883 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
884 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
885 ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
886 - || chmod -R a+r $(distdir)
887 + || chmod -R a+r "$(distdir)"
888 dist-gzip: distdir
889 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
890 $(am__remove_distdir)
891 @@ -512,6 +602,10 @@ dist-lzma: distdir
892 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
893 $(am__remove_distdir)
894
895 +dist-xz: distdir
896 + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
897 + $(am__remove_distdir)
898 +
899 dist-tarZ: distdir
900 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
901 $(am__remove_distdir)
902 @@ -535,15 +629,17 @@ dist dist-all: distdir
903 distcheck: dist
904 case '$(DIST_ARCHIVES)' in \
905 *.tar.gz*) \
906 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
907 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
908 *.tar.bz2*) \
909 - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
910 + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
911 *.tar.lzma*) \
912 - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
913 + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
914 + *.tar.xz*) \
915 + xz -dc $(distdir).tar.xz | $(am__untar) ;;\
916 *.tar.Z*) \
917 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
918 *.shar.gz*) \
919 - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
920 + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
921 *.zip*) \
922 unzip $(distdir).zip ;;\
923 esac
924 @@ -551,9 +647,11 @@ distcheck: dist
925 mkdir $(distdir)/_build
926 mkdir $(distdir)/_inst
927 chmod a-w $(distdir)
928 + test -d $(distdir)/_build || exit 0; \
929 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
930 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
931 - && cd $(distdir)/_build \
932 + && am__cwd=`pwd` \
933 + && $(am__cd) $(distdir)/_build \
934 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
935 $(DISTCHECK_CONFIGURE_FLAGS) \
936 && $(MAKE) $(AM_MAKEFLAGS) \
937 @@ -575,13 +673,15 @@ distcheck: dist
938 && rm -rf "$$dc_destdir" \
939 && $(MAKE) $(AM_MAKEFLAGS) dist \
940 && rm -rf $(DIST_ARCHIVES) \
941 - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
942 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
943 + && cd "$$am__cwd" \
944 + || exit 1
945 $(am__remove_distdir)
946 @(echo "$(distdir) archives ready for distribution: "; \
947 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
948 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
949 distuninstallcheck:
950 - @cd $(distuninstallcheck_dir) \
951 + @$(am__cd) '$(distuninstallcheck_dir)' \
952 && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
953 || { echo "ERROR: files left after uninstall:" ; \
954 if test -n "$(DESTDIR)"; then \
955 @@ -628,6 +728,7 @@ clean-generic:
956
957 distclean-generic:
958 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
959 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
960 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
961
962 maintainer-clean-generic:
963 @@ -650,6 +751,8 @@ dvi-am:
964
965 html: html-recursive
966
967 +html-am:
968 +
969 info: info-recursive
970
971 info-am:
972 @@ -658,18 +761,28 @@ install-data-am: install-docDATA
973
974 install-dvi: install-dvi-recursive
975
976 +install-dvi-am:
977 +
978 install-exec-am:
979
980 install-html: install-html-recursive
981
982 +install-html-am:
983 +
984 install-info: install-info-recursive
985
986 +install-info-am:
987 +
988 install-man:
989
990 install-pdf: install-pdf-recursive
991
992 +install-pdf-am:
993 +
994 install-ps: install-ps-recursive
995
996 +install-ps-am:
997 +
998 installcheck-am:
999
1000 maintainer-clean: maintainer-clean-recursive
1001 @@ -692,24 +805,26 @@ ps-am:
1002
1003 uninstall-am: uninstall-docDATA
1004
1005 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
1006 - install-strip
1007 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
1008 + install-am install-strip tags-recursive
1009
1010 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1011 all all-am am--refresh check check-am clean clean-generic \
1012 clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1013 - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
1014 - distclean distclean-generic distclean-libtool distclean-tags \
1015 - distcleancheck distdir distuninstallcheck dvi dvi-am html \
1016 - html-am info info-am install install-am install-data \
1017 - install-data-am install-docDATA install-dvi install-dvi-am \
1018 - install-exec install-exec-am install-html install-html-am \
1019 - install-info install-info-am install-man install-pdf \
1020 - install-pdf-am install-ps install-ps-am install-strip \
1021 - installcheck installcheck-am installdirs installdirs-am \
1022 - maintainer-clean maintainer-clean-generic mostlyclean \
1023 - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1024 - tags tags-recursive uninstall uninstall-am uninstall-docDATA
1025 + dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
1026 + distcheck distclean distclean-generic distclean-libtool \
1027 + distclean-tags distcleancheck distdir distuninstallcheck dvi \
1028 + dvi-am html html-am info info-am install install-am \
1029 + install-data install-data-am install-docDATA install-dvi \
1030 + install-dvi-am install-exec install-exec-am install-html \
1031 + install-html-am install-info install-info-am install-man \
1032 + install-pdf install-pdf-am install-ps install-ps-am \
1033 + install-strip installcheck installcheck-am installdirs \
1034 + installdirs-am maintainer-clean maintainer-clean-generic \
1035 + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
1036 + ps ps-am tags tags-recursive uninstall uninstall-am \
1037 + uninstall-docDATA
1038 +
1039
1040 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1041 # Otherwise a system limit (for SysV at least) may be exceeded.
1042 diff --git a/aclocal.m4 b/aclocal.m4
1043 index 344a8b1..cf79383 100644
1044 --- a/aclocal.m4
1045 +++ b/aclocal.m4
1046 @@ -1,7 +1,7 @@
1047 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
1048 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
1049
1050 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1051 -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1052 +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1053 # This file is free software; the Free Software Foundation
1054 # gives unlimited permission to copy and/or distribute it,
1055 # with or without modifications, as long as this notice is preserved.
1056 @@ -13,12 +13,92 @@
1057
1058 m4_ifndef([AC_AUTOCONF_VERSION],
1059 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1060 -m4_if(AC_AUTOCONF_VERSION, [2.63],,
1061 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
1062 [m4_warning([this file was generated for autoconf 2.63.
1063 You have another version of autoconf. It may work, but is not guaranteed to.
1064 If you have problems, you may need to regenerate the build system entirely.
1065 To do so, use the procedure documented by the package, typically `autoreconf'.])])
1066
1067 +# Portability macros for glibc argz. -*- Autoconf -*-
1068 +#
1069 +# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
1070 +# Written by Gary V. Vaughan <[email protected]>
1071 +#
1072 +# This file is free software; the Free Software Foundation gives
1073 +# unlimited permission to copy and/or distribute it, with or without
1074 +# modifications, as long as this notice is preserved.
1075 +
1076 +# serial 5 argz.m4
1077 +
1078 +AC_DEFUN([gl_FUNC_ARGZ],
1079 +[gl_PREREQ_ARGZ
1080 +
1081 +AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
1082 +
1083 +AC_CHECK_TYPES([error_t],
1084 + [],
1085 + [AC_DEFINE([error_t], [int],
1086 + [Define to a type to use for `error_t' if it is not otherwise available.])
1087 + AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h
1088 + does not typedef error_t.])],
1089 + [#if defined(HAVE_ARGZ_H)
1090 +# include <argz.h>
1091 +#endif])
1092 +
1093 +ARGZ_H=
1094 +AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
1095 + argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
1096 +
1097 +dnl if have system argz functions, allow forced use of
1098 +dnl libltdl-supplied implementation (and default to do so
1099 +dnl on "known bad" systems). Could use a runtime check, but
1100 +dnl (a) detecting malloc issues is notoriously unreliable
1101 +dnl (b) only known system that declares argz functions,
1102 +dnl provides them, yet they are broken, is cygwin
1103 +dnl releases prior to 16-Mar-2007 (1.5.24 and earlier)
1104 +dnl So, it's more straightforward simply to special case
1105 +dnl this for known bad systems.
1106 +AS_IF([test -z "$ARGZ_H"],
1107 + [AC_CACHE_CHECK(
1108 + [if argz actually works],
1109 + [lt_cv_sys_argz_works],
1110 + [[case $host_os in #(
1111 + *cygwin*)
1112 + lt_cv_sys_argz_works=no
1113 + if test "$cross_compiling" != no; then
1114 + lt_cv_sys_argz_works="guessing no"
1115 + else
1116 + lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
1117 + save_IFS=$IFS
1118 + IFS=-.
1119 + set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
1120 + IFS=$save_IFS
1121 + lt_os_major=${2-0}
1122 + lt_os_minor=${3-0}
1123 + lt_os_micro=${4-0}
1124 + if test "$lt_os_major" -gt 1 \
1125 + || { test "$lt_os_major" -eq 1 \
1126 + && { test "$lt_os_minor" -gt 5 \
1127 + || { test "$lt_os_minor" -eq 5 \
1128 + && test "$lt_os_micro" -gt 24; }; }; }; then
1129 + lt_cv_sys_argz_works=yes
1130 + fi
1131 + fi
1132 + ;; #(
1133 + *) lt_cv_sys_argz_works=yes ;;
1134 + esac]])
1135 + AS_IF([test $lt_cv_sys_argz_works = yes],
1136 + [AC_DEFINE([HAVE_WORKING_ARGZ], 1,
1137 + [This value is set to 1 to indicate that the system argz facility works])],
1138 + [ARGZ_H=argz.h
1139 + AC_LIBOBJ([argz])])])
1140 +
1141 +AC_SUBST([ARGZ_H])
1142 +])
1143 +
1144 +# Prerequisites of lib/argz.c.
1145 +AC_DEFUN([gl_PREREQ_ARGZ], [:])
1146 +
1147 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1148 #
1149 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1150 @@ -2485,10 +2565,13 @@ linux* | k*bsd*-gnu)
1151 # before this can be enabled.
1152 hardcode_into_libs=yes
1153
1154 + # Add ABI-specific directories to the system library path.
1155 + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
1156 +
1157 # Append ld.so.conf contents to the search path
1158 if test -f /etc/ld.so.conf; then
1159 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
1160 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
1161 + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
1162 fi
1163
1164 # We used to test for /lib/ld.so.1 and disable shared libraries on
1165 @@ -7361,6 +7444,811 @@ _LT_EOF
1166 esac
1167 ])
1168
1169 +# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
1170 +#
1171 +# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc.
1172 +# Written by Thomas Tanner, 1999
1173 +#
1174 +# This file is free software; the Free Software Foundation gives
1175 +# unlimited permission to copy and/or distribute it, with or without
1176 +# modifications, as long as this notice is preserved.
1177 +
1178 +# serial 17 LTDL_INIT
1179 +
1180 +# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
1181 +# ------------------------------------------
1182 +# DIRECTORY contains the libltdl sources. It is okay to call this
1183 +# function multiple times, as long as the same DIRECTORY is always given.
1184 +AC_DEFUN([LT_CONFIG_LTDL_DIR],
1185 +[AC_BEFORE([$0], [LTDL_INIT])
1186 +_$0($*)
1187 +])# LT_CONFIG_LTDL_DIR
1188 +
1189 +# We break this out into a separate macro, so that we can call it safely
1190 +# internally without being caught accidentally by the sed scan in libtoolize.
1191 +m4_defun([_LT_CONFIG_LTDL_DIR],
1192 +[dnl remove trailing slashes
1193 +m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
1194 +m4_case(_LTDL_DIR,
1195 + [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
1196 + m4_if(_ARG_DIR, [.],
1197 + [],
1198 + [m4_define([_LTDL_DIR], _ARG_DIR)
1199 + _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
1200 + [m4_if(_ARG_DIR, _LTDL_DIR,
1201 + [],
1202 + [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])])
1203 +m4_popdef([_ARG_DIR])
1204 +])# _LT_CONFIG_LTDL_DIR
1205 +
1206 +# Initialise:
1207 +m4_define([_LTDL_DIR], [])
1208 +
1209 +
1210 +# _LT_BUILD_PREFIX
1211 +# ----------------
1212 +# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise
1213 +# to `${top_builddir}/'.
1214 +m4_define([_LT_BUILD_PREFIX],
1215 +[m4_ifdef([AC_AUTOCONF_VERSION],
1216 + [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
1217 + [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
1218 + [${top_build_prefix}],
1219 + [${top_builddir}/])],
1220 + [${top_build_prefix}])],
1221 + [${top_builddir}/])[]dnl
1222 +])
1223 +
1224 +
1225 +# LTDL_CONVENIENCE
1226 +# ----------------
1227 +# sets LIBLTDL to the link flags for the libltdl convenience library and
1228 +# LTDLINCL to the include flags for the libltdl header and adds
1229 +# --enable-ltdl-convenience to the configure arguments. Note that
1230 +# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with
1231 +# '${top_build_prefix}' if available, otherwise with '${top_builddir}/',
1232 +# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
1233 +# quotes!). If your package is not flat and you're not using automake,
1234 +# define top_build_prefix, top_builddir, and top_srcdir appropriately
1235 +# in your Makefiles.
1236 +AC_DEFUN([LTDL_CONVENIENCE],
1237 +[AC_BEFORE([$0], [LTDL_INIT])dnl
1238 +dnl Although the argument is deprecated and no longer documented,
1239 +dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
1240 +dnl here make sure it is the same as any other declaration of libltdl's
1241 +dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
1242 +dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
1243 +m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
1244 +_$0()
1245 +])# LTDL_CONVENIENCE
1246 +
1247 +# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
1248 +# now we have LT_CONFIG_LTDL_DIR:
1249 +AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
1250 +[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
1251 +_LTDL_CONVENIENCE])
1252 +
1253 +dnl aclocal-1.4 backwards compatibility:
1254 +dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [])
1255 +
1256 +
1257 +# _LTDL_CONVENIENCE
1258 +# -----------------
1259 +# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]).
1260 +m4_defun([_LTDL_CONVENIENCE],
1261 +[case $enable_ltdl_convenience in
1262 + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
1263 + "") enable_ltdl_convenience=yes
1264 + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
1265 +esac
1266 +LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
1267 +LTDLDEPS=$LIBLTDL
1268 +LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
1269 +
1270 +AC_SUBST([LIBLTDL])
1271 +AC_SUBST([LTDLDEPS])
1272 +AC_SUBST([LTDLINCL])
1273 +
1274 +# For backwards non-gettext consistent compatibility...
1275 +INCLTDL="$LTDLINCL"
1276 +AC_SUBST([INCLTDL])
1277 +])# _LTDL_CONVENIENCE
1278 +
1279 +
1280 +# LTDL_INSTALLABLE
1281 +# ----------------
1282 +# sets LIBLTDL to the link flags for the libltdl installable library
1283 +# and LTDLINCL to the include flags for the libltdl header and adds
1284 +# --enable-ltdl-install to the configure arguments. Note that
1285 +# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl
1286 +# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if
1287 +# available, otherwise with '${top_builddir}/', and LTDLINCL will be
1288 +# prefixed with '${top_srcdir}/' (note the single quotes!). If your
1289 +# package is not flat and you're not using automake, define top_build_prefix,
1290 +# top_builddir, and top_srcdir appropriately in your Makefiles.
1291 +# In the future, this macro may have to be called after LT_INIT.
1292 +AC_DEFUN([LTDL_INSTALLABLE],
1293 +[AC_BEFORE([$0], [LTDL_INIT])dnl
1294 +dnl Although the argument is deprecated and no longer documented,
1295 +dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
1296 +dnl here make sure it is the same as any other declaration of libltdl's
1297 +dnl location! This also ensures lt_ltdl_dir is set when configure.ac is
1298 +dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
1299 +m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
1300 +_$0()
1301 +])# LTDL_INSTALLABLE
1302 +
1303 +# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
1304 +# now we have LT_CONFIG_LTDL_DIR:
1305 +AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
1306 +[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
1307 +_LTDL_INSTALLABLE])
1308 +
1309 +dnl aclocal-1.4 backwards compatibility:
1310 +dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [])
1311 +
1312 +
1313 +# _LTDL_INSTALLABLE
1314 +# -----------------
1315 +# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]).
1316 +m4_defun([_LTDL_INSTALLABLE],
1317 +[if test -f $prefix/lib/libltdl.la; then
1318 + lt_save_LDFLAGS="$LDFLAGS"
1319 + LDFLAGS="-L$prefix/lib $LDFLAGS"
1320 + AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes])
1321 + LDFLAGS="$lt_save_LDFLAGS"
1322 + if test x"${lt_lib_ltdl-no}" = xyes; then
1323 + if test x"$enable_ltdl_install" != xyes; then
1324 + # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install
1325 + AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install'])
1326 + enable_ltdl_install=no
1327 + fi
1328 + elif test x"$enable_ltdl_install" = xno; then
1329 + AC_MSG_WARN([libltdl not installed, but installation disabled])
1330 + fi
1331 +fi
1332 +
1333 +# If configure.ac declared an installable ltdl, and the user didn't override
1334 +# with --disable-ltdl-install, we will install the shipped libltdl.
1335 +case $enable_ltdl_install in
1336 + no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
1337 + LIBLTDL="-lltdl"
1338 + LTDLDEPS=
1339 + LTDLINCL=
1340 + ;;
1341 + *) enable_ltdl_install=yes
1342 + ac_configure_args="$ac_configure_args --enable-ltdl-install"
1343 + LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la"
1344 + LTDLDEPS=$LIBLTDL
1345 + LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
1346 + ;;
1347 +esac
1348 +
1349 +AC_SUBST([LIBLTDL])
1350 +AC_SUBST([LTDLDEPS])
1351 +AC_SUBST([LTDLINCL])
1352 +
1353 +# For backwards non-gettext consistent compatibility...
1354 +INCLTDL="$LTDLINCL"
1355 +AC_SUBST([INCLTDL])
1356 +])# LTDL_INSTALLABLE
1357 +
1358 +
1359 +# _LTDL_MODE_DISPATCH
1360 +# -------------------
1361 +m4_define([_LTDL_MODE_DISPATCH],
1362 +[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself:
1363 +m4_if(_LTDL_DIR, [],
1364 + [],
1365 + dnl if _LTDL_MODE was not set already, the default value is `subproject':
1366 + [m4_case(m4_default(_LTDL_MODE, [subproject]),
1367 + [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR)
1368 + _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
1369 + [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])],
1370 + [recursive], [],
1371 + [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl
1372 +dnl Be careful not to expand twice:
1373 +m4_define([$0], [])
1374 +])# _LTDL_MODE_DISPATCH
1375 +
1376 +
1377 +# _LT_LIBOBJ(MODULE_NAME)
1378 +# -----------------------
1379 +# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead
1380 +# of into LIBOBJS.
1381 +AC_DEFUN([_LT_LIBOBJ], [
1382 + m4_pattern_allow([^_LT_LIBOBJS$])
1383 + _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
1384 +])# _LT_LIBOBJS
1385 +
1386 +
1387 +# LTDL_INIT([OPTIONS])
1388 +# --------------------
1389 +# Clients of libltdl can use this macro to allow the installer to
1390 +# choose between a shipped copy of the ltdl sources or a preinstalled
1391 +# version of the library. If the shipped ltdl sources are not in a
1392 +# subdirectory named libltdl, the directory name must be given by
1393 +# LT_CONFIG_LTDL_DIR.
1394 +AC_DEFUN([LTDL_INIT],
1395 +[dnl Parse OPTIONS
1396 +_LT_SET_OPTIONS([$0], [$1])
1397 +
1398 +dnl We need to keep our own list of libobjs separate from our parent project,
1399 +dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
1400 +dnl we look for our own LIBOBJs.
1401 +m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
1402 +m4_pushdef([AC_LIBSOURCES])
1403 +
1404 +dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
1405 +m4_if(_LTDL_MODE, [],
1406 + [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
1407 + m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])],
1408 + [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])
1409 +
1410 +AC_ARG_WITH([included_ltdl],
1411 + [AS_HELP_STRING([--with-included-ltdl],
1412 + [use the GNU ltdl sources included here])])
1413 +
1414 +if test "x$with_included_ltdl" != xyes; then
1415 + # We are not being forced to use the included libltdl sources, so
1416 + # decide whether there is a useful installed version we can use.
1417 + AC_CHECK_HEADER([ltdl.h],
1418 + [AC_CHECK_DECL([lt_dlinterface_register],
1419 + [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
1420 + [with_included_ltdl=no],
1421 + [with_included_ltdl=yes])],
1422 + [with_included_ltdl=yes],
1423 + [AC_INCLUDES_DEFAULT
1424 + #include <ltdl.h>])],
1425 + [with_included_ltdl=yes],
1426 + [AC_INCLUDES_DEFAULT]
1427 + )
1428 +fi
1429 +
1430 +dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE
1431 +dnl was called yet, then for old times' sake, we assume libltdl is in an
1432 +dnl eponymous directory:
1433 +AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])
1434 +
1435 +AC_ARG_WITH([ltdl_include],
1436 + [AS_HELP_STRING([--with-ltdl-include=DIR],
1437 + [use the ltdl headers installed in DIR])])
1438 +
1439 +if test -n "$with_ltdl_include"; then
1440 + if test -f "$with_ltdl_include/ltdl.h"; then :
1441 + else
1442 + AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include'])
1443 + fi
1444 +else
1445 + with_ltdl_include=no
1446 +fi
1447 +
1448 +AC_ARG_WITH([ltdl_lib],
1449 + [AS_HELP_STRING([--with-ltdl-lib=DIR],
1450 + [use the libltdl.la installed in DIR])])
1451 +
1452 +if test -n "$with_ltdl_lib"; then
1453 + if test -f "$with_ltdl_lib/libltdl.la"; then :
1454 + else
1455 + AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
1456 + fi
1457 +else
1458 + with_ltdl_lib=no
1459 +fi
1460 +
1461 +case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
1462 + ,yes,no,no,)
1463 + m4_case(m4_default(_LTDL_TYPE, [convenience]),
1464 + [convenience], [_LTDL_CONVENIENCE],
1465 + [installable], [_LTDL_INSTALLABLE],
1466 + [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)])
1467 + ;;
1468 + ,no,no,no,)
1469 + # If the included ltdl is not to be used, then use the
1470 + # preinstalled libltdl we found.
1471 + AC_DEFINE([HAVE_LTDL], [1],
1472 + [Define this if a modern libltdl is already installed])
1473 + LIBLTDL=-lltdl
1474 + LTDLDEPS=
1475 + LTDLINCL=
1476 + ;;
1477 + ,no*,no,*)
1478 + AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together])
1479 + ;;
1480 + *) with_included_ltdl=no
1481 + LIBLTDL="-L$with_ltdl_lib -lltdl"
1482 + LTDLDEPS=
1483 + LTDLINCL="-I$with_ltdl_include"
1484 + ;;
1485 +esac
1486 +INCLTDL="$LTDLINCL"
1487 +
1488 +# Report our decision...
1489 +AC_MSG_CHECKING([where to find libltdl headers])
1490 +AC_MSG_RESULT([$LTDLINCL])
1491 +AC_MSG_CHECKING([where to find libltdl library])
1492 +AC_MSG_RESULT([$LIBLTDL])
1493 +
1494 +_LTDL_SETUP
1495 +
1496 +dnl restore autoconf definition.
1497 +m4_popdef([AC_LIBOBJ])
1498 +m4_popdef([AC_LIBSOURCES])
1499 +
1500 +AC_CONFIG_COMMANDS_PRE([
1501 + _ltdl_libobjs=
1502 + _ltdl_ltlibobjs=
1503 + if test -n "$_LT_LIBOBJS"; then
1504 + # Remove the extension.
1505 + _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
1506 + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
1507 + _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
1508 + _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
1509 + done
1510 + fi
1511 + AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs])
1512 + AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs])
1513 +])
1514 +
1515 +# Only expand once:
1516 +m4_define([LTDL_INIT])
1517 +])# LTDL_INIT
1518 +
1519 +# Old names:
1520 +AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
1521 +AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
1522 +AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
1523 +dnl aclocal-1.4 backwards compatibility:
1524 +dnl AC_DEFUN([AC_LIB_LTDL], [])
1525 +dnl AC_DEFUN([AC_WITH_LTDL], [])
1526 +dnl AC_DEFUN([LT_WITH_LTDL], [])
1527 +
1528 +
1529 +# _LTDL_SETUP
1530 +# -----------
1531 +# Perform all the checks necessary for compilation of the ltdl objects
1532 +# -- including compiler checks and header checks. This is a public
1533 +# interface mainly for the benefit of libltdl's own configure.ac, most
1534 +# other users should call LTDL_INIT instead.
1535 +AC_DEFUN([_LTDL_SETUP],
1536 +[AC_REQUIRE([AC_PROG_CC])dnl
1537 +AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
1538 +AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
1539 +AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
1540 +AC_REQUIRE([LT_LIB_DLLOAD])dnl
1541 +AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
1542 +AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
1543 +AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
1544 +AC_REQUIRE([gl_FUNC_ARGZ])dnl
1545 +
1546 +m4_require([_LT_CHECK_OBJDIR])dnl
1547 +m4_require([_LT_HEADER_DLFCN])dnl
1548 +m4_require([_LT_CHECK_DLPREOPEN])dnl
1549 +m4_require([_LT_DECL_SED])dnl
1550 +
1551 +dnl Don't require this, or it will be expanded earlier than the code
1552 +dnl that sets the variables it relies on:
1553 +_LT_ENABLE_INSTALL
1554 +
1555 +dnl _LTDL_MODE specific code must be called at least once:
1556 +_LTDL_MODE_DISPATCH
1557 +
1558 +# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
1559 +# the user used. This is so that ltdl.h can pick up the parent projects
1560 +# config.h file, The first file in AC_CONFIG_HEADERS must contain the
1561 +# definitions required by ltdl.c.
1562 +# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
1563 +AC_CONFIG_COMMANDS_PRE([dnl
1564 +m4_pattern_allow([^LT_CONFIG_H$])dnl
1565 +m4_ifset([AH_HEADER],
1566 + [LT_CONFIG_H=AH_HEADER],
1567 + [m4_ifset([AC_LIST_HEADERS],
1568 + [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`],
1569 + [])])])
1570 +AC_SUBST([LT_CONFIG_H])
1571 +
1572 +AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
1573 + [], [], [AC_INCLUDES_DEFAULT])
1574 +
1575 +AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
1576 +AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
1577 +
1578 +AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
1579 +
1580 +name=ltdl
1581 +LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
1582 +AC_SUBST([LTDLOPEN])
1583 +])# _LTDL_SETUP
1584 +
1585 +
1586 +# _LT_ENABLE_INSTALL
1587 +# ------------------
1588 +m4_define([_LT_ENABLE_INSTALL],
1589 +[AC_ARG_ENABLE([ltdl-install],
1590 + [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])
1591 +
1592 +case ,${enable_ltdl_install},${enable_ltdl_convenience} in
1593 + *yes*) ;;
1594 + *) enable_ltdl_convenience=yes ;;
1595 +esac
1596 +
1597 +m4_ifdef([AM_CONDITIONAL],
1598 +[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
1599 + AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)])
1600 +])# _LT_ENABLE_INSTALL
1601 +
1602 +
1603 +# LT_SYS_DLOPEN_DEPLIBS
1604 +# ---------------------
1605 +AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS],
1606 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
1607 +AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
1608 + [lt_cv_sys_dlopen_deplibs],
1609 + [# PORTME does your system automatically load deplibs for dlopen?
1610 + # or its logical equivalent (e.g. shl_load for HP-UX < 11)
1611 + # For now, we just catch OSes we know something about -- in the
1612 + # future, we'll try test this programmatically.
1613 + lt_cv_sys_dlopen_deplibs=unknown
1614 + case $host_os in
1615 + aix3*|aix4.1.*|aix4.2.*)
1616 + # Unknown whether this is true for these versions of AIX, but
1617 + # we want this `case' here to explicitly catch those versions.
1618 + lt_cv_sys_dlopen_deplibs=unknown
1619 + ;;
1620 + aix[[4-9]]*)
1621 + lt_cv_sys_dlopen_deplibs=yes
1622 + ;;
1623 + amigaos*)
1624 + case $host_cpu in
1625 + powerpc)
1626 + lt_cv_sys_dlopen_deplibs=no
1627 + ;;
1628 + esac
1629 + ;;
1630 + darwin*)
1631 + # Assuming the user has installed a libdl from somewhere, this is true
1632 + # If you are looking for one http://www.opendarwin.org/projects/dlcompat
1633 + lt_cv_sys_dlopen_deplibs=yes
1634 + ;;
1635 + freebsd* | dragonfly*)
1636 + lt_cv_sys_dlopen_deplibs=yes
1637 + ;;
1638 + gnu* | linux* | k*bsd*-gnu)
1639 + # GNU and its variants, using gnu ld.so (Glibc)
1640 + lt_cv_sys_dlopen_deplibs=yes
1641 + ;;
1642 + hpux10*|hpux11*)
1643 + lt_cv_sys_dlopen_deplibs=yes
1644 + ;;
1645 + interix*)
1646 + lt_cv_sys_dlopen_deplibs=yes
1647 + ;;
1648 + irix[[12345]]*|irix6.[[01]]*)
1649 + # Catch all versions of IRIX before 6.2, and indicate that we don't
1650 + # know how it worked for any of those versions.
1651 + lt_cv_sys_dlopen_deplibs=unknown
1652 + ;;
1653 + irix*)
1654 + # The case above catches anything before 6.2, and it's known that
1655 + # at 6.2 and later dlopen does load deplibs.
1656 + lt_cv_sys_dlopen_deplibs=yes
1657 + ;;
1658 + netbsd*)
1659 + lt_cv_sys_dlopen_deplibs=yes
1660 + ;;
1661 + openbsd*)
1662 + lt_cv_sys_dlopen_deplibs=yes
1663 + ;;
1664 + osf[[1234]]*)
1665 + # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
1666 + # it did *not* use an RPATH in a shared library to find objects the
1667 + # library depends on, so we explicitly say `no'.
1668 + lt_cv_sys_dlopen_deplibs=no
1669 + ;;
1670 + osf5.0|osf5.0a|osf5.1)
1671 + # dlopen *does* load deplibs and with the right loader patch applied
1672 + # it even uses RPATH in a shared library to search for shared objects
1673 + # that the library depends on, but there's no easy way to know if that
1674 + # patch is installed. Since this is the case, all we can really
1675 + # say is unknown -- it depends on the patch being installed. If
1676 + # it is, this changes to `yes'. Without it, it would be `no'.
1677 + lt_cv_sys_dlopen_deplibs=unknown
1678 + ;;
1679 + osf*)
1680 + # the two cases above should catch all versions of osf <= 5.1. Read
1681 + # the comments above for what we know about them.
1682 + # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
1683 + # is used to find them so we can finally say `yes'.
1684 + lt_cv_sys_dlopen_deplibs=yes
1685 + ;;
1686 + qnx*)
1687 + lt_cv_sys_dlopen_deplibs=yes
1688 + ;;
1689 + solaris*)
1690 + lt_cv_sys_dlopen_deplibs=yes
1691 + ;;
1692 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
1693 + libltdl_cv_sys_dlopen_deplibs=yes
1694 + ;;
1695 + esac
1696 + ])
1697 +if test "$lt_cv_sys_dlopen_deplibs" != yes; then
1698 + AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
1699 + [Define if the OS needs help to load dependent libraries for dlopen().])
1700 +fi
1701 +])# LT_SYS_DLOPEN_DEPLIBS
1702 +
1703 +# Old name:
1704 +AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS])
1705 +dnl aclocal-1.4 backwards compatibility:
1706 +dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [])
1707 +
1708 +
1709 +# LT_SYS_MODULE_EXT
1710 +# -----------------
1711 +AC_DEFUN([LT_SYS_MODULE_EXT],
1712 +[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
1713 +AC_CACHE_CHECK([which extension is used for runtime loadable modules],
1714 + [libltdl_cv_shlibext],
1715 +[
1716 +module=yes
1717 +eval libltdl_cv_shlibext=$shrext_cmds
1718 + ])
1719 +if test -n "$libltdl_cv_shlibext"; then
1720 + m4_pattern_allow([LT_MODULE_EXT])dnl
1721 + AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
1722 + [Define to the extension used for runtime loadable modules, say, ".so".])
1723 +fi
1724 +])# LT_SYS_MODULE_EXT
1725 +
1726 +# Old name:
1727 +AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT])
1728 +dnl aclocal-1.4 backwards compatibility:
1729 +dnl AC_DEFUN([AC_LTDL_SHLIBEXT], [])
1730 +
1731 +
1732 +# LT_SYS_MODULE_PATH
1733 +# ------------------
1734 +AC_DEFUN([LT_SYS_MODULE_PATH],
1735 +[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
1736 +AC_CACHE_CHECK([which variable specifies run-time module search path],
1737 + [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
1738 +if test -n "$lt_cv_module_path_var"; then
1739 + m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
1740 + AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
1741 + [Define to the name of the environment variable that determines the run-time module search path.])
1742 +fi
1743 +])# LT_SYS_MODULE_PATH
1744 +
1745 +# Old name:
1746 +AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH])
1747 +dnl aclocal-1.4 backwards compatibility:
1748 +dnl AC_DEFUN([AC_LTDL_SHLIBPATH], [])
1749 +
1750 +
1751 +# LT_SYS_DLSEARCH_PATH
1752 +# --------------------
1753 +AC_DEFUN([LT_SYS_DLSEARCH_PATH],
1754 +[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
1755 +AC_CACHE_CHECK([for the default library search path],
1756 + [lt_cv_sys_dlsearch_path],
1757 + [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
1758 +if test -n "$lt_cv_sys_dlsearch_path"; then
1759 + sys_dlsearch_path=
1760 + for dir in $lt_cv_sys_dlsearch_path; do
1761 + if test -z "$sys_dlsearch_path"; then
1762 + sys_dlsearch_path="$dir"
1763 + else
1764 + sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
1765 + fi
1766 + done
1767 + m4_pattern_allow([LT_DLSEARCH_PATH])dnl
1768 + AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"],
1769 + [Define to the system default library search path.])
1770 +fi
1771 +])# LT_SYS_DLSEARCH_PATH
1772 +
1773 +# Old name:
1774 +AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH])
1775 +dnl aclocal-1.4 backwards compatibility:
1776 +dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [])
1777 +
1778 +
1779 +# _LT_CHECK_DLPREOPEN
1780 +# -------------------
1781 +m4_defun([_LT_CHECK_DLPREOPEN],
1782 +[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
1783 +AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
1784 + [libltdl_cv_preloaded_symbols],
1785 + [if test -n "$lt_cv_sys_global_symbol_pipe"; then
1786 + libltdl_cv_preloaded_symbols=yes
1787 + else
1788 + libltdl_cv_preloaded_symbols=no
1789 + fi
1790 + ])
1791 +if test x"$libltdl_cv_preloaded_symbols" = xyes; then
1792 + AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
1793 + [Define if libtool can extract symbol lists from object files.])
1794 +fi
1795 +])# _LT_CHECK_DLPREOPEN
1796 +
1797 +
1798 +# LT_LIB_DLLOAD
1799 +# -------------
1800 +AC_DEFUN([LT_LIB_DLLOAD],
1801 +[m4_pattern_allow([^LT_DLLOADERS$])
1802 +LT_DLLOADERS=
1803 +AC_SUBST([LT_DLLOADERS])
1804 +
1805 +AC_LANG_PUSH([C])
1806 +
1807 +LIBADD_DLOPEN=
1808 +AC_SEARCH_LIBS([dlopen], [dl],
1809 + [AC_DEFINE([HAVE_LIBDL], [1],
1810 + [Define if you have the libdl library or equivalent.])
1811 + if test "$ac_cv_search_dlopen" != "none required" ; then
1812 + LIBADD_DLOPEN="-ldl"
1813 + fi
1814 + libltdl_cv_lib_dl_dlopen="yes"
1815 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
1816 + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
1817 +# include <dlfcn.h>
1818 +#endif
1819 + ]], [[dlopen(0, 0);]])],
1820 + [AC_DEFINE([HAVE_LIBDL], [1],
1821 + [Define if you have the libdl library or equivalent.])
1822 + libltdl_cv_func_dlopen="yes"
1823 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
1824 + [AC_CHECK_LIB([svld], [dlopen],
1825 + [AC_DEFINE([HAVE_LIBDL], [1],
1826 + [Define if you have the libdl library or equivalent.])
1827 + LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
1828 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
1829 +if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
1830 +then
1831 + lt_save_LIBS="$LIBS"
1832 + LIBS="$LIBS $LIBADD_DLOPEN"
1833 + AC_CHECK_FUNCS([dlerror])
1834 + LIBS="$lt_save_LIBS"
1835 +fi
1836 +AC_SUBST([LIBADD_DLOPEN])
1837 +
1838 +LIBADD_SHL_LOAD=
1839 +AC_CHECK_FUNC([shl_load],
1840 + [AC_DEFINE([HAVE_SHL_LOAD], [1],
1841 + [Define if you have the shl_load function.])
1842 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"],
1843 + [AC_CHECK_LIB([dld], [shl_load],
1844 + [AC_DEFINE([HAVE_SHL_LOAD], [1],
1845 + [Define if you have the shl_load function.])
1846 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
1847 + LIBADD_SHL_LOAD="-ldld"])])
1848 +AC_SUBST([LIBADD_SHL_LOAD])
1849 +
1850 +case $host_os in
1851 +darwin[[1567]].*)
1852 +# We only want this for pre-Mac OS X 10.4.
1853 + AC_CHECK_FUNC([_dyld_func_lookup],
1854 + [AC_DEFINE([HAVE_DYLD], [1],
1855 + [Define if you have the _dyld_func_lookup function.])
1856 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"])
1857 + ;;
1858 +beos*)
1859 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
1860 + ;;
1861 +cygwin* | mingw* | os2* | pw32*)
1862 + AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
1863 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
1864 + ;;
1865 +esac
1866 +
1867 +AC_CHECK_LIB([dld], [dld_link],
1868 + [AC_DEFINE([HAVE_DLD], [1],
1869 + [Define if you have the GNU dld library.])
1870 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"])
1871 +AC_SUBST([LIBADD_DLD_LINK])
1872 +
1873 +m4_pattern_allow([^LT_DLPREOPEN$])
1874 +LT_DLPREOPEN=
1875 +if test -n "$LT_DLLOADERS"
1876 +then
1877 + for lt_loader in $LT_DLLOADERS; do
1878 + LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
1879 + done
1880 + AC_DEFINE([HAVE_LIBDLLOADER], [1],
1881 + [Define if libdlloader will be built on this platform])
1882 +fi
1883 +AC_SUBST([LT_DLPREOPEN])
1884 +
1885 +dnl This isn't used anymore, but set it for backwards compatibility
1886 +LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
1887 +AC_SUBST([LIBADD_DL])
1888 +
1889 +AC_LANG_POP
1890 +])# LT_LIB_DLLOAD
1891 +
1892 +# Old name:
1893 +AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD])
1894 +dnl aclocal-1.4 backwards compatibility:
1895 +dnl AC_DEFUN([AC_LTDL_DLLIB], [])
1896 +
1897 +
1898 +# LT_SYS_SYMBOL_USCORE
1899 +# --------------------
1900 +# does the compiler prefix global symbols with an underscore?
1901 +AC_DEFUN([LT_SYS_SYMBOL_USCORE],
1902 +[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
1903 +AC_CACHE_CHECK([for _ prefix in compiled symbols],
1904 + [lt_cv_sys_symbol_underscore],
1905 + [lt_cv_sys_symbol_underscore=no
1906 + cat > conftest.$ac_ext <<_LT_EOF
1907 +void nm_test_func(){}
1908 +int main(){nm_test_func;return 0;}
1909 +_LT_EOF
1910 + if AC_TRY_EVAL(ac_compile); then
1911 + # Now try to grab the symbols.
1912 + ac_nlist=conftest.nm
1913 + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
1914 + # See whether the symbols have a leading underscore.
1915 + if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
1916 + lt_cv_sys_symbol_underscore=yes
1917 + else
1918 + if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
1919 + :
1920 + else
1921 + echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD
1922 + fi
1923 + fi
1924 + else
1925 + echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
1926 + fi
1927 + else
1928 + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
1929 + cat conftest.c >&AS_MESSAGE_LOG_FD
1930 + fi
1931 + rm -rf conftest*
1932 + ])
1933 + sys_symbol_underscore=$lt_cv_sys_symbol_underscore
1934 + AC_SUBST([sys_symbol_underscore])
1935 +])# LT_SYS_SYMBOL_USCORE
1936 +
1937 +# Old name:
1938 +AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE])
1939 +dnl aclocal-1.4 backwards compatibility:
1940 +dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
1941 +
1942 +
1943 +# LT_FUNC_DLSYM_USCORE
1944 +# --------------------
1945 +AC_DEFUN([LT_FUNC_DLSYM_USCORE],
1946 +[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
1947 +if test x"$lt_cv_sys_symbol_underscore" = xyes; then
1948 + if test x"$libltdl_cv_func_dlopen" = xyes ||
1949 + test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
1950 + AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
1951 + [libltdl_cv_need_uscore],
1952 + [libltdl_cv_need_uscore=unknown
1953 + save_LIBS="$LIBS"
1954 + LIBS="$LIBS $LIBADD_DLOPEN"
1955 + _LT_TRY_DLOPEN_SELF(
1956 + [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
1957 + [], [libltdl_cv_need_uscore=cross])
1958 + LIBS="$save_LIBS"
1959 + ])
1960 + fi
1961 +fi
1962 +
1963 +if test x"$libltdl_cv_need_uscore" = xyes; then
1964 + AC_DEFINE([NEED_USCORE], [1],
1965 + [Define if dlsym() requires a leading underscore in symbol names.])
1966 +fi
1967 +])# LT_FUNC_DLSYM_USCORE
1968 +
1969 +# Old name:
1970 +AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
1971 +dnl aclocal-1.4 backwards compatibility:
1972 +dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
1973 +
1974 # Helper functions for option handling. -*- Autoconf -*-
1975 #
1976 # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
1977 @@ -7859,15 +8747,15 @@ m4_define([lt_dict_filter],
1978
1979 # Generated from ltversion.in.
1980
1981 -# serial 3012 ltversion.m4
1982 +# serial 3017 ltversion.m4
1983 # This file is part of GNU Libtool
1984
1985 -m4_define([LT_PACKAGE_VERSION], [2.2.6])
1986 -m4_define([LT_PACKAGE_REVISION], [1.3012])
1987 +m4_define([LT_PACKAGE_VERSION], [2.2.6b])
1988 +m4_define([LT_PACKAGE_REVISION], [1.3017])
1989
1990 AC_DEFUN([LTVERSION_VERSION],
1991 -[macro_version='2.2.6'
1992 -macro_revision='1.3012'
1993 +[macro_version='2.2.6b'
1994 +macro_revision='1.3017'
1995 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
1996 _LT_DECL(, macro_revision, 0)
1997 ])
1998 @@ -7965,7 +8853,7 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
1999 m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
2000 m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
2001
2002 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
2003 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2004 #
2005 # This file is free software; the Free Software Foundation
2006 # gives unlimited permission to copy and/or distribute it,
2007 @@ -7977,10 +8865,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
2008 # generated from the m4 files accompanying Automake X.Y.
2009 # (This private macro should not be called outside this file.)
2010 AC_DEFUN([AM_AUTOMAKE_VERSION],
2011 -[am__api_version='1.10'
2012 +[am__api_version='1.11'
2013 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2014 dnl require some minimum version. Point them to the right macro.
2015 -m4_if([$1], [1.10.1], [],
2016 +m4_if([$1], [1.11.1], [],
2017 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2018 ])
2019
2020 @@ -7994,12 +8882,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
2021 # AM_SET_CURRENT_AUTOMAKE_VERSION
2022 # -------------------------------
2023 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2024 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
2025 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2026 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2027 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
2028 +[AM_AUTOMAKE_VERSION([1.11.1])dnl
2029 m4_ifndef([AC_AUTOCONF_VERSION],
2030 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2031 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
2032 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2033
2034 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
2035
2036 @@ -8056,14 +8944,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
2037
2038 # AM_CONDITIONAL -*- Autoconf -*-
2039
2040 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
2041 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
2042 # Free Software Foundation, Inc.
2043 #
2044 # This file is free software; the Free Software Foundation
2045 # gives unlimited permission to copy and/or distribute it,
2046 # with or without modifications, as long as this notice is preserved.
2047
2048 -# serial 8
2049 +# serial 9
2050
2051 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
2052 # -------------------------------------
2053 @@ -8076,6 +8964,7 @@ AC_SUBST([$1_TRUE])dnl
2054 AC_SUBST([$1_FALSE])dnl
2055 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
2056 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
2057 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
2058 if $2; then
2059 $1_TRUE=
2060 $1_FALSE='#'
2061 @@ -8089,14 +8978,14 @@ AC_CONFIG_COMMANDS_PRE(
2062 Usually this means the macro was only invoked conditionally.]])
2063 fi])])
2064
2065 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
2066 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
2067 # Free Software Foundation, Inc.
2068 #
2069 # This file is free software; the Free Software Foundation
2070 # gives unlimited permission to copy and/or distribute it,
2071 # with or without modifications, as long as this notice is preserved.
2072
2073 -# serial 9
2074 +# serial 10
2075
2076 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2077 # written in clear, in which case automake, when reading aclocal.m4,
2078 @@ -8153,6 +9042,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
2079 if test "$am_compiler_list" = ""; then
2080 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
2081 fi
2082 + am__universal=false
2083 + m4_case([$1], [CC],
2084 + [case " $depcc " in #(
2085 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
2086 + esac],
2087 + [CXX],
2088 + [case " $depcc " in #(
2089 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
2090 + esac])
2091 +
2092 for depmode in $am_compiler_list; do
2093 # Setup a source with many dependencies, because some compilers
2094 # like to wrap large dependency lists on column 80 (with \), and
2095 @@ -8170,7 +9069,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
2096 done
2097 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2098
2099 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
2100 + # mode. It turns out that the SunPro C++ compiler does not properly
2101 + # handle `-M -o', and we need to detect this. Also, some Intel
2102 + # versions had trouble with output in subdirs
2103 + am__obj=sub/conftest.${OBJEXT-o}
2104 + am__minus_obj="-o $am__obj"
2105 case $depmode in
2106 + gcc)
2107 + # This depmode causes a compiler race in universal mode.
2108 + test "$am__universal" = false || continue
2109 + ;;
2110 nosideeffect)
2111 # after this tag, mechanisms are not by side-effect, so they'll
2112 # only be used when explicitly requested
2113 @@ -8180,19 +9089,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
2114 break
2115 fi
2116 ;;
2117 + msvisualcpp | msvcmsys)
2118 + # This compiler won't grok `-c -o', but also, the minuso test has
2119 + # not run yet. These depmodes are late enough in the game, and
2120 + # so weak that their functioning should not be impacted.
2121 + am__obj=conftest.${OBJEXT-o}
2122 + am__minus_obj=
2123 + ;;
2124 none) break ;;
2125 esac
2126 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
2127 - # mode. It turns out that the SunPro C++ compiler does not properly
2128 - # handle `-M -o', and we need to detect this.
2129 if depmode=$depmode \
2130 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
2131 + source=sub/conftest.c object=$am__obj \
2132 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
2133 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
2134 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
2135 >/dev/null 2>conftest.err &&
2136 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
2137 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
2138 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
2139 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
2140 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
2141 # icc doesn't choke on unknown options, it will just issue warnings
2142 # or remarks (even with -Werror). So we grep stderr for any message
2143 @@ -8249,57 +9162,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
2144
2145 # Generate code to set up dependency tracking. -*- Autoconf -*-
2146
2147 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
2148 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
2149 # Free Software Foundation, Inc.
2150 #
2151 # This file is free software; the Free Software Foundation
2152 # gives unlimited permission to copy and/or distribute it,
2153 # with or without modifications, as long as this notice is preserved.
2154
2155 -#serial 3
2156 +#serial 5
2157
2158 # _AM_OUTPUT_DEPENDENCY_COMMANDS
2159 # ------------------------------
2160 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2161 -[for mf in $CONFIG_FILES; do
2162 - # Strip MF so we end up with the name of the file.
2163 - mf=`echo "$mf" | sed -e 's/:.*$//'`
2164 - # Check whether this is an Automake generated Makefile or not.
2165 - # We used to match only the files named `Makefile.in', but
2166 - # some people rename them; so instead we look at the file content.
2167 - # Grep'ing the first line is not enough: some people post-process
2168 - # each Makefile.in and add a new line on top of each file to say so.
2169 - # Grep'ing the whole file is not good either: AIX grep has a line
2170 - # limit of 2048, but all sed's we know have understand at least 4000.
2171 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2172 - dirpart=`AS_DIRNAME("$mf")`
2173 - else
2174 - continue
2175 - fi
2176 - # Extract the definition of DEPDIR, am__include, and am__quote
2177 - # from the Makefile without running `make'.
2178 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2179 - test -z "$DEPDIR" && continue
2180 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
2181 - test -z "am__include" && continue
2182 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2183 - # When using ansi2knr, U may be empty or an underscore; expand it
2184 - U=`sed -n 's/^U = //p' < "$mf"`
2185 - # Find all dependency output files, they are included files with
2186 - # $(DEPDIR) in their names. We invoke sed twice because it is the
2187 - # simplest approach to changing $(DEPDIR) to its actual value in the
2188 - # expansion.
2189 - for file in `sed -n "
2190 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2191 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2192 - # Make sure the directory exists.
2193 - test -f "$dirpart/$file" && continue
2194 - fdir=`AS_DIRNAME(["$file"])`
2195 - AS_MKDIR_P([$dirpart/$fdir])
2196 - # echo "creating $dirpart/$file"
2197 - echo '# dummy' > "$dirpart/$file"
2198 +[{
2199 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
2200 + # are listed without --file. Let's play safe and only enable the eval
2201 + # if we detect the quoting.
2202 + case $CONFIG_FILES in
2203 + *\'*) eval set x "$CONFIG_FILES" ;;
2204 + *) set x $CONFIG_FILES ;;
2205 + esac
2206 + shift
2207 + for mf
2208 + do
2209 + # Strip MF so we end up with the name of the file.
2210 + mf=`echo "$mf" | sed -e 's/:.*$//'`
2211 + # Check whether this is an Automake generated Makefile or not.
2212 + # We used to match only the files named `Makefile.in', but
2213 + # some people rename them; so instead we look at the file content.
2214 + # Grep'ing the first line is not enough: some people post-process
2215 + # each Makefile.in and add a new line on top of each file to say so.
2216 + # Grep'ing the whole file is not good either: AIX grep has a line
2217 + # limit of 2048, but all sed's we know have understand at least 4000.
2218 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2219 + dirpart=`AS_DIRNAME("$mf")`
2220 + else
2221 + continue
2222 + fi
2223 + # Extract the definition of DEPDIR, am__include, and am__quote
2224 + # from the Makefile without running `make'.
2225 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2226 + test -z "$DEPDIR" && continue
2227 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
2228 + test -z "am__include" && continue
2229 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2230 + # When using ansi2knr, U may be empty or an underscore; expand it
2231 + U=`sed -n 's/^U = //p' < "$mf"`
2232 + # Find all dependency output files, they are included files with
2233 + # $(DEPDIR) in their names. We invoke sed twice because it is the
2234 + # simplest approach to changing $(DEPDIR) to its actual value in the
2235 + # expansion.
2236 + for file in `sed -n "
2237 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2238 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2239 + # Make sure the directory exists.
2240 + test -f "$dirpart/$file" && continue
2241 + fdir=`AS_DIRNAME(["$file"])`
2242 + AS_MKDIR_P([$dirpart/$fdir])
2243 + # echo "creating $dirpart/$file"
2244 + echo '# dummy' > "$dirpart/$file"
2245 + done
2246 done
2247 -done
2248 +}
2249 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
2250
2251
2252 @@ -8331,13 +9255,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
2253 # Do all the work for Automake. -*- Autoconf -*-
2254
2255 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2256 -# 2005, 2006, 2008 Free Software Foundation, Inc.
2257 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
2258 #
2259 # This file is free software; the Free Software Foundation
2260 # gives unlimited permission to copy and/or distribute it,
2261 # with or without modifications, as long as this notice is preserved.
2262
2263 -# serial 13
2264 +# serial 16
2265
2266 # This macro actually does too much. Some checks are only needed if
2267 # your package does certain things. But this isn't really a big deal.
2268 @@ -8354,7 +9278,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
2269 # arguments mandatory, and then we can depend on a new Autoconf
2270 # release and drop the old call support.
2271 AC_DEFUN([AM_INIT_AUTOMAKE],
2272 -[AC_PREREQ([2.60])dnl
2273 +[AC_PREREQ([2.62])dnl
2274 dnl Autoconf wants to disallow AM_ names. We explicitly allow
2275 dnl the ones we care about.
2276 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
2277 @@ -8405,8 +9329,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
2278 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
2279 AM_MISSING_PROG(AUTOHEADER, autoheader)
2280 AM_MISSING_PROG(MAKEINFO, makeinfo)
2281 -AM_PROG_INSTALL_SH
2282 -AM_PROG_INSTALL_STRIP
2283 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2284 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
2285 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
2286 # We need awk for the "check" target. The system "awk" is bad on
2287 # some platforms.
2288 @@ -8414,24 +9338,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
2289 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
2290 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
2291 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
2292 - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2293 - [_AM_PROG_TAR([v7])])])
2294 + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2295 + [_AM_PROG_TAR([v7])])])
2296 _AM_IF_OPTION([no-dependencies],,
2297 [AC_PROVIDE_IFELSE([AC_PROG_CC],
2298 - [_AM_DEPENDENCIES(CC)],
2299 - [define([AC_PROG_CC],
2300 - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2301 + [_AM_DEPENDENCIES(CC)],
2302 + [define([AC_PROG_CC],
2303 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2304 AC_PROVIDE_IFELSE([AC_PROG_CXX],
2305 - [_AM_DEPENDENCIES(CXX)],
2306 - [define([AC_PROG_CXX],
2307 - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2308 + [_AM_DEPENDENCIES(CXX)],
2309 + [define([AC_PROG_CXX],
2310 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2311 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
2312 - [_AM_DEPENDENCIES(OBJC)],
2313 - [define([AC_PROG_OBJC],
2314 - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
2315 + [_AM_DEPENDENCIES(OBJC)],
2316 + [define([AC_PROG_OBJC],
2317 + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
2318 ])
2319 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
2320 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
2321 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
2322 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
2323 +AC_CONFIG_COMMANDS_PRE(dnl
2324 +[m4_provide_if([_AM_COMPILER_EXEEXT],
2325 + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
2326 ])
2327
2328 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
2329 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
2330 +dnl mangled by Autoconf and run in a shell conditional statement.
2331 +m4_define([_AC_COMPILER_EXEEXT],
2332 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
2333 +
2334
2335 # When config.status generates a header, we must update the stamp-h file.
2336 # This file resides in the same directory as the config header
2337 @@ -8454,7 +9391,7 @@ for _am_header in $config_headers :; do
2338 done
2339 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
2340
2341 -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
2342 +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
2343 #
2344 # This file is free software; the Free Software Foundation
2345 # gives unlimited permission to copy and/or distribute it,
2346 @@ -8465,7 +9402,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
2347 # Define $install_sh.
2348 AC_DEFUN([AM_PROG_INSTALL_SH],
2349 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2350 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
2351 +if test x"${install_sh}" != xset; then
2352 + case $am_aux_dir in
2353 + *\ * | *\ *)
2354 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
2355 + *)
2356 + install_sh="\${SHELL} $am_aux_dir/install-sh"
2357 + esac
2358 +fi
2359 AC_SUBST(install_sh)])
2360
2361 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
2362 @@ -8510,15 +9454,55 @@ if test "$LEX" = :; then
2363 LEX=${am_missing_run}flex
2364 fi])
2365
2366 +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
2367 +# From Jim Meyering
2368 +
2369 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
2370 +# Free Software Foundation, Inc.
2371 +#
2372 +# This file is free software; the Free Software Foundation
2373 +# gives unlimited permission to copy and/or distribute it,
2374 +# with or without modifications, as long as this notice is preserved.
2375 +
2376 +# serial 5
2377 +
2378 +# AM_MAINTAINER_MODE([DEFAULT-MODE])
2379 +# ----------------------------------
2380 +# Control maintainer-specific portions of Makefiles.
2381 +# Default is to disable them, unless `enable' is passed literally.
2382 +# For symmetry, `disable' may be passed as well. Anyway, the user
2383 +# can override the default with the --enable/--disable switch.
2384 +AC_DEFUN([AM_MAINTAINER_MODE],
2385 +[m4_case(m4_default([$1], [disable]),
2386 + [enable], [m4_define([am_maintainer_other], [disable])],
2387 + [disable], [m4_define([am_maintainer_other], [enable])],
2388 + [m4_define([am_maintainer_other], [enable])
2389 + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
2390 +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
2391 + dnl maintainer-mode's default is 'disable' unless 'enable' is passed
2392 + AC_ARG_ENABLE([maintainer-mode],
2393 +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
2394 + (and sometimes confusing) to the casual installer],
2395 + [USE_MAINTAINER_MODE=$enableval],
2396 + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
2397 + AC_MSG_RESULT([$USE_MAINTAINER_MODE])
2398 + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
2399 + MAINT=$MAINTAINER_MODE_TRUE
2400 + AC_SUBST([MAINT])dnl
2401 +]
2402 +)
2403 +
2404 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
2405 +
2406 # Check to see how 'make' treats includes. -*- Autoconf -*-
2407
2408 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
2409 +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
2410 #
2411 # This file is free software; the Free Software Foundation
2412 # gives unlimited permission to copy and/or distribute it,
2413 # with or without modifications, as long as this notice is preserved.
2414
2415 -# serial 3
2416 +# serial 4
2417
2418 # AM_MAKE_INCLUDE()
2419 # -----------------
2420 @@ -8527,7 +9511,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
2421 [am_make=${MAKE-make}
2422 cat > confinc << 'END'
2423 am__doit:
2424 - @echo done
2425 + @echo this is the am__doit target
2426 .PHONY: am__doit
2427 END
2428 # If we don't find an include directive, just comment out the code.
2429 @@ -8537,24 +9521,24 @@ am__quote=
2430 _am_result=none
2431 # First try GNU make style include.
2432 echo "include confinc" > confmf
2433 -# We grep out `Entering directory' and `Leaving directory'
2434 -# messages which can occur if `w' ends up in MAKEFLAGS.
2435 -# In particular we don't look at `^make:' because GNU make might
2436 -# be invoked under some other name (usually "gmake"), in which
2437 -# case it prints its new name instead of `make'.
2438 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
2439 - am__include=include
2440 - am__quote=
2441 - _am_result=GNU
2442 -fi
2443 +# Ignore all kinds of additional output from `make'.
2444 +case `$am_make -s -f confmf 2> /dev/null` in #(
2445 +*the\ am__doit\ target*)
2446 + am__include=include
2447 + am__quote=
2448 + _am_result=GNU
2449 + ;;
2450 +esac
2451 # Now try BSD make style include.
2452 if test "$am__include" = "#"; then
2453 echo '.include "confinc"' > confmf
2454 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
2455 - am__include=.include
2456 - am__quote="\""
2457 - _am_result=BSD
2458 - fi
2459 + case `$am_make -s -f confmf 2> /dev/null` in #(
2460 + *the\ am__doit\ target*)
2461 + am__include=.include
2462 + am__quote="\""
2463 + _am_result=BSD
2464 + ;;
2465 + esac
2466 fi
2467 AC_SUBST([am__include])
2468 AC_SUBST([am__quote])
2469 @@ -8562,14 +9546,14 @@ AC_MSG_RESULT([$_am_result])
2470 rm -f confinc confmf
2471 ])
2472
2473 -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
2474 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
2475 # Free Software Foundation, Inc.
2476 #
2477 # This file is free software; the Free Software Foundation
2478 # gives unlimited permission to copy and/or distribute it,
2479 # with or without modifications, as long as this notice is preserved.
2480
2481 -# serial 5
2482 +# serial 6
2483
2484 # AM_PROG_CC_C_O
2485 # --------------
2486 @@ -8581,8 +9565,9 @@ AC_REQUIRE_AUX_FILE([compile])dnl
2487 # FIXME: we rely on the cache variable name because
2488 # there is no other way.
2489 set dummy $CC
2490 -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
2491 -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
2492 +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
2493 +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
2494 +if test "$am_t" != yes; then
2495 # Losing compiler, so override with the script.
2496 # FIXME: It is wrong to rewrite CC.
2497 # But if we don't then we get into trouble of one sort or another.
2498 @@ -8598,14 +9583,14 @@ m4_define([AC_PROG_CC],
2499
2500 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
2501
2502 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
2503 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
2504 # Free Software Foundation, Inc.
2505 #
2506 # This file is free software; the Free Software Foundation
2507 # gives unlimited permission to copy and/or distribute it,
2508 # with or without modifications, as long as this notice is preserved.
2509
2510 -# serial 5
2511 +# serial 6
2512
2513 # AM_MISSING_PROG(NAME, PROGRAM)
2514 # ------------------------------
2515 @@ -8622,7 +9607,14 @@ AC_SUBST($1)])
2516 AC_DEFUN([AM_MISSING_HAS_RUN],
2517 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2518 AC_REQUIRE_AUX_FILE([missing])dnl
2519 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
2520 +if test x"${MISSING+set}" != xset; then
2521 + case $am_aux_dir in
2522 + *\ * | *\ *)
2523 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2524 + *)
2525 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
2526 + esac
2527 +fi
2528 # Use eval to expand $SHELL
2529 if eval "$MISSING --run true"; then
2530 am_missing_run="$MISSING --run "
2531 @@ -8660,13 +9652,13 @@ esac
2532
2533 # Helper functions for option handling. -*- Autoconf -*-
2534
2535 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
2536 +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
2537 #
2538 # This file is free software; the Free Software Foundation
2539 # gives unlimited permission to copy and/or distribute it,
2540 # with or without modifications, as long as this notice is preserved.
2541
2542 -# serial 3
2543 +# serial 4
2544
2545 # _AM_MANGLE_OPTION(NAME)
2546 # -----------------------
2547 @@ -8683,7 +9675,7 @@ AC_DEFUN([_AM_SET_OPTION],
2548 # ----------------------------------
2549 # OPTIONS is a space-separated list of Automake options.
2550 AC_DEFUN([_AM_SET_OPTIONS],
2551 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
2552 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
2553
2554 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
2555 # -------------------------------------------
2556 @@ -8693,14 +9685,14 @@ AC_DEFUN([_AM_IF_OPTION],
2557
2558 # Check to make sure that the build environment is sane. -*- Autoconf -*-
2559
2560 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
2561 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
2562 # Free Software Foundation, Inc.
2563 #
2564 # This file is free software; the Free Software Foundation
2565 # gives unlimited permission to copy and/or distribute it,
2566 # with or without modifications, as long as this notice is preserved.
2567
2568 -# serial 4
2569 +# serial 5
2570
2571 # AM_SANITY_CHECK
2572 # ---------------
2573 @@ -8709,16 +9701,29 @@ AC_DEFUN([AM_SANITY_CHECK],
2574 # Just in case
2575 sleep 1
2576 echo timestamp > conftest.file
2577 +# Reject unsafe characters in $srcdir or the absolute working directory
2578 +# name. Accept space and tab only in the latter.
2579 +am_lf='
2580 +'
2581 +case `pwd` in
2582 + *[[\\\"\#\$\&\'\`$am_lf]]*)
2583 + AC_MSG_ERROR([unsafe absolute working directory name]);;
2584 +esac
2585 +case $srcdir in
2586 + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
2587 + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
2588 +esac
2589 +
2590 # Do `set' in a subshell so we don't clobber the current shell's
2591 # arguments. Must try -L first in case configure is actually a
2592 # symlink; some systems play weird games with the mod time of symlinks
2593 # (eg FreeBSD returns the mod time of the symlink's containing
2594 # directory).
2595 if (
2596 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
2597 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2598 if test "$[*]" = "X"; then
2599 # -L didn't work.
2600 - set X `ls -t $srcdir/configure conftest.file`
2601 + set X `ls -t "$srcdir/configure" conftest.file`
2602 fi
2603 rm -f conftest.file
2604 if test "$[*]" != "X $srcdir/configure conftest.file" \
2605 @@ -8771,18 +9776,25 @@ fi
2606 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2607 AC_SUBST([INSTALL_STRIP_PROGRAM])])
2608
2609 -# Copyright (C) 2006 Free Software Foundation, Inc.
2610 +# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
2611 #
2612 # This file is free software; the Free Software Foundation
2613 # gives unlimited permission to copy and/or distribute it,
2614 # with or without modifications, as long as this notice is preserved.
2615
2616 +# serial 2
2617 +
2618 # _AM_SUBST_NOTMAKE(VARIABLE)
2619 # ---------------------------
2620 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
2621 # This macro is traced by Automake.
2622 AC_DEFUN([_AM_SUBST_NOTMAKE])
2623
2624 +# AM_SUBST_NOTMAKE(VARIABLE)
2625 +# ---------------------------
2626 +# Public sister of _AM_SUBST_NOTMAKE.
2627 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
2628 +
2629 # Check how to create a tarball. -*- Autoconf -*-
2630
2631 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
2632 diff --git a/compile b/compile
2633 index 1b1d232..c0096a7 100755
2634 --- a/compile
2635 +++ b/compile
2636 @@ -1,9 +1,10 @@
2637 #! /bin/sh
2638 # Wrapper for compilers which do not understand `-c -o'.
2639
2640 -scriptversion=2005-05-14.22
2641 +scriptversion=2009-10-06.20; # UTC
2642
2643 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
2644 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
2645 +# Foundation, Inc.
2646 # Written by Tom Tromey <[email protected]>.
2647 #
2648 # This program is free software; you can redistribute it and/or modify
2649 @@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
2650 # GNU General Public License for more details.
2651 #
2652 # You should have received a copy of the GNU General Public License
2653 -# along with this program; if not, write to the Free Software
2654 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2655 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
2656
2657 # As a special exception to the GNU General Public License, if you
2658 # distribute this file as part of a program that contains a
2659 @@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
2660 fi
2661
2662 # Name of file we expect compiler to create.
2663 -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
2664 +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
2665
2666 # Create the lock directory.
2667 -# Note: use `[/.-]' here to ensure that we don't use the same name
2668 +# Note: use `[/\\:.-]' here to ensure that we don't use the same name
2669 # that we are using for the .o file. Also, base the name on the expected
2670 # object file name, since that is what matters with a parallel build.
2671 -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
2672 +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
2673 while true; do
2674 if mkdir "$lockdir" >/dev/null 2>&1; then
2675 break
2676 @@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
2677 ret=$?
2678
2679 if test -f "$cofile"; then
2680 - mv "$cofile" "$ofile"
2681 + test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
2682 elif test -f "${cofile}bj"; then
2683 - mv "${cofile}bj" "$ofile"
2684 + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
2685 fi
2686
2687 rmdir "$lockdir"
2688 @@ -138,5 +138,6 @@ exit $ret
2689 # eval: (add-hook 'write-file-hooks 'time-stamp)
2690 # time-stamp-start: "scriptversion="
2691 # time-stamp-format: "%:y-%02m-%02d.%02H"
2692 -# time-stamp-end: "$"
2693 +# time-stamp-time-zone: "UTC"
2694 +# time-stamp-end: "; # UTC"
2695 # End:
2696 diff --git a/config.guess b/config.guess
2697 index f4f7772..dc84c68 100755
2698 --- a/config.guess
2699 +++ b/config.guess
2700 @@ -1,9 +1,10 @@
2701 #! /bin/sh
2702 # Attempt to guess a canonical system name.
2703 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2704 -# 2000, 2001, 2002 Free Software Foundation, Inc.
2705 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
2706 +# Free Software Foundation, Inc.
2707
2708 -timestamp='2002-03-04'
2709 +timestamp='2009-11-20'
2710
2711 # This file is free software; you can redistribute it and/or modify it
2712 # under the terms of the GNU General Public License as published by
2713 @@ -17,23 +18,25 @@ timestamp='2002-03-04'
2714 #
2715 # You should have received a copy of the GNU General Public License
2716 # along with this program; if not, write to the Free Software
2717 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2718 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
2719 +# 02110-1301, USA.
2720 #
2721 # As a special exception to the GNU General Public License, if you
2722 # distribute this file as part of a program that contains a
2723 # configuration script generated by Autoconf, you may include it under
2724 # the same distribution terms that you use for the rest of that program.
2725
2726 -# Originally written by Per Bothner <[email protected]>.
2727 -# Please send patches to <[email protected]>. Submit a context
2728 -# diff and a properly formatted ChangeLog entry.
2729 +
2730 +# Originally written by Per Bothner. Please send patches (context
2731 +# diff format) to <[email protected]> and include a ChangeLog
2732 +# entry.
2733 #
2734 # This script attempts to guess a canonical system name similar to
2735 # config.sub. If it succeeds, it prints the system name on stdout, and
2736 # exits with 0. Otherwise, it exits with 1.
2737 #
2738 -# The plan is that this can be called by configure scripts if you
2739 -# don't specify an explicit build system type.
2740 +# You can get the latest version of this script from:
2741 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
2742
2743 me=`echo "$0" | sed -e 's,.*/,,'`
2744
2745 @@ -53,8 +56,8 @@ version="\
2746 GNU config.guess ($timestamp)
2747
2748 Originally written by Per Bothner.
2749 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
2750 -Free Software Foundation, Inc.
2751 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2752 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2753
2754 This is free software; see the source for copying conditions. There is NO
2755 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2756 @@ -66,11 +69,11 @@ Try \`$me --help' for more information."
2757 while test $# -gt 0 ; do
2758 case $1 in
2759 --time-stamp | --time* | -t )
2760 - echo "$timestamp" ; exit 0 ;;
2761 + echo "$timestamp" ; exit ;;
2762 --version | -v )
2763 - echo "$version" ; exit 0 ;;
2764 + echo "$version" ; exit ;;
2765 --help | --h* | -h )
2766 - echo "$usage"; exit 0 ;;
2767 + echo "$usage"; exit ;;
2768 -- ) # Stop option processing
2769 shift; break ;;
2770 - ) # Use stdin as input.
2771 @@ -88,30 +91,42 @@ if test $# != 0; then
2772 exit 1
2773 fi
2774
2775 +trap 'exit 1' 1 2 15
2776
2777 -dummy=dummy-$$
2778 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
2779 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
2780 +# compiler to aid in system detection is discouraged as it requires
2781 +# temporary files to be created and, as you can see below, it is a
2782 +# headache to deal with in a portable fashion.
2783
2784 -# CC_FOR_BUILD -- compiler used by this script.
2785 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
2786 # use `HOST_CC' if defined, but it is deprecated.
2787
2788 -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
2789 - ,,) echo "int dummy(){}" > $dummy.c ;
2790 - for c in cc gcc c89 ; do
2791 - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
2792 - if test $? = 0 ; then
2793 +# Portable tmp directory creation inspired by the Autoconf team.
2794 +
2795 +set_cc_for_build='
2796 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
2797 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
2798 +: ${TMPDIR=/tmp} ;
2799 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
2800 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
2801 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
2802 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
2803 +dummy=$tmp/dummy ;
2804 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
2805 +case $CC_FOR_BUILD,$HOST_CC,$CC in
2806 + ,,) echo "int x;" > $dummy.c ;
2807 + for c in cc gcc c89 c99 ; do
2808 + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
2809 CC_FOR_BUILD="$c"; break ;
2810 fi ;
2811 done ;
2812 - rm -f $dummy.c $dummy.o $dummy.rel ;
2813 if test x"$CC_FOR_BUILD" = x ; then
2814 CC_FOR_BUILD=no_compiler_found ;
2815 fi
2816 ;;
2817 ,,*) CC_FOR_BUILD=$CC ;;
2818 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
2819 -esac'
2820 +esac ; set_cc_for_build= ;'
2821
2822 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
2823 # ([email protected] 1994-08-24)
2824 @@ -142,9 +157,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2825 UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
2826 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
2827 case "${UNAME_MACHINE_ARCH}" in
2828 + armeb) machine=armeb-unknown ;;
2829 arm*) machine=arm-unknown ;;
2830 sh3el) machine=shl-unknown ;;
2831 sh3eb) machine=sh-unknown ;;
2832 + sh5el) machine=sh5le-unknown ;;
2833 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
2834 esac
2835 # The Operating System including object format, if it has switched
2836 @@ -153,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2837 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
2838 eval $set_cc_for_build
2839 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
2840 - | grep __ELF__ >/dev/null
2841 + | grep -q __ELF__
2842 then
2843 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
2844 # Return netbsd for either. FIX?
2845 @@ -167,141 +184,128 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2846 ;;
2847 esac
2848 # The OS release
2849 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
2850 + # Debian GNU/NetBSD machines have a different userland, and
2851 + # thus, need a distinct triplet. However, they do not need
2852 + # kernel version information, so it can be replaced with a
2853 + # suitable tag, in the style of linux-gnu.
2854 + case "${UNAME_VERSION}" in
2855 + Debian*)
2856 + release='-gnu'
2857 + ;;
2858 + *)
2859 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
2860 + ;;
2861 + esac
2862 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
2863 # contains redundant information, the shorter form:
2864 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
2865 echo "${machine}-${os}${release}"
2866 - exit 0 ;;
2867 - amiga:OpenBSD:*:*)
2868 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2869 - exit 0 ;;
2870 - arc:OpenBSD:*:*)
2871 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
2872 - exit 0 ;;
2873 - hp300:OpenBSD:*:*)
2874 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2875 - exit 0 ;;
2876 - mac68k:OpenBSD:*:*)
2877 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2878 - exit 0 ;;
2879 - macppc:OpenBSD:*:*)
2880 - echo powerpc-unknown-openbsd${UNAME_RELEASE}
2881 - exit 0 ;;
2882 - mvme68k:OpenBSD:*:*)
2883 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2884 - exit 0 ;;
2885 - mvme88k:OpenBSD:*:*)
2886 - echo m88k-unknown-openbsd${UNAME_RELEASE}
2887 - exit 0 ;;
2888 - mvmeppc:OpenBSD:*:*)
2889 - echo powerpc-unknown-openbsd${UNAME_RELEASE}
2890 - exit 0 ;;
2891 - pmax:OpenBSD:*:*)
2892 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
2893 - exit 0 ;;
2894 - sgi:OpenBSD:*:*)
2895 - echo mipseb-unknown-openbsd${UNAME_RELEASE}
2896 - exit 0 ;;
2897 - sun3:OpenBSD:*:*)
2898 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2899 - exit 0 ;;
2900 - wgrisc:OpenBSD:*:*)
2901 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
2902 - exit 0 ;;
2903 + exit ;;
2904 *:OpenBSD:*:*)
2905 - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
2906 - exit 0 ;;
2907 + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
2908 + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
2909 + exit ;;
2910 + *:ekkoBSD:*:*)
2911 + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
2912 + exit ;;
2913 + *:SolidBSD:*:*)
2914 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
2915 + exit ;;
2916 + macppc:MirBSD:*:*)
2917 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
2918 + exit ;;
2919 + *:MirBSD:*:*)
2920 + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
2921 + exit ;;
2922 alpha:OSF1:*:*)
2923 - if test $UNAME_RELEASE = "V4.0"; then
2924 + case $UNAME_RELEASE in
2925 + *4.0)
2926 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
2927 - fi
2928 + ;;
2929 + *5.*)
2930 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
2931 + ;;
2932 + esac
2933 + # According to Compaq, /usr/sbin/psrinfo has been available on
2934 + # OSF/1 and Tru64 systems produced since 1995. I hope that
2935 + # covers most systems running today. This code pipes the CPU
2936 + # types through head -n 1, so we only detect the type of CPU 0.
2937 + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
2938 + case "$ALPHA_CPU_TYPE" in
2939 + "EV4 (21064)")
2940 + UNAME_MACHINE="alpha" ;;
2941 + "EV4.5 (21064)")
2942 + UNAME_MACHINE="alpha" ;;
2943 + "LCA4 (21066/21068)")
2944 + UNAME_MACHINE="alpha" ;;
2945 + "EV5 (21164)")
2946 + UNAME_MACHINE="alphaev5" ;;
2947 + "EV5.6 (21164A)")
2948 + UNAME_MACHINE="alphaev56" ;;
2949 + "EV5.6 (21164PC)")
2950 + UNAME_MACHINE="alphapca56" ;;
2951 + "EV5.7 (21164PC)")
2952 + UNAME_MACHINE="alphapca57" ;;
2953 + "EV6 (21264)")
2954 + UNAME_MACHINE="alphaev6" ;;
2955 + "EV6.7 (21264A)")
2956 + UNAME_MACHINE="alphaev67" ;;
2957 + "EV6.8CB (21264C)")
2958 + UNAME_MACHINE="alphaev68" ;;
2959 + "EV6.8AL (21264B)")
2960 + UNAME_MACHINE="alphaev68" ;;
2961 + "EV6.8CX (21264D)")
2962 + UNAME_MACHINE="alphaev68" ;;
2963 + "EV6.9A (21264/EV69A)")
2964 + UNAME_MACHINE="alphaev69" ;;
2965 + "EV7 (21364)")
2966 + UNAME_MACHINE="alphaev7" ;;
2967 + "EV7.9 (21364A)")
2968 + UNAME_MACHINE="alphaev79" ;;
2969 + esac
2970 + # A Pn.n version is a patched version.
2971 # A Vn.n version is a released version.
2972 # A Tn.n version is a released field test version.
2973 # A Xn.n version is an unreleased experimental baselevel.
2974 # 1.2 uses "1.2" for uname -r.
2975 - cat <<EOF >$dummy.s
2976 - .data
2977 -\$Lformat:
2978 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
2979 -
2980 - .text
2981 - .globl main
2982 - .align 4
2983 - .ent main
2984 -main:
2985 - .frame \$30,16,\$26,0
2986 - ldgp \$29,0(\$27)
2987 - .prologue 1
2988 - .long 0x47e03d80 # implver \$0
2989 - lda \$2,-1
2990 - .long 0x47e20c21 # amask \$2,\$1
2991 - lda \$16,\$Lformat
2992 - mov \$0,\$17
2993 - not \$1,\$18
2994 - jsr \$26,printf
2995 - ldgp \$29,0(\$26)
2996 - mov 0,\$16
2997 - jsr \$26,exit
2998 - .end main
2999 -EOF
3000 - eval $set_cc_for_build
3001 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
3002 - if test "$?" = 0 ; then
3003 - case `./$dummy` in
3004 - 0-0)
3005 - UNAME_MACHINE="alpha"
3006 - ;;
3007 - 1-0)
3008 - UNAME_MACHINE="alphaev5"
3009 - ;;
3010 - 1-1)
3011 - UNAME_MACHINE="alphaev56"
3012 - ;;
3013 - 1-101)
3014 - UNAME_MACHINE="alphapca56"
3015 - ;;
3016 - 2-303)
3017 - UNAME_MACHINE="alphaev6"
3018 - ;;
3019 - 2-307)
3020 - UNAME_MACHINE="alphaev67"
3021 - ;;
3022 - 2-1307)
3023 - UNAME_MACHINE="alphaev68"
3024 - ;;
3025 - esac
3026 - fi
3027 - rm -f $dummy.s $dummy
3028 - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
3029 - exit 0 ;;
3030 + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
3031 + exit ;;
3032 Alpha\ *:Windows_NT*:*)
3033 # How do we know it's Interix rather than the generic POSIX subsystem?
3034 # Should we change UNAME_MACHINE based on the output of uname instead
3035 # of the specific Alpha model?
3036 echo alpha-pc-interix
3037 - exit 0 ;;
3038 + exit ;;
3039 21064:Windows_NT:50:3)
3040 echo alpha-dec-winnt3.5
3041 - exit 0 ;;
3042 + exit ;;
3043 Amiga*:UNIX_System_V:4.0:*)
3044 echo m68k-unknown-sysv4
3045 - exit 0;;
3046 + exit ;;
3047 *:[Aa]miga[Oo][Ss]:*:*)
3048 echo ${UNAME_MACHINE}-unknown-amigaos
3049 - exit 0 ;;
3050 + exit ;;
3051 *:[Mm]orph[Oo][Ss]:*:*)
3052 echo ${UNAME_MACHINE}-unknown-morphos
3053 - exit 0 ;;
3054 + exit ;;
3055 *:OS/390:*:*)
3056 echo i370-ibm-openedition
3057 - exit 0 ;;
3058 + exit ;;
3059 + *:z/VM:*:*)
3060 + echo s390-ibm-zvmoe
3061 + exit ;;
3062 + *:OS400:*:*)
3063 + echo powerpc-ibm-os400
3064 + exit ;;
3065 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
3066 echo arm-acorn-riscix${UNAME_RELEASE}
3067 - exit 0;;
3068 + exit ;;
3069 + arm:riscos:*:*|arm:RISCOS:*:*)
3070 + echo arm-unknown-riscos
3071 + exit ;;
3072 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
3073 echo hppa1.1-hitachi-hiuxmpp
3074 - exit 0;;
3075 + exit ;;
3076 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
3077 # [email protected] (Earle F. Ake) contributed MIS and NILE.
3078 if test "`(/bin/universe) 2>/dev/null`" = att ; then
3079 @@ -309,25 +313,51 @@ EOF
3080 else
3081 echo pyramid-pyramid-bsd
3082 fi
3083 - exit 0 ;;
3084 + exit ;;
3085 NILE*:*:*:dcosx)
3086 echo pyramid-pyramid-svr4
3087 - exit 0 ;;
3088 + exit ;;
3089 + DRS?6000:unix:4.0:6*)
3090 + echo sparc-icl-nx6
3091 + exit ;;
3092 + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
3093 + case `/usr/bin/uname -p` in
3094 + sparc) echo sparc-icl-nx7; exit ;;
3095 + esac ;;
3096 + s390x:SunOS:*:*)
3097 + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3098 + exit ;;
3099 sun4H:SunOS:5.*:*)
3100 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3101 - exit 0 ;;
3102 + exit ;;
3103 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
3104 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3105 - exit 0 ;;
3106 - i86pc:SunOS:5.*:*)
3107 - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3108 - exit 0 ;;
3109 + exit ;;
3110 + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
3111 + echo i386-pc-auroraux${UNAME_RELEASE}
3112 + exit ;;
3113 + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
3114 + eval $set_cc_for_build
3115 + SUN_ARCH="i386"
3116 + # If there is a compiler, see if it is configured for 64-bit objects.
3117 + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
3118 + # This test works for both compilers.
3119 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
3120 + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
3121 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
3122 + grep IS_64BIT_ARCH >/dev/null
3123 + then
3124 + SUN_ARCH="x86_64"
3125 + fi
3126 + fi
3127 + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3128 + exit ;;
3129 sun4*:SunOS:6*:*)
3130 # According to config.sub, this is the proper way to canonicalize
3131 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
3132 # it's likely to be more like Solaris than SunOS4.
3133 echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3134 - exit 0 ;;
3135 + exit ;;
3136 sun4*:SunOS:*:*)
3137 case "`/usr/bin/arch -k`" in
3138 Series*|S4*)
3139 @@ -336,10 +366,10 @@ EOF
3140 esac
3141 # Japanese Language versions have a version number like `4.1.3-JL'.
3142 echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
3143 - exit 0 ;;
3144 + exit ;;
3145 sun3*:SunOS:*:*)
3146 echo m68k-sun-sunos${UNAME_RELEASE}
3147 - exit 0 ;;
3148 + exit ;;
3149 sun*:*:4.2BSD:*)
3150 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
3151 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
3152 @@ -351,10 +381,10 @@ EOF
3153 echo sparc-sun-sunos${UNAME_RELEASE}
3154 ;;
3155 esac
3156 - exit 0 ;;
3157 + exit ;;
3158 aushp:SunOS:*:*)
3159 echo sparc-auspex-sunos${UNAME_RELEASE}
3160 - exit 0 ;;
3161 + exit ;;
3162 # The situation for MiNT is a little confusing. The machine name
3163 # can be virtually everything (everything which is not
3164 # "atarist" or "atariste" at least should have a processor
3165 @@ -365,37 +395,40 @@ EOF
3166 # be no problem.
3167 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
3168 echo m68k-atari-mint${UNAME_RELEASE}
3169 - exit 0 ;;
3170 + exit ;;
3171 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
3172 echo m68k-atari-mint${UNAME_RELEASE}
3173 - exit 0 ;;
3174 + exit ;;
3175 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
3176 echo m68k-atari-mint${UNAME_RELEASE}
3177 - exit 0 ;;
3178 + exit ;;
3179 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
3180 echo m68k-milan-mint${UNAME_RELEASE}
3181 - exit 0 ;;
3182 + exit ;;
3183 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
3184 echo m68k-hades-mint${UNAME_RELEASE}
3185 - exit 0 ;;
3186 + exit ;;
3187 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
3188 echo m68k-unknown-mint${UNAME_RELEASE}
3189 - exit 0 ;;
3190 + exit ;;
3191 + m68k:machten:*:*)
3192 + echo m68k-apple-machten${UNAME_RELEASE}
3193 + exit ;;
3194 powerpc:machten:*:*)
3195 echo powerpc-apple-machten${UNAME_RELEASE}
3196 - exit 0 ;;
3197 + exit ;;
3198 RISC*:Mach:*:*)
3199 echo mips-dec-mach_bsd4.3
3200 - exit 0 ;;
3201 + exit ;;
3202 RISC*:ULTRIX:*:*)
3203 echo mips-dec-ultrix${UNAME_RELEASE}
3204 - exit 0 ;;
3205 + exit ;;
3206 VAX*:ULTRIX*:*:*)
3207 echo vax-dec-ultrix${UNAME_RELEASE}
3208 - exit 0 ;;
3209 + exit ;;
3210 2020:CLIX:*:* | 2430:CLIX:*:*)
3211 echo clipper-intergraph-clix${UNAME_RELEASE}
3212 - exit 0 ;;
3213 + exit ;;
3214 mips:*:*:UMIPS | mips:*:*:RISCos)
3215 eval $set_cc_for_build
3216 sed 's/^ //' << EOF >$dummy.c
3217 @@ -419,27 +452,33 @@ EOF
3218 exit (-1);
3219 }
3220 EOF
3221 - $CC_FOR_BUILD $dummy.c -o $dummy \
3222 - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
3223 - && rm -f $dummy.c $dummy && exit 0
3224 - rm -f $dummy.c $dummy
3225 + $CC_FOR_BUILD -o $dummy $dummy.c &&
3226 + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
3227 + SYSTEM_NAME=`$dummy $dummyarg` &&
3228 + { echo "$SYSTEM_NAME"; exit; }
3229 echo mips-mips-riscos${UNAME_RELEASE}
3230 - exit 0 ;;
3231 + exit ;;
3232 Motorola:PowerMAX_OS:*:*)
3233 echo powerpc-motorola-powermax
3234 - exit 0 ;;
3235 + exit ;;
3236 + Motorola:*:4.3:PL8-*)
3237 + echo powerpc-harris-powermax
3238 + exit ;;
3239 + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
3240 + echo powerpc-harris-powermax
3241 + exit ;;
3242 Night_Hawk:Power_UNIX:*:*)
3243 echo powerpc-harris-powerunix
3244 - exit 0 ;;
3245 + exit ;;
3246 m88k:CX/UX:7*:*)
3247 echo m88k-harris-cxux7
3248 - exit 0 ;;
3249 + exit ;;
3250 m88k:*:4*:R4*)
3251 echo m88k-motorola-sysv4
3252 - exit 0 ;;
3253 + exit ;;
3254 m88k:*:3*:R3*)
3255 echo m88k-motorola-sysv3
3256 - exit 0 ;;
3257 + exit ;;
3258 AViiON:dgux:*:*)
3259 # DG/UX returns AViiON for all architectures
3260 UNAME_PROCESSOR=`/usr/bin/uname -p`
3261 @@ -455,29 +494,29 @@ EOF
3262 else
3263 echo i586-dg-dgux${UNAME_RELEASE}
3264 fi
3265 - exit 0 ;;
3266 + exit ;;
3267 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
3268 echo m88k-dolphin-sysv3
3269 - exit 0 ;;
3270 + exit ;;
3271 M88*:*:R3*:*)
3272 # Delta 88k system running SVR3
3273 echo m88k-motorola-sysv3
3274 - exit 0 ;;
3275 + exit ;;
3276 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
3277 echo m88k-tektronix-sysv3
3278 - exit 0 ;;
3279 + exit ;;
3280 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
3281 echo m68k-tektronix-bsd
3282 - exit 0 ;;
3283 + exit ;;
3284 *:IRIX*:*:*)
3285 echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
3286 - exit 0 ;;
3287 + exit ;;
3288 ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
3289 - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
3290 - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
3291 + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
3292 + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
3293 i*86:AIX:*:*)
3294 echo i386-ibm-aix
3295 - exit 0 ;;
3296 + exit ;;
3297 ia64:AIX:*:*)
3298 if [ -x /usr/bin/oslevel ] ; then
3299 IBM_REV=`/usr/bin/oslevel`
3300 @@ -485,7 +524,7 @@ EOF
3301 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
3302 fi
3303 echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
3304 - exit 0 ;;
3305 + exit ;;
3306 *:AIX:2:3)
3307 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
3308 eval $set_cc_for_build
3309 @@ -500,16 +539,19 @@ EOF
3310 exit(0);
3311 }
3312 EOF
3313 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
3314 - rm -f $dummy.c $dummy
3315 - echo rs6000-ibm-aix3.2.5
3316 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
3317 + then
3318 + echo "$SYSTEM_NAME"
3319 + else
3320 + echo rs6000-ibm-aix3.2.5
3321 + fi
3322 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
3323 echo rs6000-ibm-aix3.2.4
3324 else
3325 echo rs6000-ibm-aix3.2
3326 fi
3327 - exit 0 ;;
3328 - *:AIX:*:[45])
3329 + exit ;;
3330 + *:AIX:*:[456])
3331 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
3332 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
3333 IBM_ARCH=rs6000
3334 @@ -522,28 +564,28 @@ EOF
3335 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
3336 fi
3337 echo ${IBM_ARCH}-ibm-aix${IBM_REV}
3338 - exit 0 ;;
3339 + exit ;;
3340 *:AIX:*:*)
3341 echo rs6000-ibm-aix
3342 - exit 0 ;;
3343 + exit ;;
3344 ibmrt:4.4BSD:*|romp-ibm:BSD:*)
3345 echo romp-ibm-bsd4.4
3346 - exit 0 ;;
3347 + exit ;;
3348 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
3349 echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
3350 - exit 0 ;; # report: romp-ibm BSD 4.3
3351 + exit ;; # report: romp-ibm BSD 4.3
3352 *:BOSX:*:*)
3353 echo rs6000-bull-bosx
3354 - exit 0 ;;
3355 + exit ;;
3356 DPX/2?00:B.O.S.:*:*)
3357 echo m68k-bull-sysv3
3358 - exit 0 ;;
3359 + exit ;;
3360 9000/[34]??:4.3bsd:1.*:*)
3361 echo m68k-hp-bsd
3362 - exit 0 ;;
3363 + exit ;;
3364 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
3365 echo m68k-hp-bsd4.4
3366 - exit 0 ;;
3367 + exit ;;
3368 9000/[34678]??:HP-UX:*:*)
3369 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
3370 case "${UNAME_MACHINE}" in
3371 @@ -599,17 +641,37 @@ EOF
3372 exit (0);
3373 }
3374 EOF
3375 - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
3376 - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
3377 - rm -f $dummy.c $dummy
3378 + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
3379 + test -z "$HP_ARCH" && HP_ARCH=hppa
3380 fi ;;
3381 esac
3382 + if [ ${HP_ARCH} = "hppa2.0w" ]
3383 + then
3384 + eval $set_cc_for_build
3385 +
3386 + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
3387 + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
3388 + # generating 64-bit code. GNU and HP use different nomenclature:
3389 + #
3390 + # $ CC_FOR_BUILD=cc ./config.guess
3391 + # => hppa2.0w-hp-hpux11.23
3392 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
3393 + # => hppa64-hp-hpux11.23
3394 +
3395 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
3396 + grep -q __LP64__
3397 + then
3398 + HP_ARCH="hppa2.0w"
3399 + else
3400 + HP_ARCH="hppa64"
3401 + fi
3402 + fi
3403 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
3404 - exit 0 ;;
3405 + exit ;;
3406 ia64:HP-UX:*:*)
3407 HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
3408 echo ia64-hp-hpux${HPUX_REV}
3409 - exit 0 ;;
3410 + exit ;;
3411 3050*:HI-UX:*:*)
3412 eval $set_cc_for_build
3413 sed 's/^ //' << EOF >$dummy.c
3414 @@ -637,174 +699,248 @@ EOF
3415 exit (0);
3416 }
3417 EOF
3418 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
3419 - rm -f $dummy.c $dummy
3420 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
3421 + { echo "$SYSTEM_NAME"; exit; }
3422 echo unknown-hitachi-hiuxwe2
3423 - exit 0 ;;
3424 + exit ;;
3425 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
3426 echo hppa1.1-hp-bsd
3427 - exit 0 ;;
3428 + exit ;;
3429 9000/8??:4.3bsd:*:*)
3430 echo hppa1.0-hp-bsd
3431 - exit 0 ;;
3432 + exit ;;
3433 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
3434 echo hppa1.0-hp-mpeix
3435 - exit 0 ;;
3436 + exit ;;
3437 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
3438 echo hppa1.1-hp-osf
3439 - exit 0 ;;
3440 + exit ;;
3441 hp8??:OSF1:*:*)
3442 echo hppa1.0-hp-osf
3443 - exit 0 ;;
3444 + exit ;;
3445 i*86:OSF1:*:*)
3446 if [ -x /usr/sbin/sysversion ] ; then
3447 echo ${UNAME_MACHINE}-unknown-osf1mk
3448 else
3449 echo ${UNAME_MACHINE}-unknown-osf1
3450 fi
3451 - exit 0 ;;
3452 + exit ;;
3453 parisc*:Lites*:*:*)
3454 echo hppa1.1-hp-lites
3455 - exit 0 ;;
3456 + exit ;;
3457 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
3458 echo c1-convex-bsd
3459 - exit 0 ;;
3460 + exit ;;
3461 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
3462 if getsysinfo -f scalar_acc
3463 then echo c32-convex-bsd
3464 else echo c2-convex-bsd
3465 fi
3466 - exit 0 ;;
3467 + exit ;;
3468 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
3469 echo c34-convex-bsd
3470 - exit 0 ;;
3471 + exit ;;
3472 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
3473 echo c38-convex-bsd
3474 - exit 0 ;;
3475 + exit ;;
3476 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
3477 echo c4-convex-bsd
3478 - exit 0 ;;
3479 + exit ;;
3480 CRAY*Y-MP:*:*:*)
3481 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3482 - exit 0 ;;
3483 + exit ;;
3484 CRAY*[A-Z]90:*:*:*)
3485 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
3486 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
3487 -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
3488 -e 's/\.[^.]*$/.X/'
3489 - exit 0 ;;
3490 + exit ;;
3491 CRAY*TS:*:*:*)
3492 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3493 - exit 0 ;;
3494 - CRAY*T3D:*:*:*)
3495 - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3496 - exit 0 ;;
3497 + exit ;;
3498 CRAY*T3E:*:*:*)
3499 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3500 - exit 0 ;;
3501 + exit ;;
3502 CRAY*SV1:*:*:*)
3503 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3504 - exit 0 ;;
3505 + exit ;;
3506 + *:UNICOS/mp:*:*)
3507 + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
3508 + exit ;;
3509 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
3510 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
3511 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
3512 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
3513 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3514 - exit 0 ;;
3515 + exit ;;
3516 + 5000:UNIX_System_V:4.*:*)
3517 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
3518 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
3519 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3520 + exit ;;
3521 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
3522 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
3523 - exit 0 ;;
3524 + exit ;;
3525 sparc*:BSD/OS:*:*)
3526 echo sparc-unknown-bsdi${UNAME_RELEASE}
3527 - exit 0 ;;
3528 + exit ;;
3529 *:BSD/OS:*:*)
3530 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
3531 - exit 0 ;;
3532 + exit ;;
3533 *:FreeBSD:*:*)
3534 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
3535 - exit 0 ;;
3536 + case ${UNAME_MACHINE} in
3537 + pc98)
3538 + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
3539 + amd64)
3540 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
3541 + *)
3542 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
3543 + esac
3544 + exit ;;
3545 i*:CYGWIN*:*)
3546 echo ${UNAME_MACHINE}-pc-cygwin
3547 - exit 0 ;;
3548 - i*:MINGW*:*)
3549 + exit ;;
3550 + *:MINGW*:*)
3551 echo ${UNAME_MACHINE}-pc-mingw32
3552 - exit 0 ;;
3553 + exit ;;
3554 + i*:windows32*:*)
3555 + # uname -m includes "-pc" on this system.
3556 + echo ${UNAME_MACHINE}-mingw32
3557 + exit ;;
3558 i*:PW*:*)
3559 echo ${UNAME_MACHINE}-pc-pw32
3560 - exit 0 ;;
3561 - x86:Interix*:3*)
3562 - echo i386-pc-interix3
3563 - exit 0 ;;
3564 + exit ;;
3565 + *:Interix*:*)
3566 + case ${UNAME_MACHINE} in
3567 + x86)
3568 + echo i586-pc-interix${UNAME_RELEASE}
3569 + exit ;;
3570 + authenticamd | genuineintel | EM64T)
3571 + echo x86_64-unknown-interix${UNAME_RELEASE}
3572 + exit ;;
3573 + IA64)
3574 + echo ia64-unknown-interix${UNAME_RELEASE}
3575 + exit ;;
3576 + esac ;;
3577 + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
3578 + echo i${UNAME_MACHINE}-pc-mks
3579 + exit ;;
3580 + 8664:Windows_NT:*)
3581 + echo x86_64-pc-mks
3582 + exit ;;
3583 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
3584 # How do we know it's Interix rather than the generic POSIX subsystem?
3585 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
3586 # UNAME_MACHINE based on the output of uname instead of i386?
3587 - echo i386-pc-interix
3588 - exit 0 ;;
3589 + echo i586-pc-interix
3590 + exit ;;
3591 i*:UWIN*:*)
3592 echo ${UNAME_MACHINE}-pc-uwin
3593 - exit 0 ;;
3594 + exit ;;
3595 + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
3596 + echo x86_64-unknown-cygwin
3597 + exit ;;
3598 p*:CYGWIN*:*)
3599 echo powerpcle-unknown-cygwin
3600 - exit 0 ;;
3601 + exit ;;
3602 prep*:SunOS:5.*:*)
3603 echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3604 - exit 0 ;;
3605 + exit ;;
3606 *:GNU:*:*)
3607 + # the GNU system
3608 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
3609 - exit 0 ;;
3610 + exit ;;
3611 + *:GNU/*:*:*)
3612 + # other systems with GNU libc and userland
3613 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
3614 + exit ;;
3615 i*86:Minix:*:*)
3616 echo ${UNAME_MACHINE}-pc-minix
3617 - exit 0 ;;
3618 + exit ;;
3619 + alpha:Linux:*:*)
3620 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3621 + EV5) UNAME_MACHINE=alphaev5 ;;
3622 + EV56) UNAME_MACHINE=alphaev56 ;;
3623 + PCA56) UNAME_MACHINE=alphapca56 ;;
3624 + PCA57) UNAME_MACHINE=alphapca56 ;;
3625 + EV6) UNAME_MACHINE=alphaev6 ;;
3626 + EV67) UNAME_MACHINE=alphaev67 ;;
3627 + EV68*) UNAME_MACHINE=alphaev68 ;;
3628 + esac
3629 + objdump --private-headers /bin/sh | grep -q ld.so.1
3630 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
3631 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
3632 + exit ;;
3633 arm*:Linux:*:*)
3634 + eval $set_cc_for_build
3635 + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
3636 + | grep -q __ARM_EABI__
3637 + then
3638 + echo ${UNAME_MACHINE}-unknown-linux-gnu
3639 + else
3640 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
3641 + fi
3642 + exit ;;
3643 + avr32*:Linux:*:*)
3644 echo ${UNAME_MACHINE}-unknown-linux-gnu
3645 - exit 0 ;;
3646 + exit ;;
3647 + cris:Linux:*:*)
3648 + echo cris-axis-linux-gnu
3649 + exit ;;
3650 + crisv32:Linux:*:*)
3651 + echo crisv32-axis-linux-gnu
3652 + exit ;;
3653 + frv:Linux:*:*)
3654 + echo frv-unknown-linux-gnu
3655 + exit ;;
3656 + i*86:Linux:*:*)
3657 + LIBC=gnu
3658 + eval $set_cc_for_build
3659 + sed 's/^ //' << EOF >$dummy.c
3660 + #ifdef __dietlibc__
3661 + LIBC=dietlibc
3662 + #endif
3663 +EOF
3664 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
3665 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
3666 + exit ;;
3667 ia64:Linux:*:*)
3668 - echo ${UNAME_MACHINE}-unknown-linux
3669 - exit 0 ;;
3670 + echo ${UNAME_MACHINE}-unknown-linux-gnu
3671 + exit ;;
3672 + m32r*:Linux:*:*)
3673 + echo ${UNAME_MACHINE}-unknown-linux-gnu
3674 + exit ;;
3675 m68*:Linux:*:*)
3676 echo ${UNAME_MACHINE}-unknown-linux-gnu
3677 - exit 0 ;;
3678 - mips:Linux:*:*)
3679 + exit ;;
3680 + mips:Linux:*:* | mips64:Linux:*:*)
3681 eval $set_cc_for_build
3682 sed 's/^ //' << EOF >$dummy.c
3683 #undef CPU
3684 - #undef mips
3685 - #undef mipsel
3686 - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3687 - CPU=mipsel
3688 + #undef ${UNAME_MACHINE}
3689 + #undef ${UNAME_MACHINE}el
3690 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3691 + CPU=${UNAME_MACHINE}el
3692 #else
3693 - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3694 - CPU=mips
3695 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3696 + CPU=${UNAME_MACHINE}
3697 #else
3698 CPU=
3699 #endif
3700 - #endif
3701 + #endif
3702 EOF
3703 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
3704 - rm -f $dummy.c
3705 - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
3706 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
3707 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
3708 ;;
3709 - ppc:Linux:*:*)
3710 - echo powerpc-unknown-linux-gnu
3711 - exit 0 ;;
3712 - ppc64:Linux:*:*)
3713 - echo powerpc64-unknown-linux-gnu
3714 - exit 0 ;;
3715 - alpha:Linux:*:*)
3716 - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3717 - EV5) UNAME_MACHINE=alphaev5 ;;
3718 - EV56) UNAME_MACHINE=alphaev56 ;;
3719 - PCA56) UNAME_MACHINE=alphapca56 ;;
3720 - PCA57) UNAME_MACHINE=alphapca56 ;;
3721 - EV6) UNAME_MACHINE=alphaev6 ;;
3722 - EV67) UNAME_MACHINE=alphaev67 ;;
3723 - EV68*) UNAME_MACHINE=alphaev68 ;;
3724 - esac
3725 - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
3726 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
3727 - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
3728 - exit 0 ;;
3729 + or32:Linux:*:*)
3730 + echo or32-unknown-linux-gnu
3731 + exit ;;
3732 + padre:Linux:*:*)
3733 + echo sparc-unknown-linux-gnu
3734 + exit ;;
3735 + parisc64:Linux:*:* | hppa64:Linux:*:*)
3736 + echo hppa64-unknown-linux-gnu
3737 + exit ;;
3738 parisc:Linux:*:* | hppa:Linux:*:*)
3739 # Look for CPU level
3740 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
3741 @@ -812,82 +948,40 @@ EOF
3742 PA8*) echo hppa2.0-unknown-linux-gnu ;;
3743 *) echo hppa-unknown-linux-gnu ;;
3744 esac
3745 - exit 0 ;;
3746 - parisc64:Linux:*:* | hppa64:Linux:*:*)
3747 - echo hppa64-unknown-linux-gnu
3748 - exit 0 ;;
3749 + exit ;;
3750 + ppc64:Linux:*:*)
3751 + echo powerpc64-unknown-linux-gnu
3752 + exit ;;
3753 + ppc:Linux:*:*)
3754 + echo powerpc-unknown-linux-gnu
3755 + exit ;;
3756 s390:Linux:*:* | s390x:Linux:*:*)
3757 echo ${UNAME_MACHINE}-ibm-linux
3758 - exit 0 ;;
3759 + exit ;;
3760 + sh64*:Linux:*:*)
3761 + echo ${UNAME_MACHINE}-unknown-linux-gnu
3762 + exit ;;
3763 sh*:Linux:*:*)
3764 echo ${UNAME_MACHINE}-unknown-linux-gnu
3765 - exit 0 ;;
3766 + exit ;;
3767 sparc:Linux:*:* | sparc64:Linux:*:*)
3768 echo ${UNAME_MACHINE}-unknown-linux-gnu
3769 - exit 0 ;;
3770 + exit ;;
3771 + vax:Linux:*:*)
3772 + echo ${UNAME_MACHINE}-dec-linux-gnu
3773 + exit ;;
3774 x86_64:Linux:*:*)
3775 echo x86_64-unknown-linux-gnu
3776 - exit 0 ;;
3777 - i*86:Linux:*:*)
3778 - # The BFD linker knows what the default object file format is, so
3779 - # first see if it will tell us. cd to the root directory to prevent
3780 - # problems with other programs or directories called `ld' in the path.
3781 - # Set LC_ALL=C to ensure ld outputs messages in English.
3782 - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
3783 - | sed -ne '/supported targets:/!d
3784 - s/[ ][ ]*/ /g
3785 - s/.*supported targets: *//
3786 - s/ .*//
3787 - p'`
3788 - case "$ld_supported_targets" in
3789 - elf32-i386)
3790 - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
3791 - ;;
3792 - a.out-i386-linux)
3793 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
3794 - exit 0 ;;
3795 - coff-i386)
3796 - echo "${UNAME_MACHINE}-pc-linux-gnucoff"
3797 - exit 0 ;;
3798 - "")
3799 - # Either a pre-BFD a.out linker (linux-gnuoldld) or
3800 - # one that does not give us useful --help.
3801 - echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
3802 - exit 0 ;;
3803 - esac
3804 - # Determine whether the default compiler is a.out or elf
3805 - eval $set_cc_for_build
3806 - sed 's/^ //' << EOF >$dummy.c
3807 - #include <features.h>
3808 - #ifdef __ELF__
3809 - # ifdef __GLIBC__
3810 - # if __GLIBC__ >= 2
3811 - LIBC=gnu
3812 - # else
3813 - LIBC=gnulibc1
3814 - # endif
3815 - # else
3816 - LIBC=gnulibc1
3817 - # endif
3818 - #else
3819 - #ifdef __INTEL_COMPILER
3820 - LIBC=gnu
3821 - #else
3822 - LIBC=gnuaout
3823 - #endif
3824 - #endif
3825 -EOF
3826 - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
3827 - rm -f $dummy.c
3828 - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
3829 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
3830 - ;;
3831 + exit ;;
3832 + xtensa*:Linux:*:*)
3833 + echo ${UNAME_MACHINE}-unknown-linux-gnu
3834 + exit ;;
3835 i*86:DYNIX/ptx:4*:*)
3836 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
3837 # earlier versions are messed up and put the nodename in both
3838 # sysname and nodename.
3839 echo i386-sequent-sysv4
3840 - exit 0 ;;
3841 + exit ;;
3842 i*86:UNIX_SV:4.2MP:2.*)
3843 # Unixware is an offshoot of SVR4, but it has its own version
3844 # number series starting with 2...
3845 @@ -895,7 +989,27 @@ EOF
3846 # I just have to hope. -- rms.
3847 # Use sysv4.2uw... so that sysv4* matches it.
3848 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
3849 - exit 0 ;;
3850 + exit ;;
3851 + i*86:OS/2:*:*)
3852 + # If we were able to find `uname', then EMX Unix compatibility
3853 + # is probably installed.
3854 + echo ${UNAME_MACHINE}-pc-os2-emx
3855 + exit ;;
3856 + i*86:XTS-300:*:STOP)
3857 + echo ${UNAME_MACHINE}-unknown-stop
3858 + exit ;;
3859 + i*86:atheos:*:*)
3860 + echo ${UNAME_MACHINE}-unknown-atheos
3861 + exit ;;
3862 + i*86:syllable:*:*)
3863 + echo ${UNAME_MACHINE}-pc-syllable
3864 + exit ;;
3865 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
3866 + echo i386-unknown-lynxos${UNAME_RELEASE}
3867 + exit ;;
3868 + i*86:*DOS:*:*)
3869 + echo ${UNAME_MACHINE}-pc-msdosdjgpp
3870 + exit ;;
3871 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
3872 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
3873 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
3874 @@ -903,99 +1017,113 @@ EOF
3875 else
3876 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
3877 fi
3878 - exit 0 ;;
3879 - i*86:*:5:[78]*)
3880 + exit ;;
3881 + i*86:*:5:[678]*)
3882 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
3883 case `/bin/uname -X | grep "^Machine"` in
3884 *486*) UNAME_MACHINE=i486 ;;
3885 *Pentium) UNAME_MACHINE=i586 ;;
3886 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
3887 esac
3888 echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
3889 - exit 0 ;;
3890 + exit ;;
3891 i*86:*:3.2:*)
3892 if test -f /usr/options/cb.name; then
3893 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
3894 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
3895 elif /bin/uname -X 2>/dev/null >/dev/null ; then
3896 - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
3897 - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
3898 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
3899 + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
3900 + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
3901 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
3902 && UNAME_MACHINE=i586
3903 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
3904 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
3905 && UNAME_MACHINE=i686
3906 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
3907 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
3908 && UNAME_MACHINE=i686
3909 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
3910 else
3911 echo ${UNAME_MACHINE}-pc-sysv32
3912 fi
3913 - exit 0 ;;
3914 - i*86:*DOS:*:*)
3915 - echo ${UNAME_MACHINE}-pc-msdosdjgpp
3916 - exit 0 ;;
3917 + exit ;;
3918 pc:*:*:*)
3919 # Left here for compatibility:
3920 # uname -m prints for DJGPP always 'pc', but it prints nothing about
3921 - # the processor, so we play safe by assuming i386.
3922 - echo i386-pc-msdosdjgpp
3923 - exit 0 ;;
3924 + # the processor, so we play safe by assuming i586.
3925 + # Note: whatever this is, it MUST be the same as what config.sub
3926 + # prints for the "djgpp" host, or else GDB configury will decide that
3927 + # this is a cross-build.
3928 + echo i586-pc-msdosdjgpp
3929 + exit ;;
3930 Intel:Mach:3*:*)
3931 echo i386-pc-mach3
3932 - exit 0 ;;
3933 + exit ;;
3934 paragon:*:*:*)
3935 echo i860-intel-osf1
3936 - exit 0 ;;
3937 + exit ;;
3938 i860:*:4.*:*) # i860-SVR4
3939 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
3940 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
3941 else # Add other i860-SVR4 vendors below as they are discovered.
3942 echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
3943 fi
3944 - exit 0 ;;
3945 + exit ;;
3946 mini*:CTIX:SYS*5:*)
3947 # "miniframe"
3948 echo m68010-convergent-sysv
3949 - exit 0 ;;
3950 - M68*:*:R3V[567]*:*)
3951 - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3952 - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
3953 + exit ;;
3954 + mc68k:UNIX:SYSTEM5:3.51m)
3955 + echo m68k-convergent-sysv
3956 + exit ;;
3957 + M680?0:D-NIX:5.3:*)
3958 + echo m68k-diab-dnix
3959 + exit ;;
3960 + M68*:*:R3V[5678]*:*)
3961 + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3962 + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
3963 OS_REL=''
3964 test -r /etc/.relid \
3965 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
3966 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3967 - && echo i486-ncr-sysv4.3${OS_REL} && exit 0
3968 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
3969 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3970 - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
3971 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3972 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
3973 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3974 - && echo i486-ncr-sysv4 && exit 0 ;;
3975 + && { echo i486-ncr-sysv4; exit; } ;;
3976 + NCR*:*:4.2:* | MPRAS*:*:4.2:*)
3977 + OS_REL='.3'
3978 + test -r /etc/.relid \
3979 + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
3980 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3981 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
3982 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3983 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
3984 + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
3985 + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3986 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
3987 echo m68k-unknown-lynxos${UNAME_RELEASE}
3988 - exit 0 ;;
3989 + exit ;;
3990 mc68030:UNIX_System_V:4.*:*)
3991 echo m68k-atari-sysv4
3992 - exit 0 ;;
3993 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
3994 - echo i386-unknown-lynxos${UNAME_RELEASE}
3995 - exit 0 ;;
3996 + exit ;;
3997 TSUNAMI:LynxOS:2.*:*)
3998 echo sparc-unknown-lynxos${UNAME_RELEASE}
3999 - exit 0 ;;
4000 + exit ;;
4001 rs6000:LynxOS:2.*:*)
4002 echo rs6000-unknown-lynxos${UNAME_RELEASE}
4003 - exit 0 ;;
4004 - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
4005 + exit ;;
4006 + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
4007 echo powerpc-unknown-lynxos${UNAME_RELEASE}
4008 - exit 0 ;;
4009 + exit ;;
4010 SM[BE]S:UNIX_SV:*:*)
4011 echo mips-dde-sysv${UNAME_RELEASE}
4012 - exit 0 ;;
4013 + exit ;;
4014 RM*:ReliantUNIX-*:*:*)
4015 echo mips-sni-sysv4
4016 - exit 0 ;;
4017 + exit ;;
4018 RM*:SINIX-*:*:*)
4019 echo mips-sni-sysv4
4020 - exit 0 ;;
4021 + exit ;;
4022 *:SINIX-*:*:*)
4023 if uname -p 2>/dev/null >/dev/null ; then
4024 UNAME_MACHINE=`(uname -p) 2>/dev/null`
4025 @@ -1003,84 +1131,120 @@ EOF
4026 else
4027 echo ns32k-sni-sysv
4028 fi
4029 - exit 0 ;;
4030 + exit ;;
4031 PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
4032 # says <[email protected]>
4033 echo i586-unisys-sysv4
4034 - exit 0 ;;
4035 + exit ;;
4036 *:UNIX_System_V:4*:FTX*)
4037 # From Gerald Hewes <[email protected]>.
4038 # How about differentiating between stratus architectures? -djm
4039 echo hppa1.1-stratus-sysv4
4040 - exit 0 ;;
4041 + exit ;;
4042 *:*:*:FTX*)
4043 # From [email protected].
4044 echo i860-stratus-sysv4
4045 - exit 0 ;;
4046 + exit ;;
4047 + i*86:VOS:*:*)
4048 + # From [email protected].
4049 + echo ${UNAME_MACHINE}-stratus-vos
4050 + exit ;;
4051 *:VOS:*:*)
4052 # From [email protected].
4053 echo hppa1.1-stratus-vos
4054 - exit 0 ;;
4055 + exit ;;
4056 mc68*:A/UX:*:*)
4057 echo m68k-apple-aux${UNAME_RELEASE}
4058 - exit 0 ;;
4059 + exit ;;
4060 news*:NEWS-OS:6*:*)
4061 echo mips-sony-newsos6
4062 - exit 0 ;;
4063 + exit ;;
4064 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
4065 if [ -d /usr/nec ]; then
4066 echo mips-nec-sysv${UNAME_RELEASE}
4067 else
4068 echo mips-unknown-sysv${UNAME_RELEASE}
4069 fi
4070 - exit 0 ;;
4071 + exit ;;
4072 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
4073 echo powerpc-be-beos
4074 - exit 0 ;;
4075 + exit ;;
4076 BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
4077 echo powerpc-apple-beos
4078 - exit 0 ;;
4079 + exit ;;
4080 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
4081 echo i586-pc-beos
4082 - exit 0 ;;
4083 + exit ;;
4084 + BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
4085 + echo i586-pc-haiku
4086 + exit ;;
4087 SX-4:SUPER-UX:*:*)
4088 echo sx4-nec-superux${UNAME_RELEASE}
4089 - exit 0 ;;
4090 + exit ;;
4091 SX-5:SUPER-UX:*:*)
4092 echo sx5-nec-superux${UNAME_RELEASE}
4093 - exit 0 ;;
4094 + exit ;;
4095 + SX-6:SUPER-UX:*:*)
4096 + echo sx6-nec-superux${UNAME_RELEASE}
4097 + exit ;;
4098 + SX-7:SUPER-UX:*:*)
4099 + echo sx7-nec-superux${UNAME_RELEASE}
4100 + exit ;;
4101 + SX-8:SUPER-UX:*:*)
4102 + echo sx8-nec-superux${UNAME_RELEASE}
4103 + exit ;;
4104 + SX-8R:SUPER-UX:*:*)
4105 + echo sx8r-nec-superux${UNAME_RELEASE}
4106 + exit ;;
4107 Power*:Rhapsody:*:*)
4108 echo powerpc-apple-rhapsody${UNAME_RELEASE}
4109 - exit 0 ;;
4110 + exit ;;
4111 *:Rhapsody:*:*)
4112 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
4113 - exit 0 ;;
4114 + exit ;;
4115 *:Darwin:*:*)
4116 - echo `uname -p`-apple-darwin${UNAME_RELEASE}
4117 - exit 0 ;;
4118 + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
4119 + case $UNAME_PROCESSOR in
4120 + i386)
4121 + eval $set_cc_for_build
4122 + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
4123 + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4124 + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
4125 + grep IS_64BIT_ARCH >/dev/null
4126 + then
4127 + UNAME_PROCESSOR="x86_64"
4128 + fi
4129 + fi ;;
4130 + unknown) UNAME_PROCESSOR=powerpc ;;
4131 + esac
4132 + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
4133 + exit ;;
4134 *:procnto*:*:* | *:QNX:[0123456789]*:*)
4135 - if test "${UNAME_MACHINE}" = "x86pc"; then
4136 + UNAME_PROCESSOR=`uname -p`
4137 + if test "$UNAME_PROCESSOR" = "x86"; then
4138 + UNAME_PROCESSOR=i386
4139 UNAME_MACHINE=pc
4140 - echo i386-${UNAME_MACHINE}-nto-qnx
4141 - else
4142 - echo `uname -p`-${UNAME_MACHINE}-nto-qnx
4143 fi
4144 - exit 0 ;;
4145 + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
4146 + exit ;;
4147 *:QNX:*:4*)
4148 echo i386-pc-qnx
4149 - exit 0 ;;
4150 - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
4151 + exit ;;
4152 + NSE-?:NONSTOP_KERNEL:*:*)
4153 + echo nse-tandem-nsk${UNAME_RELEASE}
4154 + exit ;;
4155 + NSR-?:NONSTOP_KERNEL:*:*)
4156 echo nsr-tandem-nsk${UNAME_RELEASE}
4157 - exit 0 ;;
4158 + exit ;;
4159 *:NonStop-UX:*:*)
4160 echo mips-compaq-nonstopux
4161 - exit 0 ;;
4162 + exit ;;
4163 BS2000:POSIX*:*:*)
4164 echo bs2000-siemens-sysv
4165 - exit 0 ;;
4166 + exit ;;
4167 DS/*:UNIX_System_V:*:*)
4168 echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
4169 - exit 0 ;;
4170 + exit ;;
4171 *:Plan9:*:*)
4172 # "uname -m" is not consistent, so use $cputype instead. 386
4173 # is converted to i386 for consistency with other x86
4174 @@ -1091,36 +1255,50 @@ EOF
4175 UNAME_MACHINE="$cputype"
4176 fi
4177 echo ${UNAME_MACHINE}-unknown-plan9
4178 - exit 0 ;;
4179 - i*86:OS/2:*:*)
4180 - # If we were able to find `uname', then EMX Unix compatibility
4181 - # is probably installed.
4182 - echo ${UNAME_MACHINE}-pc-os2-emx
4183 - exit 0 ;;
4184 + exit ;;
4185 *:TOPS-10:*:*)
4186 echo pdp10-unknown-tops10
4187 - exit 0 ;;
4188 + exit ;;
4189 *:TENEX:*:*)
4190 echo pdp10-unknown-tenex
4191 - exit 0 ;;
4192 + exit ;;
4193 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
4194 echo pdp10-dec-tops20
4195 - exit 0 ;;
4196 + exit ;;
4197 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
4198 echo pdp10-xkl-tops20
4199 - exit 0 ;;
4200 + exit ;;
4201 *:TOPS-20:*:*)
4202 echo pdp10-unknown-tops20
4203 - exit 0 ;;
4204 + exit ;;
4205 *:ITS:*:*)
4206 echo pdp10-unknown-its
4207 - exit 0 ;;
4208 - i*86:XTS-300:*:STOP)
4209 - echo ${UNAME_MACHINE}-unknown-stop
4210 - exit 0 ;;
4211 - i*86:atheos:*:*)
4212 - echo ${UNAME_MACHINE}-unknown-atheos
4213 - exit 0 ;;
4214 + exit ;;
4215 + SEI:*:*:SEIUX)
4216 + echo mips-sei-seiux${UNAME_RELEASE}
4217 + exit ;;
4218 + *:DragonFly:*:*)
4219 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
4220 + exit ;;
4221 + *:*VMS:*:*)
4222 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
4223 + case "${UNAME_MACHINE}" in
4224 + A*) echo alpha-dec-vms ; exit ;;
4225 + I*) echo ia64-dec-vms ; exit ;;
4226 + V*) echo vax-dec-vms ; exit ;;
4227 + esac ;;
4228 + *:XENIX:*:SysV)
4229 + echo i386-pc-xenix
4230 + exit ;;
4231 + i*86:skyos:*:*)
4232 + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
4233 + exit ;;
4234 + i*86:rdos:*:*)
4235 + echo ${UNAME_MACHINE}-pc-rdos
4236 + exit ;;
4237 + i*86:AROS:*:*)
4238 + echo ${UNAME_MACHINE}-pc-aros
4239 + exit ;;
4240 esac
4241
4242 #echo '(No uname command or uname output not recognized.)' 1>&2
4243 @@ -1152,7 +1330,7 @@ main ()
4244 #endif
4245
4246 #if defined (__arm) && defined (__acorn) && defined (__unix)
4247 - printf ("arm-acorn-riscix"); exit (0);
4248 + printf ("arm-acorn-riscix\n"); exit (0);
4249 #endif
4250
4251 #if defined (hp300) && !defined (hpux)
4252 @@ -1241,12 +1419,12 @@ main ()
4253 }
4254 EOF
4255
4256 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
4257 -rm -f $dummy.c $dummy
4258 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
4259 + { echo "$SYSTEM_NAME"; exit; }
4260
4261 # Apollos put the system type in the environment.
4262
4263 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
4264 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
4265
4266 # Convex versions that predate uname can use getsysinfo(1)
4267
4268 @@ -1255,22 +1433,22 @@ then
4269 case `getsysinfo -f cpu_type` in
4270 c1*)
4271 echo c1-convex-bsd
4272 - exit 0 ;;
4273 + exit ;;
4274 c2*)
4275 if getsysinfo -f scalar_acc
4276 then echo c32-convex-bsd
4277 else echo c2-convex-bsd
4278 fi
4279 - exit 0 ;;
4280 + exit ;;
4281 c34*)
4282 echo c34-convex-bsd
4283 - exit 0 ;;
4284 + exit ;;
4285 c38*)
4286 echo c38-convex-bsd
4287 - exit 0 ;;
4288 + exit ;;
4289 c4*)
4290 echo c4-convex-bsd
4291 - exit 0 ;;
4292 + exit ;;
4293 esac
4294 fi
4295
4296 @@ -1281,7 +1459,9 @@ This script, last modified $timestamp, has failed to recognize
4297 the operating system you are using. It is advised that you
4298 download the most up to date version of the config scripts from
4299
4300 - ftp://ftp.gnu.org/pub/gnu/config/
4301 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
4302 +and
4303 + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
4304
4305 If the version you run ($0) is already up to date, please
4306 send the following data and any information you think might be
4307 diff --git a/config.sub b/config.sub
4308 index f365797..2a55a50 100755
4309 --- a/config.sub
4310 +++ b/config.sub
4311 @@ -1,9 +1,10 @@
4312 #! /bin/sh
4313 # Configuration validation subroutine script.
4314 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4315 -# 2000, 2001, 2002 Free Software Foundation, Inc.
4316 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
4317 +# Free Software Foundation, Inc.
4318
4319 -timestamp='2002-03-07'
4320 +timestamp='2009-11-20'
4321
4322 # This file is (in principle) common to ALL GNU software.
4323 # The presence of a machine in this file suggests that SOME GNU software
4324 @@ -21,22 +22,26 @@ timestamp='2002-03-07'
4325 #
4326 # You should have received a copy of the GNU General Public License
4327 # along with this program; if not, write to the Free Software
4328 -# Foundation, Inc., 59 Temple Place - Suite 330,
4329 -# Boston, MA 02111-1307, USA.
4330 -
4331 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
4332 +# 02110-1301, USA.
4333 +#
4334 # As a special exception to the GNU General Public License, if you
4335 # distribute this file as part of a program that contains a
4336 # configuration script generated by Autoconf, you may include it under
4337 # the same distribution terms that you use for the rest of that program.
4338
4339 +
4340 # Please send patches to <[email protected]>. Submit a context
4341 -# diff and a properly formatted ChangeLog entry.
4342 +# diff and a properly formatted GNU ChangeLog entry.
4343 #
4344 # Configuration subroutine to validate and canonicalize a configuration type.
4345 # Supply the specified configuration type as an argument.
4346 # If it is invalid, we print an error message on stderr and exit with code 1.
4347 # Otherwise, we print the canonical config type on stdout and succeed.
4348
4349 +# You can get the latest version of this script from:
4350 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
4351 +
4352 # This file is supposed to be the same for all GNU packages
4353 # and recognize all the CPU types, system types and aliases
4354 # that are meaningful with *any* GNU software.
4355 @@ -70,8 +75,8 @@ Report bugs and patches to <[email protected]>."
4356 version="\
4357 GNU config.sub ($timestamp)
4358
4359 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
4360 -Free Software Foundation, Inc.
4361 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
4362 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4363
4364 This is free software; see the source for copying conditions. There is NO
4365 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
4366 @@ -83,11 +88,11 @@ Try \`$me --help' for more information."
4367 while test $# -gt 0 ; do
4368 case $1 in
4369 --time-stamp | --time* | -t )
4370 - echo "$timestamp" ; exit 0 ;;
4371 + echo "$timestamp" ; exit ;;
4372 --version | -v )
4373 - echo "$version" ; exit 0 ;;
4374 + echo "$version" ; exit ;;
4375 --help | --h* | -h )
4376 - echo "$usage"; exit 0 ;;
4377 + echo "$usage"; exit ;;
4378 -- ) # Stop option processing
4379 shift; break ;;
4380 - ) # Use stdin as input.
4381 @@ -99,7 +104,7 @@ while test $# -gt 0 ; do
4382 *local*)
4383 # First pass through any local machine types.
4384 echo $1
4385 - exit 0;;
4386 + exit ;;
4387
4388 * )
4389 break ;;
4390 @@ -118,7 +123,10 @@ esac
4391 # Here we must recognize all the valid KERNEL-OS combinations.
4392 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
4393 case $maybe_os in
4394 - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
4395 + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
4396 + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
4397 + kopensolaris*-gnu* | \
4398 + storm-chaos* | os2-emx* | rtmk-nova*)
4399 os=-$maybe_os
4400 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
4401 ;;
4402 @@ -144,10 +152,13 @@ case $os in
4403 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
4404 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
4405 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
4406 - -apple | -axis)
4407 + -apple | -axis | -knuth | -cray | -microblaze)
4408 os=
4409 basic_machine=$1
4410 ;;
4411 + -bluegene*)
4412 + os=-cnk
4413 + ;;
4414 -sim | -cisco | -oki | -wec | -winbond)
4415 os=
4416 basic_machine=$1
4417 @@ -169,6 +180,10 @@ case $os in
4418 -hiux*)
4419 os=-hiuxwe2
4420 ;;
4421 + -sco6)
4422 + os=-sco5v6
4423 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4424 + ;;
4425 -sco5)
4426 os=-sco3.2v5
4427 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4428 @@ -185,6 +200,10 @@ case $os in
4429 # Don't forget version if it is 3.2v4 or newer.
4430 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4431 ;;
4432 + -sco5v6*)
4433 + # Don't forget version if it is 3.2v4 or newer.
4434 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4435 + ;;
4436 -sco*)
4437 os=-sco3.2v2
4438 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4439 @@ -228,41 +247,71 @@ case $basic_machine in
4440 | a29k \
4441 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
4442 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
4443 - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
4444 + | am33_2.0 \
4445 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
4446 + | bfin \
4447 | c4x | clipper \
4448 - | d10v | d30v | dsp16xx \
4449 - | fr30 \
4450 + | d10v | d30v | dlx | dsp16xx \
4451 + | fido | fr30 | frv \
4452 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
4453 | i370 | i860 | i960 | ia64 \
4454 - | m32r | m68000 | m68k | m88k | mcore \
4455 - | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
4456 - | mips64vr4100 | mips64vr4100el | mips64vr4300 \
4457 - | mips64vr4300el | mips64vr5000 | mips64vr5000el \
4458 - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
4459 - | mipsisa32 | mipsisa64 \
4460 + | ip2k | iq2000 \
4461 + | lm32 \
4462 + | m32c | m32r | m32rle | m68000 | m68k | m88k \
4463 + | maxq | mb | microblaze | mcore | mep | metag \
4464 + | mips | mipsbe | mipseb | mipsel | mipsle \
4465 + | mips16 \
4466 + | mips64 | mips64el \
4467 + | mips64octeon | mips64octeonel \
4468 + | mips64orion | mips64orionel \
4469 + | mips64r5900 | mips64r5900el \
4470 + | mips64vr | mips64vrel \
4471 + | mips64vr4100 | mips64vr4100el \
4472 + | mips64vr4300 | mips64vr4300el \
4473 + | mips64vr5000 | mips64vr5000el \
4474 + | mips64vr5900 | mips64vr5900el \
4475 + | mipsisa32 | mipsisa32el \
4476 + | mipsisa32r2 | mipsisa32r2el \
4477 + | mipsisa64 | mipsisa64el \
4478 + | mipsisa64r2 | mipsisa64r2el \
4479 + | mipsisa64sb1 | mipsisa64sb1el \
4480 + | mipsisa64sr71k | mipsisa64sr71kel \
4481 + | mipstx39 | mipstx39el \
4482 | mn10200 | mn10300 \
4483 + | moxie \
4484 + | mt \
4485 + | msp430 \
4486 + | nios | nios2 \
4487 | ns16k | ns32k \
4488 - | openrisc | or32 \
4489 + | or32 \
4490 | pdp10 | pdp11 | pj | pjl \
4491 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
4492 | pyramid \
4493 - | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
4494 - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
4495 - | strongarm \
4496 - | tahoe | thumb | tic80 | tron \
4497 + | rx \
4498 + | score \
4499 + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
4500 + | sh64 | sh64le \
4501 + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
4502 + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
4503 + | spu | strongarm \
4504 + | tahoe | thumb | tic4x | tic80 | tron \
4505 + | ubicom32 \
4506 | v850 | v850e \
4507 | we32k \
4508 - | x86 | xscale | xstormy16 | xtensa \
4509 - | z8k)
4510 + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
4511 + | z8k | z80)
4512 basic_machine=$basic_machine-unknown
4513 ;;
4514 - m6811 | m68hc11 | m6812 | m68hc12)
4515 + m6811 | m68hc11 | m6812 | m68hc12 | picochip)
4516 # Motorola 68HC11/12.
4517 basic_machine=$basic_machine-unknown
4518 os=-none
4519 ;;
4520 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
4521 ;;
4522 + ms1)
4523 + basic_machine=mt-unknown
4524 + ;;
4525
4526 # We use `pc' rather than `unknown'
4527 # because (1) that's what they normally are, and
4528 @@ -281,40 +330,69 @@ case $basic_machine in
4529 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
4530 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
4531 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
4532 - | arm-* | armbe-* | armle-* | armv*-* \
4533 - | avr-* \
4534 - | bs2000-* \
4535 - | c[123]* | c30-* | [cjt]90-* | c54x-* \
4536 - | clipper-* | cydra-* \
4537 - | d10v-* | d30v-* \
4538 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
4539 + | avr-* | avr32-* \
4540 + | bfin-* | bs2000-* \
4541 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
4542 + | clipper-* | craynv-* | cydra-* \
4543 + | d10v-* | d30v-* | dlx-* \
4544 | elxsi-* \
4545 - | f30[01]-* | f700-* | fr30-* | fx80-* \
4546 + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
4547 | h8300-* | h8500-* \
4548 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
4549 | i*86-* | i860-* | i960-* | ia64-* \
4550 - | m32r-* \
4551 + | ip2k-* | iq2000-* \
4552 + | lm32-* \
4553 + | m32c-* | m32r-* | m32rle-* \
4554 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
4555 - | m88110-* | m88k-* | mcore-* \
4556 - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
4557 - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
4558 - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
4559 - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
4560 + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
4561 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
4562 + | mips16-* \
4563 + | mips64-* | mips64el-* \
4564 + | mips64octeon-* | mips64octeonel-* \
4565 + | mips64orion-* | mips64orionel-* \
4566 + | mips64r5900-* | mips64r5900el-* \
4567 + | mips64vr-* | mips64vrel-* \
4568 + | mips64vr4100-* | mips64vr4100el-* \
4569 + | mips64vr4300-* | mips64vr4300el-* \
4570 + | mips64vr5000-* | mips64vr5000el-* \
4571 + | mips64vr5900-* | mips64vr5900el-* \
4572 + | mipsisa32-* | mipsisa32el-* \
4573 + | mipsisa32r2-* | mipsisa32r2el-* \
4574 + | mipsisa64-* | mipsisa64el-* \
4575 + | mipsisa64r2-* | mipsisa64r2el-* \
4576 + | mipsisa64sb1-* | mipsisa64sb1el-* \
4577 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
4578 + | mipstx39-* | mipstx39el-* \
4579 + | mmix-* \
4580 + | mt-* \
4581 + | msp430-* \
4582 + | nios-* | nios2-* \
4583 | none-* | np1-* | ns16k-* | ns32k-* \
4584 | orion-* \
4585 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
4586 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
4587 | pyramid-* \
4588 - | romp-* | rs6000-* \
4589 - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
4590 - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
4591 - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
4592 - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
4593 + | romp-* | rs6000-* | rx-* \
4594 + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
4595 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
4596 + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
4597 + | sparclite-* \
4598 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
4599 + | tahoe-* | thumb-* \
4600 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
4601 + | tron-* \
4602 + | ubicom32-* \
4603 | v850-* | v850e-* | vax-* \
4604 | we32k-* \
4605 - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
4606 - | xtensa-* \
4607 + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
4608 + | xstormy16-* | xtensa*-* \
4609 | ymp-* \
4610 - | z8k-*)
4611 + | z8k-* | z80-*)
4612 + ;;
4613 + # Recognize the basic CPU types without company name, with glob match.
4614 + xtensa*)
4615 + basic_machine=$basic_machine-unknown
4616 ;;
4617 # Recognize the various machine names and aliases which stand
4618 # for a CPU type and a company and sometimes even an OS.
4619 @@ -332,6 +410,9 @@ case $basic_machine in
4620 basic_machine=a29k-amd
4621 os=-udi
4622 ;;
4623 + abacus)
4624 + basic_machine=abacus-unknown
4625 + ;;
4626 adobe68k)
4627 basic_machine=m68010-adobe
4628 os=-scout
4629 @@ -346,6 +427,12 @@ case $basic_machine in
4630 basic_machine=a29k-none
4631 os=-bsd
4632 ;;
4633 + amd64)
4634 + basic_machine=x86_64-pc
4635 + ;;
4636 + amd64-*)
4637 + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
4638 + ;;
4639 amdahl)
4640 basic_machine=580-amdahl
4641 os=-sysv
4642 @@ -369,6 +456,10 @@ case $basic_machine in
4643 basic_machine=m68k-apollo
4644 os=-bsd
4645 ;;
4646 + aros)
4647 + basic_machine=i386-pc
4648 + os=-aros
4649 + ;;
4650 aux)
4651 basic_machine=m68k-apple
4652 os=-aux
4653 @@ -377,10 +468,26 @@ case $basic_machine in
4654 basic_machine=ns32k-sequent
4655 os=-dynix
4656 ;;
4657 + blackfin)
4658 + basic_machine=bfin-unknown
4659 + os=-linux
4660 + ;;
4661 + blackfin-*)
4662 + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
4663 + os=-linux
4664 + ;;
4665 + bluegene*)
4666 + basic_machine=powerpc-ibm
4667 + os=-cnk
4668 + ;;
4669 c90)
4670 basic_machine=c90-cray
4671 os=-unicos
4672 ;;
4673 + cegcc)
4674 + basic_machine=arm-unknown
4675 + os=-cegcc
4676 + ;;
4677 convex-c1)
4678 basic_machine=c1-convex
4679 os=-bsd
4680 @@ -405,12 +512,27 @@ case $basic_machine in
4681 basic_machine=j90-cray
4682 os=-unicos
4683 ;;
4684 + craynv)
4685 + basic_machine=craynv-cray
4686 + os=-unicosmp
4687 + ;;
4688 + cr16)
4689 + basic_machine=cr16-unknown
4690 + os=-elf
4691 + ;;
4692 crds | unos)
4693 basic_machine=m68k-crds
4694 ;;
4695 + crisv32 | crisv32-* | etraxfs*)
4696 + basic_machine=crisv32-axis
4697 + ;;
4698 cris | cris-* | etrax*)
4699 basic_machine=cris-axis
4700 ;;
4701 + crx)
4702 + basic_machine=crx-unknown
4703 + os=-elf
4704 + ;;
4705 da30 | da30-*)
4706 basic_machine=m68k-da30
4707 ;;
4708 @@ -433,6 +555,14 @@ case $basic_machine in
4709 basic_machine=m88k-motorola
4710 os=-sysv3
4711 ;;
4712 + dicos)
4713 + basic_machine=i686-pc
4714 + os=-dicos
4715 + ;;
4716 + djgpp)
4717 + basic_machine=i586-pc
4718 + os=-msdosdjgpp
4719 + ;;
4720 dpx20 | dpx20-*)
4721 basic_machine=rs6000-bull
4722 os=-bosx
4723 @@ -583,6 +713,14 @@ case $basic_machine in
4724 basic_machine=m68k-isi
4725 os=-sysv
4726 ;;
4727 + m68knommu)
4728 + basic_machine=m68k-unknown
4729 + os=-linux
4730 + ;;
4731 + m68knommu-*)
4732 + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
4733 + os=-linux
4734 + ;;
4735 m88k-omron*)
4736 basic_machine=m88k-omron
4737 ;;
4738 @@ -594,10 +732,17 @@ case $basic_machine in
4739 basic_machine=ns32k-utek
4740 os=-sysv
4741 ;;
4742 + microblaze)
4743 + basic_machine=microblaze-xilinx
4744 + ;;
4745 mingw32)
4746 basic_machine=i386-pc
4747 os=-mingw32
4748 ;;
4749 + mingw32ce)
4750 + basic_machine=arm-unknown
4751 + os=-mingw32ce
4752 + ;;
4753 miniframe)
4754 basic_machine=m68000-convergent
4755 ;;
4756 @@ -611,10 +756,6 @@ case $basic_machine in
4757 mips3*)
4758 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
4759 ;;
4760 - mmix*)
4761 - basic_machine=mmix-knuth
4762 - os=-mmixware
4763 - ;;
4764 monitor)
4765 basic_machine=m68k-rom68k
4766 os=-coff
4767 @@ -627,6 +768,9 @@ case $basic_machine in
4768 basic_machine=i386-pc
4769 os=-msdos
4770 ;;
4771 + ms1-*)
4772 + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
4773 + ;;
4774 mvs)
4775 basic_machine=i370-ibm
4776 os=-mvs
4777 @@ -702,9 +846,12 @@ case $basic_machine in
4778 basic_machine=hppa1.1-oki
4779 os=-proelf
4780 ;;
4781 - or32 | or32-*)
4782 + openrisc | openrisc-*)
4783 basic_machine=or32-unknown
4784 - os=-coff
4785 + ;;
4786 + os400)
4787 + basic_machine=powerpc-ibm
4788 + os=-os400
4789 ;;
4790 OSE68000 | ose68000)
4791 basic_machine=m68000-ericsson
4792 @@ -722,55 +869,75 @@ case $basic_machine in
4793 basic_machine=i860-intel
4794 os=-osf
4795 ;;
4796 + parisc)
4797 + basic_machine=hppa-unknown
4798 + os=-linux
4799 + ;;
4800 + parisc-*)
4801 + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
4802 + os=-linux
4803 + ;;
4804 pbd)
4805 basic_machine=sparc-tti
4806 ;;
4807 pbb)
4808 basic_machine=m68k-tti
4809 ;;
4810 - pc532 | pc532-*)
4811 + pc532 | pc532-*)
4812 basic_machine=ns32k-pc532
4813 ;;
4814 + pc98)
4815 + basic_machine=i386-pc
4816 + ;;
4817 + pc98-*)
4818 + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
4819 + ;;
4820 pentium | p5 | k5 | k6 | nexgen | viac3)
4821 basic_machine=i586-pc
4822 ;;
4823 - pentiumpro | p6 | 6x86 | athlon)
4824 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
4825 basic_machine=i686-pc
4826 ;;
4827 - pentiumii | pentium2)
4828 + pentiumii | pentium2 | pentiumiii | pentium3)
4829 basic_machine=i686-pc
4830 ;;
4831 + pentium4)
4832 + basic_machine=i786-pc
4833 + ;;
4834 pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
4835 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
4836 ;;
4837 pentiumpro-* | p6-* | 6x86-* | athlon-*)
4838 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
4839 ;;
4840 - pentiumii-* | pentium2-*)
4841 + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
4842 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
4843 ;;
4844 + pentium4-*)
4845 + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
4846 + ;;
4847 pn)
4848 basic_machine=pn-gould
4849 ;;
4850 power) basic_machine=power-ibm
4851 ;;
4852 ppc) basic_machine=powerpc-unknown
4853 - ;;
4854 + ;;
4855 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
4856 ;;
4857 ppcle | powerpclittle | ppc-le | powerpc-little)
4858 basic_machine=powerpcle-unknown
4859 - ;;
4860 + ;;
4861 ppcle-* | powerpclittle-*)
4862 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
4863 ;;
4864 ppc64) basic_machine=powerpc64-unknown
4865 - ;;
4866 + ;;
4867 ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
4868 ;;
4869 ppc64le | powerpc64little | ppc64-le | powerpc64-little)
4870 basic_machine=powerpc64le-unknown
4871 - ;;
4872 + ;;
4873 ppc64le-* | powerpc64little-*)
4874 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
4875 ;;
4876 @@ -781,6 +948,10 @@ case $basic_machine in
4877 basic_machine=i586-unknown
4878 os=-pw32
4879 ;;
4880 + rdos)
4881 + basic_machine=i386-pc
4882 + os=-rdos
4883 + ;;
4884 rom68k)
4885 basic_machine=m68k-rom68k
4886 os=-coff
4887 @@ -801,6 +972,20 @@ case $basic_machine in
4888 basic_machine=a29k-amd
4889 os=-udi
4890 ;;
4891 + sb1)
4892 + basic_machine=mipsisa64sb1-unknown
4893 + ;;
4894 + sb1el)
4895 + basic_machine=mipsisa64sb1el-unknown
4896 + ;;
4897 + sde)
4898 + basic_machine=mipsisa32-sde
4899 + os=-elf
4900 + ;;
4901 + sei)
4902 + basic_machine=mips-sei
4903 + os=-seiux
4904 + ;;
4905 sequent)
4906 basic_machine=i386-sequent
4907 ;;
4908 @@ -808,6 +993,12 @@ case $basic_machine in
4909 basic_machine=sh-hitachi
4910 os=-hms
4911 ;;
4912 + sh5el)
4913 + basic_machine=sh5le-unknown
4914 + ;;
4915 + sh64)
4916 + basic_machine=sh64-unknown
4917 + ;;
4918 sparclite-wrs | simso-wrs)
4919 basic_machine=sparclite-wrs
4920 os=-vxworks
4921 @@ -866,7 +1057,7 @@ case $basic_machine in
4922 sun386 | sun386i | roadrunner)
4923 basic_machine=i386-sun
4924 ;;
4925 - sv1)
4926 + sv1)
4927 basic_machine=sv1-cray
4928 os=-unicos
4929 ;;
4930 @@ -874,10 +1065,6 @@ case $basic_machine in
4931 basic_machine=i386-sequent
4932 os=-dynix
4933 ;;
4934 - t3d)
4935 - basic_machine=alpha-cray
4936 - os=-unicos
4937 - ;;
4938 t3e)
4939 basic_machine=alphaev5-cray
4940 os=-unicos
4941 @@ -890,6 +1077,18 @@ case $basic_machine in
4942 basic_machine=tic54x-unknown
4943 os=-coff
4944 ;;
4945 + tic55x | c55x*)
4946 + basic_machine=tic55x-unknown
4947 + os=-coff
4948 + ;;
4949 + tic6x | c6x*)
4950 + basic_machine=tic6x-unknown
4951 + os=-coff
4952 + ;;
4953 + tile*)
4954 + basic_machine=tile-unknown
4955 + os=-linux-gnu
4956 + ;;
4957 tx39)
4958 basic_machine=mipstx39-unknown
4959 ;;
4960 @@ -903,6 +1102,10 @@ case $basic_machine in
4961 tower | tower-32)
4962 basic_machine=m68k-ncr
4963 ;;
4964 + tpf)
4965 + basic_machine=s390x-ibm
4966 + os=-tpf
4967 + ;;
4968 udi29k)
4969 basic_machine=a29k-amd
4970 os=-udi
4971 @@ -924,8 +1127,8 @@ case $basic_machine in
4972 os=-vms
4973 ;;
4974 vpp*|vx|vx-*)
4975 - basic_machine=f301-fujitsu
4976 - ;;
4977 + basic_machine=f301-fujitsu
4978 + ;;
4979 vxworks960)
4980 basic_machine=i960-wrs
4981 os=-vxworks
4982 @@ -946,11 +1149,11 @@ case $basic_machine in
4983 basic_machine=hppa1.1-winbond
4984 os=-proelf
4985 ;;
4986 - windows32)
4987 - basic_machine=i386-pc
4988 - os=-windows32-msvcrt
4989 + xbox)
4990 + basic_machine=i686-pc
4991 + os=-mingw32
4992 ;;
4993 - xps | xps100)
4994 + xps | xps100)
4995 basic_machine=xps100-honeywell
4996 ;;
4997 ymp)
4998 @@ -961,6 +1164,10 @@ case $basic_machine in
4999 basic_machine=z8k-unknown
5000 os=-sim
5001 ;;
5002 + z80-*-coff)
5003 + basic_machine=z80-unknown
5004 + os=-sim
5005 + ;;
5006 none)
5007 basic_machine=none-none
5008 os=-none
5009 @@ -980,6 +1187,9 @@ case $basic_machine in
5010 romp)
5011 basic_machine=romp-ibm
5012 ;;
5013 + mmix)
5014 + basic_machine=mmix-knuth
5015 + ;;
5016 rs6000)
5017 basic_machine=rs6000-ibm
5018 ;;
5019 @@ -996,16 +1206,13 @@ case $basic_machine in
5020 we32k)
5021 basic_machine=we32k-att
5022 ;;
5023 - sh3 | sh4 | sh3eb | sh4eb)
5024 + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
5025 basic_machine=sh-unknown
5026 ;;
5027 - sh64)
5028 - basic_machine=sh64-unknown
5029 - ;;
5030 - sparc | sparcv9 | sparcv9b)
5031 + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
5032 basic_machine=sparc-sun
5033 ;;
5034 - cydra)
5035 + cydra)
5036 basic_machine=cydra-cydrome
5037 ;;
5038 orion)
5039 @@ -1020,10 +1227,6 @@ case $basic_machine in
5040 pmac | pmac-mpw)
5041 basic_machine=powerpc-apple
5042 ;;
5043 - c4x*)
5044 - basic_machine=c4x-none
5045 - os=-coff
5046 - ;;
5047 *-unknown)
5048 # Make sure to match an already-canonicalized machine name.
5049 ;;
5050 @@ -1053,6 +1256,9 @@ case $os in
5051 # First match some system type aliases
5052 # that might get confused with valid system types.
5053 # -solaris* is a basic system type, with this one exception.
5054 + -auroraux)
5055 + os=-auroraux
5056 + ;;
5057 -solaris1 | -solaris1.*)
5058 os=`echo $os | sed -e 's|solaris1|sunos4|'`
5059 ;;
5060 @@ -1073,24 +1279,30 @@ case $os in
5061 # Each alternative MUST END IN A *, to match a version number.
5062 # -sysv* is not here because it comes later, after sysvr4.
5063 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
5064 - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
5065 - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
5066 + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
5067 + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
5068 + | -sym* | -kopensolaris* \
5069 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
5070 - | -aos* \
5071 + | -aos* | -aros* \
5072 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
5073 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
5074 - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
5075 - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
5076 + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
5077 + | -openbsd* | -solidbsd* \
5078 + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
5079 + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
5080 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
5081 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
5082 - | -chorusos* | -chorusrdb* \
5083 + | -chorusos* | -chorusrdb* | -cegcc* \
5084 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
5085 - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
5086 - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
5087 + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
5088 + | -uxpv* | -beos* | -mpeix* | -udk* \
5089 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
5090 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
5091 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
5092 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
5093 - | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
5094 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
5095 + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
5096 + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
5097 # Remember, each alternative MUST END IN *, to match a version number.
5098 ;;
5099 -qnx*)
5100 @@ -1102,16 +1314,21 @@ case $os in
5101 ;;
5102 esac
5103 ;;
5104 + -nto-qnx*)
5105 + ;;
5106 -nto*)
5107 - os=-nto-qnx
5108 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
5109 ;;
5110 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
5111 - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
5112 + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
5113 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
5114 ;;
5115 -mac*)
5116 os=`echo $os | sed -e 's|mac|macos|'`
5117 ;;
5118 + -linux-dietlibc)
5119 + os=-linux-dietlibc
5120 + ;;
5121 -linux*)
5122 os=`echo $os | sed -e 's|linux|linux-gnu|'`
5123 ;;
5124 @@ -1124,6 +1341,9 @@ case $os in
5125 -opened*)
5126 os=-openedition
5127 ;;
5128 + -os400*)
5129 + os=-os400
5130 + ;;
5131 -wince*)
5132 os=-wince
5133 ;;
5134 @@ -1145,6 +1365,9 @@ case $os in
5135 -atheos*)
5136 os=-atheos
5137 ;;
5138 + -syllable*)
5139 + os=-syllable
5140 + ;;
5141 -386bsd)
5142 os=-bsd
5143 ;;
5144 @@ -1155,7 +1378,7 @@ case $os in
5145 os=-rtmk-nova
5146 ;;
5147 -ns2 )
5148 - os=-nextstep2
5149 + os=-nextstep2
5150 ;;
5151 -nsk*)
5152 os=-nsk
5153 @@ -1167,6 +1390,9 @@ case $os in
5154 -sinix*)
5155 os=-sysv4
5156 ;;
5157 + -tpf*)
5158 + os=-tpf
5159 + ;;
5160 -triton*)
5161 os=-sysv3
5162 ;;
5163 @@ -1194,8 +1420,20 @@ case $os in
5164 -xenix)
5165 os=-xenix
5166 ;;
5167 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
5168 - os=-mint
5169 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
5170 + os=-mint
5171 + ;;
5172 + -aros*)
5173 + os=-aros
5174 + ;;
5175 + -kaos*)
5176 + os=-kaos
5177 + ;;
5178 + -zvmoe)
5179 + os=-zvmoe
5180 + ;;
5181 + -dicos*)
5182 + os=-dicos
5183 ;;
5184 -none)
5185 ;;
5186 @@ -1219,6 +1457,12 @@ else
5187 # system, and we'll never get to this point.
5188
5189 case $basic_machine in
5190 + score-*)
5191 + os=-elf
5192 + ;;
5193 + spu-*)
5194 + os=-elf
5195 + ;;
5196 *-acorn)
5197 os=-riscix1.2
5198 ;;
5199 @@ -1228,11 +1472,14 @@ case $basic_machine in
5200 arm*-semi)
5201 os=-aout
5202 ;;
5203 + c4x-* | tic4x-*)
5204 + os=-coff
5205 + ;;
5206 # This must come before the *-dec entry.
5207 pdp10-*)
5208 os=-tops20
5209 ;;
5210 - pdp11-*)
5211 + pdp11-*)
5212 os=-none
5213 ;;
5214 *-dec | vax-*)
5215 @@ -1253,6 +1500,9 @@ case $basic_machine in
5216 m68*-cisco)
5217 os=-aout
5218 ;;
5219 + mep-*)
5220 + os=-elf
5221 + ;;
5222 mips*-cisco)
5223 os=-elf
5224 ;;
5225 @@ -1271,9 +1521,15 @@ case $basic_machine in
5226 *-be)
5227 os=-beos
5228 ;;
5229 + *-haiku)
5230 + os=-haiku
5231 + ;;
5232 *-ibm)
5233 os=-aix
5234 ;;
5235 + *-knuth)
5236 + os=-mmixware
5237 + ;;
5238 *-wec)
5239 os=-proelf
5240 ;;
5241 @@ -1325,19 +1581,19 @@ case $basic_machine in
5242 *-next)
5243 os=-nextstep3
5244 ;;
5245 - *-gould)
5246 + *-gould)
5247 os=-sysv
5248 ;;
5249 - *-highlevel)
5250 + *-highlevel)
5251 os=-bsd
5252 ;;
5253 *-encore)
5254 os=-bsd
5255 ;;
5256 - *-sgi)
5257 + *-sgi)
5258 os=-irix
5259 ;;
5260 - *-siemens)
5261 + *-siemens)
5262 os=-sysv4
5263 ;;
5264 *-masscomp)
5265 @@ -1376,7 +1632,7 @@ case $basic_machine in
5266 -sunos*)
5267 vendor=sun
5268 ;;
5269 - -aix*)
5270 + -cnk*|-aix*)
5271 vendor=ibm
5272 ;;
5273 -beos*)
5274 @@ -1406,10 +1662,16 @@ case $basic_machine in
5275 -mvs* | -opened*)
5276 vendor=ibm
5277 ;;
5278 + -os400*)
5279 + vendor=ibm
5280 + ;;
5281 -ptx*)
5282 vendor=sequent
5283 ;;
5284 - -vxsim* | -vxworks*)
5285 + -tpf*)
5286 + vendor=ibm
5287 + ;;
5288 + -vxsim* | -vxworks* | -windiss*)
5289 vendor=wrs
5290 ;;
5291 -aux*)
5292 @@ -1433,7 +1695,7 @@ case $basic_machine in
5293 esac
5294
5295 echo $basic_machine$os
5296 -exit 0
5297 +exit
5298
5299 # Local variables:
5300 # eval: (add-hook 'write-file-hooks 'time-stamp)
5301 diff --git a/configure b/configure
5302 index 70f97ff..a3fe2a4 100755
5303 --- a/configure
5304 +++ b/configure
5305 @@ -720,6 +720,10 @@ fi
5306
5307
5308
5309 +lt_ltdl_dir='libltdl'
5310 +
5311 +lt_dlopen_dir="$lt_ltdl_dir"
5312 +
5313 exec 7<&0 </dev/null 6>&1
5314
5315 # Name of the host.
5316 @@ -784,8 +788,13 @@ ac_includes_default="\
5317 # include <unistd.h>
5318 #endif"
5319
5320 +enable_option_checking=no
5321 ac_config_libobj_dir=pub
5322 -ac_subst_vars='LTLIBOBJS
5323 +ac_subst_vars='ltdl_LTLIBOBJS
5324 +ltdl_LIBOBJS
5325 +am__EXEEXT_FALSE
5326 +am__EXEEXT_TRUE
5327 +LTLIBOBJS
5328 BUILD_DOC_FALSE
5329 BUILD_DOC_TRUE
5330 HOSTNAME
5331 @@ -808,6 +817,34 @@ GETLOADAVG_LIBS
5332 KMEM_GROUP
5333 NEED_SETGID
5334 LIBOBJS
5335 +YFLAGS
5336 +YACC
5337 +LEXLIB
5338 +LEX_OUTPUT_ROOT
5339 +LEX
5340 +PTHREAD_CPPFLAGS
5341 +PTHREAD_CFLAGS
5342 +PTHREAD_LIBS
5343 +PTHREAD_CC
5344 +LTDLOPEN
5345 +LT_CONFIG_H
5346 +subdirs
5347 +CONVENIENCE_LTDL_FALSE
5348 +CONVENIENCE_LTDL_TRUE
5349 +INSTALL_LTDL_FALSE
5350 +INSTALL_LTDL_TRUE
5351 +ARGZ_H
5352 +sys_symbol_underscore
5353 +LIBADD_DL
5354 +LT_DLPREOPEN
5355 +LIBADD_DLD_LINK
5356 +LIBADD_SHL_LOAD
5357 +LIBADD_DLOPEN
5358 +LT_DLLOADERS
5359 +INCLTDL
5360 +LTDLINCL
5361 +LTDLDEPS
5362 +LIBLTDL
5363 CPP
5364 OTOOL64
5365 OTOOL
5366 @@ -815,6 +852,7 @@ LIPO
5367 NMEDIT
5368 DSYMUTIL
5369 lt_ECHO
5370 +RANLIB
5371 AR
5372 OBJDUMP
5373 LN_S
5374 @@ -826,17 +864,6 @@ FGREP
5375 EGREP
5376 GREP
5377 SED
5378 -LIBTOOL
5379 -RANLIB
5380 -YFLAGS
5381 -YACC
5382 -LEXLIB
5383 -LEX_OUTPUT_ROOT
5384 -LEX
5385 -PTHREAD_CPPFLAGS
5386 -PTHREAD_CFLAGS
5387 -PTHREAD_LIBS
5388 -PTHREAD_CC
5389 am__fastdepCC_FALSE
5390 am__fastdepCC_TRUE
5391 CCDEPMODE
5392 @@ -853,6 +880,10 @@ CPPFLAGS
5393 LDFLAGS
5394 CFLAGS
5395 CC
5396 +LIBTOOL
5397 +MAINT
5398 +MAINTAINER_MODE_FALSE
5399 +MAINTAINER_MODE_TRUE
5400 am__untar
5401 am__tar
5402 AMTAR
5403 @@ -928,13 +959,18 @@ SHELL'
5404 ac_subst_files=''
5405 ac_user_opts='
5406 enable_option_checking
5407 -enable_dependency_tracking
5408 +enable_maintainer_mode
5409 enable_shared
5410 enable_static
5411 with_pic
5412 enable_fast_install
5413 +enable_dependency_tracking
5414 with_gnu_ld
5415 enable_libtool_lock
5416 +with_included_ltdl
5417 +with_ltdl_include
5418 +with_ltdl_lib
5419 +enable_ltdl_install
5420 with_berkeleydb
5421 with_openssl
5422 with_pcre
5423 @@ -951,10 +987,10 @@ CFLAGS
5424 LDFLAGS
5425 LIBS
5426 CPPFLAGS
5427 +CPP
5428 YACC
5429 -YFLAGS
5430 -CPP'
5431 -
5432 +YFLAGS'
5433 +ac_subdirs_all='libltdl'
5434
5435 # Initialize some variables set by options.
5436 ac_init_help=
5437 @@ -1583,13 +1619,16 @@ Optional Features:
5438 --disable-option-checking ignore unrecognized --enable/--with options
5439 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
5440 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
5441 - --disable-dependency-tracking speeds up one-time build
5442 - --enable-dependency-tracking do not reject slow dependency extractors
5443 - --enable-shared[=PKGS] build shared libraries [default=no]
5444 + --enable-maintainer-mode enable make rules and dependencies not useful
5445 + (and sometimes confusing) to the casual installer
5446 + --enable-shared[=PKGS] build shared libraries [default=yes]
5447 --enable-static[=PKGS] build static libraries [default=yes]
5448 --enable-fast-install[=PKGS]
5449 optimize for fast installation [default=yes]
5450 + --disable-dependency-tracking speeds up one-time build
5451 + --enable-dependency-tracking do not reject slow dependency extractors
5452 --disable-libtool-lock avoid locking (might break parallel builds)
5453 + --enable-ltdl-install install libltdl
5454 --enable-DCE support for DCE and ACLs
5455 --enable-selinux Enable use of the SELINUX libraries
5456
5457 @@ -1599,6 +1638,9 @@ Optional Packages:
5458 --with-pic try to use only PIC/non-PIC objects [default=use
5459 both]
5460 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
5461 + --with-included-ltdl use the GNU ltdl sources included here
5462 + --with-ltdl-include=DIR use the ltdl headers installed in DIR
5463 + --with-ltdl-lib=DIR use the libltdl.la installed in DIR
5464 --with-berkeleydb=PATH directory where BerkeleyDB exists
5465 --with-openssl=PATH directory where OpenSSL exists
5466 --with-pcre[=PATH] directory where Perl compatible regex exists (optionally in PATH)
5467 @@ -1613,12 +1655,12 @@ Some influential environment variables:
5468 LIBS libraries to pass to the linker, e.g. -l<library>
5469 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
5470 you have headers in a nonstandard directory <include dir>
5471 + CPP C preprocessor
5472 YACC The `Yet Another C Compiler' implementation to use. Defaults to
5473 the first program found out of: `bison -y', `byacc', `yacc'.
5474 YFLAGS The list of arguments that will be passed by default to $YACC.
5475 This script will default YFLAGS to the empty string to avoid a
5476 default value of `-d' given by some make applications.
5477 - CPP C preprocessor
5478
5479 Use these variables to override the choices made by `configure' or to help
5480 it to find libraries and programs with nonstandard names/locations.
5481 @@ -2218,7 +2260,7 @@ test -n "$target_alias" &&
5482 program_prefix=${target_alias}-
5483
5484
5485 -am__api_version='1.10'
5486 +am__api_version='1.11'
5487
5488 # Find a good install program. We prefer a C program (faster),
5489 # so one script is as good as another. But avoid the broken or
5490 @@ -2318,16 +2360,33 @@ $as_echo_n "checking whether build environment is sane... " >&6; }
5491 # Just in case
5492 sleep 1
5493 echo timestamp > conftest.file
5494 +# Reject unsafe characters in $srcdir or the absolute working directory
5495 +# name. Accept space and tab only in the latter.
5496 +am_lf='
5497 +'
5498 +case `pwd` in
5499 + *[\\\"\#\$\&\'\`$am_lf]*)
5500 + { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
5501 +$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
5502 + { (exit 1); exit 1; }; };;
5503 +esac
5504 +case $srcdir in
5505 + *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
5506 + { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
5507 +$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
5508 + { (exit 1); exit 1; }; };;
5509 +esac
5510 +
5511 # Do `set' in a subshell so we don't clobber the current shell's
5512 # arguments. Must try -L first in case configure is actually a
5513 # symlink; some systems play weird games with the mod time of symlinks
5514 # (eg FreeBSD returns the mod time of the symlink's containing
5515 # directory).
5516 if (
5517 - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
5518 + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
5519 if test "$*" = "X"; then
5520 # -L didn't work.
5521 - set X `ls -t $srcdir/configure conftest.file`
5522 + set X `ls -t "$srcdir/configure" conftest.file`
5523 fi
5524 rm -f conftest.file
5525 if test "$*" != "X $srcdir/configure conftest.file" \
5526 @@ -2371,7 +2430,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
5527 # expand $ac_aux_dir to an absolute path
5528 am_aux_dir=`cd $ac_aux_dir && pwd`
5529
5530 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
5531 +if test x"${MISSING+set}" != xset; then
5532 + case $am_aux_dir in
5533 + *\ * | *\ *)
5534 + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
5535 + *)
5536 + MISSING="\${SHELL} $am_aux_dir/missing" ;;
5537 + esac
5538 +fi
5539 # Use eval to expand $SHELL
5540 if eval "$MISSING --run true"; then
5541 am_missing_run="$MISSING --run "
5542 @@ -2381,6 +2447,115 @@ else
5543 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
5544 fi
5545
5546 +if test x"${install_sh}" != xset; then
5547 + case $am_aux_dir in
5548 + *\ * | *\ *)
5549 + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
5550 + *)
5551 + install_sh="\${SHELL} $am_aux_dir/install-sh"
5552 + esac
5553 +fi
5554 +
5555 +# Installed binaries are usually stripped using `strip' when the user
5556 +# run `make install-strip'. However `strip' might not be the right
5557 +# tool to use in cross-compilation environments, therefore Automake
5558 +# will honor the `STRIP' environment variable to overrule this program.
5559 +if test "$cross_compiling" != no; then
5560 + if test -n "$ac_tool_prefix"; then
5561 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5562 +set dummy ${ac_tool_prefix}strip; ac_word=$2
5563 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5564 +$as_echo_n "checking for $ac_word... " >&6; }
5565 +if test "${ac_cv_prog_STRIP+set}" = set; then
5566 + $as_echo_n "(cached) " >&6
5567 +else
5568 + if test -n "$STRIP"; then
5569 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
5570 +else
5571 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5572 +for as_dir in $PATH
5573 +do
5574 + IFS=$as_save_IFS
5575 + test -z "$as_dir" && as_dir=.
5576 + for ac_exec_ext in '' $ac_executable_extensions; do
5577 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5578 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5579 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5580 + break 2
5581 + fi
5582 +done
5583 +done
5584 +IFS=$as_save_IFS
5585 +
5586 +fi
5587 +fi
5588 +STRIP=$ac_cv_prog_STRIP
5589 +if test -n "$STRIP"; then
5590 + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
5591 +$as_echo "$STRIP" >&6; }
5592 +else
5593 + { $as_echo "$as_me:$LINENO: result: no" >&5
5594 +$as_echo "no" >&6; }
5595 +fi
5596 +
5597 +
5598 +fi
5599 +if test -z "$ac_cv_prog_STRIP"; then
5600 + ac_ct_STRIP=$STRIP
5601 + # Extract the first word of "strip", so it can be a program name with args.
5602 +set dummy strip; ac_word=$2
5603 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5604 +$as_echo_n "checking for $ac_word... " >&6; }
5605 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
5606 + $as_echo_n "(cached) " >&6
5607 +else
5608 + if test -n "$ac_ct_STRIP"; then
5609 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
5610 +else
5611 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5612 +for as_dir in $PATH
5613 +do
5614 + IFS=$as_save_IFS
5615 + test -z "$as_dir" && as_dir=.
5616 + for ac_exec_ext in '' $ac_executable_extensions; do
5617 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5618 + ac_cv_prog_ac_ct_STRIP="strip"
5619 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5620 + break 2
5621 + fi
5622 +done
5623 +done
5624 +IFS=$as_save_IFS
5625 +
5626 +fi
5627 +fi
5628 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
5629 +if test -n "$ac_ct_STRIP"; then
5630 + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
5631 +$as_echo "$ac_ct_STRIP" >&6; }
5632 +else
5633 + { $as_echo "$as_me:$LINENO: result: no" >&5
5634 +$as_echo "no" >&6; }
5635 +fi
5636 +
5637 + if test "x$ac_ct_STRIP" = x; then
5638 + STRIP=":"
5639 + else
5640 + case $cross_compiling:$ac_tool_warned in
5641 +yes:)
5642 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5643 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5644 +ac_tool_warned=yes ;;
5645 +esac
5646 + STRIP=$ac_ct_STRIP
5647 + fi
5648 +else
5649 + STRIP="$ac_cv_prog_STRIP"
5650 +fi
5651 +
5652 +fi
5653 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
5654 +
5655 { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
5656 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
5657 if test -z "$MKDIR_P"; then
5658 @@ -2563,149 +2738,69 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
5659
5660 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
5661
5662 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
5663 +# We need awk for the "check" target. The system "awk" is bad on
5664 +# some platforms.
5665 +# Always define AMTAR for backward compatibility.
5666
5667 -# Installed binaries are usually stripped using `strip' when the user
5668 -# run `make install-strip'. However `strip' might not be the right
5669 -# tool to use in cross-compilation environments, therefore Automake
5670 -# will honor the `STRIP' environment variable to overrule this program.
5671 -if test "$cross_compiling" != no; then
5672 - if test -n "$ac_tool_prefix"; then
5673 - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5674 -set dummy ${ac_tool_prefix}strip; ac_word=$2
5675 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5676 -$as_echo_n "checking for $ac_word... " >&6; }
5677 -if test "${ac_cv_prog_STRIP+set}" = set; then
5678 - $as_echo_n "(cached) " >&6
5679 -else
5680 - if test -n "$STRIP"; then
5681 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
5682 -else
5683 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5684 -for as_dir in $PATH
5685 -do
5686 - IFS=$as_save_IFS
5687 - test -z "$as_dir" && as_dir=.
5688 - for ac_exec_ext in '' $ac_executable_extensions; do
5689 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5690 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5691 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5692 - break 2
5693 - fi
5694 -done
5695 -done
5696 -IFS=$as_save_IFS
5697 +AMTAR=${AMTAR-"${am_missing_run}tar"}
5698
5699 -fi
5700 -fi
5701 -STRIP=$ac_cv_prog_STRIP
5702 -if test -n "$STRIP"; then
5703 - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
5704 -$as_echo "$STRIP" >&6; }
5705 -else
5706 - { $as_echo "$as_me:$LINENO: result: no" >&5
5707 -$as_echo "no" >&6; }
5708 -fi
5709 +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
5710
5711
5712 -fi
5713 -if test -z "$ac_cv_prog_STRIP"; then
5714 - ac_ct_STRIP=$STRIP
5715 - # Extract the first word of "strip", so it can be a program name with args.
5716 -set dummy strip; ac_word=$2
5717 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
5718 -$as_echo_n "checking for $ac_word... " >&6; }
5719 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
5720 - $as_echo_n "(cached) " >&6
5721 -else
5722 - if test -n "$ac_ct_STRIP"; then
5723 - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
5724 -else
5725 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5726 -for as_dir in $PATH
5727 -do
5728 - IFS=$as_save_IFS
5729 - test -z "$as_dir" && as_dir=.
5730 - for ac_exec_ext in '' $ac_executable_extensions; do
5731 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5732 - ac_cv_prog_ac_ct_STRIP="strip"
5733 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5734 - break 2
5735 - fi
5736 -done
5737 -done
5738 -IFS=$as_save_IFS
5739
5740 -fi
5741 -fi
5742 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
5743 -if test -n "$ac_ct_STRIP"; then
5744 - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
5745 -$as_echo "$ac_ct_STRIP" >&6; }
5746 +
5747 +
5748 +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
5749 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
5750 + # Check whether --enable-maintainer-mode was given.
5751 +if test "${enable_maintainer_mode+set}" = set; then
5752 + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
5753 else
5754 - { $as_echo "$as_me:$LINENO: result: no" >&5
5755 -$as_echo "no" >&6; }
5756 + USE_MAINTAINER_MODE=no
5757 fi
5758
5759 - if test "x$ac_ct_STRIP" = x; then
5760 - STRIP=":"
5761 - else
5762 - case $cross_compiling:$ac_tool_warned in
5763 -yes:)
5764 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
5765 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5766 -ac_tool_warned=yes ;;
5767 -esac
5768 - STRIP=$ac_ct_STRIP
5769 - fi
5770 + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
5771 +$as_echo "$USE_MAINTAINER_MODE" >&6; }
5772 + if test $USE_MAINTAINER_MODE = yes; then
5773 + MAINTAINER_MODE_TRUE=
5774 + MAINTAINER_MODE_FALSE='#'
5775 else
5776 - STRIP="$ac_cv_prog_STRIP"
5777 + MAINTAINER_MODE_TRUE='#'
5778 + MAINTAINER_MODE_FALSE=
5779 fi
5780
5781 -fi
5782 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
5783 + MAINT=$MAINTAINER_MODE_TRUE
5784 +
5785 +
5786 +
5787 +ac_config_headers="$ac_config_headers src/conf.h"
5788 +
5789 +
5790 +
5791 +case `pwd` in
5792 + *\ * | *\ *)
5793 + { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
5794 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
5795 +esac
5796 +
5797 +
5798 +
5799 +macro_version='2.2.6b'
5800 +macro_revision='1.3017'
5801
5802 -# We need awk for the "check" target. The system "awk" is bad on
5803 -# some platforms.
5804 -# Always define AMTAR for backward compatibility.
5805
5806 -AMTAR=${AMTAR-"${am_missing_run}tar"}
5807
5808 -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
5809
5810
5811
5812
5813
5814 -ac_config_headers="$ac_config_headers src/conf.h"
5815
5816
5817 -#
5818 -# Add to the default list of places in LDFLAGS to compensate for
5819 -# ... the configure default value of LIBS on some systems
5820 -#
5821 -for x in /usr/lib64 /usr/local/gnu/lib /usr/local/gnulib /opt/dce/lib /sw/lib
5822 -do
5823 - if test -d "$x"; then
5824 - y=`expr " $LDFLAGS " : ".* -L$x "`
5825 - if test $y -eq 0; then
5826 - LDFLAGS="$LDFLAGS -L$x"
5827 - fi
5828 - fi
5829 -done
5830
5831 -#
5832 -# Add to the default list of places in CPPFLAGS to match LDFLAGS above
5833 -#
5834 -for x in /usr/local/gnu/include /opt/dce/include /sw/include
5835 -do
5836 - if test -d "$x"; then
5837 - y=`expr " $CPPFLAGS " : ".* -I$x "`
5838 - if test $y -eq 0; then
5839 - CPPFLAGS="$CPPFLAGS -I$x"
5840 - fi
5841 - fi
5842 -done
5843 +
5844 +
5845 +ltmain="$ac_aux_dir/ltmain.sh"
5846
5847 DEPDIR="${am__leading_dot}deps"
5848
5849 @@ -2715,7 +2810,7 @@ ac_config_commands="$ac_config_commands depfiles"
5850 am_make=${MAKE-make}
5851 cat > confinc << 'END'
5852 am__doit:
5853 - @echo done
5854 + @echo this is the am__doit target
5855 .PHONY: am__doit
5856 END
5857 # If we don't find an include directive, just comment out the code.
5858 @@ -2726,24 +2821,24 @@ am__quote=
5859 _am_result=none
5860 # First try GNU make style include.
5861 echo "include confinc" > confmf
5862 -# We grep out `Entering directory' and `Leaving directory'
5863 -# messages which can occur if `w' ends up in MAKEFLAGS.
5864 -# In particular we don't look at `^make:' because GNU make might
5865 -# be invoked under some other name (usually "gmake"), in which
5866 -# case it prints its new name instead of `make'.
5867 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
5868 - am__include=include
5869 - am__quote=
5870 - _am_result=GNU
5871 -fi
5872 +# Ignore all kinds of additional output from `make'.
5873 +case `$am_make -s -f confmf 2> /dev/null` in #(
5874 +*the\ am__doit\ target*)
5875 + am__include=include
5876 + am__quote=
5877 + _am_result=GNU
5878 + ;;
5879 +esac
5880 # Now try BSD make style include.
5881 if test "$am__include" = "#"; then
5882 echo '.include "confinc"' > confmf
5883 - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
5884 - am__include=.include
5885 - am__quote="\""
5886 - _am_result=BSD
5887 - fi
5888 + case `$am_make -s -f confmf 2> /dev/null` in #(
5889 + *the\ am__doit\ target*)
5890 + am__include=.include
5891 + am__quote="\""
5892 + _am_result=BSD
5893 + ;;
5894 + esac
5895 fi
5896
5897
5898 @@ -3732,6 +3827,11 @@ else
5899 if test "$am_compiler_list" = ""; then
5900 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
5901 fi
5902 + am__universal=false
5903 + case " $depcc " in #(
5904 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
5905 + esac
5906 +
5907 for depmode in $am_compiler_list; do
5908 # Setup a source with many dependencies, because some compilers
5909 # like to wrap large dependency lists on column 80 (with \), and
5910 @@ -3749,1256 +3849,17 @@ else
5911 done
5912 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
5913
5914 - case $depmode in
5915 - nosideeffect)
5916 - # after this tag, mechanisms are not by side-effect, so they'll
5917 - # only be used when explicitly requested
5918 - if test "x$enable_dependency_tracking" = xyes; then
5919 - continue
5920 - else
5921 - break
5922 - fi
5923 - ;;
5924 - none) break ;;
5925 - esac
5926 # We check with `-c' and `-o' for the sake of the "dashmstdout"
5927 # mode. It turns out that the SunPro C++ compiler does not properly
5928 - # handle `-M -o', and we need to detect this.
5929 - if depmode=$depmode \
5930 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
5931 - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
5932 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
5933 - >/dev/null 2>conftest.err &&
5934 - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
5935 - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
5936 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
5937 - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
5938 - # icc doesn't choke on unknown options, it will just issue warnings
5939 - # or remarks (even with -Werror). So we grep stderr for any message
5940 - # that says an option was ignored or not supported.
5941 - # When given -MP, icc 7.0 and 7.1 complain thusly:
5942 - # icc: Command line warning: ignoring option '-M'; no argument required
5943 - # The diagnosis changed in icc 8.0:
5944 - # icc: Command line remark: option '-MP' not supported
5945 - if (grep 'ignoring option' conftest.err ||
5946 - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
5947 - am_cv_CC_dependencies_compiler_type=$depmode
5948 - break
5949 - fi
5950 - fi
5951 - done
5952 -
5953 - cd ..
5954 - rm -rf conftest.dir
5955 -else
5956 - am_cv_CC_dependencies_compiler_type=none
5957 -fi
5958 -
5959 -fi
5960 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
5961 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
5962 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
5963 -
5964 - if
5965 - test "x$enable_dependency_tracking" != xno \
5966 - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
5967 - am__fastdepCC_TRUE=
5968 - am__fastdepCC_FALSE='#'
5969 -else
5970 - am__fastdepCC_TRUE='#'
5971 - am__fastdepCC_FALSE=
5972 -fi
5973 -
5974 -
5975 -
5976 -
5977 -
5978 -
5979 -ac_ext=c
5980 -ac_cpp='$CPP $CPPFLAGS'
5981 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5982 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5983 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
5984 -
5985 -acx_pthread_ok=no
5986 -
5987 -# We used to check for pthread.h first, but this fails if pthread.h
5988 -# requires special compiler flags (e.g. on True64 or Sequent).
5989 -# It gets checked for in the link test anyway.
5990 -
5991 -# First of all, check if the user has set any of the PTHREAD_LIBS,
5992 -# etcetera environment variables, and if threads linking works using
5993 -# them:
5994 -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS$PTHREAD_CPPFLAGS" != x; then
5995 - save_CFLAGS="$CFLAGS"
5996 - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
5997 - save_CPPFLAGS="$CPPFLAGS"
5998 - CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
5999 - save_LIBS="$LIBS"
6000 - LIBS="$PTHREAD_LIBS $LIBS"
6001 - { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
6002 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
6003 - cat >conftest.$ac_ext <<_ACEOF
6004 -/* confdefs.h. */
6005 -_ACEOF
6006 -cat confdefs.h >>conftest.$ac_ext
6007 -cat >>conftest.$ac_ext <<_ACEOF
6008 -/* end confdefs.h. */
6009 -
6010 -/* Override any GCC internal prototype to avoid an error.
6011 - Use char because int might match the return type of a GCC
6012 - builtin and then its argument prototype would still apply. */
6013 -#ifdef __cplusplus
6014 -extern "C"
6015 -#endif
6016 -char pthread_join ();
6017 -int
6018 -main ()
6019 -{
6020 -return pthread_join ();
6021 - ;
6022 - return 0;
6023 -}
6024 -_ACEOF
6025 -rm -f conftest.$ac_objext conftest$ac_exeext
6026 -if { (ac_try="$ac_link"
6027 -case "(($ac_try" in
6028 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6029 - *) ac_try_echo=$ac_try;;
6030 -esac
6031 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6032 -$as_echo "$ac_try_echo") >&5
6033 - (eval "$ac_link") 2>conftest.er1
6034 - ac_status=$?
6035 - grep -v '^ *+' conftest.er1 >conftest.err
6036 - rm -f conftest.er1
6037 - cat conftest.err >&5
6038 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6039 - (exit $ac_status); } && {
6040 - test -z "$ac_c_werror_flag" ||
6041 - test ! -s conftest.err
6042 - } && test -s conftest$ac_exeext && {
6043 - test "$cross_compiling" = yes ||
6044 - $as_test_x conftest$ac_exeext
6045 - }; then
6046 - acx_pthread_ok=yes
6047 -else
6048 - $as_echo "$as_me: failed program was:" >&5
6049 -sed 's/^/| /' conftest.$ac_ext >&5
6050 -
6051 -
6052 -fi
6053 -
6054 -rm -rf conftest.dSYM
6055 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6056 - conftest$ac_exeext conftest.$ac_ext
6057 - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
6058 -$as_echo "$acx_pthread_ok" >&6; }
6059 - if test x"$acx_pthread_ok" = xno; then
6060 - PTHREAD_LIBS=""
6061 - PTHREAD_CFLAGS=""
6062 - fi
6063 - LIBS="$save_LIBS"
6064 - CFLAGS="$save_CFLAGS"
6065 - CPPFLAGS="$save_CPPFLAGS"
6066 -fi
6067 -
6068 -# We must check for the threads library under a number of different
6069 -# names; the ordering is very important because some systems
6070 -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
6071 -# libraries is broken (non-POSIX).
6072 -
6073 -# Create a list of thread flags to try. Items starting with a "-" are
6074 -# C compiler flags, and other items are library names, except for "none"
6075 -# which indicates that we try without any flags at all.
6076 -
6077 -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
6078 -
6079 -# The ordering *is* (sometimes) important. Some notes on the
6080 -# individual items follow:
6081 -
6082 -# pthreads: AIX (must check this before -lpthread)
6083 -# none: in case threads are in libc; should be tried before -Kthread and
6084 -# other compiler flags to prevent continual compiler warnings
6085 -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
6086 -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
6087 -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
6088 -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
6089 -# -pthreads: Solaris/gcc
6090 -# -mthreads: Mingw32/gcc, Lynx/gcc
6091 -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
6092 -# doesn't hurt to check since this sometimes defines pthreads too;
6093 -# also defines -D_REENTRANT)
6094 -# pthread: Linux, etcetera
6095 -# --thread-safe: KAI C++
6096 -
6097 -case "${host_cpu}-${host_os}" in
6098 - *solaris*)
6099 -
6100 - # On Solaris (at least, for some versions), libc contains stubbed
6101 - # (non-functional) versions of the pthreads routines, so link-based
6102 - # tests will erroneously succeed. (We need to link with -pthread or
6103 - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
6104 - # a function called by this macro, so we could check for that, but
6105 - # who knows whether they'll stub that too in a future libc.) So,
6106 - # we'll just look for -pthreads and -lpthread first:
6107 -
6108 - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
6109 - ;;
6110 -esac
6111 -
6112 -if test x"$acx_pthread_ok" = xno; then
6113 -for flag in $acx_pthread_flags; do
6114 -
6115 - case $flag in
6116 - none)
6117 - { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
6118 -$as_echo_n "checking whether pthreads work without any flags... " >&6; }
6119 - ;;
6120 -
6121 - -*)
6122 - { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
6123 -$as_echo_n "checking whether pthreads work with $flag... " >&6; }
6124 - PTHREAD_CFLAGS="$flag"
6125 - PTHREAD_CPPFLAGS="$flag"
6126 - ;;
6127 -
6128 - *)
6129 - { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
6130 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
6131 - PTHREAD_LIBS="-l$flag"
6132 - ;;
6133 - esac
6134 -
6135 - save_LIBS="$LIBS"
6136 - save_CFLAGS="$CFLAGS"
6137 - save_CPPFLAGS="$CPPFLAGS"
6138 - LIBS="$PTHREAD_LIBS $LIBS"
6139 - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
6140 - CPPFLAGS="$CFLAGS $PTHREAD_CPPFLAGS"
6141 -
6142 - # Check for various functions. We must include pthread.h,
6143 - # since some functions may be macros. (On the Sequent, we
6144 - # need a special flag -Kthread to make this header compile.)
6145 - # We check for pthread_join because it is in -lpthread on IRIX
6146 - # while pthread_create is in libc. We check for pthread_attr_init
6147 - # due to DEC craziness with -lpthreads. We check for
6148 - # pthread_cleanup_push because it is one of the few pthread
6149 - # functions on Solaris that doesn't have a non-functional libc stub.
6150 - # We try pthread_create on general principles.
6151 - cat >conftest.$ac_ext <<_ACEOF
6152 -/* confdefs.h. */
6153 -_ACEOF
6154 -cat confdefs.h >>conftest.$ac_ext
6155 -cat >>conftest.$ac_ext <<_ACEOF
6156 -/* end confdefs.h. */
6157 -#include <pthread.h>
6158 -int
6159 -main ()
6160 -{
6161 -pthread_t th; pthread_join(th, 0);
6162 - pthread_attr_init(0); pthread_cleanup_push(0, 0);
6163 - pthread_create(0,0,0,0); pthread_cleanup_pop(0);
6164 - ;
6165 - return 0;
6166 -}
6167 -_ACEOF
6168 -rm -f conftest.$ac_objext conftest$ac_exeext
6169 -if { (ac_try="$ac_link"
6170 -case "(($ac_try" in
6171 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6172 - *) ac_try_echo=$ac_try;;
6173 -esac
6174 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6175 -$as_echo "$ac_try_echo") >&5
6176 - (eval "$ac_link") 2>conftest.er1
6177 - ac_status=$?
6178 - grep -v '^ *+' conftest.er1 >conftest.err
6179 - rm -f conftest.er1
6180 - cat conftest.err >&5
6181 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6182 - (exit $ac_status); } && {
6183 - test -z "$ac_c_werror_flag" ||
6184 - test ! -s conftest.err
6185 - } && test -s conftest$ac_exeext && {
6186 - test "$cross_compiling" = yes ||
6187 - $as_test_x conftest$ac_exeext
6188 - }; then
6189 - acx_pthread_ok=yes
6190 -else
6191 - $as_echo "$as_me: failed program was:" >&5
6192 -sed 's/^/| /' conftest.$ac_ext >&5
6193 -
6194 -
6195 -fi
6196 -
6197 -rm -rf conftest.dSYM
6198 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6199 - conftest$ac_exeext conftest.$ac_ext
6200 -
6201 - LIBS="$save_LIBS"
6202 - CFLAGS="$save_CFLAGS"
6203 - CPPFLAGS="$save_CPPFLAGS"
6204 -
6205 - { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
6206 -$as_echo "$acx_pthread_ok" >&6; }
6207 - if test "x$acx_pthread_ok" = xyes; then
6208 - break;
6209 - fi
6210 -
6211 - PTHREAD_LIBS=""
6212 - PTHREAD_CFLAGS=""
6213 - PTHREAD_CPPFLAGS=""
6214 -done
6215 -fi
6216 -
6217 -# Various other checks:
6218 -if test "x$acx_pthread_ok" = xyes; then
6219 - save_LIBS="$LIBS"
6220 - LIBS="$PTHREAD_LIBS $LIBS"
6221 - save_CFLAGS="$CFLAGS"
6222 - CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
6223 - save_CPPFLAGS="$CPPFLAGS"
6224 - CPPFLAGS="$CFLAGS $PTHREAD_CPPFLAGS"
6225 -
6226 - # Detect AIX lossage: threads are created detached by default
6227 - # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
6228 - { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
6229 -$as_echo_n "checking for joinable pthread attribute... " >&6; }
6230 - cat >conftest.$ac_ext <<_ACEOF
6231 -/* confdefs.h. */
6232 -_ACEOF
6233 -cat confdefs.h >>conftest.$ac_ext
6234 -cat >>conftest.$ac_ext <<_ACEOF
6235 -/* end confdefs.h. */
6236 -#include <pthread.h>
6237 -int
6238 -main ()
6239 -{
6240 -int attr=PTHREAD_CREATE_JOINABLE;
6241 - ;
6242 - return 0;
6243 -}
6244 -_ACEOF
6245 -rm -f conftest.$ac_objext conftest$ac_exeext
6246 -if { (ac_try="$ac_link"
6247 -case "(($ac_try" in
6248 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6249 - *) ac_try_echo=$ac_try;;
6250 -esac
6251 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6252 -$as_echo "$ac_try_echo") >&5
6253 - (eval "$ac_link") 2>conftest.er1
6254 - ac_status=$?
6255 - grep -v '^ *+' conftest.er1 >conftest.err
6256 - rm -f conftest.er1
6257 - cat conftest.err >&5
6258 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6259 - (exit $ac_status); } && {
6260 - test -z "$ac_c_werror_flag" ||
6261 - test ! -s conftest.err
6262 - } && test -s conftest$ac_exeext && {
6263 - test "$cross_compiling" = yes ||
6264 - $as_test_x conftest$ac_exeext
6265 - }; then
6266 - ok=PTHREAD_CREATE_JOINABLE
6267 -else
6268 - $as_echo "$as_me: failed program was:" >&5
6269 -sed 's/^/| /' conftest.$ac_ext >&5
6270 -
6271 - ok=unknown
6272 -fi
6273 -
6274 -rm -rf conftest.dSYM
6275 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6276 - conftest$ac_exeext conftest.$ac_ext
6277 - if test x"$ok" = xunknown; then
6278 - cat >conftest.$ac_ext <<_ACEOF
6279 -/* confdefs.h. */
6280 -_ACEOF
6281 -cat confdefs.h >>conftest.$ac_ext
6282 -cat >>conftest.$ac_ext <<_ACEOF
6283 -/* end confdefs.h. */
6284 -#include <pthread.h>
6285 -int
6286 -main ()
6287 -{
6288 -int attr=PTHREAD_CREATE_UNDETACHED;
6289 - ;
6290 - return 0;
6291 -}
6292 -_ACEOF
6293 -rm -f conftest.$ac_objext conftest$ac_exeext
6294 -if { (ac_try="$ac_link"
6295 -case "(($ac_try" in
6296 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6297 - *) ac_try_echo=$ac_try;;
6298 -esac
6299 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6300 -$as_echo "$ac_try_echo") >&5
6301 - (eval "$ac_link") 2>conftest.er1
6302 - ac_status=$?
6303 - grep -v '^ *+' conftest.er1 >conftest.err
6304 - rm -f conftest.er1
6305 - cat conftest.err >&5
6306 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6307 - (exit $ac_status); } && {
6308 - test -z "$ac_c_werror_flag" ||
6309 - test ! -s conftest.err
6310 - } && test -s conftest$ac_exeext && {
6311 - test "$cross_compiling" = yes ||
6312 - $as_test_x conftest$ac_exeext
6313 - }; then
6314 - ok=PTHREAD_CREATE_UNDETACHED
6315 -else
6316 - $as_echo "$as_me: failed program was:" >&5
6317 -sed 's/^/| /' conftest.$ac_ext >&5
6318 -
6319 - ok=unknown
6320 -fi
6321 -
6322 -rm -rf conftest.dSYM
6323 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6324 - conftest$ac_exeext conftest.$ac_ext
6325 - fi
6326 - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
6327 -
6328 -cat >>confdefs.h <<\_ACEOF
6329 -#define PTHREAD_CREATE_JOINABLE $ok
6330 -_ACEOF
6331 -
6332 - fi
6333 - { $as_echo "$as_me:$LINENO: result: ${ok}" >&5
6334 -$as_echo "${ok}" >&6; }
6335 - if test x"$ok" = xunknown; then
6336 - { $as_echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5
6337 -$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;}
6338 - fi
6339 -
6340 - { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
6341 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
6342 - flag=no
6343 - case "${host_cpu}-${host_os}" in
6344 - *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
6345 - # -D_REENTRANT is actually implied by -pthread in Tru64 5.1,
6346 - # at least.
6347 - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
6348 - esac
6349 - { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
6350 -$as_echo "${flag}" >&6; }
6351 - if test "x$flag" != xno; then
6352 - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
6353 - PTHREAD_CPPFLAGS="$flag $PTHREAD_CPPFLAGS"
6354 - fi
6355 -
6356 - LIBS="$save_LIBS"
6357 - CFLAGS="$save_CFLAGS"
6358 - CPPFLAGS="$save_CPPFLAGS"
6359 -
6360 - # More AIX lossage: must compile with cc_r
6361 - # Extract the first word of "cc_r", so it can be a program name with args.
6362 -set dummy cc_r; ac_word=$2
6363 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6364 -$as_echo_n "checking for $ac_word... " >&6; }
6365 -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
6366 - $as_echo_n "(cached) " >&6
6367 -else
6368 - if test -n "$PTHREAD_CC"; then
6369 - ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
6370 -else
6371 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6372 -for as_dir in $PATH
6373 -do
6374 - IFS=$as_save_IFS
6375 - test -z "$as_dir" && as_dir=.
6376 - for ac_exec_ext in '' $ac_executable_extensions; do
6377 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6378 - ac_cv_prog_PTHREAD_CC="cc_r"
6379 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6380 - break 2
6381 - fi
6382 -done
6383 -done
6384 -IFS=$as_save_IFS
6385 -
6386 - test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}"
6387 -fi
6388 -fi
6389 -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
6390 -if test -n "$PTHREAD_CC"; then
6391 - { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
6392 -$as_echo "$PTHREAD_CC" >&6; }
6393 -else
6394 - { $as_echo "$as_me:$LINENO: result: no" >&5
6395 -$as_echo "no" >&6; }
6396 -fi
6397 -
6398 -
6399 -else
6400 - PTHREAD_CC="$CC"
6401 -fi
6402 -
6403 -
6404 -
6405 -
6406 -
6407 -
6408 -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
6409 -if test x"$acx_pthread_ok" = xyes; then
6410 -
6411 -cat >>confdefs.h <<\_ACEOF
6412 -#define HAVE_PTHREAD 1
6413 -_ACEOF
6414 -
6415 - :
6416 -else
6417 - acx_pthread_ok=no
6418 -
6419 -fi
6420 -ac_ext=c
6421 -ac_cpp='$CPP $CPPFLAGS'
6422 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6423 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6424 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
6425 -
6426 -
6427 -CC=$PTHREAD_CC
6428 -CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
6429 -CPPFLAGS="$PTHREAD_CPPFLAGS $CPPFLAGS"
6430 -LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS"
6431 -
6432 -
6433 -ac_ext=c
6434 -ac_cpp='$CPP $CPPFLAGS'
6435 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6436 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6437 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
6438 -if test -n "$ac_tool_prefix"; then
6439 - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
6440 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
6441 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6442 -$as_echo_n "checking for $ac_word... " >&6; }
6443 -if test "${ac_cv_prog_CC+set}" = set; then
6444 - $as_echo_n "(cached) " >&6
6445 -else
6446 - if test -n "$CC"; then
6447 - ac_cv_prog_CC="$CC" # Let the user override the test.
6448 -else
6449 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6450 -for as_dir in $PATH
6451 -do
6452 - IFS=$as_save_IFS
6453 - test -z "$as_dir" && as_dir=.
6454 - for ac_exec_ext in '' $ac_executable_extensions; do
6455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6456 - ac_cv_prog_CC="${ac_tool_prefix}gcc"
6457 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6458 - break 2
6459 - fi
6460 -done
6461 -done
6462 -IFS=$as_save_IFS
6463 -
6464 -fi
6465 -fi
6466 -CC=$ac_cv_prog_CC
6467 -if test -n "$CC"; then
6468 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
6469 -$as_echo "$CC" >&6; }
6470 -else
6471 - { $as_echo "$as_me:$LINENO: result: no" >&5
6472 -$as_echo "no" >&6; }
6473 -fi
6474 -
6475 -
6476 -fi
6477 -if test -z "$ac_cv_prog_CC"; then
6478 - ac_ct_CC=$CC
6479 - # Extract the first word of "gcc", so it can be a program name with args.
6480 -set dummy gcc; ac_word=$2
6481 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6482 -$as_echo_n "checking for $ac_word... " >&6; }
6483 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6484 - $as_echo_n "(cached) " >&6
6485 -else
6486 - if test -n "$ac_ct_CC"; then
6487 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
6488 -else
6489 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6490 -for as_dir in $PATH
6491 -do
6492 - IFS=$as_save_IFS
6493 - test -z "$as_dir" && as_dir=.
6494 - for ac_exec_ext in '' $ac_executable_extensions; do
6495 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6496 - ac_cv_prog_ac_ct_CC="gcc"
6497 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6498 - break 2
6499 - fi
6500 -done
6501 -done
6502 -IFS=$as_save_IFS
6503 -
6504 -fi
6505 -fi
6506 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
6507 -if test -n "$ac_ct_CC"; then
6508 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6509 -$as_echo "$ac_ct_CC" >&6; }
6510 -else
6511 - { $as_echo "$as_me:$LINENO: result: no" >&5
6512 -$as_echo "no" >&6; }
6513 -fi
6514 -
6515 - if test "x$ac_ct_CC" = x; then
6516 - CC=""
6517 - else
6518 - case $cross_compiling:$ac_tool_warned in
6519 -yes:)
6520 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6521 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6522 -ac_tool_warned=yes ;;
6523 -esac
6524 - CC=$ac_ct_CC
6525 - fi
6526 -else
6527 - CC="$ac_cv_prog_CC"
6528 -fi
6529 -
6530 -if test -z "$CC"; then
6531 - if test -n "$ac_tool_prefix"; then
6532 - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6533 -set dummy ${ac_tool_prefix}cc; ac_word=$2
6534 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6535 -$as_echo_n "checking for $ac_word... " >&6; }
6536 -if test "${ac_cv_prog_CC+set}" = set; then
6537 - $as_echo_n "(cached) " >&6
6538 -else
6539 - if test -n "$CC"; then
6540 - ac_cv_prog_CC="$CC" # Let the user override the test.
6541 -else
6542 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6543 -for as_dir in $PATH
6544 -do
6545 - IFS=$as_save_IFS
6546 - test -z "$as_dir" && as_dir=.
6547 - for ac_exec_ext in '' $ac_executable_extensions; do
6548 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6549 - ac_cv_prog_CC="${ac_tool_prefix}cc"
6550 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6551 - break 2
6552 - fi
6553 -done
6554 -done
6555 -IFS=$as_save_IFS
6556 -
6557 -fi
6558 -fi
6559 -CC=$ac_cv_prog_CC
6560 -if test -n "$CC"; then
6561 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
6562 -$as_echo "$CC" >&6; }
6563 -else
6564 - { $as_echo "$as_me:$LINENO: result: no" >&5
6565 -$as_echo "no" >&6; }
6566 -fi
6567 -
6568 -
6569 - fi
6570 -fi
6571 -if test -z "$CC"; then
6572 - # Extract the first word of "cc", so it can be a program name with args.
6573 -set dummy cc; ac_word=$2
6574 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6575 -$as_echo_n "checking for $ac_word... " >&6; }
6576 -if test "${ac_cv_prog_CC+set}" = set; then
6577 - $as_echo_n "(cached) " >&6
6578 -else
6579 - if test -n "$CC"; then
6580 - ac_cv_prog_CC="$CC" # Let the user override the test.
6581 -else
6582 - ac_prog_rejected=no
6583 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6584 -for as_dir in $PATH
6585 -do
6586 - IFS=$as_save_IFS
6587 - test -z "$as_dir" && as_dir=.
6588 - for ac_exec_ext in '' $ac_executable_extensions; do
6589 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6590 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
6591 - ac_prog_rejected=yes
6592 - continue
6593 - fi
6594 - ac_cv_prog_CC="cc"
6595 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6596 - break 2
6597 - fi
6598 -done
6599 -done
6600 -IFS=$as_save_IFS
6601 -
6602 -if test $ac_prog_rejected = yes; then
6603 - # We found a bogon in the path, so make sure we never use it.
6604 - set dummy $ac_cv_prog_CC
6605 - shift
6606 - if test $# != 0; then
6607 - # We chose a different compiler from the bogus one.
6608 - # However, it has the same basename, so the bogon will be chosen
6609 - # first if we set CC to just the basename; use the full file name.
6610 - shift
6611 - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
6612 - fi
6613 -fi
6614 -fi
6615 -fi
6616 -CC=$ac_cv_prog_CC
6617 -if test -n "$CC"; then
6618 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
6619 -$as_echo "$CC" >&6; }
6620 -else
6621 - { $as_echo "$as_me:$LINENO: result: no" >&5
6622 -$as_echo "no" >&6; }
6623 -fi
6624 -
6625 -
6626 -fi
6627 -if test -z "$CC"; then
6628 - if test -n "$ac_tool_prefix"; then
6629 - for ac_prog in cl.exe
6630 - do
6631 - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6632 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6633 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6634 -$as_echo_n "checking for $ac_word... " >&6; }
6635 -if test "${ac_cv_prog_CC+set}" = set; then
6636 - $as_echo_n "(cached) " >&6
6637 -else
6638 - if test -n "$CC"; then
6639 - ac_cv_prog_CC="$CC" # Let the user override the test.
6640 -else
6641 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6642 -for as_dir in $PATH
6643 -do
6644 - IFS=$as_save_IFS
6645 - test -z "$as_dir" && as_dir=.
6646 - for ac_exec_ext in '' $ac_executable_extensions; do
6647 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6648 - ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
6649 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6650 - break 2
6651 - fi
6652 -done
6653 -done
6654 -IFS=$as_save_IFS
6655 -
6656 -fi
6657 -fi
6658 -CC=$ac_cv_prog_CC
6659 -if test -n "$CC"; then
6660 - { $as_echo "$as_me:$LINENO: result: $CC" >&5
6661 -$as_echo "$CC" >&6; }
6662 -else
6663 - { $as_echo "$as_me:$LINENO: result: no" >&5
6664 -$as_echo "no" >&6; }
6665 -fi
6666 -
6667 -
6668 - test -n "$CC" && break
6669 - done
6670 -fi
6671 -if test -z "$CC"; then
6672 - ac_ct_CC=$CC
6673 - for ac_prog in cl.exe
6674 -do
6675 - # Extract the first word of "$ac_prog", so it can be a program name with args.
6676 -set dummy $ac_prog; ac_word=$2
6677 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
6678 -$as_echo_n "checking for $ac_word... " >&6; }
6679 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6680 - $as_echo_n "(cached) " >&6
6681 -else
6682 - if test -n "$ac_ct_CC"; then
6683 - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
6684 -else
6685 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6686 -for as_dir in $PATH
6687 -do
6688 - IFS=$as_save_IFS
6689 - test -z "$as_dir" && as_dir=.
6690 - for ac_exec_ext in '' $ac_executable_extensions; do
6691 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6692 - ac_cv_prog_ac_ct_CC="$ac_prog"
6693 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6694 - break 2
6695 - fi
6696 -done
6697 -done
6698 -IFS=$as_save_IFS
6699 -
6700 -fi
6701 -fi
6702 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
6703 -if test -n "$ac_ct_CC"; then
6704 - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6705 -$as_echo "$ac_ct_CC" >&6; }
6706 -else
6707 - { $as_echo "$as_me:$LINENO: result: no" >&5
6708 -$as_echo "no" >&6; }
6709 -fi
6710 -
6711 -
6712 - test -n "$ac_ct_CC" && break
6713 -done
6714 -
6715 - if test "x$ac_ct_CC" = x; then
6716 - CC=""
6717 - else
6718 - case $cross_compiling:$ac_tool_warned in
6719 -yes:)
6720 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
6721 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6722 -ac_tool_warned=yes ;;
6723 -esac
6724 - CC=$ac_ct_CC
6725 - fi
6726 -fi
6727 -
6728 -fi
6729 -
6730 -
6731 -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
6732 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6733 -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
6734 -See \`config.log' for more details." >&5
6735 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
6736 -See \`config.log' for more details." >&2;}
6737 - { (exit 1); exit 1; }; }; }
6738 -
6739 -# Provide some information about the compiler.
6740 -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
6741 -set X $ac_compile
6742 -ac_compiler=$2
6743 -{ (ac_try="$ac_compiler --version >&5"
6744 -case "(($ac_try" in
6745 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6746 - *) ac_try_echo=$ac_try;;
6747 -esac
6748 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6749 -$as_echo "$ac_try_echo") >&5
6750 - (eval "$ac_compiler --version >&5") 2>&5
6751 - ac_status=$?
6752 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6753 - (exit $ac_status); }
6754 -{ (ac_try="$ac_compiler -v >&5"
6755 -case "(($ac_try" in
6756 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6757 - *) ac_try_echo=$ac_try;;
6758 -esac
6759 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6760 -$as_echo "$ac_try_echo") >&5
6761 - (eval "$ac_compiler -v >&5") 2>&5
6762 - ac_status=$?
6763 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6764 - (exit $ac_status); }
6765 -{ (ac_try="$ac_compiler -V >&5"
6766 -case "(($ac_try" in
6767 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6768 - *) ac_try_echo=$ac_try;;
6769 -esac
6770 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6771 -$as_echo "$ac_try_echo") >&5
6772 - (eval "$ac_compiler -V >&5") 2>&5
6773 - ac_status=$?
6774 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6775 - (exit $ac_status); }
6776 -
6777 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
6778 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
6779 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
6780 - $as_echo_n "(cached) " >&6
6781 -else
6782 - cat >conftest.$ac_ext <<_ACEOF
6783 -/* confdefs.h. */
6784 -_ACEOF
6785 -cat confdefs.h >>conftest.$ac_ext
6786 -cat >>conftest.$ac_ext <<_ACEOF
6787 -/* end confdefs.h. */
6788 -
6789 -int
6790 -main ()
6791 -{
6792 -#ifndef __GNUC__
6793 - choke me
6794 -#endif
6795 -
6796 - ;
6797 - return 0;
6798 -}
6799 -_ACEOF
6800 -rm -f conftest.$ac_objext
6801 -if { (ac_try="$ac_compile"
6802 -case "(($ac_try" in
6803 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6804 - *) ac_try_echo=$ac_try;;
6805 -esac
6806 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6807 -$as_echo "$ac_try_echo") >&5
6808 - (eval "$ac_compile") 2>conftest.er1
6809 - ac_status=$?
6810 - grep -v '^ *+' conftest.er1 >conftest.err
6811 - rm -f conftest.er1
6812 - cat conftest.err >&5
6813 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6814 - (exit $ac_status); } && {
6815 - test -z "$ac_c_werror_flag" ||
6816 - test ! -s conftest.err
6817 - } && test -s conftest.$ac_objext; then
6818 - ac_compiler_gnu=yes
6819 -else
6820 - $as_echo "$as_me: failed program was:" >&5
6821 -sed 's/^/| /' conftest.$ac_ext >&5
6822 -
6823 - ac_compiler_gnu=no
6824 -fi
6825 -
6826 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6827 -ac_cv_c_compiler_gnu=$ac_compiler_gnu
6828 -
6829 -fi
6830 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
6831 -$as_echo "$ac_cv_c_compiler_gnu" >&6; }
6832 -if test $ac_compiler_gnu = yes; then
6833 - GCC=yes
6834 -else
6835 - GCC=
6836 -fi
6837 -ac_test_CFLAGS=${CFLAGS+set}
6838 -ac_save_CFLAGS=$CFLAGS
6839 -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
6840 -$as_echo_n "checking whether $CC accepts -g... " >&6; }
6841 -if test "${ac_cv_prog_cc_g+set}" = set; then
6842 - $as_echo_n "(cached) " >&6
6843 -else
6844 - ac_save_c_werror_flag=$ac_c_werror_flag
6845 - ac_c_werror_flag=yes
6846 - ac_cv_prog_cc_g=no
6847 - CFLAGS="-g"
6848 - cat >conftest.$ac_ext <<_ACEOF
6849 -/* confdefs.h. */
6850 -_ACEOF
6851 -cat confdefs.h >>conftest.$ac_ext
6852 -cat >>conftest.$ac_ext <<_ACEOF
6853 -/* end confdefs.h. */
6854 -
6855 -int
6856 -main ()
6857 -{
6858 -
6859 - ;
6860 - return 0;
6861 -}
6862 -_ACEOF
6863 -rm -f conftest.$ac_objext
6864 -if { (ac_try="$ac_compile"
6865 -case "(($ac_try" in
6866 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6867 - *) ac_try_echo=$ac_try;;
6868 -esac
6869 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6870 -$as_echo "$ac_try_echo") >&5
6871 - (eval "$ac_compile") 2>conftest.er1
6872 - ac_status=$?
6873 - grep -v '^ *+' conftest.er1 >conftest.err
6874 - rm -f conftest.er1
6875 - cat conftest.err >&5
6876 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6877 - (exit $ac_status); } && {
6878 - test -z "$ac_c_werror_flag" ||
6879 - test ! -s conftest.err
6880 - } && test -s conftest.$ac_objext; then
6881 - ac_cv_prog_cc_g=yes
6882 -else
6883 - $as_echo "$as_me: failed program was:" >&5
6884 -sed 's/^/| /' conftest.$ac_ext >&5
6885 -
6886 - CFLAGS=""
6887 - cat >conftest.$ac_ext <<_ACEOF
6888 -/* confdefs.h. */
6889 -_ACEOF
6890 -cat confdefs.h >>conftest.$ac_ext
6891 -cat >>conftest.$ac_ext <<_ACEOF
6892 -/* end confdefs.h. */
6893 -
6894 -int
6895 -main ()
6896 -{
6897 -
6898 - ;
6899 - return 0;
6900 -}
6901 -_ACEOF
6902 -rm -f conftest.$ac_objext
6903 -if { (ac_try="$ac_compile"
6904 -case "(($ac_try" in
6905 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6906 - *) ac_try_echo=$ac_try;;
6907 -esac
6908 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6909 -$as_echo "$ac_try_echo") >&5
6910 - (eval "$ac_compile") 2>conftest.er1
6911 - ac_status=$?
6912 - grep -v '^ *+' conftest.er1 >conftest.err
6913 - rm -f conftest.er1
6914 - cat conftest.err >&5
6915 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6916 - (exit $ac_status); } && {
6917 - test -z "$ac_c_werror_flag" ||
6918 - test ! -s conftest.err
6919 - } && test -s conftest.$ac_objext; then
6920 - :
6921 -else
6922 - $as_echo "$as_me: failed program was:" >&5
6923 -sed 's/^/| /' conftest.$ac_ext >&5
6924 -
6925 - ac_c_werror_flag=$ac_save_c_werror_flag
6926 - CFLAGS="-g"
6927 - cat >conftest.$ac_ext <<_ACEOF
6928 -/* confdefs.h. */
6929 -_ACEOF
6930 -cat confdefs.h >>conftest.$ac_ext
6931 -cat >>conftest.$ac_ext <<_ACEOF
6932 -/* end confdefs.h. */
6933 -
6934 -int
6935 -main ()
6936 -{
6937 -
6938 - ;
6939 - return 0;
6940 -}
6941 -_ACEOF
6942 -rm -f conftest.$ac_objext
6943 -if { (ac_try="$ac_compile"
6944 -case "(($ac_try" in
6945 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6946 - *) ac_try_echo=$ac_try;;
6947 -esac
6948 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
6949 -$as_echo "$ac_try_echo") >&5
6950 - (eval "$ac_compile") 2>conftest.er1
6951 - ac_status=$?
6952 - grep -v '^ *+' conftest.er1 >conftest.err
6953 - rm -f conftest.er1
6954 - cat conftest.err >&5
6955 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
6956 - (exit $ac_status); } && {
6957 - test -z "$ac_c_werror_flag" ||
6958 - test ! -s conftest.err
6959 - } && test -s conftest.$ac_objext; then
6960 - ac_cv_prog_cc_g=yes
6961 -else
6962 - $as_echo "$as_me: failed program was:" >&5
6963 -sed 's/^/| /' conftest.$ac_ext >&5
6964 -
6965 -
6966 -fi
6967 -
6968 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6969 -fi
6970 -
6971 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6972 -fi
6973 -
6974 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6975 - ac_c_werror_flag=$ac_save_c_werror_flag
6976 -fi
6977 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
6978 -$as_echo "$ac_cv_prog_cc_g" >&6; }
6979 -if test "$ac_test_CFLAGS" = set; then
6980 - CFLAGS=$ac_save_CFLAGS
6981 -elif test $ac_cv_prog_cc_g = yes; then
6982 - if test "$GCC" = yes; then
6983 - CFLAGS="-g -O2"
6984 - else
6985 - CFLAGS="-g"
6986 - fi
6987 -else
6988 - if test "$GCC" = yes; then
6989 - CFLAGS="-O2"
6990 - else
6991 - CFLAGS=
6992 - fi
6993 -fi
6994 -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
6995 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
6996 -if test "${ac_cv_prog_cc_c89+set}" = set; then
6997 - $as_echo_n "(cached) " >&6
6998 -else
6999 - ac_cv_prog_cc_c89=no
7000 -ac_save_CC=$CC
7001 -cat >conftest.$ac_ext <<_ACEOF
7002 -/* confdefs.h. */
7003 -_ACEOF
7004 -cat confdefs.h >>conftest.$ac_ext
7005 -cat >>conftest.$ac_ext <<_ACEOF
7006 -/* end confdefs.h. */
7007 -#include <stdarg.h>
7008 -#include <stdio.h>
7009 -#include <sys/types.h>
7010 -#include <sys/stat.h>
7011 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
7012 -struct buf { int x; };
7013 -FILE * (*rcsopen) (struct buf *, struct stat *, int);
7014 -static char *e (p, i)
7015 - char **p;
7016 - int i;
7017 -{
7018 - return p[i];
7019 -}
7020 -static char *f (char * (*g) (char **, int), char **p, ...)
7021 -{
7022 - char *s;
7023 - va_list v;
7024 - va_start (v,p);
7025 - s = g (p, va_arg (v,int));
7026 - va_end (v);
7027 - return s;
7028 -}
7029 -
7030 -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
7031 - function prototypes and stuff, but not '\xHH' hex character constants.
7032 - These don't provoke an error unfortunately, instead are silently treated
7033 - as 'x'. The following induces an error, until -std is added to get
7034 - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
7035 - array size at least. It's necessary to write '\x00'==0 to get something
7036 - that's true only with -std. */
7037 -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
7038 -
7039 -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
7040 - inside strings and character constants. */
7041 -#define FOO(x) 'x'
7042 -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
7043 -
7044 -int test (int i, double x);
7045 -struct s1 {int (*f) (int a);};
7046 -struct s2 {int (*f) (double a);};
7047 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
7048 -int argc;
7049 -char **argv;
7050 -int
7051 -main ()
7052 -{
7053 -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
7054 - ;
7055 - return 0;
7056 -}
7057 -_ACEOF
7058 -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
7059 - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7060 -do
7061 - CC="$ac_save_CC $ac_arg"
7062 - rm -f conftest.$ac_objext
7063 -if { (ac_try="$ac_compile"
7064 -case "(($ac_try" in
7065 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7066 - *) ac_try_echo=$ac_try;;
7067 -esac
7068 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7069 -$as_echo "$ac_try_echo") >&5
7070 - (eval "$ac_compile") 2>conftest.er1
7071 - ac_status=$?
7072 - grep -v '^ *+' conftest.er1 >conftest.err
7073 - rm -f conftest.er1
7074 - cat conftest.err >&5
7075 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7076 - (exit $ac_status); } && {
7077 - test -z "$ac_c_werror_flag" ||
7078 - test ! -s conftest.err
7079 - } && test -s conftest.$ac_objext; then
7080 - ac_cv_prog_cc_c89=$ac_arg
7081 -else
7082 - $as_echo "$as_me: failed program was:" >&5
7083 -sed 's/^/| /' conftest.$ac_ext >&5
7084 -
7085 -
7086 -fi
7087 -
7088 -rm -f core conftest.err conftest.$ac_objext
7089 - test "x$ac_cv_prog_cc_c89" != "xno" && break
7090 -done
7091 -rm -f conftest.$ac_ext
7092 -CC=$ac_save_CC
7093 -
7094 -fi
7095 -# AC_CACHE_VAL
7096 -case "x$ac_cv_prog_cc_c89" in
7097 - x)
7098 - { $as_echo "$as_me:$LINENO: result: none needed" >&5
7099 -$as_echo "none needed" >&6; } ;;
7100 - xno)
7101 - { $as_echo "$as_me:$LINENO: result: unsupported" >&5
7102 -$as_echo "unsupported" >&6; } ;;
7103 - *)
7104 - CC="$CC $ac_cv_prog_cc_c89"
7105 - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
7106 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
7107 -esac
7108 -
7109 -
7110 -ac_ext=c
7111 -ac_cpp='$CPP $CPPFLAGS'
7112 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7113 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7114 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
7115 -
7116 -depcc="$CC" am_compiler_list=
7117 -
7118 -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
7119 -$as_echo_n "checking dependency style of $depcc... " >&6; }
7120 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
7121 - $as_echo_n "(cached) " >&6
7122 -else
7123 - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
7124 - # We make a subdir and do the tests there. Otherwise we can end up
7125 - # making bogus files that we don't know about and never remove. For
7126 - # instance it was reported that on HP-UX the gcc test will end up
7127 - # making a dummy file named `D' -- because `-MD' means `put the output
7128 - # in D'.
7129 - mkdir conftest.dir
7130 - # Copy depcomp to subdir because otherwise we won't find it if we're
7131 - # using a relative directory.
7132 - cp "$am_depcomp" conftest.dir
7133 - cd conftest.dir
7134 - # We will build objects and dependencies in a subdirectory because
7135 - # it helps to detect inapplicable dependency modes. For instance
7136 - # both Tru64's cc and ICC support -MD to output dependencies as a
7137 - # side effect of compilation, but ICC will put the dependencies in
7138 - # the current directory while Tru64 will put them in the object
7139 - # directory.
7140 - mkdir sub
7141 -
7142 - am_cv_CC_dependencies_compiler_type=none
7143 - if test "$am_compiler_list" = ""; then
7144 - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
7145 - fi
7146 - for depmode in $am_compiler_list; do
7147 - # Setup a source with many dependencies, because some compilers
7148 - # like to wrap large dependency lists on column 80 (with \), and
7149 - # we should not choose a depcomp mode which is confused by this.
7150 - #
7151 - # We need to recreate these files for each test, as the compiler may
7152 - # overwrite some of them when testing with obscure command lines.
7153 - # This happens at least with the AIX C compiler.
7154 - : > sub/conftest.c
7155 - for i in 1 2 3 4 5 6; do
7156 - echo '#include "conftst'$i'.h"' >> sub/conftest.c
7157 - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
7158 - # Solaris 8's {/usr,}/bin/sh.
7159 - touch sub/conftst$i.h
7160 - done
7161 - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
7162 -
7163 + # handle `-M -o', and we need to detect this. Also, some Intel
7164 + # versions had trouble with output in subdirs
7165 + am__obj=sub/conftest.${OBJEXT-o}
7166 + am__minus_obj="-o $am__obj"
7167 case $depmode in
7168 + gcc)
7169 + # This depmode causes a compiler race in universal mode.
7170 + test "$am__universal" = false || continue
7171 + ;;
7172 nosideeffect)
7173 # after this tag, mechanisms are not by side-effect, so they'll
7174 # only be used when explicitly requested
7175 @@ -5008,19 +3869,23 @@ else
7176 break
7177 fi
7178 ;;
7179 + msvisualcpp | msvcmsys)
7180 + # This compiler won't grok `-c -o', but also, the minuso test has
7181 + # not run yet. These depmodes are late enough in the game, and
7182 + # so weak that their functioning should not be impacted.
7183 + am__obj=conftest.${OBJEXT-o}
7184 + am__minus_obj=
7185 + ;;
7186 none) break ;;
7187 esac
7188 - # We check with `-c' and `-o' for the sake of the "dashmstdout"
7189 - # mode. It turns out that the SunPro C++ compiler does not properly
7190 - # handle `-M -o', and we need to detect this.
7191 if depmode=$depmode \
7192 - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
7193 + source=sub/conftest.c object=$am__obj \
7194 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
7195 - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
7196 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
7197 >/dev/null 2>conftest.err &&
7198 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
7199 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
7200 - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
7201 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
7202 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
7203 # icc doesn't choke on unknown options, it will just issue warnings
7204 # or remarks (even with -Werror). So we grep stderr for any message
7205 @@ -5059,638 +3924,6 @@ else
7206 fi
7207
7208
7209 -for ac_prog in flex lex
7210 -do
7211 - # Extract the first word of "$ac_prog", so it can be a program name with args.
7212 -set dummy $ac_prog; ac_word=$2
7213 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7214 -$as_echo_n "checking for $ac_word... " >&6; }
7215 -if test "${ac_cv_prog_LEX+set}" = set; then
7216 - $as_echo_n "(cached) " >&6
7217 -else
7218 - if test -n "$LEX"; then
7219 - ac_cv_prog_LEX="$LEX" # Let the user override the test.
7220 -else
7221 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7222 -for as_dir in $PATH
7223 -do
7224 - IFS=$as_save_IFS
7225 - test -z "$as_dir" && as_dir=.
7226 - for ac_exec_ext in '' $ac_executable_extensions; do
7227 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7228 - ac_cv_prog_LEX="$ac_prog"
7229 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7230 - break 2
7231 - fi
7232 -done
7233 -done
7234 -IFS=$as_save_IFS
7235 -
7236 -fi
7237 -fi
7238 -LEX=$ac_cv_prog_LEX
7239 -if test -n "$LEX"; then
7240 - { $as_echo "$as_me:$LINENO: result: $LEX" >&5
7241 -$as_echo "$LEX" >&6; }
7242 -else
7243 - { $as_echo "$as_me:$LINENO: result: no" >&5
7244 -$as_echo "no" >&6; }
7245 -fi
7246 -
7247 -
7248 - test -n "$LEX" && break
7249 -done
7250 -test -n "$LEX" || LEX=":"
7251 -
7252 -if test "x$LEX" != "x:"; then
7253 - cat >conftest.l <<_ACEOF
7254 -%%
7255 -a { ECHO; }
7256 -b { REJECT; }
7257 -c { yymore (); }
7258 -d { yyless (1); }
7259 -e { yyless (input () != 0); }
7260 -f { unput (yytext[0]); }
7261 -. { BEGIN INITIAL; }
7262 -%%
7263 -#ifdef YYTEXT_POINTER
7264 -extern char *yytext;
7265 -#endif
7266 -int
7267 -main (void)
7268 -{
7269 - return ! yylex () + ! yywrap ();
7270 -}
7271 -_ACEOF
7272 -{ (ac_try="$LEX conftest.l"
7273 -case "(($ac_try" in
7274 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7275 - *) ac_try_echo=$ac_try;;
7276 -esac
7277 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7278 -$as_echo "$ac_try_echo") >&5
7279 - (eval "$LEX conftest.l") 2>&5
7280 - ac_status=$?
7281 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7282 - (exit $ac_status); }
7283 -{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
7284 -$as_echo_n "checking lex output file root... " >&6; }
7285 -if test "${ac_cv_prog_lex_root+set}" = set; then
7286 - $as_echo_n "(cached) " >&6
7287 -else
7288 -
7289 -if test -f lex.yy.c; then
7290 - ac_cv_prog_lex_root=lex.yy
7291 -elif test -f lexyy.c; then
7292 - ac_cv_prog_lex_root=lexyy
7293 -else
7294 - { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
7295 -$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
7296 - { (exit 1); exit 1; }; }
7297 -fi
7298 -fi
7299 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
7300 -$as_echo "$ac_cv_prog_lex_root" >&6; }
7301 -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
7302 -
7303 -if test -z "${LEXLIB+set}"; then
7304 - { $as_echo "$as_me:$LINENO: checking lex library" >&5
7305 -$as_echo_n "checking lex library... " >&6; }
7306 -if test "${ac_cv_lib_lex+set}" = set; then
7307 - $as_echo_n "(cached) " >&6
7308 -else
7309 -
7310 - ac_save_LIBS=$LIBS
7311 - ac_cv_lib_lex='none needed'
7312 - for ac_lib in '' -lfl -ll; do
7313 - LIBS="$ac_lib $ac_save_LIBS"
7314 - cat >conftest.$ac_ext <<_ACEOF
7315 -`cat $LEX_OUTPUT_ROOT.c`
7316 -_ACEOF
7317 -rm -f conftest.$ac_objext conftest$ac_exeext
7318 -if { (ac_try="$ac_link"
7319 -case "(($ac_try" in
7320 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7321 - *) ac_try_echo=$ac_try;;
7322 -esac
7323 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7324 -$as_echo "$ac_try_echo") >&5
7325 - (eval "$ac_link") 2>conftest.er1
7326 - ac_status=$?
7327 - grep -v '^ *+' conftest.er1 >conftest.err
7328 - rm -f conftest.er1
7329 - cat conftest.err >&5
7330 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7331 - (exit $ac_status); } && {
7332 - test -z "$ac_c_werror_flag" ||
7333 - test ! -s conftest.err
7334 - } && test -s conftest$ac_exeext && {
7335 - test "$cross_compiling" = yes ||
7336 - $as_test_x conftest$ac_exeext
7337 - }; then
7338 - ac_cv_lib_lex=$ac_lib
7339 -else
7340 - $as_echo "$as_me: failed program was:" >&5
7341 -sed 's/^/| /' conftest.$ac_ext >&5
7342 -
7343 -
7344 -fi
7345 -
7346 -rm -rf conftest.dSYM
7347 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7348 - conftest$ac_exeext conftest.$ac_ext
7349 - test "$ac_cv_lib_lex" != 'none needed' && break
7350 - done
7351 - LIBS=$ac_save_LIBS
7352 -
7353 -fi
7354 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
7355 -$as_echo "$ac_cv_lib_lex" >&6; }
7356 - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
7357 -fi
7358 -
7359 -
7360 -{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
7361 -$as_echo_n "checking whether yytext is a pointer... " >&6; }
7362 -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
7363 - $as_echo_n "(cached) " >&6
7364 -else
7365 - # POSIX says lex can declare yytext either as a pointer or an array; the
7366 -# default is implementation-dependent. Figure out which it is, since
7367 -# not all implementations provide the %pointer and %array declarations.
7368 -ac_cv_prog_lex_yytext_pointer=no
7369 -ac_save_LIBS=$LIBS
7370 -LIBS="$LEXLIB $ac_save_LIBS"
7371 -cat >conftest.$ac_ext <<_ACEOF
7372 -#define YYTEXT_POINTER 1
7373 -`cat $LEX_OUTPUT_ROOT.c`
7374 -_ACEOF
7375 -rm -f conftest.$ac_objext conftest$ac_exeext
7376 -if { (ac_try="$ac_link"
7377 -case "(($ac_try" in
7378 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7379 - *) ac_try_echo=$ac_try;;
7380 -esac
7381 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7382 -$as_echo "$ac_try_echo") >&5
7383 - (eval "$ac_link") 2>conftest.er1
7384 - ac_status=$?
7385 - grep -v '^ *+' conftest.er1 >conftest.err
7386 - rm -f conftest.er1
7387 - cat conftest.err >&5
7388 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7389 - (exit $ac_status); } && {
7390 - test -z "$ac_c_werror_flag" ||
7391 - test ! -s conftest.err
7392 - } && test -s conftest$ac_exeext && {
7393 - test "$cross_compiling" = yes ||
7394 - $as_test_x conftest$ac_exeext
7395 - }; then
7396 - ac_cv_prog_lex_yytext_pointer=yes
7397 -else
7398 - $as_echo "$as_me: failed program was:" >&5
7399 -sed 's/^/| /' conftest.$ac_ext >&5
7400 -
7401 -
7402 -fi
7403 -
7404 -rm -rf conftest.dSYM
7405 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7406 - conftest$ac_exeext conftest.$ac_ext
7407 -LIBS=$ac_save_LIBS
7408 -
7409 -fi
7410 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
7411 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
7412 -if test $ac_cv_prog_lex_yytext_pointer = yes; then
7413 -
7414 -cat >>confdefs.h <<\_ACEOF
7415 -#define YYTEXT_POINTER 1
7416 -_ACEOF
7417 -
7418 -fi
7419 -rm -f conftest.l $LEX_OUTPUT_ROOT.c
7420 -
7421 -fi
7422 -if test "$LEX" = :; then
7423 - LEX=${am_missing_run}flex
7424 -fi
7425 -for ac_prog in 'bison -y' byacc
7426 -do
7427 - # Extract the first word of "$ac_prog", so it can be a program name with args.
7428 -set dummy $ac_prog; ac_word=$2
7429 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7430 -$as_echo_n "checking for $ac_word... " >&6; }
7431 -if test "${ac_cv_prog_YACC+set}" = set; then
7432 - $as_echo_n "(cached) " >&6
7433 -else
7434 - if test -n "$YACC"; then
7435 - ac_cv_prog_YACC="$YACC" # Let the user override the test.
7436 -else
7437 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7438 -for as_dir in $PATH
7439 -do
7440 - IFS=$as_save_IFS
7441 - test -z "$as_dir" && as_dir=.
7442 - for ac_exec_ext in '' $ac_executable_extensions; do
7443 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7444 - ac_cv_prog_YACC="$ac_prog"
7445 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7446 - break 2
7447 - fi
7448 -done
7449 -done
7450 -IFS=$as_save_IFS
7451 -
7452 -fi
7453 -fi
7454 -YACC=$ac_cv_prog_YACC
7455 -if test -n "$YACC"; then
7456 - { $as_echo "$as_me:$LINENO: result: $YACC" >&5
7457 -$as_echo "$YACC" >&6; }
7458 -else
7459 - { $as_echo "$as_me:$LINENO: result: no" >&5
7460 -$as_echo "no" >&6; }
7461 -fi
7462 -
7463 -
7464 - test -n "$YACC" && break
7465 -done
7466 -test -n "$YACC" || YACC="yacc"
7467 -
7468 -if test -n "$ac_tool_prefix"; then
7469 - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
7470 -set dummy ${ac_tool_prefix}ranlib; ac_word=$2
7471 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7472 -$as_echo_n "checking for $ac_word... " >&6; }
7473 -if test "${ac_cv_prog_RANLIB+set}" = set; then
7474 - $as_echo_n "(cached) " >&6
7475 -else
7476 - if test -n "$RANLIB"; then
7477 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
7478 -else
7479 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7480 -for as_dir in $PATH
7481 -do
7482 - IFS=$as_save_IFS
7483 - test -z "$as_dir" && as_dir=.
7484 - for ac_exec_ext in '' $ac_executable_extensions; do
7485 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7486 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
7487 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7488 - break 2
7489 - fi
7490 -done
7491 -done
7492 -IFS=$as_save_IFS
7493 -
7494 -fi
7495 -fi
7496 -RANLIB=$ac_cv_prog_RANLIB
7497 -if test -n "$RANLIB"; then
7498 - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
7499 -$as_echo "$RANLIB" >&6; }
7500 -else
7501 - { $as_echo "$as_me:$LINENO: result: no" >&5
7502 -$as_echo "no" >&6; }
7503 -fi
7504 -
7505 -
7506 -fi
7507 -if test -z "$ac_cv_prog_RANLIB"; then
7508 - ac_ct_RANLIB=$RANLIB
7509 - # Extract the first word of "ranlib", so it can be a program name with args.
7510 -set dummy ranlib; ac_word=$2
7511 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
7512 -$as_echo_n "checking for $ac_word... " >&6; }
7513 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
7514 - $as_echo_n "(cached) " >&6
7515 -else
7516 - if test -n "$ac_ct_RANLIB"; then
7517 - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
7518 -else
7519 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7520 -for as_dir in $PATH
7521 -do
7522 - IFS=$as_save_IFS
7523 - test -z "$as_dir" && as_dir=.
7524 - for ac_exec_ext in '' $ac_executable_extensions; do
7525 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7526 - ac_cv_prog_ac_ct_RANLIB="ranlib"
7527 - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7528 - break 2
7529 - fi
7530 -done
7531 -done
7532 -IFS=$as_save_IFS
7533 -
7534 -fi
7535 -fi
7536 -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
7537 -if test -n "$ac_ct_RANLIB"; then
7538 - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
7539 -$as_echo "$ac_ct_RANLIB" >&6; }
7540 -else
7541 - { $as_echo "$as_me:$LINENO: result: no" >&5
7542 -$as_echo "no" >&6; }
7543 -fi
7544 -
7545 - if test "x$ac_ct_RANLIB" = x; then
7546 - RANLIB=":"
7547 - else
7548 - case $cross_compiling:$ac_tool_warned in
7549 -yes:)
7550 -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
7551 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
7552 -ac_tool_warned=yes ;;
7553 -esac
7554 - RANLIB=$ac_ct_RANLIB
7555 - fi
7556 -else
7557 - RANLIB="$ac_cv_prog_RANLIB"
7558 -fi
7559 -
7560 -# Find a good install program. We prefer a C program (faster),
7561 -# so one script is as good as another. But avoid the broken or
7562 -# incompatible versions:
7563 -# SysV /etc/install, /usr/sbin/install
7564 -# SunOS /usr/etc/install
7565 -# IRIX /sbin/install
7566 -# AIX /bin/install
7567 -# AmigaOS /C/install, which installs bootblocks on floppy discs
7568 -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
7569 -# AFS /usr/afsws/bin/install, which mishandles nonexistent args
7570 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
7571 -# OS/2's system install, which has a completely different semantic
7572 -# ./install, which can be erroneously created by make from ./install.sh.
7573 -# Reject install programs that cannot install multiple files.
7574 -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
7575 -$as_echo_n "checking for a BSD-compatible install... " >&6; }
7576 -if test -z "$INSTALL"; then
7577 -if test "${ac_cv_path_install+set}" = set; then
7578 - $as_echo_n "(cached) " >&6
7579 -else
7580 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7581 -for as_dir in $PATH
7582 -do
7583 - IFS=$as_save_IFS
7584 - test -z "$as_dir" && as_dir=.
7585 - # Account for people who put trailing slashes in PATH elements.
7586 -case $as_dir/ in
7587 - ./ | .// | /cC/* | \
7588 - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
7589 - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
7590 - /usr/ucb/* ) ;;
7591 - *)
7592 - # OSF1 and SCO ODT 3.0 have their own names for install.
7593 - # Don't use installbsd from OSF since it installs stuff as root
7594 - # by default.
7595 - for ac_prog in ginstall scoinst install; do
7596 - for ac_exec_ext in '' $ac_executable_extensions; do
7597 - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
7598 - if test $ac_prog = install &&
7599 - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7600 - # AIX install. It has an incompatible calling convention.
7601 - :
7602 - elif test $ac_prog = install &&
7603 - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
7604 - # program-specific install script used by HP pwplus--don't use.
7605 - :
7606 - else
7607 - rm -rf conftest.one conftest.two conftest.dir
7608 - echo one > conftest.one
7609 - echo two > conftest.two
7610 - mkdir conftest.dir
7611 - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
7612 - test -s conftest.one && test -s conftest.two &&
7613 - test -s conftest.dir/conftest.one &&
7614 - test -s conftest.dir/conftest.two
7615 - then
7616 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
7617 - break 3
7618 - fi
7619 - fi
7620 - fi
7621 - done
7622 - done
7623 - ;;
7624 -esac
7625 -
7626 -done
7627 -IFS=$as_save_IFS
7628 -
7629 -rm -rf conftest.one conftest.two conftest.dir
7630 -
7631 -fi
7632 - if test "${ac_cv_path_install+set}" = set; then
7633 - INSTALL=$ac_cv_path_install
7634 - else
7635 - # As a last resort, use the slow shell script. Don't cache a
7636 - # value for INSTALL within a source directory, because that will
7637 - # break other packages using the cache if that directory is
7638 - # removed, or if the value is a relative name.
7639 - INSTALL=$ac_install_sh
7640 - fi
7641 -fi
7642 -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
7643 -$as_echo "$INSTALL" >&6; }
7644 -
7645 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
7646 -# It thinks the first close brace ends the variable substitution.
7647 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
7648 -
7649 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
7650 -
7651 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
7652 -
7653 -if test "x$CC" != xcc; then
7654 - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
7655 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
7656 -else
7657 - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
7658 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
7659 -fi
7660 -set dummy $CC; ac_cc=`$as_echo "$2" |
7661 - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
7662 -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
7663 - $as_echo_n "(cached) " >&6
7664 -else
7665 - cat >conftest.$ac_ext <<_ACEOF
7666 -/* confdefs.h. */
7667 -_ACEOF
7668 -cat confdefs.h >>conftest.$ac_ext
7669 -cat >>conftest.$ac_ext <<_ACEOF
7670 -/* end confdefs.h. */
7671 -
7672 -int
7673 -main ()
7674 -{
7675 -
7676 - ;
7677 - return 0;
7678 -}
7679 -_ACEOF
7680 -# Make sure it works both with $CC and with simple cc.
7681 -# We do the test twice because some compilers refuse to overwrite an
7682 -# existing .o file with -o, though they will create one.
7683 -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
7684 -rm -f conftest2.*
7685 -if { (case "(($ac_try" in
7686 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7687 - *) ac_try_echo=$ac_try;;
7688 -esac
7689 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7690 -$as_echo "$ac_try_echo") >&5
7691 - (eval "$ac_try") 2>&5
7692 - ac_status=$?
7693 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7694 - (exit $ac_status); } &&
7695 - test -f conftest2.$ac_objext && { (case "(($ac_try" in
7696 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7697 - *) ac_try_echo=$ac_try;;
7698 -esac
7699 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7700 -$as_echo "$ac_try_echo") >&5
7701 - (eval "$ac_try") 2>&5
7702 - ac_status=$?
7703 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7704 - (exit $ac_status); };
7705 -then
7706 - eval ac_cv_prog_cc_${ac_cc}_c_o=yes
7707 - if test "x$CC" != xcc; then
7708 - # Test first that cc exists at all.
7709 - if { ac_try='cc -c conftest.$ac_ext >&5'
7710 - { (case "(($ac_try" in
7711 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7712 - *) ac_try_echo=$ac_try;;
7713 -esac
7714 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7715 -$as_echo "$ac_try_echo") >&5
7716 - (eval "$ac_try") 2>&5
7717 - ac_status=$?
7718 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7719 - (exit $ac_status); }; }; then
7720 - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
7721 - rm -f conftest2.*
7722 - if { (case "(($ac_try" in
7723 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7724 - *) ac_try_echo=$ac_try;;
7725 -esac
7726 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7727 -$as_echo "$ac_try_echo") >&5
7728 - (eval "$ac_try") 2>&5
7729 - ac_status=$?
7730 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7731 - (exit $ac_status); } &&
7732 - test -f conftest2.$ac_objext && { (case "(($ac_try" in
7733 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
7734 - *) ac_try_echo=$ac_try;;
7735 -esac
7736 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
7737 -$as_echo "$ac_try_echo") >&5
7738 - (eval "$ac_try") 2>&5
7739 - ac_status=$?
7740 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
7741 - (exit $ac_status); };
7742 - then
7743 - # cc works too.
7744 - :
7745 - else
7746 - # cc exists but doesn't like -o.
7747 - eval ac_cv_prog_cc_${ac_cc}_c_o=no
7748 - fi
7749 - fi
7750 - fi
7751 -else
7752 - eval ac_cv_prog_cc_${ac_cc}_c_o=no
7753 -fi
7754 -rm -f core conftest*
7755 -
7756 -fi
7757 -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
7758 - { $as_echo "$as_me:$LINENO: result: yes" >&5
7759 -$as_echo "yes" >&6; }
7760 -else
7761 - { $as_echo "$as_me:$LINENO: result: no" >&5
7762 -$as_echo "no" >&6; }
7763 -
7764 -cat >>confdefs.h <<\_ACEOF
7765 -#define NO_MINUS_C_MINUS_O 1
7766 -_ACEOF
7767 -
7768 -fi
7769 -
7770 -# FIXME: we rely on the cache variable name because
7771 -# there is no other way.
7772 -set dummy $CC
7773 -ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
7774 -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
7775 - # Losing compiler, so override with the script.
7776 - # FIXME: It is wrong to rewrite CC.
7777 - # But if we don't then we get into trouble of one sort or another.
7778 - # A longer-term fix would be to have automake use am__CC in this case,
7779 - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
7780 - CC="$am_aux_dir/compile $CC"
7781 -fi
7782 -
7783 -
7784 -
7785 -# Check whether --enable-shared was given.
7786 -if test "${enable_shared+set}" = set; then
7787 - enableval=$enable_shared; p=${PACKAGE-default}
7788 - case $enableval in
7789 - yes) enable_shared=yes ;;
7790 - no) enable_shared=no ;;
7791 - *)
7792 - enable_shared=no
7793 - # Look at the argument we got. We use all the common list separators.
7794 - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
7795 - for pkg in $enableval; do
7796 - IFS="$lt_save_ifs"
7797 - if test "X$pkg" = "X$p"; then
7798 - enable_shared=yes
7799 - fi
7800 - done
7801 - IFS="$lt_save_ifs"
7802 - ;;
7803 - esac
7804 -else
7805 - enable_shared=no
7806 -fi
7807 -
7808 -
7809 -
7810 -
7811 -
7812 -
7813 -
7814 -
7815 -
7816 -case `pwd` in
7817 - *\ * | *\ *)
7818 - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
7819 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
7820 -esac
7821 -
7822 -
7823 -
7824 -macro_version='2.2.6'
7825 -macro_revision='1.3012'
7826 -
7827 -
7828 -
7829 -
7830 -
7831 -
7832 -
7833 -
7834 -
7835 -
7836 -
7837 -
7838 -
7839 -ltmain="$ac_aux_dir/ltmain.sh"
7840 -
7841 { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
7842 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
7843 if test "${ac_cv_path_SED+set}" = set; then
7844 @@ -6285,13 +4518,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
7845 else
7846 lt_cv_nm_interface="BSD nm"
7847 echo "int some_variable = 0;" > conftest.$ac_ext
7848 - (eval echo "\"\$as_me:6288: $ac_compile\"" >&5)
7849 + (eval echo "\"\$as_me:4521: $ac_compile\"" >&5)
7850 (eval "$ac_compile" 2>conftest.err)
7851 cat conftest.err >&5
7852 - (eval echo "\"\$as_me:6291: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
7853 + (eval echo "\"\$as_me:4524: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
7854 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
7855 cat conftest.err >&5
7856 - (eval echo "\"\$as_me:6294: output\"" >&5)
7857 + (eval echo "\"\$as_me:4527: output\"" >&5)
7858 cat conftest.out >&5
7859 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
7860 lt_cv_nm_interface="MS dumpbin"
7861 @@ -7465,6 +5698,7 @@ fi
7862
7863
7864
7865 +
7866 # Check whether --enable-libtool-lock was given.
7867 if test "${enable_libtool_lock+set}" = set; then
7868 enableval=$enable_libtool_lock;
7869 @@ -7496,7 +5730,7 @@ ia64-*-hpux*)
7870 ;;
7871 *-*-irix6*)
7872 # Find out which ABI we are using.
7873 - echo '#line 7499 "configure"' > conftest.$ac_ext
7874 + echo '#line 5733 "configure"' > conftest.$ac_ext
7875 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7876 (eval $ac_compile) 2>&5
7877 ac_status=$?
7878 @@ -8863,6 +7097,36 @@ done
7879 enable_win32_dll=no
7880
7881
7882 + # Check whether --enable-shared was given.
7883 +if test "${enable_shared+set}" = set; then
7884 + enableval=$enable_shared; p=${PACKAGE-default}
7885 + case $enableval in
7886 + yes) enable_shared=yes ;;
7887 + no) enable_shared=no ;;
7888 + *)
7889 + enable_shared=no
7890 + # Look at the argument we got. We use all the common list separators.
7891 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
7892 + for pkg in $enableval; do
7893 + IFS="$lt_save_ifs"
7894 + if test "X$pkg" = "X$p"; then
7895 + enable_shared=yes
7896 + fi
7897 + done
7898 + IFS="$lt_save_ifs"
7899 + ;;
7900 + esac
7901 +else
7902 + enable_shared=yes
7903 +fi
7904 +
7905 +
7906 +
7907 +
7908 +
7909 +
7910 +
7911 +
7912
7913 # Check whether --enable-static was given.
7914 if test "${enable_static+set}" = set; then
7915 @@ -9319,11 +7583,11 @@ else
7916 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7917 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7918 -e 's:$: $lt_compiler_flag:'`
7919 - (eval echo "\"\$as_me:9322: $lt_compile\"" >&5)
7920 + (eval echo "\"\$as_me:7586: $lt_compile\"" >&5)
7921 (eval "$lt_compile" 2>conftest.err)
7922 ac_status=$?
7923 cat conftest.err >&5
7924 - echo "$as_me:9326: \$? = $ac_status" >&5
7925 + echo "$as_me:7590: \$? = $ac_status" >&5
7926 if (exit $ac_status) && test -s "$ac_outfile"; then
7927 # The compiler can only warn and ignore the option if not recognized
7928 # So say no if there are warnings other than the usual output.
7929 @@ -9658,11 +7922,11 @@ else
7930 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7931 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7932 -e 's:$: $lt_compiler_flag:'`
7933 - (eval echo "\"\$as_me:9661: $lt_compile\"" >&5)
7934 + (eval echo "\"\$as_me:7925: $lt_compile\"" >&5)
7935 (eval "$lt_compile" 2>conftest.err)
7936 ac_status=$?
7937 cat conftest.err >&5
7938 - echo "$as_me:9665: \$? = $ac_status" >&5
7939 + echo "$as_me:7929: \$? = $ac_status" >&5
7940 if (exit $ac_status) && test -s "$ac_outfile"; then
7941 # The compiler can only warn and ignore the option if not recognized
7942 # So say no if there are warnings other than the usual output.
7943 @@ -9763,11 +8027,11 @@ else
7944 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7945 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7946 -e 's:$: $lt_compiler_flag:'`
7947 - (eval echo "\"\$as_me:9766: $lt_compile\"" >&5)
7948 + (eval echo "\"\$as_me:8030: $lt_compile\"" >&5)
7949 (eval "$lt_compile" 2>out/conftest.err)
7950 ac_status=$?
7951 cat out/conftest.err >&5
7952 - echo "$as_me:9770: \$? = $ac_status" >&5
7953 + echo "$as_me:8034: \$? = $ac_status" >&5
7954 if (exit $ac_status) && test -s out/conftest2.$ac_objext
7955 then
7956 # The compiler can only warn and ignore the option if not recognized
7957 @@ -9818,11 +8082,11 @@ else
7958 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7959 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7960 -e 's:$: $lt_compiler_flag:'`
7961 - (eval echo "\"\$as_me:9821: $lt_compile\"" >&5)
7962 + (eval echo "\"\$as_me:8085: $lt_compile\"" >&5)
7963 (eval "$lt_compile" 2>out/conftest.err)
7964 ac_status=$?
7965 cat out/conftest.err >&5
7966 - echo "$as_me:9825: \$? = $ac_status" >&5
7967 + echo "$as_me:8089: \$? = $ac_status" >&5
7968 if (exit $ac_status) && test -s out/conftest2.$ac_objext
7969 then
7970 # The compiler can only warn and ignore the option if not recognized
7971 @@ -11670,10 +9934,13 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
7972 # before this can be enabled.
7973 hardcode_into_libs=yes
7974
7975 + # Add ABI-specific directories to the system library path.
7976 + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
7977 +
7978 # Append ld.so.conf contents to the search path
7979 if test -f /etc/ld.so.conf; then
7980 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
7981 - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
7982 + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
7983 fi
7984
7985 # We used to test for /lib/ld.so.1 and disable shared libraries on
7986 @@ -12618,7 +10885,7 @@ else
7987 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7988 lt_status=$lt_dlunknown
7989 cat > conftest.$ac_ext <<_LT_EOF
7990 -#line 12621 "configure"
7991 +#line 10888 "configure"
7992 #include "confdefs.h"
7993
7994 #if HAVE_DLFCN_H
7995 @@ -12714,7 +10981,7 @@ else
7996 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
7997 lt_status=$lt_dlunknown
7998 cat > conftest.$ac_ext <<_LT_EOF
7999 -#line 12717 "configure"
8000 +#line 10984 "configure"
8001 #include "confdefs.h"
8002
8003 #if HAVE_DLFCN_H
8004 @@ -12942,6 +11209,4095 @@ CC="$lt_save_CC"
8005
8006
8007
8008 +
8009 +
8010 +
8011 +
8012 +
8013 +
8014 +
8015 +{ $as_echo "$as_me:$LINENO: checking which extension is used for runtime loadable modules" >&5
8016 +$as_echo_n "checking which extension is used for runtime loadable modules... " >&6; }
8017 +if test "${libltdl_cv_shlibext+set}" = set; then
8018 + $as_echo_n "(cached) " >&6
8019 +else
8020 +
8021 +module=yes
8022 +eval libltdl_cv_shlibext=$shrext_cmds
8023 +
8024 +fi
8025 +{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
8026 +$as_echo "$libltdl_cv_shlibext" >&6; }
8027 +if test -n "$libltdl_cv_shlibext"; then
8028 +
8029 +cat >>confdefs.h <<_ACEOF
8030 +#define LT_MODULE_EXT "$libltdl_cv_shlibext"
8031 +_ACEOF
8032 +
8033 +fi
8034 +
8035 +{ $as_echo "$as_me:$LINENO: checking which variable specifies run-time module search path" >&5
8036 +$as_echo_n "checking which variable specifies run-time module search path... " >&6; }
8037 +if test "${lt_cv_module_path_var+set}" = set; then
8038 + $as_echo_n "(cached) " >&6
8039 +else
8040 + lt_cv_module_path_var="$shlibpath_var"
8041 +fi
8042 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_module_path_var" >&5
8043 +$as_echo "$lt_cv_module_path_var" >&6; }
8044 +if test -n "$lt_cv_module_path_var"; then
8045 +
8046 +cat >>confdefs.h <<_ACEOF
8047 +#define LT_MODULE_PATH_VAR "$lt_cv_module_path_var"
8048 +_ACEOF
8049 +
8050 +fi
8051 +
8052 +{ $as_echo "$as_me:$LINENO: checking for the default library search path" >&5
8053 +$as_echo_n "checking for the default library search path... " >&6; }
8054 +if test "${lt_cv_sys_dlsearch_path+set}" = set; then
8055 + $as_echo_n "(cached) " >&6
8056 +else
8057 + lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"
8058 +fi
8059 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_dlsearch_path" >&5
8060 +$as_echo "$lt_cv_sys_dlsearch_path" >&6; }
8061 +if test -n "$lt_cv_sys_dlsearch_path"; then
8062 + sys_dlsearch_path=
8063 + for dir in $lt_cv_sys_dlsearch_path; do
8064 + if test -z "$sys_dlsearch_path"; then
8065 + sys_dlsearch_path="$dir"
8066 + else
8067 + sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
8068 + fi
8069 + done
8070 +
8071 +cat >>confdefs.h <<_ACEOF
8072 +#define LT_DLSEARCH_PATH "$sys_dlsearch_path"
8073 +_ACEOF
8074 +
8075 +fi
8076 +
8077 +
8078 +LT_DLLOADERS=
8079 +
8080 +
8081 +ac_ext=c
8082 +ac_cpp='$CPP $CPPFLAGS'
8083 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8084 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8085 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8086 +
8087 +
8088 +LIBADD_DLOPEN=
8089 +{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
8090 +$as_echo_n "checking for library containing dlopen... " >&6; }
8091 +if test "${ac_cv_search_dlopen+set}" = set; then
8092 + $as_echo_n "(cached) " >&6
8093 +else
8094 + ac_func_search_save_LIBS=$LIBS
8095 +cat >conftest.$ac_ext <<_ACEOF
8096 +/* confdefs.h. */
8097 +_ACEOF
8098 +cat confdefs.h >>conftest.$ac_ext
8099 +cat >>conftest.$ac_ext <<_ACEOF
8100 +/* end confdefs.h. */
8101 +
8102 +/* Override any GCC internal prototype to avoid an error.
8103 + Use char because int might match the return type of a GCC
8104 + builtin and then its argument prototype would still apply. */
8105 +#ifdef __cplusplus
8106 +extern "C"
8107 +#endif
8108 +char dlopen ();
8109 +int
8110 +main ()
8111 +{
8112 +return dlopen ();
8113 + ;
8114 + return 0;
8115 +}
8116 +_ACEOF
8117 +for ac_lib in '' dl; do
8118 + if test -z "$ac_lib"; then
8119 + ac_res="none required"
8120 + else
8121 + ac_res=-l$ac_lib
8122 + LIBS="-l$ac_lib $ac_func_search_save_LIBS"
8123 + fi
8124 + rm -f conftest.$ac_objext conftest$ac_exeext
8125 +if { (ac_try="$ac_link"
8126 +case "(($ac_try" in
8127 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8128 + *) ac_try_echo=$ac_try;;
8129 +esac
8130 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8131 +$as_echo "$ac_try_echo") >&5
8132 + (eval "$ac_link") 2>conftest.er1
8133 + ac_status=$?
8134 + grep -v '^ *+' conftest.er1 >conftest.err
8135 + rm -f conftest.er1
8136 + cat conftest.err >&5
8137 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8138 + (exit $ac_status); } && {
8139 + test -z "$ac_c_werror_flag" ||
8140 + test ! -s conftest.err
8141 + } && test -s conftest$ac_exeext && {
8142 + test "$cross_compiling" = yes ||
8143 + $as_test_x conftest$ac_exeext
8144 + }; then
8145 + ac_cv_search_dlopen=$ac_res
8146 +else
8147 + $as_echo "$as_me: failed program was:" >&5
8148 +sed 's/^/| /' conftest.$ac_ext >&5
8149 +
8150 +
8151 +fi
8152 +
8153 +rm -rf conftest.dSYM
8154 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8155 + conftest$ac_exeext
8156 + if test "${ac_cv_search_dlopen+set}" = set; then
8157 + break
8158 +fi
8159 +done
8160 +if test "${ac_cv_search_dlopen+set}" = set; then
8161 + :
8162 +else
8163 + ac_cv_search_dlopen=no
8164 +fi
8165 +rm conftest.$ac_ext
8166 +LIBS=$ac_func_search_save_LIBS
8167 +fi
8168 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
8169 +$as_echo "$ac_cv_search_dlopen" >&6; }
8170 +ac_res=$ac_cv_search_dlopen
8171 +if test "$ac_res" != no; then
8172 + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
8173 +
8174 +cat >>confdefs.h <<\_ACEOF
8175 +#define HAVE_LIBDL 1
8176 +_ACEOF
8177 +
8178 + if test "$ac_cv_search_dlopen" != "none required" ; then
8179 + LIBADD_DLOPEN="-ldl"
8180 + fi
8181 + libltdl_cv_lib_dl_dlopen="yes"
8182 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
8183 +else
8184 + cat >conftest.$ac_ext <<_ACEOF
8185 +/* confdefs.h. */
8186 +_ACEOF
8187 +cat confdefs.h >>conftest.$ac_ext
8188 +cat >>conftest.$ac_ext <<_ACEOF
8189 +/* end confdefs.h. */
8190 +#if HAVE_DLFCN_H
8191 +# include <dlfcn.h>
8192 +#endif
8193 +
8194 +int
8195 +main ()
8196 +{
8197 +dlopen(0, 0);
8198 + ;
8199 + return 0;
8200 +}
8201 +_ACEOF
8202 +rm -f conftest.$ac_objext conftest$ac_exeext
8203 +if { (ac_try="$ac_link"
8204 +case "(($ac_try" in
8205 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8206 + *) ac_try_echo=$ac_try;;
8207 +esac
8208 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8209 +$as_echo "$ac_try_echo") >&5
8210 + (eval "$ac_link") 2>conftest.er1
8211 + ac_status=$?
8212 + grep -v '^ *+' conftest.er1 >conftest.err
8213 + rm -f conftest.er1
8214 + cat conftest.err >&5
8215 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8216 + (exit $ac_status); } && {
8217 + test -z "$ac_c_werror_flag" ||
8218 + test ! -s conftest.err
8219 + } && test -s conftest$ac_exeext && {
8220 + test "$cross_compiling" = yes ||
8221 + $as_test_x conftest$ac_exeext
8222 + }; then
8223 +
8224 +cat >>confdefs.h <<\_ACEOF
8225 +#define HAVE_LIBDL 1
8226 +_ACEOF
8227 +
8228 + libltdl_cv_func_dlopen="yes"
8229 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
8230 +else
8231 + $as_echo "$as_me: failed program was:" >&5
8232 +sed 's/^/| /' conftest.$ac_ext >&5
8233 +
8234 + { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
8235 +$as_echo_n "checking for dlopen in -lsvld... " >&6; }
8236 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then
8237 + $as_echo_n "(cached) " >&6
8238 +else
8239 + ac_check_lib_save_LIBS=$LIBS
8240 +LIBS="-lsvld $LIBS"
8241 +cat >conftest.$ac_ext <<_ACEOF
8242 +/* confdefs.h. */
8243 +_ACEOF
8244 +cat confdefs.h >>conftest.$ac_ext
8245 +cat >>conftest.$ac_ext <<_ACEOF
8246 +/* end confdefs.h. */
8247 +
8248 +/* Override any GCC internal prototype to avoid an error.
8249 + Use char because int might match the return type of a GCC
8250 + builtin and then its argument prototype would still apply. */
8251 +#ifdef __cplusplus
8252 +extern "C"
8253 +#endif
8254 +char dlopen ();
8255 +int
8256 +main ()
8257 +{
8258 +return dlopen ();
8259 + ;
8260 + return 0;
8261 +}
8262 +_ACEOF
8263 +rm -f conftest.$ac_objext conftest$ac_exeext
8264 +if { (ac_try="$ac_link"
8265 +case "(($ac_try" in
8266 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8267 + *) ac_try_echo=$ac_try;;
8268 +esac
8269 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8270 +$as_echo "$ac_try_echo") >&5
8271 + (eval "$ac_link") 2>conftest.er1
8272 + ac_status=$?
8273 + grep -v '^ *+' conftest.er1 >conftest.err
8274 + rm -f conftest.er1
8275 + cat conftest.err >&5
8276 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8277 + (exit $ac_status); } && {
8278 + test -z "$ac_c_werror_flag" ||
8279 + test ! -s conftest.err
8280 + } && test -s conftest$ac_exeext && {
8281 + test "$cross_compiling" = yes ||
8282 + $as_test_x conftest$ac_exeext
8283 + }; then
8284 + ac_cv_lib_svld_dlopen=yes
8285 +else
8286 + $as_echo "$as_me: failed program was:" >&5
8287 +sed 's/^/| /' conftest.$ac_ext >&5
8288 +
8289 + ac_cv_lib_svld_dlopen=no
8290 +fi
8291 +
8292 +rm -rf conftest.dSYM
8293 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8294 + conftest$ac_exeext conftest.$ac_ext
8295 +LIBS=$ac_check_lib_save_LIBS
8296 +fi
8297 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
8298 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
8299 +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
8300 +
8301 +cat >>confdefs.h <<\_ACEOF
8302 +#define HAVE_LIBDL 1
8303 +_ACEOF
8304 +
8305 + LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
8306 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
8307 +fi
8308 +
8309 +fi
8310 +
8311 +rm -rf conftest.dSYM
8312 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8313 + conftest$ac_exeext conftest.$ac_ext
8314 +fi
8315 +
8316 +if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
8317 +then
8318 + lt_save_LIBS="$LIBS"
8319 + LIBS="$LIBS $LIBADD_DLOPEN"
8320 +
8321 +for ac_func in dlerror
8322 +do
8323 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
8324 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
8325 +$as_echo_n "checking for $ac_func... " >&6; }
8326 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
8327 + $as_echo_n "(cached) " >&6
8328 +else
8329 + cat >conftest.$ac_ext <<_ACEOF
8330 +/* confdefs.h. */
8331 +_ACEOF
8332 +cat confdefs.h >>conftest.$ac_ext
8333 +cat >>conftest.$ac_ext <<_ACEOF
8334 +/* end confdefs.h. */
8335 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
8336 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
8337 +#define $ac_func innocuous_$ac_func
8338 +
8339 +/* System header to define __stub macros and hopefully few prototypes,
8340 + which can conflict with char $ac_func (); below.
8341 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8342 + <limits.h> exists even on freestanding compilers. */
8343 +
8344 +#ifdef __STDC__
8345 +# include <limits.h>
8346 +#else
8347 +# include <assert.h>
8348 +#endif
8349 +
8350 +#undef $ac_func
8351 +
8352 +/* Override any GCC internal prototype to avoid an error.
8353 + Use char because int might match the return type of a GCC
8354 + builtin and then its argument prototype would still apply. */
8355 +#ifdef __cplusplus
8356 +extern "C"
8357 +#endif
8358 +char $ac_func ();
8359 +/* The GNU C library defines this for functions which it implements
8360 + to always fail with ENOSYS. Some functions are actually named
8361 + something starting with __ and the normal name is an alias. */
8362 +#if defined __stub_$ac_func || defined __stub___$ac_func
8363 +choke me
8364 +#endif
8365 +
8366 +int
8367 +main ()
8368 +{
8369 +return $ac_func ();
8370 + ;
8371 + return 0;
8372 +}
8373 +_ACEOF
8374 +rm -f conftest.$ac_objext conftest$ac_exeext
8375 +if { (ac_try="$ac_link"
8376 +case "(($ac_try" in
8377 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8378 + *) ac_try_echo=$ac_try;;
8379 +esac
8380 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8381 +$as_echo "$ac_try_echo") >&5
8382 + (eval "$ac_link") 2>conftest.er1
8383 + ac_status=$?
8384 + grep -v '^ *+' conftest.er1 >conftest.err
8385 + rm -f conftest.er1
8386 + cat conftest.err >&5
8387 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8388 + (exit $ac_status); } && {
8389 + test -z "$ac_c_werror_flag" ||
8390 + test ! -s conftest.err
8391 + } && test -s conftest$ac_exeext && {
8392 + test "$cross_compiling" = yes ||
8393 + $as_test_x conftest$ac_exeext
8394 + }; then
8395 + eval "$as_ac_var=yes"
8396 +else
8397 + $as_echo "$as_me: failed program was:" >&5
8398 +sed 's/^/| /' conftest.$ac_ext >&5
8399 +
8400 + eval "$as_ac_var=no"
8401 +fi
8402 +
8403 +rm -rf conftest.dSYM
8404 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8405 + conftest$ac_exeext conftest.$ac_ext
8406 +fi
8407 +ac_res=`eval 'as_val=${'$as_ac_var'}
8408 + $as_echo "$as_val"'`
8409 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
8410 +$as_echo "$ac_res" >&6; }
8411 +as_val=`eval 'as_val=${'$as_ac_var'}
8412 + $as_echo "$as_val"'`
8413 + if test "x$as_val" = x""yes; then
8414 + cat >>confdefs.h <<_ACEOF
8415 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
8416 +_ACEOF
8417 +
8418 +fi
8419 +done
8420 +
8421 + LIBS="$lt_save_LIBS"
8422 +fi
8423 +
8424 +
8425 +LIBADD_SHL_LOAD=
8426 +{ $as_echo "$as_me:$LINENO: checking for shl_load" >&5
8427 +$as_echo_n "checking for shl_load... " >&6; }
8428 +if test "${ac_cv_func_shl_load+set}" = set; then
8429 + $as_echo_n "(cached) " >&6
8430 +else
8431 + cat >conftest.$ac_ext <<_ACEOF
8432 +/* confdefs.h. */
8433 +_ACEOF
8434 +cat confdefs.h >>conftest.$ac_ext
8435 +cat >>conftest.$ac_ext <<_ACEOF
8436 +/* end confdefs.h. */
8437 +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
8438 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
8439 +#define shl_load innocuous_shl_load
8440 +
8441 +/* System header to define __stub macros and hopefully few prototypes,
8442 + which can conflict with char shl_load (); below.
8443 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8444 + <limits.h> exists even on freestanding compilers. */
8445 +
8446 +#ifdef __STDC__
8447 +# include <limits.h>
8448 +#else
8449 +# include <assert.h>
8450 +#endif
8451 +
8452 +#undef shl_load
8453 +
8454 +/* Override any GCC internal prototype to avoid an error.
8455 + Use char because int might match the return type of a GCC
8456 + builtin and then its argument prototype would still apply. */
8457 +#ifdef __cplusplus
8458 +extern "C"
8459 +#endif
8460 +char shl_load ();
8461 +/* The GNU C library defines this for functions which it implements
8462 + to always fail with ENOSYS. Some functions are actually named
8463 + something starting with __ and the normal name is an alias. */
8464 +#if defined __stub_shl_load || defined __stub___shl_load
8465 +choke me
8466 +#endif
8467 +
8468 +int
8469 +main ()
8470 +{
8471 +return shl_load ();
8472 + ;
8473 + return 0;
8474 +}
8475 +_ACEOF
8476 +rm -f conftest.$ac_objext conftest$ac_exeext
8477 +if { (ac_try="$ac_link"
8478 +case "(($ac_try" in
8479 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8480 + *) ac_try_echo=$ac_try;;
8481 +esac
8482 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8483 +$as_echo "$ac_try_echo") >&5
8484 + (eval "$ac_link") 2>conftest.er1
8485 + ac_status=$?
8486 + grep -v '^ *+' conftest.er1 >conftest.err
8487 + rm -f conftest.er1
8488 + cat conftest.err >&5
8489 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8490 + (exit $ac_status); } && {
8491 + test -z "$ac_c_werror_flag" ||
8492 + test ! -s conftest.err
8493 + } && test -s conftest$ac_exeext && {
8494 + test "$cross_compiling" = yes ||
8495 + $as_test_x conftest$ac_exeext
8496 + }; then
8497 + ac_cv_func_shl_load=yes
8498 +else
8499 + $as_echo "$as_me: failed program was:" >&5
8500 +sed 's/^/| /' conftest.$ac_ext >&5
8501 +
8502 + ac_cv_func_shl_load=no
8503 +fi
8504 +
8505 +rm -rf conftest.dSYM
8506 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8507 + conftest$ac_exeext conftest.$ac_ext
8508 +fi
8509 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
8510 +$as_echo "$ac_cv_func_shl_load" >&6; }
8511 +if test "x$ac_cv_func_shl_load" = x""yes; then
8512 +
8513 +cat >>confdefs.h <<\_ACEOF
8514 +#define HAVE_SHL_LOAD 1
8515 +_ACEOF
8516 +
8517 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
8518 +else
8519 + { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
8520 +$as_echo_n "checking for shl_load in -ldld... " >&6; }
8521 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then
8522 + $as_echo_n "(cached) " >&6
8523 +else
8524 + ac_check_lib_save_LIBS=$LIBS
8525 +LIBS="-ldld $LIBS"
8526 +cat >conftest.$ac_ext <<_ACEOF
8527 +/* confdefs.h. */
8528 +_ACEOF
8529 +cat confdefs.h >>conftest.$ac_ext
8530 +cat >>conftest.$ac_ext <<_ACEOF
8531 +/* end confdefs.h. */
8532 +
8533 +/* Override any GCC internal prototype to avoid an error.
8534 + Use char because int might match the return type of a GCC
8535 + builtin and then its argument prototype would still apply. */
8536 +#ifdef __cplusplus
8537 +extern "C"
8538 +#endif
8539 +char shl_load ();
8540 +int
8541 +main ()
8542 +{
8543 +return shl_load ();
8544 + ;
8545 + return 0;
8546 +}
8547 +_ACEOF
8548 +rm -f conftest.$ac_objext conftest$ac_exeext
8549 +if { (ac_try="$ac_link"
8550 +case "(($ac_try" in
8551 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8552 + *) ac_try_echo=$ac_try;;
8553 +esac
8554 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8555 +$as_echo "$ac_try_echo") >&5
8556 + (eval "$ac_link") 2>conftest.er1
8557 + ac_status=$?
8558 + grep -v '^ *+' conftest.er1 >conftest.err
8559 + rm -f conftest.er1
8560 + cat conftest.err >&5
8561 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8562 + (exit $ac_status); } && {
8563 + test -z "$ac_c_werror_flag" ||
8564 + test ! -s conftest.err
8565 + } && test -s conftest$ac_exeext && {
8566 + test "$cross_compiling" = yes ||
8567 + $as_test_x conftest$ac_exeext
8568 + }; then
8569 + ac_cv_lib_dld_shl_load=yes
8570 +else
8571 + $as_echo "$as_me: failed program was:" >&5
8572 +sed 's/^/| /' conftest.$ac_ext >&5
8573 +
8574 + ac_cv_lib_dld_shl_load=no
8575 +fi
8576 +
8577 +rm -rf conftest.dSYM
8578 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8579 + conftest$ac_exeext conftest.$ac_ext
8580 +LIBS=$ac_check_lib_save_LIBS
8581 +fi
8582 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
8583 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
8584 +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
8585 +
8586 +cat >>confdefs.h <<\_ACEOF
8587 +#define HAVE_SHL_LOAD 1
8588 +_ACEOF
8589 +
8590 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
8591 + LIBADD_SHL_LOAD="-ldld"
8592 +fi
8593 +
8594 +fi
8595 +
8596 +
8597 +
8598 +case $host_os in
8599 +darwin[1567].*)
8600 +# We only want this for pre-Mac OS X 10.4.
8601 + { $as_echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
8602 +$as_echo_n "checking for _dyld_func_lookup... " >&6; }
8603 +if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
8604 + $as_echo_n "(cached) " >&6
8605 +else
8606 + cat >conftest.$ac_ext <<_ACEOF
8607 +/* confdefs.h. */
8608 +_ACEOF
8609 +cat confdefs.h >>conftest.$ac_ext
8610 +cat >>conftest.$ac_ext <<_ACEOF
8611 +/* end confdefs.h. */
8612 +/* Define _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
8613 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
8614 +#define _dyld_func_lookup innocuous__dyld_func_lookup
8615 +
8616 +/* System header to define __stub macros and hopefully few prototypes,
8617 + which can conflict with char _dyld_func_lookup (); below.
8618 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
8619 + <limits.h> exists even on freestanding compilers. */
8620 +
8621 +#ifdef __STDC__
8622 +# include <limits.h>
8623 +#else
8624 +# include <assert.h>
8625 +#endif
8626 +
8627 +#undef _dyld_func_lookup
8628 +
8629 +/* Override any GCC internal prototype to avoid an error.
8630 + Use char because int might match the return type of a GCC
8631 + builtin and then its argument prototype would still apply. */
8632 +#ifdef __cplusplus
8633 +extern "C"
8634 +#endif
8635 +char _dyld_func_lookup ();
8636 +/* The GNU C library defines this for functions which it implements
8637 + to always fail with ENOSYS. Some functions are actually named
8638 + something starting with __ and the normal name is an alias. */
8639 +#if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
8640 +choke me
8641 +#endif
8642 +
8643 +int
8644 +main ()
8645 +{
8646 +return _dyld_func_lookup ();
8647 + ;
8648 + return 0;
8649 +}
8650 +_ACEOF
8651 +rm -f conftest.$ac_objext conftest$ac_exeext
8652 +if { (ac_try="$ac_link"
8653 +case "(($ac_try" in
8654 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8655 + *) ac_try_echo=$ac_try;;
8656 +esac
8657 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8658 +$as_echo "$ac_try_echo") >&5
8659 + (eval "$ac_link") 2>conftest.er1
8660 + ac_status=$?
8661 + grep -v '^ *+' conftest.er1 >conftest.err
8662 + rm -f conftest.er1
8663 + cat conftest.err >&5
8664 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8665 + (exit $ac_status); } && {
8666 + test -z "$ac_c_werror_flag" ||
8667 + test ! -s conftest.err
8668 + } && test -s conftest$ac_exeext && {
8669 + test "$cross_compiling" = yes ||
8670 + $as_test_x conftest$ac_exeext
8671 + }; then
8672 + ac_cv_func__dyld_func_lookup=yes
8673 +else
8674 + $as_echo "$as_me: failed program was:" >&5
8675 +sed 's/^/| /' conftest.$ac_ext >&5
8676 +
8677 + ac_cv_func__dyld_func_lookup=no
8678 +fi
8679 +
8680 +rm -rf conftest.dSYM
8681 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8682 + conftest$ac_exeext conftest.$ac_ext
8683 +fi
8684 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
8685 +$as_echo "$ac_cv_func__dyld_func_lookup" >&6; }
8686 +if test "x$ac_cv_func__dyld_func_lookup" = x""yes; then
8687 +
8688 +cat >>confdefs.h <<\_ACEOF
8689 +#define HAVE_DYLD 1
8690 +_ACEOF
8691 +
8692 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"
8693 +fi
8694 +
8695 + ;;
8696 +beos*)
8697 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
8698 + ;;
8699 +cygwin* | mingw* | os2* | pw32*)
8700 + { $as_echo "$as_me:$LINENO: checking whether cygwin_conv_path is declared" >&5
8701 +$as_echo_n "checking whether cygwin_conv_path is declared... " >&6; }
8702 +if test "${ac_cv_have_decl_cygwin_conv_path+set}" = set; then
8703 + $as_echo_n "(cached) " >&6
8704 +else
8705 + cat >conftest.$ac_ext <<_ACEOF
8706 +/* confdefs.h. */
8707 +_ACEOF
8708 +cat confdefs.h >>conftest.$ac_ext
8709 +cat >>conftest.$ac_ext <<_ACEOF
8710 +/* end confdefs.h. */
8711 +#include <sys/cygwin.h>
8712 +
8713 +int
8714 +main ()
8715 +{
8716 +#ifndef cygwin_conv_path
8717 + (void) cygwin_conv_path;
8718 +#endif
8719 +
8720 + ;
8721 + return 0;
8722 +}
8723 +_ACEOF
8724 +rm -f conftest.$ac_objext
8725 +if { (ac_try="$ac_compile"
8726 +case "(($ac_try" in
8727 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8728 + *) ac_try_echo=$ac_try;;
8729 +esac
8730 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8731 +$as_echo "$ac_try_echo") >&5
8732 + (eval "$ac_compile") 2>conftest.er1
8733 + ac_status=$?
8734 + grep -v '^ *+' conftest.er1 >conftest.err
8735 + rm -f conftest.er1
8736 + cat conftest.err >&5
8737 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8738 + (exit $ac_status); } && {
8739 + test -z "$ac_c_werror_flag" ||
8740 + test ! -s conftest.err
8741 + } && test -s conftest.$ac_objext; then
8742 + ac_cv_have_decl_cygwin_conv_path=yes
8743 +else
8744 + $as_echo "$as_me: failed program was:" >&5
8745 +sed 's/^/| /' conftest.$ac_ext >&5
8746 +
8747 + ac_cv_have_decl_cygwin_conv_path=no
8748 +fi
8749 +
8750 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
8751 +fi
8752 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_cygwin_conv_path" >&5
8753 +$as_echo "$ac_cv_have_decl_cygwin_conv_path" >&6; }
8754 +if test "x$ac_cv_have_decl_cygwin_conv_path" = x""yes; then
8755 +
8756 +cat >>confdefs.h <<_ACEOF
8757 +#define HAVE_DECL_CYGWIN_CONV_PATH 1
8758 +_ACEOF
8759 +
8760 +
8761 +else
8762 + cat >>confdefs.h <<_ACEOF
8763 +#define HAVE_DECL_CYGWIN_CONV_PATH 0
8764 +_ACEOF
8765 +
8766 +
8767 +fi
8768 +
8769 +
8770 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
8771 + ;;
8772 +esac
8773 +
8774 +{ $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
8775 +$as_echo_n "checking for dld_link in -ldld... " >&6; }
8776 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then
8777 + $as_echo_n "(cached) " >&6
8778 +else
8779 + ac_check_lib_save_LIBS=$LIBS
8780 +LIBS="-ldld $LIBS"
8781 +cat >conftest.$ac_ext <<_ACEOF
8782 +/* confdefs.h. */
8783 +_ACEOF
8784 +cat confdefs.h >>conftest.$ac_ext
8785 +cat >>conftest.$ac_ext <<_ACEOF
8786 +/* end confdefs.h. */
8787 +
8788 +/* Override any GCC internal prototype to avoid an error.
8789 + Use char because int might match the return type of a GCC
8790 + builtin and then its argument prototype would still apply. */
8791 +#ifdef __cplusplus
8792 +extern "C"
8793 +#endif
8794 +char dld_link ();
8795 +int
8796 +main ()
8797 +{
8798 +return dld_link ();
8799 + ;
8800 + return 0;
8801 +}
8802 +_ACEOF
8803 +rm -f conftest.$ac_objext conftest$ac_exeext
8804 +if { (ac_try="$ac_link"
8805 +case "(($ac_try" in
8806 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
8807 + *) ac_try_echo=$ac_try;;
8808 +esac
8809 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
8810 +$as_echo "$ac_try_echo") >&5
8811 + (eval "$ac_link") 2>conftest.er1
8812 + ac_status=$?
8813 + grep -v '^ *+' conftest.er1 >conftest.err
8814 + rm -f conftest.er1
8815 + cat conftest.err >&5
8816 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8817 + (exit $ac_status); } && {
8818 + test -z "$ac_c_werror_flag" ||
8819 + test ! -s conftest.err
8820 + } && test -s conftest$ac_exeext && {
8821 + test "$cross_compiling" = yes ||
8822 + $as_test_x conftest$ac_exeext
8823 + }; then
8824 + ac_cv_lib_dld_dld_link=yes
8825 +else
8826 + $as_echo "$as_me: failed program was:" >&5
8827 +sed 's/^/| /' conftest.$ac_ext >&5
8828 +
8829 + ac_cv_lib_dld_dld_link=no
8830 +fi
8831 +
8832 +rm -rf conftest.dSYM
8833 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
8834 + conftest$ac_exeext conftest.$ac_ext
8835 +LIBS=$ac_check_lib_save_LIBS
8836 +fi
8837 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
8838 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
8839 +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
8840 +
8841 +cat >>confdefs.h <<\_ACEOF
8842 +#define HAVE_DLD 1
8843 +_ACEOF
8844 +
8845 + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"
8846 +fi
8847 +
8848 +
8849 +
8850 +
8851 +LT_DLPREOPEN=
8852 +if test -n "$LT_DLLOADERS"
8853 +then
8854 + for lt_loader in $LT_DLLOADERS; do
8855 + LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
8856 + done
8857 +
8858 +cat >>confdefs.h <<\_ACEOF
8859 +#define HAVE_LIBDLLOADER 1
8860 +_ACEOF
8861 +
8862 +fi
8863 +
8864 +
8865 +LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
8866 +
8867 +
8868 +ac_ext=c
8869 +ac_cpp='$CPP $CPPFLAGS'
8870 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8871 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8872 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8873 +
8874 +
8875 +{ $as_echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
8876 +$as_echo_n "checking for _ prefix in compiled symbols... " >&6; }
8877 +if test "${lt_cv_sys_symbol_underscore+set}" = set; then
8878 + $as_echo_n "(cached) " >&6
8879 +else
8880 + lt_cv_sys_symbol_underscore=no
8881 + cat > conftest.$ac_ext <<_LT_EOF
8882 +void nm_test_func(){}
8883 +int main(){nm_test_func;return 0;}
8884 +_LT_EOF
8885 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8886 + (eval $ac_compile) 2>&5
8887 + ac_status=$?
8888 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8889 + (exit $ac_status); }; then
8890 + # Now try to grab the symbols.
8891 + ac_nlist=conftest.nm
8892 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
8893 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
8894 + ac_status=$?
8895 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
8896 + (exit $ac_status); } && test -s "$ac_nlist"; then
8897 + # See whether the symbols have a leading underscore.
8898 + if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
8899 + lt_cv_sys_symbol_underscore=yes
8900 + else
8901 + if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
8902 + :
8903 + else
8904 + echo "configure: cannot find nm_test_func in $ac_nlist" >&5
8905 + fi
8906 + fi
8907 + else
8908 + echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
8909 + fi
8910 + else
8911 + echo "configure: failed program was:" >&5
8912 + cat conftest.c >&5
8913 + fi
8914 + rm -rf conftest*
8915 +
8916 +fi
8917 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
8918 +$as_echo "$lt_cv_sys_symbol_underscore" >&6; }
8919 + sys_symbol_underscore=$lt_cv_sys_symbol_underscore
8920 +
8921 +
8922 +if test x"$lt_cv_sys_symbol_underscore" = xyes; then
8923 + if test x"$libltdl_cv_func_dlopen" = xyes ||
8924 + test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
8925 + { $as_echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
8926 +$as_echo_n "checking whether we have to add an underscore for dlsym... " >&6; }
8927 +if test "${libltdl_cv_need_uscore+set}" = set; then
8928 + $as_echo_n "(cached) " >&6
8929 +else
8930 + libltdl_cv_need_uscore=unknown
8931 + save_LIBS="$LIBS"
8932 + LIBS="$LIBS $LIBADD_DLOPEN"
8933 + if test "$cross_compiling" = yes; then :
8934 + libltdl_cv_need_uscore=cross
8935 +else
8936 + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
8937 + lt_status=$lt_dlunknown
8938 + cat > conftest.$ac_ext <<_LT_EOF
8939 +#line 12143 "configure"
8940 +#include "confdefs.h"
8941 +
8942 +#if HAVE_DLFCN_H
8943 +#include <dlfcn.h>
8944 +#endif
8945 +
8946 +#include <stdio.h>
8947 +
8948 +#ifdef RTLD_GLOBAL
8949 +# define LT_DLGLOBAL RTLD_GLOBAL
8950 +#else
8951 +# ifdef DL_GLOBAL
8952 +# define LT_DLGLOBAL DL_GLOBAL
8953 +# else
8954 +# define LT_DLGLOBAL 0
8955 +# endif
8956 +#endif
8957 +
8958 +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
8959 + find out it does not work in some platform. */
8960 +#ifndef LT_DLLAZY_OR_NOW
8961 +# ifdef RTLD_LAZY
8962 +# define LT_DLLAZY_OR_NOW RTLD_LAZY
8963 +# else
8964 +# ifdef DL_LAZY
8965 +# define LT_DLLAZY_OR_NOW DL_LAZY
8966 +# else
8967 +# ifdef RTLD_NOW
8968 +# define LT_DLLAZY_OR_NOW RTLD_NOW
8969 +# else
8970 +# ifdef DL_NOW
8971 +# define LT_DLLAZY_OR_NOW DL_NOW
8972 +# else
8973 +# define LT_DLLAZY_OR_NOW 0
8974 +# endif
8975 +# endif
8976 +# endif
8977 +# endif
8978 +#endif
8979 +
8980 +void fnord() { int i=42;}
8981 +int main ()
8982 +{
8983 + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
8984 + int status = $lt_dlunknown;
8985 +
8986 + if (self)
8987 + {
8988 + if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
8989 + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
8990 + /* dlclose (self); */
8991 + }
8992 + else
8993 + puts (dlerror ());
8994 +
8995 + return status;
8996 +}
8997 +_LT_EOF
8998 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8999 + (eval $ac_link) 2>&5
9000 + ac_status=$?
9001 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9002 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
9003 + (./conftest; exit; ) >&5 2>/dev/null
9004 + lt_status=$?
9005 + case x$lt_status in
9006 + x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
9007 + x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
9008 + x$lt_dlunknown|x*) ;;
9009 + esac
9010 + else :
9011 + # compilation failed
9012 +
9013 + fi
9014 +fi
9015 +rm -fr conftest*
9016 +
9017 + LIBS="$save_LIBS"
9018 +
9019 +fi
9020 +{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
9021 +$as_echo "$libltdl_cv_need_uscore" >&6; }
9022 + fi
9023 +fi
9024 +
9025 +if test x"$libltdl_cv_need_uscore" = xyes; then
9026 +
9027 +cat >>confdefs.h <<\_ACEOF
9028 +#define NEED_USCORE 1
9029 +_ACEOF
9030 +
9031 +fi
9032 +
9033 +{ $as_echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
9034 +$as_echo_n "checking whether deplibs are loaded by dlopen... " >&6; }
9035 +if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then
9036 + $as_echo_n "(cached) " >&6
9037 +else
9038 + # PORTME does your system automatically load deplibs for dlopen?
9039 + # or its logical equivalent (e.g. shl_load for HP-UX < 11)
9040 + # For now, we just catch OSes we know something about -- in the
9041 + # future, we'll try test this programmatically.
9042 + lt_cv_sys_dlopen_deplibs=unknown
9043 + case $host_os in
9044 + aix3*|aix4.1.*|aix4.2.*)
9045 + # Unknown whether this is true for these versions of AIX, but
9046 + # we want this `case' here to explicitly catch those versions.
9047 + lt_cv_sys_dlopen_deplibs=unknown
9048 + ;;
9049 + aix[4-9]*)
9050 + lt_cv_sys_dlopen_deplibs=yes
9051 + ;;
9052 + amigaos*)
9053 + case $host_cpu in
9054 + powerpc)
9055 + lt_cv_sys_dlopen_deplibs=no
9056 + ;;
9057 + esac
9058 + ;;
9059 + darwin*)
9060 + # Assuming the user has installed a libdl from somewhere, this is true
9061 + # If you are looking for one http://www.opendarwin.org/projects/dlcompat
9062 + lt_cv_sys_dlopen_deplibs=yes
9063 + ;;
9064 + freebsd* | dragonfly*)
9065 + lt_cv_sys_dlopen_deplibs=yes
9066 + ;;
9067 + gnu* | linux* | k*bsd*-gnu)
9068 + # GNU and its variants, using gnu ld.so (Glibc)
9069 + lt_cv_sys_dlopen_deplibs=yes
9070 + ;;
9071 + hpux10*|hpux11*)
9072 + lt_cv_sys_dlopen_deplibs=yes
9073 + ;;
9074 + interix*)
9075 + lt_cv_sys_dlopen_deplibs=yes
9076 + ;;
9077 + irix[12345]*|irix6.[01]*)
9078 + # Catch all versions of IRIX before 6.2, and indicate that we don't
9079 + # know how it worked for any of those versions.
9080 + lt_cv_sys_dlopen_deplibs=unknown
9081 + ;;
9082 + irix*)
9083 + # The case above catches anything before 6.2, and it's known that
9084 + # at 6.2 and later dlopen does load deplibs.
9085 + lt_cv_sys_dlopen_deplibs=yes
9086 + ;;
9087 + netbsd*)
9088 + lt_cv_sys_dlopen_deplibs=yes
9089 + ;;
9090 + openbsd*)
9091 + lt_cv_sys_dlopen_deplibs=yes
9092 + ;;
9093 + osf[1234]*)
9094 + # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
9095 + # it did *not* use an RPATH in a shared library to find objects the
9096 + # library depends on, so we explicitly say `no'.
9097 + lt_cv_sys_dlopen_deplibs=no
9098 + ;;
9099 + osf5.0|osf5.0a|osf5.1)
9100 + # dlopen *does* load deplibs and with the right loader patch applied
9101 + # it even uses RPATH in a shared library to search for shared objects
9102 + # that the library depends on, but there's no easy way to know if that
9103 + # patch is installed. Since this is the case, all we can really
9104 + # say is unknown -- it depends on the patch being installed. If
9105 + # it is, this changes to `yes'. Without it, it would be `no'.
9106 + lt_cv_sys_dlopen_deplibs=unknown
9107 + ;;
9108 + osf*)
9109 + # the two cases above should catch all versions of osf <= 5.1. Read
9110 + # the comments above for what we know about them.
9111 + # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
9112 + # is used to find them so we can finally say `yes'.
9113 + lt_cv_sys_dlopen_deplibs=yes
9114 + ;;
9115 + qnx*)
9116 + lt_cv_sys_dlopen_deplibs=yes
9117 + ;;
9118 + solaris*)
9119 + lt_cv_sys_dlopen_deplibs=yes
9120 + ;;
9121 + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
9122 + libltdl_cv_sys_dlopen_deplibs=yes
9123 + ;;
9124 + esac
9125 +
9126 +fi
9127 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_dlopen_deplibs" >&5
9128 +$as_echo "$lt_cv_sys_dlopen_deplibs" >&6; }
9129 +if test "$lt_cv_sys_dlopen_deplibs" != yes; then
9130 +
9131 +cat >>confdefs.h <<\_ACEOF
9132 +#define LTDL_DLOPEN_DEPLIBS 1
9133 +_ACEOF
9134 +
9135 +fi
9136 +
9137 +:
9138 +
9139 +
9140 +for ac_header in argz.h
9141 +do
9142 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9143 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9144 +$as_echo_n "checking for $ac_header... " >&6; }
9145 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9146 + $as_echo_n "(cached) " >&6
9147 +else
9148 + cat >conftest.$ac_ext <<_ACEOF
9149 +/* confdefs.h. */
9150 +_ACEOF
9151 +cat confdefs.h >>conftest.$ac_ext
9152 +cat >>conftest.$ac_ext <<_ACEOF
9153 +/* end confdefs.h. */
9154 +$ac_includes_default
9155 +
9156 +#include <$ac_header>
9157 +_ACEOF
9158 +rm -f conftest.$ac_objext
9159 +if { (ac_try="$ac_compile"
9160 +case "(($ac_try" in
9161 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9162 + *) ac_try_echo=$ac_try;;
9163 +esac
9164 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9165 +$as_echo "$ac_try_echo") >&5
9166 + (eval "$ac_compile") 2>conftest.er1
9167 + ac_status=$?
9168 + grep -v '^ *+' conftest.er1 >conftest.err
9169 + rm -f conftest.er1
9170 + cat conftest.err >&5
9171 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9172 + (exit $ac_status); } && {
9173 + test -z "$ac_c_werror_flag" ||
9174 + test ! -s conftest.err
9175 + } && test -s conftest.$ac_objext; then
9176 + eval "$as_ac_Header=yes"
9177 +else
9178 + $as_echo "$as_me: failed program was:" >&5
9179 +sed 's/^/| /' conftest.$ac_ext >&5
9180 +
9181 + eval "$as_ac_Header=no"
9182 +fi
9183 +
9184 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9185 +fi
9186 +ac_res=`eval 'as_val=${'$as_ac_Header'}
9187 + $as_echo "$as_val"'`
9188 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9189 +$as_echo "$ac_res" >&6; }
9190 +as_val=`eval 'as_val=${'$as_ac_Header'}
9191 + $as_echo "$as_val"'`
9192 + if test "x$as_val" = x""yes; then
9193 + cat >>confdefs.h <<_ACEOF
9194 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9195 +_ACEOF
9196 +
9197 +fi
9198 +
9199 +done
9200 +
9201 +
9202 +{ $as_echo "$as_me:$LINENO: checking for error_t" >&5
9203 +$as_echo_n "checking for error_t... " >&6; }
9204 +if test "${ac_cv_type_error_t+set}" = set; then
9205 + $as_echo_n "(cached) " >&6
9206 +else
9207 + ac_cv_type_error_t=no
9208 +cat >conftest.$ac_ext <<_ACEOF
9209 +/* confdefs.h. */
9210 +_ACEOF
9211 +cat confdefs.h >>conftest.$ac_ext
9212 +cat >>conftest.$ac_ext <<_ACEOF
9213 +/* end confdefs.h. */
9214 +#if defined(HAVE_ARGZ_H)
9215 +# include <argz.h>
9216 +#endif
9217 +
9218 +int
9219 +main ()
9220 +{
9221 +if (sizeof (error_t))
9222 + return 0;
9223 + ;
9224 + return 0;
9225 +}
9226 +_ACEOF
9227 +rm -f conftest.$ac_objext
9228 +if { (ac_try="$ac_compile"
9229 +case "(($ac_try" in
9230 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9231 + *) ac_try_echo=$ac_try;;
9232 +esac
9233 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9234 +$as_echo "$ac_try_echo") >&5
9235 + (eval "$ac_compile") 2>conftest.er1
9236 + ac_status=$?
9237 + grep -v '^ *+' conftest.er1 >conftest.err
9238 + rm -f conftest.er1
9239 + cat conftest.err >&5
9240 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9241 + (exit $ac_status); } && {
9242 + test -z "$ac_c_werror_flag" ||
9243 + test ! -s conftest.err
9244 + } && test -s conftest.$ac_objext; then
9245 + cat >conftest.$ac_ext <<_ACEOF
9246 +/* confdefs.h. */
9247 +_ACEOF
9248 +cat confdefs.h >>conftest.$ac_ext
9249 +cat >>conftest.$ac_ext <<_ACEOF
9250 +/* end confdefs.h. */
9251 +#if defined(HAVE_ARGZ_H)
9252 +# include <argz.h>
9253 +#endif
9254 +
9255 +int
9256 +main ()
9257 +{
9258 +if (sizeof ((error_t)))
9259 + return 0;
9260 + ;
9261 + return 0;
9262 +}
9263 +_ACEOF
9264 +rm -f conftest.$ac_objext
9265 +if { (ac_try="$ac_compile"
9266 +case "(($ac_try" in
9267 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9268 + *) ac_try_echo=$ac_try;;
9269 +esac
9270 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9271 +$as_echo "$ac_try_echo") >&5
9272 + (eval "$ac_compile") 2>conftest.er1
9273 + ac_status=$?
9274 + grep -v '^ *+' conftest.er1 >conftest.err
9275 + rm -f conftest.er1
9276 + cat conftest.err >&5
9277 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9278 + (exit $ac_status); } && {
9279 + test -z "$ac_c_werror_flag" ||
9280 + test ! -s conftest.err
9281 + } && test -s conftest.$ac_objext; then
9282 + :
9283 +else
9284 + $as_echo "$as_me: failed program was:" >&5
9285 +sed 's/^/| /' conftest.$ac_ext >&5
9286 +
9287 + ac_cv_type_error_t=yes
9288 +fi
9289 +
9290 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9291 +else
9292 + $as_echo "$as_me: failed program was:" >&5
9293 +sed 's/^/| /' conftest.$ac_ext >&5
9294 +
9295 +
9296 +fi
9297 +
9298 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9299 +fi
9300 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
9301 +$as_echo "$ac_cv_type_error_t" >&6; }
9302 +if test "x$ac_cv_type_error_t" = x""yes; then
9303 +
9304 +cat >>confdefs.h <<_ACEOF
9305 +#define HAVE_ERROR_T 1
9306 +_ACEOF
9307 +
9308 +
9309 +else
9310 +
9311 +cat >>confdefs.h <<\_ACEOF
9312 +#define error_t int
9313 +_ACEOF
9314 +
9315 +
9316 +cat >>confdefs.h <<\_ACEOF
9317 +#define __error_t_defined 1
9318 +_ACEOF
9319 +
9320 +fi
9321 +
9322 +
9323 +ARGZ_H=
9324 +
9325 +
9326 +
9327 +
9328 +
9329 +
9330 +
9331 +for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
9332 + argz_next argz_stringify
9333 +do
9334 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9335 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
9336 +$as_echo_n "checking for $ac_func... " >&6; }
9337 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
9338 + $as_echo_n "(cached) " >&6
9339 +else
9340 + cat >conftest.$ac_ext <<_ACEOF
9341 +/* confdefs.h. */
9342 +_ACEOF
9343 +cat confdefs.h >>conftest.$ac_ext
9344 +cat >>conftest.$ac_ext <<_ACEOF
9345 +/* end confdefs.h. */
9346 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
9347 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
9348 +#define $ac_func innocuous_$ac_func
9349 +
9350 +/* System header to define __stub macros and hopefully few prototypes,
9351 + which can conflict with char $ac_func (); below.
9352 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9353 + <limits.h> exists even on freestanding compilers. */
9354 +
9355 +#ifdef __STDC__
9356 +# include <limits.h>
9357 +#else
9358 +# include <assert.h>
9359 +#endif
9360 +
9361 +#undef $ac_func
9362 +
9363 +/* Override any GCC internal prototype to avoid an error.
9364 + Use char because int might match the return type of a GCC
9365 + builtin and then its argument prototype would still apply. */
9366 +#ifdef __cplusplus
9367 +extern "C"
9368 +#endif
9369 +char $ac_func ();
9370 +/* The GNU C library defines this for functions which it implements
9371 + to always fail with ENOSYS. Some functions are actually named
9372 + something starting with __ and the normal name is an alias. */
9373 +#if defined __stub_$ac_func || defined __stub___$ac_func
9374 +choke me
9375 +#endif
9376 +
9377 +int
9378 +main ()
9379 +{
9380 +return $ac_func ();
9381 + ;
9382 + return 0;
9383 +}
9384 +_ACEOF
9385 +rm -f conftest.$ac_objext conftest$ac_exeext
9386 +if { (ac_try="$ac_link"
9387 +case "(($ac_try" in
9388 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9389 + *) ac_try_echo=$ac_try;;
9390 +esac
9391 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9392 +$as_echo "$ac_try_echo") >&5
9393 + (eval "$ac_link") 2>conftest.er1
9394 + ac_status=$?
9395 + grep -v '^ *+' conftest.er1 >conftest.err
9396 + rm -f conftest.er1
9397 + cat conftest.err >&5
9398 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9399 + (exit $ac_status); } && {
9400 + test -z "$ac_c_werror_flag" ||
9401 + test ! -s conftest.err
9402 + } && test -s conftest$ac_exeext && {
9403 + test "$cross_compiling" = yes ||
9404 + $as_test_x conftest$ac_exeext
9405 + }; then
9406 + eval "$as_ac_var=yes"
9407 +else
9408 + $as_echo "$as_me: failed program was:" >&5
9409 +sed 's/^/| /' conftest.$ac_ext >&5
9410 +
9411 + eval "$as_ac_var=no"
9412 +fi
9413 +
9414 +rm -rf conftest.dSYM
9415 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9416 + conftest$ac_exeext conftest.$ac_ext
9417 +fi
9418 +ac_res=`eval 'as_val=${'$as_ac_var'}
9419 + $as_echo "$as_val"'`
9420 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9421 +$as_echo "$ac_res" >&6; }
9422 +as_val=`eval 'as_val=${'$as_ac_var'}
9423 + $as_echo "$as_val"'`
9424 + if test "x$as_val" = x""yes; then
9425 + cat >>confdefs.h <<_ACEOF
9426 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9427 +_ACEOF
9428 +
9429 +else
9430 + ARGZ_H=argz.h;
9431 +
9432 + _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
9433 +
9434 +fi
9435 +done
9436 +
9437 +
9438 +if test -z "$ARGZ_H"; then
9439 + { $as_echo "$as_me:$LINENO: checking if argz actually works" >&5
9440 +$as_echo_n "checking if argz actually works... " >&6; }
9441 +if test "${lt_cv_sys_argz_works+set}" = set; then
9442 + $as_echo_n "(cached) " >&6
9443 +else
9444 + case $host_os in #(
9445 + *cygwin*)
9446 + lt_cv_sys_argz_works=no
9447 + if test "$cross_compiling" != no; then
9448 + lt_cv_sys_argz_works="guessing no"
9449 + else
9450 + lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
9451 + save_IFS=$IFS
9452 + IFS=-.
9453 + set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
9454 + IFS=$save_IFS
9455 + lt_os_major=${2-0}
9456 + lt_os_minor=${3-0}
9457 + lt_os_micro=${4-0}
9458 + if test "$lt_os_major" -gt 1 \
9459 + || { test "$lt_os_major" -eq 1 \
9460 + && { test "$lt_os_minor" -gt 5 \
9461 + || { test "$lt_os_minor" -eq 5 \
9462 + && test "$lt_os_micro" -gt 24; }; }; }; then
9463 + lt_cv_sys_argz_works=yes
9464 + fi
9465 + fi
9466 + ;; #(
9467 + *) lt_cv_sys_argz_works=yes ;;
9468 + esac
9469 +fi
9470 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
9471 +$as_echo "$lt_cv_sys_argz_works" >&6; }
9472 + if test $lt_cv_sys_argz_works = yes; then
9473 +
9474 +cat >>confdefs.h <<\_ACEOF
9475 +#define HAVE_WORKING_ARGZ 1
9476 +_ACEOF
9477 +
9478 +else
9479 + ARGZ_H=argz.h
9480 +
9481 +
9482 + _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
9483 +
9484 +fi
9485 +
9486 +fi
9487 +
9488 +
9489 +
9490 +
9491 +{ $as_echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
9492 +$as_echo_n "checking whether libtool supports -dlopen/-dlpreopen... " >&6; }
9493 +if test "${libltdl_cv_preloaded_symbols+set}" = set; then
9494 + $as_echo_n "(cached) " >&6
9495 +else
9496 + if test -n "$lt_cv_sys_global_symbol_pipe"; then
9497 + libltdl_cv_preloaded_symbols=yes
9498 + else
9499 + libltdl_cv_preloaded_symbols=no
9500 + fi
9501 +
9502 +fi
9503 +{ $as_echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
9504 +$as_echo "$libltdl_cv_preloaded_symbols" >&6; }
9505 +if test x"$libltdl_cv_preloaded_symbols" = xyes; then
9506 +
9507 +cat >>confdefs.h <<\_ACEOF
9508 +#define HAVE_PRELOADED_SYMBOLS 1
9509 +_ACEOF
9510 +
9511 +fi
9512 +
9513 +
9514 +
9515 +# Set options
9516 +
9517 +
9518 +
9519 +
9520 +
9521 +
9522 +
9523 +
9524 +
9525 +
9526 +
9527 +
9528 +# Check whether --with-included_ltdl was given.
9529 +if test "${with_included_ltdl+set}" = set; then
9530 + withval=$with_included_ltdl;
9531 +fi
9532 +
9533 +
9534 +if test "x$with_included_ltdl" != xyes; then
9535 + # We are not being forced to use the included libltdl sources, so
9536 + # decide whether there is a useful installed version we can use.
9537 + { $as_echo "$as_me:$LINENO: checking for ltdl.h" >&5
9538 +$as_echo_n "checking for ltdl.h... " >&6; }
9539 +if test "${ac_cv_header_ltdl_h+set}" = set; then
9540 + $as_echo_n "(cached) " >&6
9541 +else
9542 + cat >conftest.$ac_ext <<_ACEOF
9543 +/* confdefs.h. */
9544 +_ACEOF
9545 +cat confdefs.h >>conftest.$ac_ext
9546 +cat >>conftest.$ac_ext <<_ACEOF
9547 +/* end confdefs.h. */
9548 +$ac_includes_default
9549 +
9550 +
9551 +#include <ltdl.h>
9552 +_ACEOF
9553 +rm -f conftest.$ac_objext
9554 +if { (ac_try="$ac_compile"
9555 +case "(($ac_try" in
9556 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9557 + *) ac_try_echo=$ac_try;;
9558 +esac
9559 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9560 +$as_echo "$ac_try_echo") >&5
9561 + (eval "$ac_compile") 2>conftest.er1
9562 + ac_status=$?
9563 + grep -v '^ *+' conftest.er1 >conftest.err
9564 + rm -f conftest.er1
9565 + cat conftest.err >&5
9566 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9567 + (exit $ac_status); } && {
9568 + test -z "$ac_c_werror_flag" ||
9569 + test ! -s conftest.err
9570 + } && test -s conftest.$ac_objext; then
9571 + ac_cv_header_ltdl_h=yes
9572 +else
9573 + $as_echo "$as_me: failed program was:" >&5
9574 +sed 's/^/| /' conftest.$ac_ext >&5
9575 +
9576 + ac_cv_header_ltdl_h=no
9577 +fi
9578 +
9579 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9580 +fi
9581 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
9582 +$as_echo "$ac_cv_header_ltdl_h" >&6; }
9583 +if test "x$ac_cv_header_ltdl_h" = x""yes; then
9584 + { $as_echo "$as_me:$LINENO: checking whether lt_dlinterface_register is declared" >&5
9585 +$as_echo_n "checking whether lt_dlinterface_register is declared... " >&6; }
9586 +if test "${ac_cv_have_decl_lt_dlinterface_register+set}" = set; then
9587 + $as_echo_n "(cached) " >&6
9588 +else
9589 + cat >conftest.$ac_ext <<_ACEOF
9590 +/* confdefs.h. */
9591 +_ACEOF
9592 +cat confdefs.h >>conftest.$ac_ext
9593 +cat >>conftest.$ac_ext <<_ACEOF
9594 +/* end confdefs.h. */
9595 +$ac_includes_default
9596 + #include <ltdl.h>
9597 +
9598 +int
9599 +main ()
9600 +{
9601 +#ifndef lt_dlinterface_register
9602 + (void) lt_dlinterface_register;
9603 +#endif
9604 +
9605 + ;
9606 + return 0;
9607 +}
9608 +_ACEOF
9609 +rm -f conftest.$ac_objext
9610 +if { (ac_try="$ac_compile"
9611 +case "(($ac_try" in
9612 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9613 + *) ac_try_echo=$ac_try;;
9614 +esac
9615 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9616 +$as_echo "$ac_try_echo") >&5
9617 + (eval "$ac_compile") 2>conftest.er1
9618 + ac_status=$?
9619 + grep -v '^ *+' conftest.er1 >conftest.err
9620 + rm -f conftest.er1
9621 + cat conftest.err >&5
9622 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9623 + (exit $ac_status); } && {
9624 + test -z "$ac_c_werror_flag" ||
9625 + test ! -s conftest.err
9626 + } && test -s conftest.$ac_objext; then
9627 + ac_cv_have_decl_lt_dlinterface_register=yes
9628 +else
9629 + $as_echo "$as_me: failed program was:" >&5
9630 +sed 's/^/| /' conftest.$ac_ext >&5
9631 +
9632 + ac_cv_have_decl_lt_dlinterface_register=no
9633 +fi
9634 +
9635 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9636 +fi
9637 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_lt_dlinterface_register" >&5
9638 +$as_echo "$ac_cv_have_decl_lt_dlinterface_register" >&6; }
9639 +if test "x$ac_cv_have_decl_lt_dlinterface_register" = x""yes; then
9640 + { $as_echo "$as_me:$LINENO: checking for lt_dladvise_preload in -lltdl" >&5
9641 +$as_echo_n "checking for lt_dladvise_preload in -lltdl... " >&6; }
9642 +if test "${ac_cv_lib_ltdl_lt_dladvise_preload+set}" = set; then
9643 + $as_echo_n "(cached) " >&6
9644 +else
9645 + ac_check_lib_save_LIBS=$LIBS
9646 +LIBS="-lltdl $LIBS"
9647 +cat >conftest.$ac_ext <<_ACEOF
9648 +/* confdefs.h. */
9649 +_ACEOF
9650 +cat confdefs.h >>conftest.$ac_ext
9651 +cat >>conftest.$ac_ext <<_ACEOF
9652 +/* end confdefs.h. */
9653 +
9654 +/* Override any GCC internal prototype to avoid an error.
9655 + Use char because int might match the return type of a GCC
9656 + builtin and then its argument prototype would still apply. */
9657 +#ifdef __cplusplus
9658 +extern "C"
9659 +#endif
9660 +char lt_dladvise_preload ();
9661 +int
9662 +main ()
9663 +{
9664 +return lt_dladvise_preload ();
9665 + ;
9666 + return 0;
9667 +}
9668 +_ACEOF
9669 +rm -f conftest.$ac_objext conftest$ac_exeext
9670 +if { (ac_try="$ac_link"
9671 +case "(($ac_try" in
9672 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9673 + *) ac_try_echo=$ac_try;;
9674 +esac
9675 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9676 +$as_echo "$ac_try_echo") >&5
9677 + (eval "$ac_link") 2>conftest.er1
9678 + ac_status=$?
9679 + grep -v '^ *+' conftest.er1 >conftest.err
9680 + rm -f conftest.er1
9681 + cat conftest.err >&5
9682 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9683 + (exit $ac_status); } && {
9684 + test -z "$ac_c_werror_flag" ||
9685 + test ! -s conftest.err
9686 + } && test -s conftest$ac_exeext && {
9687 + test "$cross_compiling" = yes ||
9688 + $as_test_x conftest$ac_exeext
9689 + }; then
9690 + ac_cv_lib_ltdl_lt_dladvise_preload=yes
9691 +else
9692 + $as_echo "$as_me: failed program was:" >&5
9693 +sed 's/^/| /' conftest.$ac_ext >&5
9694 +
9695 + ac_cv_lib_ltdl_lt_dladvise_preload=no
9696 +fi
9697 +
9698 +rm -rf conftest.dSYM
9699 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
9700 + conftest$ac_exeext conftest.$ac_ext
9701 +LIBS=$ac_check_lib_save_LIBS
9702 +fi
9703 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dladvise_preload" >&5
9704 +$as_echo "$ac_cv_lib_ltdl_lt_dladvise_preload" >&6; }
9705 +if test "x$ac_cv_lib_ltdl_lt_dladvise_preload" = x""yes; then
9706 + with_included_ltdl=no
9707 +else
9708 + with_included_ltdl=yes
9709 +fi
9710 +
9711 +else
9712 + with_included_ltdl=yes
9713 +fi
9714 +
9715 +else
9716 + with_included_ltdl=yes
9717 +fi
9718 +
9719 +
9720 +fi
9721 +
9722 +
9723 +
9724 +
9725 +# Check whether --with-ltdl_include was given.
9726 +if test "${with_ltdl_include+set}" = set; then
9727 + withval=$with_ltdl_include;
9728 +fi
9729 +
9730 +
9731 +if test -n "$with_ltdl_include"; then
9732 + if test -f "$with_ltdl_include/ltdl.h"; then :
9733 + else
9734 + { { $as_echo "$as_me:$LINENO: error: invalid ltdl include directory: \`$with_ltdl_include'" >&5
9735 +$as_echo "$as_me: error: invalid ltdl include directory: \`$with_ltdl_include'" >&2;}
9736 + { (exit 1); exit 1; }; }
9737 + fi
9738 +else
9739 + with_ltdl_include=no
9740 +fi
9741 +
9742 +
9743 +# Check whether --with-ltdl_lib was given.
9744 +if test "${with_ltdl_lib+set}" = set; then
9745 + withval=$with_ltdl_lib;
9746 +fi
9747 +
9748 +
9749 +if test -n "$with_ltdl_lib"; then
9750 + if test -f "$with_ltdl_lib/libltdl.la"; then :
9751 + else
9752 + { { $as_echo "$as_me:$LINENO: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&5
9753 +$as_echo "$as_me: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&2;}
9754 + { (exit 1); exit 1; }; }
9755 + fi
9756 +else
9757 + with_ltdl_lib=no
9758 +fi
9759 +
9760 +case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
9761 + ,yes,no,no,)
9762 + case $enable_ltdl_convenience in
9763 + no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
9764 +$as_echo "$as_me: error: this package needs a convenience libltdl" >&2;}
9765 + { (exit 1); exit 1; }; } ;;
9766 + "") enable_ltdl_convenience=yes
9767 + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
9768 +esac
9769 +LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
9770 +LTDLDEPS=$LIBLTDL
9771 +LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
9772 +
9773 +
9774 +
9775 +
9776 +
9777 +# For backwards non-gettext consistent compatibility...
9778 +INCLTDL="$LTDLINCL"
9779 +
9780 +
9781 + ;;
9782 + ,no,no,no,)
9783 + # If the included ltdl is not to be used, then use the
9784 + # preinstalled libltdl we found.
9785 +
9786 +cat >>confdefs.h <<\_ACEOF
9787 +#define HAVE_LTDL 1
9788 +_ACEOF
9789 +
9790 + LIBLTDL=-lltdl
9791 + LTDLDEPS=
9792 + LTDLINCL=
9793 + ;;
9794 + ,no*,no,*)
9795 + { { $as_echo "$as_me:$LINENO: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&5
9796 +$as_echo "$as_me: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&2;}
9797 + { (exit 1); exit 1; }; }
9798 + ;;
9799 + *) with_included_ltdl=no
9800 + LIBLTDL="-L$with_ltdl_lib -lltdl"
9801 + LTDLDEPS=
9802 + LTDLINCL="-I$with_ltdl_include"
9803 + ;;
9804 +esac
9805 +INCLTDL="$LTDLINCL"
9806 +
9807 +# Report our decision...
9808 +{ $as_echo "$as_me:$LINENO: checking where to find libltdl headers" >&5
9809 +$as_echo_n "checking where to find libltdl headers... " >&6; }
9810 +{ $as_echo "$as_me:$LINENO: result: $LTDLINCL" >&5
9811 +$as_echo "$LTDLINCL" >&6; }
9812 +{ $as_echo "$as_me:$LINENO: checking where to find libltdl library" >&5
9813 +$as_echo_n "checking where to find libltdl library... " >&6; }
9814 +{ $as_echo "$as_me:$LINENO: result: $LIBLTDL" >&5
9815 +$as_echo "$LIBLTDL" >&6; }
9816 +
9817 +
9818 +
9819 +# Check whether --enable-ltdl-install was given.
9820 +if test "${enable_ltdl_install+set}" = set; then
9821 + enableval=$enable_ltdl_install;
9822 +fi
9823 +
9824 +
9825 +case ,${enable_ltdl_install},${enable_ltdl_convenience} in
9826 + *yes*) ;;
9827 + *) enable_ltdl_convenience=yes ;;
9828 +esac
9829 +
9830 + if test x"${enable_ltdl_install-no}" != xno; then
9831 + INSTALL_LTDL_TRUE=
9832 + INSTALL_LTDL_FALSE='#'
9833 +else
9834 + INSTALL_LTDL_TRUE='#'
9835 + INSTALL_LTDL_FALSE=
9836 +fi
9837 +
9838 + if test x"${enable_ltdl_convenience-no}" != xno; then
9839 + CONVENIENCE_LTDL_TRUE=
9840 + CONVENIENCE_LTDL_FALSE='#'
9841 +else
9842 + CONVENIENCE_LTDL_TRUE='#'
9843 + CONVENIENCE_LTDL_FALSE=
9844 +fi
9845 +
9846 +
9847 +
9848 + subdirs="$subdirs libltdl"
9849 +
9850 +
9851 +
9852 +
9853 +
9854 +# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
9855 +# the user used. This is so that ltdl.h can pick up the parent projects
9856 +# config.h file, The first file in AC_CONFIG_HEADERS must contain the
9857 +# definitions required by ltdl.c.
9858 +# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
9859 +
9860 +
9861 +
9862 +
9863 +
9864 +
9865 +
9866 +
9867 +
9868 +for ac_header in unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h
9869 +do
9870 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
9871 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
9872 +$as_echo_n "checking for $ac_header... " >&6; }
9873 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
9874 + $as_echo_n "(cached) " >&6
9875 +else
9876 + cat >conftest.$ac_ext <<_ACEOF
9877 +/* confdefs.h. */
9878 +_ACEOF
9879 +cat confdefs.h >>conftest.$ac_ext
9880 +cat >>conftest.$ac_ext <<_ACEOF
9881 +/* end confdefs.h. */
9882 +$ac_includes_default
9883 +
9884 +#include <$ac_header>
9885 +_ACEOF
9886 +rm -f conftest.$ac_objext
9887 +if { (ac_try="$ac_compile"
9888 +case "(($ac_try" in
9889 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9890 + *) ac_try_echo=$ac_try;;
9891 +esac
9892 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9893 +$as_echo "$ac_try_echo") >&5
9894 + (eval "$ac_compile") 2>conftest.er1
9895 + ac_status=$?
9896 + grep -v '^ *+' conftest.er1 >conftest.err
9897 + rm -f conftest.er1
9898 + cat conftest.err >&5
9899 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
9900 + (exit $ac_status); } && {
9901 + test -z "$ac_c_werror_flag" ||
9902 + test ! -s conftest.err
9903 + } && test -s conftest.$ac_objext; then
9904 + eval "$as_ac_Header=yes"
9905 +else
9906 + $as_echo "$as_me: failed program was:" >&5
9907 +sed 's/^/| /' conftest.$ac_ext >&5
9908 +
9909 + eval "$as_ac_Header=no"
9910 +fi
9911 +
9912 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9913 +fi
9914 +ac_res=`eval 'as_val=${'$as_ac_Header'}
9915 + $as_echo "$as_val"'`
9916 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
9917 +$as_echo "$ac_res" >&6; }
9918 +as_val=`eval 'as_val=${'$as_ac_Header'}
9919 + $as_echo "$as_val"'`
9920 + if test "x$as_val" = x""yes; then
9921 + cat >>confdefs.h <<_ACEOF
9922 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
9923 +_ACEOF
9924 +
9925 +fi
9926 +
9927 +done
9928 +
9929 +
9930 +
9931 +
9932 +
9933 +for ac_func in closedir opendir readdir
9934 +do
9935 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9936 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
9937 +$as_echo_n "checking for $ac_func... " >&6; }
9938 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
9939 + $as_echo_n "(cached) " >&6
9940 +else
9941 + cat >conftest.$ac_ext <<_ACEOF
9942 +/* confdefs.h. */
9943 +_ACEOF
9944 +cat confdefs.h >>conftest.$ac_ext
9945 +cat >>conftest.$ac_ext <<_ACEOF
9946 +/* end confdefs.h. */
9947 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
9948 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
9949 +#define $ac_func innocuous_$ac_func
9950 +
9951 +/* System header to define __stub macros and hopefully few prototypes,
9952 + which can conflict with char $ac_func (); below.
9953 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9954 + <limits.h> exists even on freestanding compilers. */
9955 +
9956 +#ifdef __STDC__
9957 +# include <limits.h>
9958 +#else
9959 +# include <assert.h>
9960 +#endif
9961 +
9962 +#undef $ac_func
9963 +
9964 +/* Override any GCC internal prototype to avoid an error.
9965 + Use char because int might match the return type of a GCC
9966 + builtin and then its argument prototype would still apply. */
9967 +#ifdef __cplusplus
9968 +extern "C"
9969 +#endif
9970 +char $ac_func ();
9971 +/* The GNU C library defines this for functions which it implements
9972 + to always fail with ENOSYS. Some functions are actually named
9973 + something starting with __ and the normal name is an alias. */
9974 +#if defined __stub_$ac_func || defined __stub___$ac_func
9975 +choke me
9976 +#endif
9977 +
9978 +int
9979 +main ()
9980 +{
9981 +return $ac_func ();
9982 + ;
9983 + return 0;
9984 +}
9985 +_ACEOF
9986 +rm -f conftest.$ac_objext conftest$ac_exeext
9987 +if { (ac_try="$ac_link"
9988 +case "(($ac_try" in
9989 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9990 + *) ac_try_echo=$ac_try;;
9991 +esac
9992 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
9993 +$as_echo "$ac_try_echo") >&5
9994 + (eval "$ac_link") 2>conftest.er1
9995 + ac_status=$?
9996 + grep -v '^ *+' conftest.er1 >conftest.err
9997 + rm -f conftest.er1
9998 + cat conftest.err >&5
9999 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10000 + (exit $ac_status); } && {
10001 + test -z "$ac_c_werror_flag" ||
10002 + test ! -s conftest.err
10003 + } && test -s conftest$ac_exeext && {
10004 + test "$cross_compiling" = yes ||
10005 + $as_test_x conftest$ac_exeext
10006 + }; then
10007 + eval "$as_ac_var=yes"
10008 +else
10009 + $as_echo "$as_me: failed program was:" >&5
10010 +sed 's/^/| /' conftest.$ac_ext >&5
10011 +
10012 + eval "$as_ac_var=no"
10013 +fi
10014 +
10015 +rm -rf conftest.dSYM
10016 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10017 + conftest$ac_exeext conftest.$ac_ext
10018 +fi
10019 +ac_res=`eval 'as_val=${'$as_ac_var'}
10020 + $as_echo "$as_val"'`
10021 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10022 +$as_echo "$ac_res" >&6; }
10023 +as_val=`eval 'as_val=${'$as_ac_var'}
10024 + $as_echo "$as_val"'`
10025 + if test "x$as_val" = x""yes; then
10026 + cat >>confdefs.h <<_ACEOF
10027 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
10028 +_ACEOF
10029 +
10030 +else
10031 +
10032 +
10033 + _LT_LIBOBJS="$_LT_LIBOBJS lt__dirent.$ac_objext"
10034 +
10035 +fi
10036 +done
10037 +
10038 +
10039 +
10040 +for ac_func in strlcat strlcpy
10041 +do
10042 +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
10043 +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
10044 +$as_echo_n "checking for $ac_func... " >&6; }
10045 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
10046 + $as_echo_n "(cached) " >&6
10047 +else
10048 + cat >conftest.$ac_ext <<_ACEOF
10049 +/* confdefs.h. */
10050 +_ACEOF
10051 +cat confdefs.h >>conftest.$ac_ext
10052 +cat >>conftest.$ac_ext <<_ACEOF
10053 +/* end confdefs.h. */
10054 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
10055 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
10056 +#define $ac_func innocuous_$ac_func
10057 +
10058 +/* System header to define __stub macros and hopefully few prototypes,
10059 + which can conflict with char $ac_func (); below.
10060 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
10061 + <limits.h> exists even on freestanding compilers. */
10062 +
10063 +#ifdef __STDC__
10064 +# include <limits.h>
10065 +#else
10066 +# include <assert.h>
10067 +#endif
10068 +
10069 +#undef $ac_func
10070 +
10071 +/* Override any GCC internal prototype to avoid an error.
10072 + Use char because int might match the return type of a GCC
10073 + builtin and then its argument prototype would still apply. */
10074 +#ifdef __cplusplus
10075 +extern "C"
10076 +#endif
10077 +char $ac_func ();
10078 +/* The GNU C library defines this for functions which it implements
10079 + to always fail with ENOSYS. Some functions are actually named
10080 + something starting with __ and the normal name is an alias. */
10081 +#if defined __stub_$ac_func || defined __stub___$ac_func
10082 +choke me
10083 +#endif
10084 +
10085 +int
10086 +main ()
10087 +{
10088 +return $ac_func ();
10089 + ;
10090 + return 0;
10091 +}
10092 +_ACEOF
10093 +rm -f conftest.$ac_objext conftest$ac_exeext
10094 +if { (ac_try="$ac_link"
10095 +case "(($ac_try" in
10096 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10097 + *) ac_try_echo=$ac_try;;
10098 +esac
10099 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10100 +$as_echo "$ac_try_echo") >&5
10101 + (eval "$ac_link") 2>conftest.er1
10102 + ac_status=$?
10103 + grep -v '^ *+' conftest.er1 >conftest.err
10104 + rm -f conftest.er1
10105 + cat conftest.err >&5
10106 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10107 + (exit $ac_status); } && {
10108 + test -z "$ac_c_werror_flag" ||
10109 + test ! -s conftest.err
10110 + } && test -s conftest$ac_exeext && {
10111 + test "$cross_compiling" = yes ||
10112 + $as_test_x conftest$ac_exeext
10113 + }; then
10114 + eval "$as_ac_var=yes"
10115 +else
10116 + $as_echo "$as_me: failed program was:" >&5
10117 +sed 's/^/| /' conftest.$ac_ext >&5
10118 +
10119 + eval "$as_ac_var=no"
10120 +fi
10121 +
10122 +rm -rf conftest.dSYM
10123 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10124 + conftest$ac_exeext conftest.$ac_ext
10125 +fi
10126 +ac_res=`eval 'as_val=${'$as_ac_var'}
10127 + $as_echo "$as_val"'`
10128 + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
10129 +$as_echo "$ac_res" >&6; }
10130 +as_val=`eval 'as_val=${'$as_ac_var'}
10131 + $as_echo "$as_val"'`
10132 + if test "x$as_val" = x""yes; then
10133 + cat >>confdefs.h <<_ACEOF
10134 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
10135 +_ACEOF
10136 +
10137 +else
10138 +
10139 +
10140 + _LT_LIBOBJS="$_LT_LIBOBJS lt__strl.$ac_objext"
10141 +
10142 +fi
10143 +done
10144 +
10145 +
10146 +
10147 +cat >>confdefs.h <<_ACEOF
10148 +#define LT_LIBEXT "$libext"
10149 +_ACEOF
10150 +
10151 +
10152 +name=ltdl
10153 +LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
10154 +
10155 +
10156 +
10157 +
10158 +
10159 +
10160 +
10161 +
10162 +# Only expand once:
10163 +
10164 +
10165 +enable_dlopen=yes
10166 +
10167 +
10168 +
10169 +
10170 +
10171 +
10172 +
10173 +case $enable_ltdl_convenience in
10174 + no) { { $as_echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
10175 +$as_echo "$as_me: error: this package needs a convenience libltdl" >&2;}
10176 + { (exit 1); exit 1; }; } ;;
10177 + "") enable_ltdl_convenience=yes
10178 + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
10179 +esac
10180 +LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
10181 +LTDLDEPS=$LIBLTDL
10182 +LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
10183 +
10184 +
10185 +
10186 +
10187 +
10188 +# For backwards non-gettext consistent compatibility...
10189 +INCLTDL="$LTDLINCL"
10190 +
10191 +
10192 +
10193 +
10194 +
10195 +
10196 +#
10197 +# Add to the default list of places in LDFLAGS to compensate for
10198 +# ... the configure default value of LIBS on some systems
10199 +#
10200 +for x in /usr/lib64 /usr/local/gnu/lib /usr/local/gnulib /opt/dce/lib /sw/lib
10201 +do
10202 + if test -d "$x"; then
10203 + y=`expr " $LDFLAGS " : ".* -L$x "`
10204 + if test $y -eq 0; then
10205 + LDFLAGS="$LDFLAGS -L$x"
10206 + fi
10207 + fi
10208 +done
10209 +
10210 +#
10211 +# Add to the default list of places in CPPFLAGS to match LDFLAGS above
10212 +#
10213 +for x in /usr/local/gnu/include /opt/dce/include /sw/include
10214 +do
10215 + if test -d "$x"; then
10216 + y=`expr " $CPPFLAGS " : ".* -I$x "`
10217 + if test $y -eq 0; then
10218 + CPPFLAGS="$CPPFLAGS -I$x"
10219 + fi
10220 + fi
10221 +done
10222 +
10223 +
10224 +
10225 +
10226 +ac_ext=c
10227 +ac_cpp='$CPP $CPPFLAGS'
10228 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10229 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10230 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
10231 +
10232 +acx_pthread_ok=no
10233 +
10234 +# We used to check for pthread.h first, but this fails if pthread.h
10235 +# requires special compiler flags (e.g. on True64 or Sequent).
10236 +# It gets checked for in the link test anyway.
10237 +
10238 +# First of all, check if the user has set any of the PTHREAD_LIBS,
10239 +# etcetera environment variables, and if threads linking works using
10240 +# them:
10241 +if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS$PTHREAD_CPPFLAGS" != x; then
10242 + save_CFLAGS="$CFLAGS"
10243 + CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
10244 + save_CPPFLAGS="$CPPFLAGS"
10245 + CPPFLAGS="$CPPFLAGS $PTHREAD_CPPFLAGS"
10246 + save_LIBS="$LIBS"
10247 + LIBS="$PTHREAD_LIBS $LIBS"
10248 + { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
10249 +$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
10250 + cat >conftest.$ac_ext <<_ACEOF
10251 +/* confdefs.h. */
10252 +_ACEOF
10253 +cat confdefs.h >>conftest.$ac_ext
10254 +cat >>conftest.$ac_ext <<_ACEOF
10255 +/* end confdefs.h. */
10256 +
10257 +/* Override any GCC internal prototype to avoid an error.
10258 + Use char because int might match the return type of a GCC
10259 + builtin and then its argument prototype would still apply. */
10260 +#ifdef __cplusplus
10261 +extern "C"
10262 +#endif
10263 +char pthread_join ();
10264 +int
10265 +main ()
10266 +{
10267 +return pthread_join ();
10268 + ;
10269 + return 0;
10270 +}
10271 +_ACEOF
10272 +rm -f conftest.$ac_objext conftest$ac_exeext
10273 +if { (ac_try="$ac_link"
10274 +case "(($ac_try" in
10275 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10276 + *) ac_try_echo=$ac_try;;
10277 +esac
10278 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10279 +$as_echo "$ac_try_echo") >&5
10280 + (eval "$ac_link") 2>conftest.er1
10281 + ac_status=$?
10282 + grep -v '^ *+' conftest.er1 >conftest.err
10283 + rm -f conftest.er1
10284 + cat conftest.err >&5
10285 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10286 + (exit $ac_status); } && {
10287 + test -z "$ac_c_werror_flag" ||
10288 + test ! -s conftest.err
10289 + } && test -s conftest$ac_exeext && {
10290 + test "$cross_compiling" = yes ||
10291 + $as_test_x conftest$ac_exeext
10292 + }; then
10293 + acx_pthread_ok=yes
10294 +else
10295 + $as_echo "$as_me: failed program was:" >&5
10296 +sed 's/^/| /' conftest.$ac_ext >&5
10297 +
10298 +
10299 +fi
10300 +
10301 +rm -rf conftest.dSYM
10302 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10303 + conftest$ac_exeext conftest.$ac_ext
10304 + { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
10305 +$as_echo "$acx_pthread_ok" >&6; }
10306 + if test x"$acx_pthread_ok" = xno; then
10307 + PTHREAD_LIBS=""
10308 + PTHREAD_CFLAGS=""
10309 + fi
10310 + LIBS="$save_LIBS"
10311 + CFLAGS="$save_CFLAGS"
10312 + CPPFLAGS="$save_CPPFLAGS"
10313 +fi
10314 +
10315 +# We must check for the threads library under a number of different
10316 +# names; the ordering is very important because some systems
10317 +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
10318 +# libraries is broken (non-POSIX).
10319 +
10320 +# Create a list of thread flags to try. Items starting with a "-" are
10321 +# C compiler flags, and other items are library names, except for "none"
10322 +# which indicates that we try without any flags at all.
10323 +
10324 +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
10325 +
10326 +# The ordering *is* (sometimes) important. Some notes on the
10327 +# individual items follow:
10328 +
10329 +# pthreads: AIX (must check this before -lpthread)
10330 +# none: in case threads are in libc; should be tried before -Kthread and
10331 +# other compiler flags to prevent continual compiler warnings
10332 +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
10333 +# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
10334 +# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
10335 +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
10336 +# -pthreads: Solaris/gcc
10337 +# -mthreads: Mingw32/gcc, Lynx/gcc
10338 +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
10339 +# doesn't hurt to check since this sometimes defines pthreads too;
10340 +# also defines -D_REENTRANT)
10341 +# pthread: Linux, etcetera
10342 +# --thread-safe: KAI C++
10343 +
10344 +case "${host_cpu}-${host_os}" in
10345 + *solaris*)
10346 +
10347 + # On Solaris (at least, for some versions), libc contains stubbed
10348 + # (non-functional) versions of the pthreads routines, so link-based
10349 + # tests will erroneously succeed. (We need to link with -pthread or
10350 + # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
10351 + # a function called by this macro, so we could check for that, but
10352 + # who knows whether they'll stub that too in a future libc.) So,
10353 + # we'll just look for -pthreads and -lpthread first:
10354 +
10355 + acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
10356 + ;;
10357 +esac
10358 +
10359 +if test x"$acx_pthread_ok" = xno; then
10360 +for flag in $acx_pthread_flags; do
10361 +
10362 + case $flag in
10363 + none)
10364 + { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
10365 +$as_echo_n "checking whether pthreads work without any flags... " >&6; }
10366 + ;;
10367 +
10368 + -*)
10369 + { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
10370 +$as_echo_n "checking whether pthreads work with $flag... " >&6; }
10371 + PTHREAD_CFLAGS="$flag"
10372 + PTHREAD_CPPFLAGS="$flag"
10373 + ;;
10374 +
10375 + *)
10376 + { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
10377 +$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
10378 + PTHREAD_LIBS="-l$flag"
10379 + ;;
10380 + esac
10381 +
10382 + save_LIBS="$LIBS"
10383 + save_CFLAGS="$CFLAGS"
10384 + save_CPPFLAGS="$CPPFLAGS"
10385 + LIBS="$PTHREAD_LIBS $LIBS"
10386 + CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
10387 + CPPFLAGS="$CFLAGS $PTHREAD_CPPFLAGS"
10388 +
10389 + # Check for various functions. We must include pthread.h,
10390 + # since some functions may be macros. (On the Sequent, we
10391 + # need a special flag -Kthread to make this header compile.)
10392 + # We check for pthread_join because it is in -lpthread on IRIX
10393 + # while pthread_create is in libc. We check for pthread_attr_init
10394 + # due to DEC craziness with -lpthreads. We check for
10395 + # pthread_cleanup_push because it is one of the few pthread
10396 + # functions on Solaris that doesn't have a non-functional libc stub.
10397 + # We try pthread_create on general principles.
10398 + cat >conftest.$ac_ext <<_ACEOF
10399 +/* confdefs.h. */
10400 +_ACEOF
10401 +cat confdefs.h >>conftest.$ac_ext
10402 +cat >>conftest.$ac_ext <<_ACEOF
10403 +/* end confdefs.h. */
10404 +#include <pthread.h>
10405 +int
10406 +main ()
10407 +{
10408 +pthread_t th; pthread_join(th, 0);
10409 + pthread_attr_init(0); pthread_cleanup_push(0, 0);
10410 + pthread_create(0,0,0,0); pthread_cleanup_pop(0);
10411 + ;
10412 + return 0;
10413 +}
10414 +_ACEOF
10415 +rm -f conftest.$ac_objext conftest$ac_exeext
10416 +if { (ac_try="$ac_link"
10417 +case "(($ac_try" in
10418 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10419 + *) ac_try_echo=$ac_try;;
10420 +esac
10421 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10422 +$as_echo "$ac_try_echo") >&5
10423 + (eval "$ac_link") 2>conftest.er1
10424 + ac_status=$?
10425 + grep -v '^ *+' conftest.er1 >conftest.err
10426 + rm -f conftest.er1
10427 + cat conftest.err >&5
10428 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10429 + (exit $ac_status); } && {
10430 + test -z "$ac_c_werror_flag" ||
10431 + test ! -s conftest.err
10432 + } && test -s conftest$ac_exeext && {
10433 + test "$cross_compiling" = yes ||
10434 + $as_test_x conftest$ac_exeext
10435 + }; then
10436 + acx_pthread_ok=yes
10437 +else
10438 + $as_echo "$as_me: failed program was:" >&5
10439 +sed 's/^/| /' conftest.$ac_ext >&5
10440 +
10441 +
10442 +fi
10443 +
10444 +rm -rf conftest.dSYM
10445 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10446 + conftest$ac_exeext conftest.$ac_ext
10447 +
10448 + LIBS="$save_LIBS"
10449 + CFLAGS="$save_CFLAGS"
10450 + CPPFLAGS="$save_CPPFLAGS"
10451 +
10452 + { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
10453 +$as_echo "$acx_pthread_ok" >&6; }
10454 + if test "x$acx_pthread_ok" = xyes; then
10455 + break;
10456 + fi
10457 +
10458 + PTHREAD_LIBS=""
10459 + PTHREAD_CFLAGS=""
10460 + PTHREAD_CPPFLAGS=""
10461 +done
10462 +fi
10463 +
10464 +# Various other checks:
10465 +if test "x$acx_pthread_ok" = xyes; then
10466 + save_LIBS="$LIBS"
10467 + LIBS="$PTHREAD_LIBS $LIBS"
10468 + save_CFLAGS="$CFLAGS"
10469 + CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
10470 + save_CPPFLAGS="$CPPFLAGS"
10471 + CPPFLAGS="$CFLAGS $PTHREAD_CPPFLAGS"
10472 +
10473 + # Detect AIX lossage: threads are created detached by default
10474 + # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
10475 + { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
10476 +$as_echo_n "checking for joinable pthread attribute... " >&6; }
10477 + cat >conftest.$ac_ext <<_ACEOF
10478 +/* confdefs.h. */
10479 +_ACEOF
10480 +cat confdefs.h >>conftest.$ac_ext
10481 +cat >>conftest.$ac_ext <<_ACEOF
10482 +/* end confdefs.h. */
10483 +#include <pthread.h>
10484 +int
10485 +main ()
10486 +{
10487 +int attr=PTHREAD_CREATE_JOINABLE;
10488 + ;
10489 + return 0;
10490 +}
10491 +_ACEOF
10492 +rm -f conftest.$ac_objext conftest$ac_exeext
10493 +if { (ac_try="$ac_link"
10494 +case "(($ac_try" in
10495 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10496 + *) ac_try_echo=$ac_try;;
10497 +esac
10498 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10499 +$as_echo "$ac_try_echo") >&5
10500 + (eval "$ac_link") 2>conftest.er1
10501 + ac_status=$?
10502 + grep -v '^ *+' conftest.er1 >conftest.err
10503 + rm -f conftest.er1
10504 + cat conftest.err >&5
10505 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10506 + (exit $ac_status); } && {
10507 + test -z "$ac_c_werror_flag" ||
10508 + test ! -s conftest.err
10509 + } && test -s conftest$ac_exeext && {
10510 + test "$cross_compiling" = yes ||
10511 + $as_test_x conftest$ac_exeext
10512 + }; then
10513 + ok=PTHREAD_CREATE_JOINABLE
10514 +else
10515 + $as_echo "$as_me: failed program was:" >&5
10516 +sed 's/^/| /' conftest.$ac_ext >&5
10517 +
10518 + ok=unknown
10519 +fi
10520 +
10521 +rm -rf conftest.dSYM
10522 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10523 + conftest$ac_exeext conftest.$ac_ext
10524 + if test x"$ok" = xunknown; then
10525 + cat >conftest.$ac_ext <<_ACEOF
10526 +/* confdefs.h. */
10527 +_ACEOF
10528 +cat confdefs.h >>conftest.$ac_ext
10529 +cat >>conftest.$ac_ext <<_ACEOF
10530 +/* end confdefs.h. */
10531 +#include <pthread.h>
10532 +int
10533 +main ()
10534 +{
10535 +int attr=PTHREAD_CREATE_UNDETACHED;
10536 + ;
10537 + return 0;
10538 +}
10539 +_ACEOF
10540 +rm -f conftest.$ac_objext conftest$ac_exeext
10541 +if { (ac_try="$ac_link"
10542 +case "(($ac_try" in
10543 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10544 + *) ac_try_echo=$ac_try;;
10545 +esac
10546 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10547 +$as_echo "$ac_try_echo") >&5
10548 + (eval "$ac_link") 2>conftest.er1
10549 + ac_status=$?
10550 + grep -v '^ *+' conftest.er1 >conftest.err
10551 + rm -f conftest.er1
10552 + cat conftest.err >&5
10553 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
10554 + (exit $ac_status); } && {
10555 + test -z "$ac_c_werror_flag" ||
10556 + test ! -s conftest.err
10557 + } && test -s conftest$ac_exeext && {
10558 + test "$cross_compiling" = yes ||
10559 + $as_test_x conftest$ac_exeext
10560 + }; then
10561 + ok=PTHREAD_CREATE_UNDETACHED
10562 +else
10563 + $as_echo "$as_me: failed program was:" >&5
10564 +sed 's/^/| /' conftest.$ac_ext >&5
10565 +
10566 + ok=unknown
10567 +fi
10568 +
10569 +rm -rf conftest.dSYM
10570 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
10571 + conftest$ac_exeext conftest.$ac_ext
10572 + fi
10573 + if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
10574 +
10575 +cat >>confdefs.h <<\_ACEOF
10576 +#define PTHREAD_CREATE_JOINABLE $ok
10577 +_ACEOF
10578 +
10579 + fi
10580 + { $as_echo "$as_me:$LINENO: result: ${ok}" >&5
10581 +$as_echo "${ok}" >&6; }
10582 + if test x"$ok" = xunknown; then
10583 + { $as_echo "$as_me:$LINENO: WARNING: we do not know how to create joinable pthreads" >&5
10584 +$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;}
10585 + fi
10586 +
10587 + { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
10588 +$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
10589 + flag=no
10590 + case "${host_cpu}-${host_os}" in
10591 + *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
10592 + # -D_REENTRANT is actually implied by -pthread in Tru64 5.1,
10593 + # at least.
10594 + *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
10595 + esac
10596 + { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
10597 +$as_echo "${flag}" >&6; }
10598 + if test "x$flag" != xno; then
10599 + PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
10600 + PTHREAD_CPPFLAGS="$flag $PTHREAD_CPPFLAGS"
10601 + fi
10602 +
10603 + LIBS="$save_LIBS"
10604 + CFLAGS="$save_CFLAGS"
10605 + CPPFLAGS="$save_CPPFLAGS"
10606 +
10607 + # More AIX lossage: must compile with cc_r
10608 + # Extract the first word of "cc_r", so it can be a program name with args.
10609 +set dummy cc_r; ac_word=$2
10610 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10611 +$as_echo_n "checking for $ac_word... " >&6; }
10612 +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
10613 + $as_echo_n "(cached) " >&6
10614 +else
10615 + if test -n "$PTHREAD_CC"; then
10616 + ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
10617 +else
10618 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10619 +for as_dir in $PATH
10620 +do
10621 + IFS=$as_save_IFS
10622 + test -z "$as_dir" && as_dir=.
10623 + for ac_exec_ext in '' $ac_executable_extensions; do
10624 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10625 + ac_cv_prog_PTHREAD_CC="cc_r"
10626 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10627 + break 2
10628 + fi
10629 +done
10630 +done
10631 +IFS=$as_save_IFS
10632 +
10633 + test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}"
10634 +fi
10635 +fi
10636 +PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
10637 +if test -n "$PTHREAD_CC"; then
10638 + { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
10639 +$as_echo "$PTHREAD_CC" >&6; }
10640 +else
10641 + { $as_echo "$as_me:$LINENO: result: no" >&5
10642 +$as_echo "no" >&6; }
10643 +fi
10644 +
10645 +
10646 +else
10647 + PTHREAD_CC="$CC"
10648 +fi
10649 +
10650 +
10651 +
10652 +
10653 +
10654 +
10655 +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
10656 +if test x"$acx_pthread_ok" = xyes; then
10657 +
10658 +cat >>confdefs.h <<\_ACEOF
10659 +#define HAVE_PTHREAD 1
10660 +_ACEOF
10661 +
10662 + :
10663 +else
10664 + acx_pthread_ok=no
10665 +
10666 +fi
10667 +ac_ext=c
10668 +ac_cpp='$CPP $CPPFLAGS'
10669 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10670 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10671 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
10672 +
10673 +
10674 +CC=$PTHREAD_CC
10675 +CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
10676 +CPPFLAGS="$PTHREAD_CPPFLAGS $CPPFLAGS"
10677 +LDFLAGS="$PTHREAD_LDFLAGS $LDFLAGS"
10678 +
10679 +
10680 +ac_ext=c
10681 +ac_cpp='$CPP $CPPFLAGS'
10682 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10683 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10684 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
10685 +if test -n "$ac_tool_prefix"; then
10686 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
10687 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
10688 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10689 +$as_echo_n "checking for $ac_word... " >&6; }
10690 +if test "${ac_cv_prog_CC+set}" = set; then
10691 + $as_echo_n "(cached) " >&6
10692 +else
10693 + if test -n "$CC"; then
10694 + ac_cv_prog_CC="$CC" # Let the user override the test.
10695 +else
10696 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10697 +for as_dir in $PATH
10698 +do
10699 + IFS=$as_save_IFS
10700 + test -z "$as_dir" && as_dir=.
10701 + for ac_exec_ext in '' $ac_executable_extensions; do
10702 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10703 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
10704 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10705 + break 2
10706 + fi
10707 +done
10708 +done
10709 +IFS=$as_save_IFS
10710 +
10711 +fi
10712 +fi
10713 +CC=$ac_cv_prog_CC
10714 +if test -n "$CC"; then
10715 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
10716 +$as_echo "$CC" >&6; }
10717 +else
10718 + { $as_echo "$as_me:$LINENO: result: no" >&5
10719 +$as_echo "no" >&6; }
10720 +fi
10721 +
10722 +
10723 +fi
10724 +if test -z "$ac_cv_prog_CC"; then
10725 + ac_ct_CC=$CC
10726 + # Extract the first word of "gcc", so it can be a program name with args.
10727 +set dummy gcc; ac_word=$2
10728 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10729 +$as_echo_n "checking for $ac_word... " >&6; }
10730 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
10731 + $as_echo_n "(cached) " >&6
10732 +else
10733 + if test -n "$ac_ct_CC"; then
10734 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
10735 +else
10736 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10737 +for as_dir in $PATH
10738 +do
10739 + IFS=$as_save_IFS
10740 + test -z "$as_dir" && as_dir=.
10741 + for ac_exec_ext in '' $ac_executable_extensions; do
10742 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10743 + ac_cv_prog_ac_ct_CC="gcc"
10744 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10745 + break 2
10746 + fi
10747 +done
10748 +done
10749 +IFS=$as_save_IFS
10750 +
10751 +fi
10752 +fi
10753 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
10754 +if test -n "$ac_ct_CC"; then
10755 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
10756 +$as_echo "$ac_ct_CC" >&6; }
10757 +else
10758 + { $as_echo "$as_me:$LINENO: result: no" >&5
10759 +$as_echo "no" >&6; }
10760 +fi
10761 +
10762 + if test "x$ac_ct_CC" = x; then
10763 + CC=""
10764 + else
10765 + case $cross_compiling:$ac_tool_warned in
10766 +yes:)
10767 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10768 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10769 +ac_tool_warned=yes ;;
10770 +esac
10771 + CC=$ac_ct_CC
10772 + fi
10773 +else
10774 + CC="$ac_cv_prog_CC"
10775 +fi
10776 +
10777 +if test -z "$CC"; then
10778 + if test -n "$ac_tool_prefix"; then
10779 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
10780 +set dummy ${ac_tool_prefix}cc; ac_word=$2
10781 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10782 +$as_echo_n "checking for $ac_word... " >&6; }
10783 +if test "${ac_cv_prog_CC+set}" = set; then
10784 + $as_echo_n "(cached) " >&6
10785 +else
10786 + if test -n "$CC"; then
10787 + ac_cv_prog_CC="$CC" # Let the user override the test.
10788 +else
10789 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10790 +for as_dir in $PATH
10791 +do
10792 + IFS=$as_save_IFS
10793 + test -z "$as_dir" && as_dir=.
10794 + for ac_exec_ext in '' $ac_executable_extensions; do
10795 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10796 + ac_cv_prog_CC="${ac_tool_prefix}cc"
10797 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10798 + break 2
10799 + fi
10800 +done
10801 +done
10802 +IFS=$as_save_IFS
10803 +
10804 +fi
10805 +fi
10806 +CC=$ac_cv_prog_CC
10807 +if test -n "$CC"; then
10808 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
10809 +$as_echo "$CC" >&6; }
10810 +else
10811 + { $as_echo "$as_me:$LINENO: result: no" >&5
10812 +$as_echo "no" >&6; }
10813 +fi
10814 +
10815 +
10816 + fi
10817 +fi
10818 +if test -z "$CC"; then
10819 + # Extract the first word of "cc", so it can be a program name with args.
10820 +set dummy cc; ac_word=$2
10821 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10822 +$as_echo_n "checking for $ac_word... " >&6; }
10823 +if test "${ac_cv_prog_CC+set}" = set; then
10824 + $as_echo_n "(cached) " >&6
10825 +else
10826 + if test -n "$CC"; then
10827 + ac_cv_prog_CC="$CC" # Let the user override the test.
10828 +else
10829 + ac_prog_rejected=no
10830 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10831 +for as_dir in $PATH
10832 +do
10833 + IFS=$as_save_IFS
10834 + test -z "$as_dir" && as_dir=.
10835 + for ac_exec_ext in '' $ac_executable_extensions; do
10836 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10837 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
10838 + ac_prog_rejected=yes
10839 + continue
10840 + fi
10841 + ac_cv_prog_CC="cc"
10842 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10843 + break 2
10844 + fi
10845 +done
10846 +done
10847 +IFS=$as_save_IFS
10848 +
10849 +if test $ac_prog_rejected = yes; then
10850 + # We found a bogon in the path, so make sure we never use it.
10851 + set dummy $ac_cv_prog_CC
10852 + shift
10853 + if test $# != 0; then
10854 + # We chose a different compiler from the bogus one.
10855 + # However, it has the same basename, so the bogon will be chosen
10856 + # first if we set CC to just the basename; use the full file name.
10857 + shift
10858 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
10859 + fi
10860 +fi
10861 +fi
10862 +fi
10863 +CC=$ac_cv_prog_CC
10864 +if test -n "$CC"; then
10865 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
10866 +$as_echo "$CC" >&6; }
10867 +else
10868 + { $as_echo "$as_me:$LINENO: result: no" >&5
10869 +$as_echo "no" >&6; }
10870 +fi
10871 +
10872 +
10873 +fi
10874 +if test -z "$CC"; then
10875 + if test -n "$ac_tool_prefix"; then
10876 + for ac_prog in cl.exe
10877 + do
10878 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
10879 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
10880 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10881 +$as_echo_n "checking for $ac_word... " >&6; }
10882 +if test "${ac_cv_prog_CC+set}" = set; then
10883 + $as_echo_n "(cached) " >&6
10884 +else
10885 + if test -n "$CC"; then
10886 + ac_cv_prog_CC="$CC" # Let the user override the test.
10887 +else
10888 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10889 +for as_dir in $PATH
10890 +do
10891 + IFS=$as_save_IFS
10892 + test -z "$as_dir" && as_dir=.
10893 + for ac_exec_ext in '' $ac_executable_extensions; do
10894 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10895 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
10896 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10897 + break 2
10898 + fi
10899 +done
10900 +done
10901 +IFS=$as_save_IFS
10902 +
10903 +fi
10904 +fi
10905 +CC=$ac_cv_prog_CC
10906 +if test -n "$CC"; then
10907 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
10908 +$as_echo "$CC" >&6; }
10909 +else
10910 + { $as_echo "$as_me:$LINENO: result: no" >&5
10911 +$as_echo "no" >&6; }
10912 +fi
10913 +
10914 +
10915 + test -n "$CC" && break
10916 + done
10917 +fi
10918 +if test -z "$CC"; then
10919 + ac_ct_CC=$CC
10920 + for ac_prog in cl.exe
10921 +do
10922 + # Extract the first word of "$ac_prog", so it can be a program name with args.
10923 +set dummy $ac_prog; ac_word=$2
10924 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
10925 +$as_echo_n "checking for $ac_word... " >&6; }
10926 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
10927 + $as_echo_n "(cached) " >&6
10928 +else
10929 + if test -n "$ac_ct_CC"; then
10930 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
10931 +else
10932 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10933 +for as_dir in $PATH
10934 +do
10935 + IFS=$as_save_IFS
10936 + test -z "$as_dir" && as_dir=.
10937 + for ac_exec_ext in '' $ac_executable_extensions; do
10938 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
10939 + ac_cv_prog_ac_ct_CC="$ac_prog"
10940 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10941 + break 2
10942 + fi
10943 +done
10944 +done
10945 +IFS=$as_save_IFS
10946 +
10947 +fi
10948 +fi
10949 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
10950 +if test -n "$ac_ct_CC"; then
10951 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
10952 +$as_echo "$ac_ct_CC" >&6; }
10953 +else
10954 + { $as_echo "$as_me:$LINENO: result: no" >&5
10955 +$as_echo "no" >&6; }
10956 +fi
10957 +
10958 +
10959 + test -n "$ac_ct_CC" && break
10960 +done
10961 +
10962 + if test "x$ac_ct_CC" = x; then
10963 + CC=""
10964 + else
10965 + case $cross_compiling:$ac_tool_warned in
10966 +yes:)
10967 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
10968 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10969 +ac_tool_warned=yes ;;
10970 +esac
10971 + CC=$ac_ct_CC
10972 + fi
10973 +fi
10974 +
10975 +fi
10976 +
10977 +
10978 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
10979 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10980 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
10981 +See \`config.log' for more details." >&5
10982 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
10983 +See \`config.log' for more details." >&2;}
10984 + { (exit 1); exit 1; }; }; }
10985 +
10986 +# Provide some information about the compiler.
10987 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
10988 +set X $ac_compile
10989 +ac_compiler=$2
10990 +{ (ac_try="$ac_compiler --version >&5"
10991 +case "(($ac_try" in
10992 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10993 + *) ac_try_echo=$ac_try;;
10994 +esac
10995 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
10996 +$as_echo "$ac_try_echo") >&5
10997 + (eval "$ac_compiler --version >&5") 2>&5
10998 + ac_status=$?
10999 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11000 + (exit $ac_status); }
11001 +{ (ac_try="$ac_compiler -v >&5"
11002 +case "(($ac_try" in
11003 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11004 + *) ac_try_echo=$ac_try;;
11005 +esac
11006 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11007 +$as_echo "$ac_try_echo") >&5
11008 + (eval "$ac_compiler -v >&5") 2>&5
11009 + ac_status=$?
11010 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11011 + (exit $ac_status); }
11012 +{ (ac_try="$ac_compiler -V >&5"
11013 +case "(($ac_try" in
11014 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11015 + *) ac_try_echo=$ac_try;;
11016 +esac
11017 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11018 +$as_echo "$ac_try_echo") >&5
11019 + (eval "$ac_compiler -V >&5") 2>&5
11020 + ac_status=$?
11021 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11022 + (exit $ac_status); }
11023 +
11024 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
11025 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
11026 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
11027 + $as_echo_n "(cached) " >&6
11028 +else
11029 + cat >conftest.$ac_ext <<_ACEOF
11030 +/* confdefs.h. */
11031 +_ACEOF
11032 +cat confdefs.h >>conftest.$ac_ext
11033 +cat >>conftest.$ac_ext <<_ACEOF
11034 +/* end confdefs.h. */
11035 +
11036 +int
11037 +main ()
11038 +{
11039 +#ifndef __GNUC__
11040 + choke me
11041 +#endif
11042 +
11043 + ;
11044 + return 0;
11045 +}
11046 +_ACEOF
11047 +rm -f conftest.$ac_objext
11048 +if { (ac_try="$ac_compile"
11049 +case "(($ac_try" in
11050 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11051 + *) ac_try_echo=$ac_try;;
11052 +esac
11053 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11054 +$as_echo "$ac_try_echo") >&5
11055 + (eval "$ac_compile") 2>conftest.er1
11056 + ac_status=$?
11057 + grep -v '^ *+' conftest.er1 >conftest.err
11058 + rm -f conftest.er1
11059 + cat conftest.err >&5
11060 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11061 + (exit $ac_status); } && {
11062 + test -z "$ac_c_werror_flag" ||
11063 + test ! -s conftest.err
11064 + } && test -s conftest.$ac_objext; then
11065 + ac_compiler_gnu=yes
11066 +else
11067 + $as_echo "$as_me: failed program was:" >&5
11068 +sed 's/^/| /' conftest.$ac_ext >&5
11069 +
11070 + ac_compiler_gnu=no
11071 +fi
11072 +
11073 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11074 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
11075 +
11076 +fi
11077 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
11078 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
11079 +if test $ac_compiler_gnu = yes; then
11080 + GCC=yes
11081 +else
11082 + GCC=
11083 +fi
11084 +ac_test_CFLAGS=${CFLAGS+set}
11085 +ac_save_CFLAGS=$CFLAGS
11086 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
11087 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
11088 +if test "${ac_cv_prog_cc_g+set}" = set; then
11089 + $as_echo_n "(cached) " >&6
11090 +else
11091 + ac_save_c_werror_flag=$ac_c_werror_flag
11092 + ac_c_werror_flag=yes
11093 + ac_cv_prog_cc_g=no
11094 + CFLAGS="-g"
11095 + cat >conftest.$ac_ext <<_ACEOF
11096 +/* confdefs.h. */
11097 +_ACEOF
11098 +cat confdefs.h >>conftest.$ac_ext
11099 +cat >>conftest.$ac_ext <<_ACEOF
11100 +/* end confdefs.h. */
11101 +
11102 +int
11103 +main ()
11104 +{
11105 +
11106 + ;
11107 + return 0;
11108 +}
11109 +_ACEOF
11110 +rm -f conftest.$ac_objext
11111 +if { (ac_try="$ac_compile"
11112 +case "(($ac_try" in
11113 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11114 + *) ac_try_echo=$ac_try;;
11115 +esac
11116 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11117 +$as_echo "$ac_try_echo") >&5
11118 + (eval "$ac_compile") 2>conftest.er1
11119 + ac_status=$?
11120 + grep -v '^ *+' conftest.er1 >conftest.err
11121 + rm -f conftest.er1
11122 + cat conftest.err >&5
11123 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11124 + (exit $ac_status); } && {
11125 + test -z "$ac_c_werror_flag" ||
11126 + test ! -s conftest.err
11127 + } && test -s conftest.$ac_objext; then
11128 + ac_cv_prog_cc_g=yes
11129 +else
11130 + $as_echo "$as_me: failed program was:" >&5
11131 +sed 's/^/| /' conftest.$ac_ext >&5
11132 +
11133 + CFLAGS=""
11134 + cat >conftest.$ac_ext <<_ACEOF
11135 +/* confdefs.h. */
11136 +_ACEOF
11137 +cat confdefs.h >>conftest.$ac_ext
11138 +cat >>conftest.$ac_ext <<_ACEOF
11139 +/* end confdefs.h. */
11140 +
11141 +int
11142 +main ()
11143 +{
11144 +
11145 + ;
11146 + return 0;
11147 +}
11148 +_ACEOF
11149 +rm -f conftest.$ac_objext
11150 +if { (ac_try="$ac_compile"
11151 +case "(($ac_try" in
11152 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11153 + *) ac_try_echo=$ac_try;;
11154 +esac
11155 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11156 +$as_echo "$ac_try_echo") >&5
11157 + (eval "$ac_compile") 2>conftest.er1
11158 + ac_status=$?
11159 + grep -v '^ *+' conftest.er1 >conftest.err
11160 + rm -f conftest.er1
11161 + cat conftest.err >&5
11162 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11163 + (exit $ac_status); } && {
11164 + test -z "$ac_c_werror_flag" ||
11165 + test ! -s conftest.err
11166 + } && test -s conftest.$ac_objext; then
11167 + :
11168 +else
11169 + $as_echo "$as_me: failed program was:" >&5
11170 +sed 's/^/| /' conftest.$ac_ext >&5
11171 +
11172 + ac_c_werror_flag=$ac_save_c_werror_flag
11173 + CFLAGS="-g"
11174 + cat >conftest.$ac_ext <<_ACEOF
11175 +/* confdefs.h. */
11176 +_ACEOF
11177 +cat confdefs.h >>conftest.$ac_ext
11178 +cat >>conftest.$ac_ext <<_ACEOF
11179 +/* end confdefs.h. */
11180 +
11181 +int
11182 +main ()
11183 +{
11184 +
11185 + ;
11186 + return 0;
11187 +}
11188 +_ACEOF
11189 +rm -f conftest.$ac_objext
11190 +if { (ac_try="$ac_compile"
11191 +case "(($ac_try" in
11192 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11193 + *) ac_try_echo=$ac_try;;
11194 +esac
11195 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11196 +$as_echo "$ac_try_echo") >&5
11197 + (eval "$ac_compile") 2>conftest.er1
11198 + ac_status=$?
11199 + grep -v '^ *+' conftest.er1 >conftest.err
11200 + rm -f conftest.er1
11201 + cat conftest.err >&5
11202 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11203 + (exit $ac_status); } && {
11204 + test -z "$ac_c_werror_flag" ||
11205 + test ! -s conftest.err
11206 + } && test -s conftest.$ac_objext; then
11207 + ac_cv_prog_cc_g=yes
11208 +else
11209 + $as_echo "$as_me: failed program was:" >&5
11210 +sed 's/^/| /' conftest.$ac_ext >&5
11211 +
11212 +
11213 +fi
11214 +
11215 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11216 +fi
11217 +
11218 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11219 +fi
11220 +
11221 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11222 + ac_c_werror_flag=$ac_save_c_werror_flag
11223 +fi
11224 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
11225 +$as_echo "$ac_cv_prog_cc_g" >&6; }
11226 +if test "$ac_test_CFLAGS" = set; then
11227 + CFLAGS=$ac_save_CFLAGS
11228 +elif test $ac_cv_prog_cc_g = yes; then
11229 + if test "$GCC" = yes; then
11230 + CFLAGS="-g -O2"
11231 + else
11232 + CFLAGS="-g"
11233 + fi
11234 +else
11235 + if test "$GCC" = yes; then
11236 + CFLAGS="-O2"
11237 + else
11238 + CFLAGS=
11239 + fi
11240 +fi
11241 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
11242 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
11243 +if test "${ac_cv_prog_cc_c89+set}" = set; then
11244 + $as_echo_n "(cached) " >&6
11245 +else
11246 + ac_cv_prog_cc_c89=no
11247 +ac_save_CC=$CC
11248 +cat >conftest.$ac_ext <<_ACEOF
11249 +/* confdefs.h. */
11250 +_ACEOF
11251 +cat confdefs.h >>conftest.$ac_ext
11252 +cat >>conftest.$ac_ext <<_ACEOF
11253 +/* end confdefs.h. */
11254 +#include <stdarg.h>
11255 +#include <stdio.h>
11256 +#include <sys/types.h>
11257 +#include <sys/stat.h>
11258 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
11259 +struct buf { int x; };
11260 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
11261 +static char *e (p, i)
11262 + char **p;
11263 + int i;
11264 +{
11265 + return p[i];
11266 +}
11267 +static char *f (char * (*g) (char **, int), char **p, ...)
11268 +{
11269 + char *s;
11270 + va_list v;
11271 + va_start (v,p);
11272 + s = g (p, va_arg (v,int));
11273 + va_end (v);
11274 + return s;
11275 +}
11276 +
11277 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
11278 + function prototypes and stuff, but not '\xHH' hex character constants.
11279 + These don't provoke an error unfortunately, instead are silently treated
11280 + as 'x'. The following induces an error, until -std is added to get
11281 + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
11282 + array size at least. It's necessary to write '\x00'==0 to get something
11283 + that's true only with -std. */
11284 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
11285 +
11286 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
11287 + inside strings and character constants. */
11288 +#define FOO(x) 'x'
11289 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
11290 +
11291 +int test (int i, double x);
11292 +struct s1 {int (*f) (int a);};
11293 +struct s2 {int (*f) (double a);};
11294 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
11295 +int argc;
11296 +char **argv;
11297 +int
11298 +main ()
11299 +{
11300 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
11301 + ;
11302 + return 0;
11303 +}
11304 +_ACEOF
11305 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
11306 + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
11307 +do
11308 + CC="$ac_save_CC $ac_arg"
11309 + rm -f conftest.$ac_objext
11310 +if { (ac_try="$ac_compile"
11311 +case "(($ac_try" in
11312 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11313 + *) ac_try_echo=$ac_try;;
11314 +esac
11315 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11316 +$as_echo "$ac_try_echo") >&5
11317 + (eval "$ac_compile") 2>conftest.er1
11318 + ac_status=$?
11319 + grep -v '^ *+' conftest.er1 >conftest.err
11320 + rm -f conftest.er1
11321 + cat conftest.err >&5
11322 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11323 + (exit $ac_status); } && {
11324 + test -z "$ac_c_werror_flag" ||
11325 + test ! -s conftest.err
11326 + } && test -s conftest.$ac_objext; then
11327 + ac_cv_prog_cc_c89=$ac_arg
11328 +else
11329 + $as_echo "$as_me: failed program was:" >&5
11330 +sed 's/^/| /' conftest.$ac_ext >&5
11331 +
11332 +
11333 +fi
11334 +
11335 +rm -f core conftest.err conftest.$ac_objext
11336 + test "x$ac_cv_prog_cc_c89" != "xno" && break
11337 +done
11338 +rm -f conftest.$ac_ext
11339 +CC=$ac_save_CC
11340 +
11341 +fi
11342 +# AC_CACHE_VAL
11343 +case "x$ac_cv_prog_cc_c89" in
11344 + x)
11345 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
11346 +$as_echo "none needed" >&6; } ;;
11347 + xno)
11348 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
11349 +$as_echo "unsupported" >&6; } ;;
11350 + *)
11351 + CC="$CC $ac_cv_prog_cc_c89"
11352 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
11353 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
11354 +esac
11355 +
11356 +
11357 +ac_ext=c
11358 +ac_cpp='$CPP $CPPFLAGS'
11359 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11360 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11361 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
11362 +
11363 +depcc="$CC" am_compiler_list=
11364 +
11365 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
11366 +$as_echo_n "checking dependency style of $depcc... " >&6; }
11367 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
11368 + $as_echo_n "(cached) " >&6
11369 +else
11370 + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
11371 + # We make a subdir and do the tests there. Otherwise we can end up
11372 + # making bogus files that we don't know about and never remove. For
11373 + # instance it was reported that on HP-UX the gcc test will end up
11374 + # making a dummy file named `D' -- because `-MD' means `put the output
11375 + # in D'.
11376 + mkdir conftest.dir
11377 + # Copy depcomp to subdir because otherwise we won't find it if we're
11378 + # using a relative directory.
11379 + cp "$am_depcomp" conftest.dir
11380 + cd conftest.dir
11381 + # We will build objects and dependencies in a subdirectory because
11382 + # it helps to detect inapplicable dependency modes. For instance
11383 + # both Tru64's cc and ICC support -MD to output dependencies as a
11384 + # side effect of compilation, but ICC will put the dependencies in
11385 + # the current directory while Tru64 will put them in the object
11386 + # directory.
11387 + mkdir sub
11388 +
11389 + am_cv_CC_dependencies_compiler_type=none
11390 + if test "$am_compiler_list" = ""; then
11391 + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
11392 + fi
11393 + am__universal=false
11394 + case " $depcc " in #(
11395 + *\ -arch\ *\ -arch\ *) am__universal=true ;;
11396 + esac
11397 +
11398 + for depmode in $am_compiler_list; do
11399 + # Setup a source with many dependencies, because some compilers
11400 + # like to wrap large dependency lists on column 80 (with \), and
11401 + # we should not choose a depcomp mode which is confused by this.
11402 + #
11403 + # We need to recreate these files for each test, as the compiler may
11404 + # overwrite some of them when testing with obscure command lines.
11405 + # This happens at least with the AIX C compiler.
11406 + : > sub/conftest.c
11407 + for i in 1 2 3 4 5 6; do
11408 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
11409 + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
11410 + # Solaris 8's {/usr,}/bin/sh.
11411 + touch sub/conftst$i.h
11412 + done
11413 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
11414 +
11415 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
11416 + # mode. It turns out that the SunPro C++ compiler does not properly
11417 + # handle `-M -o', and we need to detect this. Also, some Intel
11418 + # versions had trouble with output in subdirs
11419 + am__obj=sub/conftest.${OBJEXT-o}
11420 + am__minus_obj="-o $am__obj"
11421 + case $depmode in
11422 + gcc)
11423 + # This depmode causes a compiler race in universal mode.
11424 + test "$am__universal" = false || continue
11425 + ;;
11426 + nosideeffect)
11427 + # after this tag, mechanisms are not by side-effect, so they'll
11428 + # only be used when explicitly requested
11429 + if test "x$enable_dependency_tracking" = xyes; then
11430 + continue
11431 + else
11432 + break
11433 + fi
11434 + ;;
11435 + msvisualcpp | msvcmsys)
11436 + # This compiler won't grok `-c -o', but also, the minuso test has
11437 + # not run yet. These depmodes are late enough in the game, and
11438 + # so weak that their functioning should not be impacted.
11439 + am__obj=conftest.${OBJEXT-o}
11440 + am__minus_obj=
11441 + ;;
11442 + none) break ;;
11443 + esac
11444 + if depmode=$depmode \
11445 + source=sub/conftest.c object=$am__obj \
11446 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
11447 + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
11448 + >/dev/null 2>conftest.err &&
11449 + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
11450 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
11451 + grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
11452 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
11453 + # icc doesn't choke on unknown options, it will just issue warnings
11454 + # or remarks (even with -Werror). So we grep stderr for any message
11455 + # that says an option was ignored or not supported.
11456 + # When given -MP, icc 7.0 and 7.1 complain thusly:
11457 + # icc: Command line warning: ignoring option '-M'; no argument required
11458 + # The diagnosis changed in icc 8.0:
11459 + # icc: Command line remark: option '-MP' not supported
11460 + if (grep 'ignoring option' conftest.err ||
11461 + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
11462 + am_cv_CC_dependencies_compiler_type=$depmode
11463 + break
11464 + fi
11465 + fi
11466 + done
11467 +
11468 + cd ..
11469 + rm -rf conftest.dir
11470 +else
11471 + am_cv_CC_dependencies_compiler_type=none
11472 +fi
11473 +
11474 +fi
11475 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
11476 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
11477 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
11478 +
11479 + if
11480 + test "x$enable_dependency_tracking" != xno \
11481 + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
11482 + am__fastdepCC_TRUE=
11483 + am__fastdepCC_FALSE='#'
11484 +else
11485 + am__fastdepCC_TRUE='#'
11486 + am__fastdepCC_FALSE=
11487 +fi
11488 +
11489 +
11490 +for ac_prog in flex lex
11491 +do
11492 + # Extract the first word of "$ac_prog", so it can be a program name with args.
11493 +set dummy $ac_prog; ac_word=$2
11494 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
11495 +$as_echo_n "checking for $ac_word... " >&6; }
11496 +if test "${ac_cv_prog_LEX+set}" = set; then
11497 + $as_echo_n "(cached) " >&6
11498 +else
11499 + if test -n "$LEX"; then
11500 + ac_cv_prog_LEX="$LEX" # Let the user override the test.
11501 +else
11502 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11503 +for as_dir in $PATH
11504 +do
11505 + IFS=$as_save_IFS
11506 + test -z "$as_dir" && as_dir=.
11507 + for ac_exec_ext in '' $ac_executable_extensions; do
11508 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11509 + ac_cv_prog_LEX="$ac_prog"
11510 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11511 + break 2
11512 + fi
11513 +done
11514 +done
11515 +IFS=$as_save_IFS
11516 +
11517 +fi
11518 +fi
11519 +LEX=$ac_cv_prog_LEX
11520 +if test -n "$LEX"; then
11521 + { $as_echo "$as_me:$LINENO: result: $LEX" >&5
11522 +$as_echo "$LEX" >&6; }
11523 +else
11524 + { $as_echo "$as_me:$LINENO: result: no" >&5
11525 +$as_echo "no" >&6; }
11526 +fi
11527 +
11528 +
11529 + test -n "$LEX" && break
11530 +done
11531 +test -n "$LEX" || LEX=":"
11532 +
11533 +if test "x$LEX" != "x:"; then
11534 + cat >conftest.l <<_ACEOF
11535 +%%
11536 +a { ECHO; }
11537 +b { REJECT; }
11538 +c { yymore (); }
11539 +d { yyless (1); }
11540 +e { yyless (input () != 0); }
11541 +f { unput (yytext[0]); }
11542 +. { BEGIN INITIAL; }
11543 +%%
11544 +#ifdef YYTEXT_POINTER
11545 +extern char *yytext;
11546 +#endif
11547 +int
11548 +main (void)
11549 +{
11550 + return ! yylex () + ! yywrap ();
11551 +}
11552 +_ACEOF
11553 +{ (ac_try="$LEX conftest.l"
11554 +case "(($ac_try" in
11555 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11556 + *) ac_try_echo=$ac_try;;
11557 +esac
11558 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11559 +$as_echo "$ac_try_echo") >&5
11560 + (eval "$LEX conftest.l") 2>&5
11561 + ac_status=$?
11562 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11563 + (exit $ac_status); }
11564 +{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
11565 +$as_echo_n "checking lex output file root... " >&6; }
11566 +if test "${ac_cv_prog_lex_root+set}" = set; then
11567 + $as_echo_n "(cached) " >&6
11568 +else
11569 +
11570 +if test -f lex.yy.c; then
11571 + ac_cv_prog_lex_root=lex.yy
11572 +elif test -f lexyy.c; then
11573 + ac_cv_prog_lex_root=lexyy
11574 +else
11575 + { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
11576 +$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
11577 + { (exit 1); exit 1; }; }
11578 +fi
11579 +fi
11580 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
11581 +$as_echo "$ac_cv_prog_lex_root" >&6; }
11582 +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
11583 +
11584 +if test -z "${LEXLIB+set}"; then
11585 + { $as_echo "$as_me:$LINENO: checking lex library" >&5
11586 +$as_echo_n "checking lex library... " >&6; }
11587 +if test "${ac_cv_lib_lex+set}" = set; then
11588 + $as_echo_n "(cached) " >&6
11589 +else
11590 +
11591 + ac_save_LIBS=$LIBS
11592 + ac_cv_lib_lex='none needed'
11593 + for ac_lib in '' -lfl -ll; do
11594 + LIBS="$ac_lib $ac_save_LIBS"
11595 + cat >conftest.$ac_ext <<_ACEOF
11596 +`cat $LEX_OUTPUT_ROOT.c`
11597 +_ACEOF
11598 +rm -f conftest.$ac_objext conftest$ac_exeext
11599 +if { (ac_try="$ac_link"
11600 +case "(($ac_try" in
11601 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11602 + *) ac_try_echo=$ac_try;;
11603 +esac
11604 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11605 +$as_echo "$ac_try_echo") >&5
11606 + (eval "$ac_link") 2>conftest.er1
11607 + ac_status=$?
11608 + grep -v '^ *+' conftest.er1 >conftest.err
11609 + rm -f conftest.er1
11610 + cat conftest.err >&5
11611 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11612 + (exit $ac_status); } && {
11613 + test -z "$ac_c_werror_flag" ||
11614 + test ! -s conftest.err
11615 + } && test -s conftest$ac_exeext && {
11616 + test "$cross_compiling" = yes ||
11617 + $as_test_x conftest$ac_exeext
11618 + }; then
11619 + ac_cv_lib_lex=$ac_lib
11620 +else
11621 + $as_echo "$as_me: failed program was:" >&5
11622 +sed 's/^/| /' conftest.$ac_ext >&5
11623 +
11624 +
11625 +fi
11626 +
11627 +rm -rf conftest.dSYM
11628 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11629 + conftest$ac_exeext conftest.$ac_ext
11630 + test "$ac_cv_lib_lex" != 'none needed' && break
11631 + done
11632 + LIBS=$ac_save_LIBS
11633 +
11634 +fi
11635 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
11636 +$as_echo "$ac_cv_lib_lex" >&6; }
11637 + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
11638 +fi
11639 +
11640 +
11641 +{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
11642 +$as_echo_n "checking whether yytext is a pointer... " >&6; }
11643 +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
11644 + $as_echo_n "(cached) " >&6
11645 +else
11646 + # POSIX says lex can declare yytext either as a pointer or an array; the
11647 +# default is implementation-dependent. Figure out which it is, since
11648 +# not all implementations provide the %pointer and %array declarations.
11649 +ac_cv_prog_lex_yytext_pointer=no
11650 +ac_save_LIBS=$LIBS
11651 +LIBS="$LEXLIB $ac_save_LIBS"
11652 +cat >conftest.$ac_ext <<_ACEOF
11653 +#define YYTEXT_POINTER 1
11654 +`cat $LEX_OUTPUT_ROOT.c`
11655 +_ACEOF
11656 +rm -f conftest.$ac_objext conftest$ac_exeext
11657 +if { (ac_try="$ac_link"
11658 +case "(($ac_try" in
11659 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11660 + *) ac_try_echo=$ac_try;;
11661 +esac
11662 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11663 +$as_echo "$ac_try_echo") >&5
11664 + (eval "$ac_link") 2>conftest.er1
11665 + ac_status=$?
11666 + grep -v '^ *+' conftest.er1 >conftest.err
11667 + rm -f conftest.er1
11668 + cat conftest.err >&5
11669 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11670 + (exit $ac_status); } && {
11671 + test -z "$ac_c_werror_flag" ||
11672 + test ! -s conftest.err
11673 + } && test -s conftest$ac_exeext && {
11674 + test "$cross_compiling" = yes ||
11675 + $as_test_x conftest$ac_exeext
11676 + }; then
11677 + ac_cv_prog_lex_yytext_pointer=yes
11678 +else
11679 + $as_echo "$as_me: failed program was:" >&5
11680 +sed 's/^/| /' conftest.$ac_ext >&5
11681 +
11682 +
11683 +fi
11684 +
11685 +rm -rf conftest.dSYM
11686 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
11687 + conftest$ac_exeext conftest.$ac_ext
11688 +LIBS=$ac_save_LIBS
11689 +
11690 +fi
11691 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
11692 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
11693 +if test $ac_cv_prog_lex_yytext_pointer = yes; then
11694 +
11695 +cat >>confdefs.h <<\_ACEOF
11696 +#define YYTEXT_POINTER 1
11697 +_ACEOF
11698 +
11699 +fi
11700 +rm -f conftest.l $LEX_OUTPUT_ROOT.c
11701 +
11702 +fi
11703 +if test "$LEX" = :; then
11704 + LEX=${am_missing_run}flex
11705 +fi
11706 +for ac_prog in 'bison -y' byacc
11707 +do
11708 + # Extract the first word of "$ac_prog", so it can be a program name with args.
11709 +set dummy $ac_prog; ac_word=$2
11710 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
11711 +$as_echo_n "checking for $ac_word... " >&6; }
11712 +if test "${ac_cv_prog_YACC+set}" = set; then
11713 + $as_echo_n "(cached) " >&6
11714 +else
11715 + if test -n "$YACC"; then
11716 + ac_cv_prog_YACC="$YACC" # Let the user override the test.
11717 +else
11718 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11719 +for as_dir in $PATH
11720 +do
11721 + IFS=$as_save_IFS
11722 + test -z "$as_dir" && as_dir=.
11723 + for ac_exec_ext in '' $ac_executable_extensions; do
11724 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11725 + ac_cv_prog_YACC="$ac_prog"
11726 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11727 + break 2
11728 + fi
11729 +done
11730 +done
11731 +IFS=$as_save_IFS
11732 +
11733 +fi
11734 +fi
11735 +YACC=$ac_cv_prog_YACC
11736 +if test -n "$YACC"; then
11737 + { $as_echo "$as_me:$LINENO: result: $YACC" >&5
11738 +$as_echo "$YACC" >&6; }
11739 +else
11740 + { $as_echo "$as_me:$LINENO: result: no" >&5
11741 +$as_echo "no" >&6; }
11742 +fi
11743 +
11744 +
11745 + test -n "$YACC" && break
11746 +done
11747 +test -n "$YACC" || YACC="yacc"
11748 +
11749 +if test -n "$ac_tool_prefix"; then
11750 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
11751 +set dummy ${ac_tool_prefix}ranlib; ac_word=$2
11752 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
11753 +$as_echo_n "checking for $ac_word... " >&6; }
11754 +if test "${ac_cv_prog_RANLIB+set}" = set; then
11755 + $as_echo_n "(cached) " >&6
11756 +else
11757 + if test -n "$RANLIB"; then
11758 + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
11759 +else
11760 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11761 +for as_dir in $PATH
11762 +do
11763 + IFS=$as_save_IFS
11764 + test -z "$as_dir" && as_dir=.
11765 + for ac_exec_ext in '' $ac_executable_extensions; do
11766 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11767 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
11768 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11769 + break 2
11770 + fi
11771 +done
11772 +done
11773 +IFS=$as_save_IFS
11774 +
11775 +fi
11776 +fi
11777 +RANLIB=$ac_cv_prog_RANLIB
11778 +if test -n "$RANLIB"; then
11779 + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
11780 +$as_echo "$RANLIB" >&6; }
11781 +else
11782 + { $as_echo "$as_me:$LINENO: result: no" >&5
11783 +$as_echo "no" >&6; }
11784 +fi
11785 +
11786 +
11787 +fi
11788 +if test -z "$ac_cv_prog_RANLIB"; then
11789 + ac_ct_RANLIB=$RANLIB
11790 + # Extract the first word of "ranlib", so it can be a program name with args.
11791 +set dummy ranlib; ac_word=$2
11792 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
11793 +$as_echo_n "checking for $ac_word... " >&6; }
11794 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
11795 + $as_echo_n "(cached) " >&6
11796 +else
11797 + if test -n "$ac_ct_RANLIB"; then
11798 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
11799 +else
11800 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11801 +for as_dir in $PATH
11802 +do
11803 + IFS=$as_save_IFS
11804 + test -z "$as_dir" && as_dir=.
11805 + for ac_exec_ext in '' $ac_executable_extensions; do
11806 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11807 + ac_cv_prog_ac_ct_RANLIB="ranlib"
11808 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11809 + break 2
11810 + fi
11811 +done
11812 +done
11813 +IFS=$as_save_IFS
11814 +
11815 +fi
11816 +fi
11817 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
11818 +if test -n "$ac_ct_RANLIB"; then
11819 + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
11820 +$as_echo "$ac_ct_RANLIB" >&6; }
11821 +else
11822 + { $as_echo "$as_me:$LINENO: result: no" >&5
11823 +$as_echo "no" >&6; }
11824 +fi
11825 +
11826 + if test "x$ac_ct_RANLIB" = x; then
11827 + RANLIB=":"
11828 + else
11829 + case $cross_compiling:$ac_tool_warned in
11830 +yes:)
11831 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
11832 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11833 +ac_tool_warned=yes ;;
11834 +esac
11835 + RANLIB=$ac_ct_RANLIB
11836 + fi
11837 +else
11838 + RANLIB="$ac_cv_prog_RANLIB"
11839 +fi
11840 +
11841 +# Find a good install program. We prefer a C program (faster),
11842 +# so one script is as good as another. But avoid the broken or
11843 +# incompatible versions:
11844 +# SysV /etc/install, /usr/sbin/install
11845 +# SunOS /usr/etc/install
11846 +# IRIX /sbin/install
11847 +# AIX /bin/install
11848 +# AmigaOS /C/install, which installs bootblocks on floppy discs
11849 +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
11850 +# AFS /usr/afsws/bin/install, which mishandles nonexistent args
11851 +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
11852 +# OS/2's system install, which has a completely different semantic
11853 +# ./install, which can be erroneously created by make from ./install.sh.
11854 +# Reject install programs that cannot install multiple files.
11855 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
11856 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
11857 +if test -z "$INSTALL"; then
11858 +if test "${ac_cv_path_install+set}" = set; then
11859 + $as_echo_n "(cached) " >&6
11860 +else
11861 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11862 +for as_dir in $PATH
11863 +do
11864 + IFS=$as_save_IFS
11865 + test -z "$as_dir" && as_dir=.
11866 + # Account for people who put trailing slashes in PATH elements.
11867 +case $as_dir/ in
11868 + ./ | .// | /cC/* | \
11869 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
11870 + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
11871 + /usr/ucb/* ) ;;
11872 + *)
11873 + # OSF1 and SCO ODT 3.0 have their own names for install.
11874 + # Don't use installbsd from OSF since it installs stuff as root
11875 + # by default.
11876 + for ac_prog in ginstall scoinst install; do
11877 + for ac_exec_ext in '' $ac_executable_extensions; do
11878 + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
11879 + if test $ac_prog = install &&
11880 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
11881 + # AIX install. It has an incompatible calling convention.
11882 + :
11883 + elif test $ac_prog = install &&
11884 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
11885 + # program-specific install script used by HP pwplus--don't use.
11886 + :
11887 + else
11888 + rm -rf conftest.one conftest.two conftest.dir
11889 + echo one > conftest.one
11890 + echo two > conftest.two
11891 + mkdir conftest.dir
11892 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
11893 + test -s conftest.one && test -s conftest.two &&
11894 + test -s conftest.dir/conftest.one &&
11895 + test -s conftest.dir/conftest.two
11896 + then
11897 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
11898 + break 3
11899 + fi
11900 + fi
11901 + fi
11902 + done
11903 + done
11904 + ;;
11905 +esac
11906 +
11907 +done
11908 +IFS=$as_save_IFS
11909 +
11910 +rm -rf conftest.one conftest.two conftest.dir
11911 +
11912 +fi
11913 + if test "${ac_cv_path_install+set}" = set; then
11914 + INSTALL=$ac_cv_path_install
11915 + else
11916 + # As a last resort, use the slow shell script. Don't cache a
11917 + # value for INSTALL within a source directory, because that will
11918 + # break other packages using the cache if that directory is
11919 + # removed, or if the value is a relative name.
11920 + INSTALL=$ac_install_sh
11921 + fi
11922 +fi
11923 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
11924 +$as_echo "$INSTALL" >&6; }
11925 +
11926 +# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
11927 +# It thinks the first close brace ends the variable substitution.
11928 +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
11929 +
11930 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
11931 +
11932 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
11933 +
11934 +if test "x$CC" != xcc; then
11935 + { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
11936 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
11937 +else
11938 + { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
11939 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
11940 +fi
11941 +set dummy $CC; ac_cc=`$as_echo "$2" |
11942 + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
11943 +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
11944 + $as_echo_n "(cached) " >&6
11945 +else
11946 + cat >conftest.$ac_ext <<_ACEOF
11947 +/* confdefs.h. */
11948 +_ACEOF
11949 +cat confdefs.h >>conftest.$ac_ext
11950 +cat >>conftest.$ac_ext <<_ACEOF
11951 +/* end confdefs.h. */
11952 +
11953 +int
11954 +main ()
11955 +{
11956 +
11957 + ;
11958 + return 0;
11959 +}
11960 +_ACEOF
11961 +# Make sure it works both with $CC and with simple cc.
11962 +# We do the test twice because some compilers refuse to overwrite an
11963 +# existing .o file with -o, though they will create one.
11964 +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
11965 +rm -f conftest2.*
11966 +if { (case "(($ac_try" in
11967 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11968 + *) ac_try_echo=$ac_try;;
11969 +esac
11970 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11971 +$as_echo "$ac_try_echo") >&5
11972 + (eval "$ac_try") 2>&5
11973 + ac_status=$?
11974 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11975 + (exit $ac_status); } &&
11976 + test -f conftest2.$ac_objext && { (case "(($ac_try" in
11977 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11978 + *) ac_try_echo=$ac_try;;
11979 +esac
11980 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11981 +$as_echo "$ac_try_echo") >&5
11982 + (eval "$ac_try") 2>&5
11983 + ac_status=$?
11984 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
11985 + (exit $ac_status); };
11986 +then
11987 + eval ac_cv_prog_cc_${ac_cc}_c_o=yes
11988 + if test "x$CC" != xcc; then
11989 + # Test first that cc exists at all.
11990 + if { ac_try='cc -c conftest.$ac_ext >&5'
11991 + { (case "(($ac_try" in
11992 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11993 + *) ac_try_echo=$ac_try;;
11994 +esac
11995 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
11996 +$as_echo "$ac_try_echo") >&5
11997 + (eval "$ac_try") 2>&5
11998 + ac_status=$?
11999 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12000 + (exit $ac_status); }; }; then
12001 + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
12002 + rm -f conftest2.*
12003 + if { (case "(($ac_try" in
12004 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12005 + *) ac_try_echo=$ac_try;;
12006 +esac
12007 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12008 +$as_echo "$ac_try_echo") >&5
12009 + (eval "$ac_try") 2>&5
12010 + ac_status=$?
12011 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12012 + (exit $ac_status); } &&
12013 + test -f conftest2.$ac_objext && { (case "(($ac_try" in
12014 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
12015 + *) ac_try_echo=$ac_try;;
12016 +esac
12017 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
12018 +$as_echo "$ac_try_echo") >&5
12019 + (eval "$ac_try") 2>&5
12020 + ac_status=$?
12021 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
12022 + (exit $ac_status); };
12023 + then
12024 + # cc works too.
12025 + :
12026 + else
12027 + # cc exists but doesn't like -o.
12028 + eval ac_cv_prog_cc_${ac_cc}_c_o=no
12029 + fi
12030 + fi
12031 + fi
12032 +else
12033 + eval ac_cv_prog_cc_${ac_cc}_c_o=no
12034 +fi
12035 +rm -f core conftest*
12036 +
12037 +fi
12038 +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
12039 + { $as_echo "$as_me:$LINENO: result: yes" >&5
12040 +$as_echo "yes" >&6; }
12041 +else
12042 + { $as_echo "$as_me:$LINENO: result: no" >&5
12043 +$as_echo "no" >&6; }
12044 +
12045 +cat >>confdefs.h <<\_ACEOF
12046 +#define NO_MINUS_C_MINUS_O 1
12047 +_ACEOF
12048 +
12049 +fi
12050 +
12051 +# FIXME: we rely on the cache variable name because
12052 +# there is no other way.
12053 +set dummy $CC
12054 +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
12055 +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
12056 +if test "$am_t" != yes; then
12057 + # Losing compiler, so override with the script.
12058 + # FIXME: It is wrong to rewrite CC.
12059 + # But if we don't then we get into trouble of one sort or another.
12060 + # A longer-term fix would be to have automake use am__CC in this case,
12061 + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
12062 + CC="$am_aux_dir/compile $CC"
12063 +fi
12064 +
12065 +
12066 +
12067 +# Check whether --enable-shared was given.
12068 +if test "${enable_shared+set}" = set; then
12069 + enableval=$enable_shared; p=${PACKAGE-default}
12070 + case $enableval in
12071 + yes) enable_shared=yes ;;
12072 + no) enable_shared=no ;;
12073 + *)
12074 + enable_shared=no
12075 + # Look at the argument we got. We use all the common list separators.
12076 + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
12077 + for pkg in $enableval; do
12078 + IFS="$lt_save_ifs"
12079 + if test "X$pkg" = "X$p"; then
12080 + enable_shared=yes
12081 + fi
12082 + done
12083 + IFS="$lt_save_ifs"
12084 + ;;
12085 + esac
12086 +else
12087 + enable_shared=no
12088 +fi
12089 +
12090 +
12091 +
12092 +
12093 +
12094 +
12095 +
12096 +
12097 ac_have_func=no # yes means we've found a way to get the load average.
12098
12099 # Make sure getloadavg.c is where it belongs, at configure-time.
12100 @@ -23945,6 +26301,21 @@ LIBOBJS=$ac_libobjs
12101 LTLIBOBJS=$ac_ltlibobjs
12102
12103
12104 + if test -n "$EXEEXT"; then
12105 + am__EXEEXT_TRUE=
12106 + am__EXEEXT_FALSE='#'
12107 +else
12108 + am__EXEEXT_TRUE='#'
12109 + am__EXEEXT_FALSE=
12110 +fi
12111 +
12112 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
12113 + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
12114 +Usually this means the macro was only invoked conditionally." >&5
12115 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
12116 +Usually this means the macro was only invoked conditionally." >&2;}
12117 + { (exit 1); exit 1; }; }
12118 +fi
12119 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
12120 { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
12121 Usually this means the macro was only invoked conditionally." >&5
12122 @@ -23959,6 +26330,37 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
12123 Usually this means the macro was only invoked conditionally." >&2;}
12124 { (exit 1); exit 1; }; }
12125 fi
12126 +if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
12127 + { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
12128 +Usually this means the macro was only invoked conditionally." >&5
12129 +$as_echo "$as_me: error: conditional \"INSTALL_LTDL\" was never defined.
12130 +Usually this means the macro was only invoked conditionally." >&2;}
12131 + { (exit 1); exit 1; }; }
12132 +fi
12133 +if test -z "${CONVENIENCE_LTDL_TRUE}" && test -z "${CONVENIENCE_LTDL_FALSE}"; then
12134 + { { $as_echo "$as_me:$LINENO: error: conditional \"CONVENIENCE_LTDL\" was never defined.
12135 +Usually this means the macro was only invoked conditionally." >&5
12136 +$as_echo "$as_me: error: conditional \"CONVENIENCE_LTDL\" was never defined.
12137 +Usually this means the macro was only invoked conditionally." >&2;}
12138 + { (exit 1); exit 1; }; }
12139 +fi
12140 +LT_CONFIG_H=src/conf.h
12141 +
12142 + _ltdl_libobjs=
12143 + _ltdl_ltlibobjs=
12144 + if test -n "$_LT_LIBOBJS"; then
12145 + # Remove the extension.
12146 + _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
12147 + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
12148 + _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
12149 + _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
12150 + done
12151 + fi
12152 + ltdl_LIBOBJS=$_ltdl_libobjs
12153 +
12154 + ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
12155 +
12156 +
12157 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
12158 { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
12159 Usually this means the macro was only invoked conditionally." >&5
12160 @@ -24481,9 +26883,9 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
12161 sed_quote_subst='$sed_quote_subst'
12162 double_quote_subst='$double_quote_subst'
12163 delay_variable_subst='$delay_variable_subst'
12164 -enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
12165 macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
12166 macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
12167 +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
12168 enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
12169 pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
12170 enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
12171 @@ -25400,18 +27802,28 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
12172
12173
12174 case $ac_file$ac_mode in
12175 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
12176 - # Strip MF so we end up with the name of the file.
12177 - mf=`echo "$mf" | sed -e 's/:.*$//'`
12178 - # Check whether this is an Automake generated Makefile or not.
12179 - # We used to match only the files named `Makefile.in', but
12180 - # some people rename them; so instead we look at the file content.
12181 - # Grep'ing the first line is not enough: some people post-process
12182 - # each Makefile.in and add a new line on top of each file to say so.
12183 - # Grep'ing the whole file is not good either: AIX grep has a line
12184 - # limit of 2048, but all sed's we know have understand at least 4000.
12185 - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
12186 - dirpart=`$as_dirname -- "$mf" ||
12187 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
12188 + # Autoconf 2.62 quotes --file arguments for eval, but not when files
12189 + # are listed without --file. Let's play safe and only enable the eval
12190 + # if we detect the quoting.
12191 + case $CONFIG_FILES in
12192 + *\'*) eval set x "$CONFIG_FILES" ;;
12193 + *) set x $CONFIG_FILES ;;
12194 + esac
12195 + shift
12196 + for mf
12197 + do
12198 + # Strip MF so we end up with the name of the file.
12199 + mf=`echo "$mf" | sed -e 's/:.*$//'`
12200 + # Check whether this is an Automake generated Makefile or not.
12201 + # We used to match only the files named `Makefile.in', but
12202 + # some people rename them; so instead we look at the file content.
12203 + # Grep'ing the first line is not enough: some people post-process
12204 + # each Makefile.in and add a new line on top of each file to say so.
12205 + # Grep'ing the whole file is not good either: AIX grep has a line
12206 + # limit of 2048, but all sed's we know have understand at least 4000.
12207 + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
12208 + dirpart=`$as_dirname -- "$mf" ||
12209 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12210 X"$mf" : 'X\(//\)[^/]' \| \
12211 X"$mf" : 'X\(//\)$' \| \
12212 @@ -25434,28 +27846,28 @@ $as_echo X"$mf" |
12213 q
12214 }
12215 s/.*/./; q'`
12216 - else
12217 - continue
12218 - fi
12219 - # Extract the definition of DEPDIR, am__include, and am__quote
12220 - # from the Makefile without running `make'.
12221 - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
12222 - test -z "$DEPDIR" && continue
12223 - am__include=`sed -n 's/^am__include = //p' < "$mf"`
12224 - test -z "am__include" && continue
12225 - am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
12226 - # When using ansi2knr, U may be empty or an underscore; expand it
12227 - U=`sed -n 's/^U = //p' < "$mf"`
12228 - # Find all dependency output files, they are included files with
12229 - # $(DEPDIR) in their names. We invoke sed twice because it is the
12230 - # simplest approach to changing $(DEPDIR) to its actual value in the
12231 - # expansion.
12232 - for file in `sed -n "
12233 - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
12234 - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
12235 - # Make sure the directory exists.
12236 - test -f "$dirpart/$file" && continue
12237 - fdir=`$as_dirname -- "$file" ||
12238 + else
12239 + continue
12240 + fi
12241 + # Extract the definition of DEPDIR, am__include, and am__quote
12242 + # from the Makefile without running `make'.
12243 + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
12244 + test -z "$DEPDIR" && continue
12245 + am__include=`sed -n 's/^am__include = //p' < "$mf"`
12246 + test -z "am__include" && continue
12247 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
12248 + # When using ansi2knr, U may be empty or an underscore; expand it
12249 + U=`sed -n 's/^U = //p' < "$mf"`
12250 + # Find all dependency output files, they are included files with
12251 + # $(DEPDIR) in their names. We invoke sed twice because it is the
12252 + # simplest approach to changing $(DEPDIR) to its actual value in the
12253 + # expansion.
12254 + for file in `sed -n "
12255 + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
12256 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
12257 + # Make sure the directory exists.
12258 + test -f "$dirpart/$file" && continue
12259 + fdir=`$as_dirname -- "$file" ||
12260 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12261 X"$file" : 'X\(//\)[^/]' \| \
12262 X"$file" : 'X\(//\)$' \| \
12263 @@ -25478,7 +27890,7 @@ $as_echo X"$file" |
12264 q
12265 }
12266 s/.*/./; q'`
12267 - { as_dir=$dirpart/$fdir
12268 + { as_dir=$dirpart/$fdir
12269 case $as_dir in #(
12270 -*) as_dir=./$as_dir;;
12271 esac
12272 @@ -25519,10 +27931,11 @@ $as_echo X"$as_dir" |
12273 } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
12274 $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
12275 { (exit 1); exit 1; }; }; }
12276 - # echo "creating $dirpart/$file"
12277 - echo '# dummy' > "$dirpart/$file"
12278 + # echo "creating $dirpart/$file"
12279 + echo '# dummy' > "$dirpart/$file"
12280 + done
12281 done
12282 -done
12283 +}
12284 ;;
12285 "libtool":C)
12286
12287 @@ -25577,13 +27990,13 @@ available_tags=""
12288
12289 # ### BEGIN LIBTOOL CONFIG
12290
12291 -# Whether or not to build shared libraries.
12292 -build_libtool_libs=$enable_shared
12293 -
12294 # Which release of libtool.m4 was used?
12295 macro_version=$macro_version
12296 macro_revision=$macro_revision
12297
12298 +# Whether or not to build shared libraries.
12299 +build_libtool_libs=$enable_shared
12300 +
12301 # Whether or not to build static libraries.
12302 build_old_libs=$enable_static
12303
12304 @@ -26195,6 +28608,193 @@ if test "$no_create" != yes; then
12305 # would make configure fail if this is the last instruction.
12306 $ac_cs_success || { (exit 1); exit 1; }
12307 fi
12308 +
12309 +#
12310 +# CONFIG_SUBDIRS section.
12311 +#
12312 +if test "$no_recursion" != yes; then
12313 +
12314 + # Remove --cache-file, --srcdir, and --disable-option-checking arguments
12315 + # so they do not pile up.
12316 + ac_sub_configure_args=
12317 + ac_prev=
12318 + eval "set x $ac_configure_args"
12319 + shift
12320 + for ac_arg
12321 + do
12322 + if test -n "$ac_prev"; then
12323 + ac_prev=
12324 + continue
12325 + fi
12326 + case $ac_arg in
12327 + -cache-file | --cache-file | --cache-fil | --cache-fi \
12328 + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
12329 + ac_prev=cache_file ;;
12330 + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
12331 + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
12332 + | --c=*)
12333 + ;;
12334 + --config-cache | -C)
12335 + ;;
12336 + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
12337 + ac_prev=srcdir ;;
12338 + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
12339 + ;;
12340 + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
12341 + ac_prev=prefix ;;
12342 + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
12343 + ;;
12344 + --disable-option-checking)
12345 + ;;
12346 + *)
12347 + case $ac_arg in
12348 + *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
12349 + esac
12350 + ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
12351 + esac
12352 + done
12353 +
12354 + # Always prepend --prefix to ensure using the same prefix
12355 + # in subdir configurations.
12356 + ac_arg="--prefix=$prefix"
12357 + case $ac_arg in
12358 + *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
12359 + esac
12360 + ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
12361 +
12362 + # Pass --silent
12363 + if test "$silent" = yes; then
12364 + ac_sub_configure_args="--silent $ac_sub_configure_args"
12365 + fi
12366 +
12367 + # Always prepend --disable-option-checking to silence warnings, since
12368 + # different subdirs can have different --enable and --with options.
12369 + ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
12370 +
12371 + ac_popdir=`pwd`
12372 + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
12373 +
12374 + # Do not complain, so a configure script can configure whichever
12375 + # parts of a large source tree are present.
12376 + test -d "$srcdir/$ac_dir" || continue
12377 +
12378 + ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
12379 + $as_echo "$as_me:$LINENO: $ac_msg" >&5
12380 + $as_echo "$ac_msg" >&6
12381 + { as_dir="$ac_dir"
12382 + case $as_dir in #(
12383 + -*) as_dir=./$as_dir;;
12384 + esac
12385 + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
12386 + as_dirs=
12387 + while :; do
12388 + case $as_dir in #(
12389 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
12390 + *) as_qdir=$as_dir;;
12391 + esac
12392 + as_dirs="'$as_qdir' $as_dirs"
12393 + as_dir=`$as_dirname -- "$as_dir" ||
12394 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12395 + X"$as_dir" : 'X\(//\)[^/]' \| \
12396 + X"$as_dir" : 'X\(//\)$' \| \
12397 + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
12398 +$as_echo X"$as_dir" |
12399 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
12400 + s//\1/
12401 + q
12402 + }
12403 + /^X\(\/\/\)[^/].*/{
12404 + s//\1/
12405 + q
12406 + }
12407 + /^X\(\/\/\)$/{
12408 + s//\1/
12409 + q
12410 + }
12411 + /^X\(\/\).*/{
12412 + s//\1/
12413 + q
12414 + }
12415 + s/.*/./; q'`
12416 + test -d "$as_dir" && break
12417 + done
12418 + test -z "$as_dirs" || eval "mkdir $as_dirs"
12419 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
12420 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
12421 + { (exit 1); exit 1; }; }; }
12422 + ac_builddir=.
12423 +
12424 +case "$ac_dir" in
12425 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
12426 +*)
12427 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
12428 + # A ".." for each directory in $ac_dir_suffix.
12429 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
12430 + case $ac_top_builddir_sub in
12431 + "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
12432 + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
12433 + esac ;;
12434 +esac
12435 +ac_abs_top_builddir=$ac_pwd
12436 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
12437 +# for backward compatibility:
12438 +ac_top_builddir=$ac_top_build_prefix
12439 +
12440 +case $srcdir in
12441 + .) # We are building in place.
12442 + ac_srcdir=.
12443 + ac_top_srcdir=$ac_top_builddir_sub
12444 + ac_abs_top_srcdir=$ac_pwd ;;
12445 + [\\/]* | ?:[\\/]* ) # Absolute name.
12446 + ac_srcdir=$srcdir$ac_dir_suffix;
12447 + ac_top_srcdir=$srcdir
12448 + ac_abs_top_srcdir=$srcdir ;;
12449 + *) # Relative name.
12450 + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
12451 + ac_top_srcdir=$ac_top_build_prefix$srcdir
12452 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
12453 +esac
12454 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
12455 +
12456 +
12457 + cd "$ac_dir"
12458 +
12459 + # Check for guested configure; otherwise get Cygnus style configure.
12460 + if test -f "$ac_srcdir/configure.gnu"; then
12461 + ac_sub_configure=$ac_srcdir/configure.gnu
12462 + elif test -f "$ac_srcdir/configure"; then
12463 + ac_sub_configure=$ac_srcdir/configure
12464 + elif test -f "$ac_srcdir/configure.in"; then
12465 + # This should be Cygnus configure.
12466 + ac_sub_configure=$ac_aux_dir/configure
12467 + else
12468 + { $as_echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
12469 +$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
12470 + ac_sub_configure=
12471 + fi
12472 +
12473 + # The recursion is here.
12474 + if test -n "$ac_sub_configure"; then
12475 + # Make the cache file name correct relative to the subdirectory.
12476 + case $cache_file in
12477 + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
12478 + *) # Relative name.
12479 + ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
12480 + esac
12481 +
12482 + { $as_echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
12483 +$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
12484 + # The eval makes quoting arguments work.
12485 + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
12486 + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
12487 + { { $as_echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
12488 +$as_echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
12489 + { (exit 1); exit 1; }; }
12490 + fi
12491 +
12492 + cd "$ac_popdir"
12493 + done
12494 +fi
12495 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
12496 { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
12497 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
12498 diff --git a/contrib/Makefile.in b/contrib/Makefile.in
12499 index 9361ba4..7c53bc7 100644
12500 --- a/contrib/Makefile.in
12501 +++ b/contrib/Makefile.in
12502 @@ -1,8 +1,9 @@
12503 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
12504 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
12505 # @configure_input@
12506
12507 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
12508 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
12509 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
12510 +# Inc.
12511 # This Makefile.in is free software; the Free Software Foundation
12512 # gives unlimited permission to copy and/or distribute it,
12513 # with or without modifications, as long as this notice is preserved.
12514 @@ -16,8 +17,9 @@
12515
12516 VPATH = @srcdir@
12517 pkgdatadir = $(datadir)/@PACKAGE@
12518 -pkglibdir = $(libdir)/@PACKAGE@
12519 pkgincludedir = $(includedir)/@PACKAGE@
12520 +pkglibdir = $(libdir)/@PACKAGE@
12521 +pkglibexecdir = $(libexecdir)/@PACKAGE@
12522 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12523 install_sh_DATA = $(install_sh) -c -m 644
12524 install_sh_PROGRAM = $(install_sh) -c
12525 @@ -43,9 +45,29 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
12526 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12527 CONFIG_HEADER = $(top_builddir)/src/conf.h
12528 CONFIG_CLEAN_FILES =
12529 +CONFIG_CLEAN_VPATH_FILES =
12530 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
12531 +am__vpath_adj = case $$p in \
12532 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
12533 + *) f=$$p;; \
12534 + esac;
12535 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
12536 +am__install_max = 40
12537 +am__nobase_strip_setup = \
12538 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
12539 +am__nobase_strip = \
12540 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
12541 +am__nobase_list = $(am__nobase_strip_setup); \
12542 + for p in $$list; do echo "$$p $$p"; done | \
12543 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
12544 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
12545 + if (++n[$$2] == $(am__install_max)) \
12546 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
12547 + END { for (dir in files) print dir, files[dir] }'
12548 +am__base_list = \
12549 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
12550 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
12551 am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sbindir)"
12552 -pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
12553 -sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
12554 SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
12555 SOURCES =
12556 DIST_SOURCES =
12557 @@ -53,6 +75,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12558 ACLOCAL = @ACLOCAL@
12559 AMTAR = @AMTAR@
12560 AR = @AR@
12561 +ARGZ_H = @ARGZ_H@
12562 AUTOCONF = @AUTOCONF@
12563 AUTOHEADER = @AUTOHEADER@
12564 AUTOMAKE = @AUTOMAKE@
12565 @@ -83,6 +106,7 @@ GETCONF = @GETCONF@
12566 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
12567 GREP = @GREP@
12568 HOSTNAME = @HOSTNAME@
12569 +INCLTDL = @INCLTDL@
12570 INSTALL = @INSTALL@
12571 INSTALL_DATA = @INSTALL_DATA@
12572 INSTALL_PROGRAM = @INSTALL_PROGRAM@
12573 @@ -95,13 +119,25 @@ LDFLAGS = @LDFLAGS@
12574 LEX = @LEX@
12575 LEXLIB = @LEXLIB@
12576 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
12577 +LIBADD_DL = @LIBADD_DL@
12578 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
12579 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
12580 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
12581 +LIBLTDL = @LIBLTDL@
12582 LIBOBJS = @LIBOBJS@
12583 LIBS = @LIBS@
12584 LIBTOOL = @LIBTOOL@
12585 LIB_SELINUX = @LIB_SELINUX@
12586 LIPO = @LIPO@
12587 LN_S = @LN_S@
12588 +LTDLDEPS = @LTDLDEPS@
12589 +LTDLINCL = @LTDLINCL@
12590 +LTDLOPEN = @LTDLOPEN@
12591 LTLIBOBJS = @LTLIBOBJS@
12592 +LT_CONFIG_H = @LT_CONFIG_H@
12593 +LT_DLLOADERS = @LT_DLLOADERS@
12594 +LT_DLPREOPEN = @LT_DLPREOPEN@
12595 +MAINT = @MAINT@
12596 MAKEINFO = @MAKEINFO@
12597 MKDIR_P = @MKDIR_P@
12598 NEED_SETGID = @NEED_SETGID@
12599 @@ -173,6 +209,8 @@ libexecdir = @libexecdir@
12600 localedir = @localedir@
12601 localstatedir = @localstatedir@
12602 lt_ECHO = @lt_ECHO@
12603 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
12604 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
12605 mandir = @mandir@
12606 mkdir_p = @mkdir_p@
12607 oldincludedir = @oldincludedir@
12608 @@ -183,6 +221,8 @@ psdir = @psdir@
12609 sbindir = @sbindir@
12610 sharedstatedir = @sharedstatedir@
12611 srcdir = @srcdir@
12612 +subdirs = @subdirs@
12613 +sys_symbol_underscore = @sys_symbol_underscore@
12614 sysconfdir = @sysconfdir@
12615 target = @target@
12616 target_alias = @target_alias@
12617 @@ -224,18 +264,18 @@ MAINTAINERCLEANFILES = Makefile.in
12618 all: all-am
12619
12620 .SUFFIXES:
12621 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
12622 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
12623 @for dep in $?; do \
12624 case '$(am__configure_deps)' in \
12625 *$$dep*) \
12626 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
12627 - && exit 0; \
12628 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
12629 + && { if test -f $@; then exit 0; else break; fi; }; \
12630 exit 1;; \
12631 esac; \
12632 done; \
12633 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
12634 - cd $(top_srcdir) && \
12635 - $(AUTOMAKE) --gnu contrib/Makefile
12636 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \
12637 + $(am__cd) $(top_srcdir) && \
12638 + $(AUTOMAKE) --gnu contrib/Makefile
12639 .PRECIOUS: Makefile
12640 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12641 @case '$?' in \
12642 @@ -249,48 +289,79 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12643 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
12644 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12645
12646 -$(top_srcdir)/configure: $(am__configure_deps)
12647 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
12648 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12649 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
12650 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
12651 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
12652 +$(am__aclocal_m4_deps):
12653 install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
12654 @$(NORMAL_INSTALL)
12655 test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
12656 - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
12657 + @list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \
12658 + for p in $$list; do \
12659 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12660 - if test -f $$d$$p; then \
12661 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
12662 - echo " $(pkgdataSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
12663 - $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
12664 - else :; fi; \
12665 - done
12666 + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
12667 + done | \
12668 + sed -e 'p;s,.*/,,;n' \
12669 + -e 'h;s|.*|.|' \
12670 + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
12671 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
12672 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
12673 + if ($$2 == $$4) { files[d] = files[d] " " $$1; \
12674 + if (++n[d] == $(am__install_max)) { \
12675 + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
12676 + else { print "f", d "/" $$4, $$1 } } \
12677 + END { for (d in files) print "f", d, files[d] }' | \
12678 + while read type dir files; do \
12679 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
12680 + test -z "$$files" || { \
12681 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \
12682 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \
12683 + } \
12684 + ; done
12685
12686 uninstall-pkgdataSCRIPTS:
12687 @$(NORMAL_UNINSTALL)
12688 - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
12689 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
12690 - echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
12691 - rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
12692 - done
12693 + @list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \
12694 + files=`for p in $$list; do echo "$$p"; done | \
12695 + sed -e 's,.*/,,;$(transform)'`; \
12696 + test -n "$$list" || exit 0; \
12697 + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
12698 + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
12699 install-sbinSCRIPTS: $(sbin_SCRIPTS)
12700 @$(NORMAL_INSTALL)
12701 test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
12702 - @list='$(sbin_SCRIPTS)'; for p in $$list; do \
12703 + @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
12704 + for p in $$list; do \
12705 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
12706 - if test -f $$d$$p; then \
12707 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
12708 - echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
12709 - $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
12710 - else :; fi; \
12711 - done
12712 + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
12713 + done | \
12714 + sed -e 'p;s,.*/,,;n' \
12715 + -e 'h;s|.*|.|' \
12716 + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
12717 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
12718 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
12719 + if ($$2 == $$4) { files[d] = files[d] " " $$1; \
12720 + if (++n[d] == $(am__install_max)) { \
12721 + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
12722 + else { print "f", d "/" $$4, $$1 } } \
12723 + END { for (d in files) print "f", d, files[d] }' | \
12724 + while read type dir files; do \
12725 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
12726 + test -z "$$files" || { \
12727 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
12728 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
12729 + } \
12730 + ; done
12731
12732 uninstall-sbinSCRIPTS:
12733 @$(NORMAL_UNINSTALL)
12734 - @list='$(sbin_SCRIPTS)'; for p in $$list; do \
12735 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
12736 - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
12737 - rm -f "$(DESTDIR)$(sbindir)/$$f"; \
12738 - done
12739 + @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
12740 + files=`for p in $$list; do echo "$$p"; done | \
12741 + sed -e 's,.*/,,;$(transform)'`; \
12742 + test -n "$$list" || exit 0; \
12743 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
12744 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
12745
12746 mostlyclean-libtool:
12747 -rm -f *.lo
12748 @@ -320,13 +391,17 @@ distdir: $(DISTFILES)
12749 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12750 if test -d $$d/$$file; then \
12751 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
12752 + if test -d "$(distdir)/$$file"; then \
12753 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12754 + fi; \
12755 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12756 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12757 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
12758 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
12759 fi; \
12760 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12761 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
12762 else \
12763 - test -f $(distdir)/$$file \
12764 - || cp -p $$d/$$file $(distdir)/$$file \
12765 + test -f "$(distdir)/$$file" \
12766 + || cp -p $$d/$$file "$(distdir)/$$file" \
12767 || exit 1; \
12768 fi; \
12769 done
12770 @@ -359,6 +434,7 @@ clean-generic:
12771
12772 distclean-generic:
12773 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
12774 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
12775 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
12776
12777 maintainer-clean-generic:
12778 @@ -379,6 +455,8 @@ dvi-am:
12779
12780 html: html-am
12781
12782 +html-am:
12783 +
12784 info: info-am
12785
12786 info-am:
12787 @@ -387,18 +465,28 @@ install-data-am: install-pkgdataSCRIPTS
12788
12789 install-dvi: install-dvi-am
12790
12791 +install-dvi-am:
12792 +
12793 install-exec-am: install-sbinSCRIPTS
12794
12795 install-html: install-html-am
12796
12797 +install-html-am:
12798 +
12799 install-info: install-info-am
12800
12801 +install-info-am:
12802 +
12803 install-man:
12804
12805 install-pdf: install-pdf-am
12806
12807 +install-pdf-am:
12808 +
12809 install-ps: install-ps-am
12810
12811 +install-ps-am:
12812 +
12813 installcheck-am:
12814
12815 maintainer-clean: maintainer-clean-am
12816 @@ -434,6 +522,7 @@ uninstall-am: uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
12817 ps ps-am uninstall uninstall-am uninstall-pkgdataSCRIPTS \
12818 uninstall-sbinSCRIPTS
12819
12820 +
12821 # Tell versions [3.59,3.63) of GNU make to not export all variables.
12822 # Otherwise a system limit (for SysV at least) may be exceeded.
12823 .NOEXPORT:
12824 diff --git a/depcomp b/depcomp
12825 index 11e2d3b..df8eea7 100755
12826 --- a/depcomp
12827 +++ b/depcomp
12828 @@ -1,9 +1,10 @@
12829 #! /bin/sh
12830 # depcomp - compile a program generating dependencies as side-effects
12831
12832 -scriptversion=2004-05-31.23
12833 +scriptversion=2009-04-28.21; # UTC
12834
12835 -# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
12836 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
12837 +# Software Foundation, Inc.
12838
12839 # This program is free software; you can redistribute it and/or modify
12840 # it under the terms of the GNU General Public License as published by
12841 @@ -16,9 +17,7 @@ scriptversion=2004-05-31.23
12842 # GNU General Public License for more details.
12843
12844 # You should have received a copy of the GNU General Public License
12845 -# along with this program; if not, write to the Free Software
12846 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
12847 -# 02111-1307, USA.
12848 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
12849
12850 # As a special exception to the GNU General Public License, if you
12851 # distribute this file as part of a program that contains a
12852 @@ -50,11 +49,11 @@ Environment variables:
12853
12854 Report bugs to <[email protected]>.
12855 EOF
12856 - exit 0
12857 + exit $?
12858 ;;
12859 -v | --v*)
12860 echo "depcomp $scriptversion"
12861 - exit 0
12862 + exit $?
12863 ;;
12864 esac
12865
12866 @@ -86,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
12867 depmode=dashmstdout
12868 fi
12869
12870 +cygpath_u="cygpath -u -f -"
12871 +if test "$depmode" = msvcmsys; then
12872 + # This is just like msvisualcpp but w/o cygpath translation.
12873 + # Just convert the backslash-escaped backslashes to single forward
12874 + # slashes to satisfy depend.m4
12875 + cygpath_u="sed s,\\\\\\\\,/,g"
12876 + depmode=msvisualcpp
12877 +fi
12878 +
12879 case "$depmode" in
12880 gcc3)
12881 ## gcc 3 implements dependency tracking that does exactly what
12882 ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
12883 ## it if -MD -MP comes after the -MF stuff. Hmm.
12884 - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
12885 +## Unfortunately, FreeBSD c89 acceptance of flags depends upon
12886 +## the command line argument order; so add the flags where they
12887 +## appear in depend2.am. Note that the slowdown incurred here
12888 +## affects only configure: in makefiles, %FASTDEP% shortcuts this.
12889 + for arg
12890 + do
12891 + case $arg in
12892 + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
12893 + *) set fnord "$@" "$arg" ;;
12894 + esac
12895 + shift # fnord
12896 + shift # $arg
12897 + done
12898 + "$@"
12899 stat=$?
12900 if test $stat -eq 0; then :
12901 else
12902 @@ -178,14 +199,14 @@ sgi)
12903 ' < "$tmpdepfile" \
12904 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
12905 tr '
12906 -' ' ' >> $depfile
12907 - echo >> $depfile
12908 +' ' ' >> "$depfile"
12909 + echo >> "$depfile"
12910
12911 # The second pass generates a dummy entry for each header file.
12912 tr ' ' '
12913 ' < "$tmpdepfile" \
12914 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
12915 - >> $depfile
12916 + >> "$depfile"
12917 else
12918 # The sourcefile does not contain any dependencies, so just
12919 # store a dummy comment line, to avoid errors with the Makefile
12920 @@ -201,34 +222,39 @@ aix)
12921 # current directory. Also, the AIX compiler puts `$object:' at the
12922 # start of each line; $object doesn't have directory information.
12923 # Version 6 uses the directory in both cases.
12924 - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
12925 - tmpdepfile="$stripped.u"
12926 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
12927 + test "x$dir" = "x$object" && dir=
12928 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
12929 if test "$libtool" = yes; then
12930 + tmpdepfile1=$dir$base.u
12931 + tmpdepfile2=$base.u
12932 + tmpdepfile3=$dir.libs/$base.u
12933 "$@" -Wc,-M
12934 else
12935 + tmpdepfile1=$dir$base.u
12936 + tmpdepfile2=$dir$base.u
12937 + tmpdepfile3=$dir$base.u
12938 "$@" -M
12939 fi
12940 stat=$?
12941
12942 - if test -f "$tmpdepfile"; then :
12943 - else
12944 - stripped=`echo "$stripped" | sed 's,^.*/,,'`
12945 - tmpdepfile="$stripped.u"
12946 - fi
12947 -
12948 if test $stat -eq 0; then :
12949 else
12950 - rm -f "$tmpdepfile"
12951 + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
12952 exit $stat
12953 fi
12954
12955 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
12956 + do
12957 + test -f "$tmpdepfile" && break
12958 + done
12959 if test -f "$tmpdepfile"; then
12960 - outname="$stripped.o"
12961 # Each line is of the form `foo.o: dependent.h'.
12962 # Do two passes, one to just change these to
12963 # `$object: dependent.h' and one to simply `dependent.h:'.
12964 - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
12965 - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
12966 + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
12967 + # That's a tab and a space in the [].
12968 + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
12969 else
12970 # The sourcefile does not contain any dependencies, so just
12971 # store a dummy comment line, to avoid errors with the Makefile
12972 @@ -276,6 +302,51 @@ icc)
12973 rm -f "$tmpdepfile"
12974 ;;
12975
12976 +hp2)
12977 + # The "hp" stanza above does not work with aCC (C++) and HP's ia64
12978 + # compilers, which have integrated preprocessors. The correct option
12979 + # to use with these is +Maked; it writes dependencies to a file named
12980 + # 'foo.d', which lands next to the object file, wherever that
12981 + # happens to be.
12982 + # Much of this is similar to the tru64 case; see comments there.
12983 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
12984 + test "x$dir" = "x$object" && dir=
12985 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
12986 + if test "$libtool" = yes; then
12987 + tmpdepfile1=$dir$base.d
12988 + tmpdepfile2=$dir.libs/$base.d
12989 + "$@" -Wc,+Maked
12990 + else
12991 + tmpdepfile1=$dir$base.d
12992 + tmpdepfile2=$dir$base.d
12993 + "$@" +Maked
12994 + fi
12995 + stat=$?
12996 + if test $stat -eq 0; then :
12997 + else
12998 + rm -f "$tmpdepfile1" "$tmpdepfile2"
12999 + exit $stat
13000 + fi
13001 +
13002 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
13003 + do
13004 + test -f "$tmpdepfile" && break
13005 + done
13006 + if test -f "$tmpdepfile"; then
13007 + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
13008 + # Add `dependent.h:' lines.
13009 + sed -ne '2,${
13010 + s/^ *//
13011 + s/ \\*$//
13012 + s/$/:/
13013 + p
13014 + }' "$tmpdepfile" >> "$depfile"
13015 + else
13016 + echo "#dummy" > "$depfile"
13017 + fi
13018 + rm -f "$tmpdepfile" "$tmpdepfile2"
13019 + ;;
13020 +
13021 tru64)
13022 # The Tru64 compiler uses -MD to generate dependencies as a side
13023 # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
13024 @@ -287,36 +358,43 @@ tru64)
13025 base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
13026
13027 if test "$libtool" = yes; then
13028 - # Dependencies are output in .lo.d with libtool 1.4.
13029 - # With libtool 1.5 they are output both in $dir.libs/$base.o.d
13030 - # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the
13031 - # latter, because the former will be cleaned when $dir.libs is
13032 - # erased.
13033 - tmpdepfile1="$dir.libs/$base.lo.d"
13034 - tmpdepfile2="$dir$base.o.d"
13035 - tmpdepfile3="$dir.libs/$base.d"
13036 + # With Tru64 cc, shared objects can also be used to make a
13037 + # static library. This mechanism is used in libtool 1.4 series to
13038 + # handle both shared and static libraries in a single compilation.
13039 + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
13040 + #
13041 + # With libtool 1.5 this exception was removed, and libtool now
13042 + # generates 2 separate objects for the 2 libraries. These two
13043 + # compilations output dependencies in $dir.libs/$base.o.d and
13044 + # in $dir$base.o.d. We have to check for both files, because
13045 + # one of the two compilations can be disabled. We should prefer
13046 + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
13047 + # automatically cleaned when .libs/ is deleted, while ignoring
13048 + # the former would cause a distcleancheck panic.
13049 + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
13050 + tmpdepfile2=$dir$base.o.d # libtool 1.5
13051 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
13052 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
13053 "$@" -Wc,-MD
13054 else
13055 - tmpdepfile1="$dir$base.o.d"
13056 - tmpdepfile2="$dir$base.d"
13057 - tmpdepfile3="$dir$base.d"
13058 + tmpdepfile1=$dir$base.o.d
13059 + tmpdepfile2=$dir$base.d
13060 + tmpdepfile3=$dir$base.d
13061 + tmpdepfile4=$dir$base.d
13062 "$@" -MD
13063 fi
13064
13065 stat=$?
13066 if test $stat -eq 0; then :
13067 else
13068 - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
13069 + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
13070 exit $stat
13071 fi
13072
13073 - if test -f "$tmpdepfile1"; then
13074 - tmpdepfile="$tmpdepfile1"
13075 - elif test -f "$tmpdepfile2"; then
13076 - tmpdepfile="$tmpdepfile2"
13077 - else
13078 - tmpdepfile="$tmpdepfile3"
13079 - fi
13080 + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
13081 + do
13082 + test -f "$tmpdepfile" && break
13083 + done
13084 if test -f "$tmpdepfile"; then
13085 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
13086 # That's a tab and a space in the [].
13087 @@ -338,7 +416,7 @@ dashmstdout)
13088
13089 # Remove the call to Libtool.
13090 if test "$libtool" = yes; then
13091 - while test $1 != '--mode=compile'; do
13092 + while test "X$1" != 'X--mode=compile'; do
13093 shift
13094 done
13095 shift
13096 @@ -389,32 +467,39 @@ makedepend)
13097 "$@" || exit $?
13098 # Remove any Libtool call
13099 if test "$libtool" = yes; then
13100 - while test $1 != '--mode=compile'; do
13101 + while test "X$1" != 'X--mode=compile'; do
13102 shift
13103 done
13104 shift
13105 fi
13106 # X makedepend
13107 shift
13108 - cleared=no
13109 - for arg in "$@"; do
13110 + cleared=no eat=no
13111 + for arg
13112 + do
13113 case $cleared in
13114 no)
13115 set ""; shift
13116 cleared=yes ;;
13117 esac
13118 + if test $eat = yes; then
13119 + eat=no
13120 + continue
13121 + fi
13122 case "$arg" in
13123 -D*|-I*)
13124 set fnord "$@" "$arg"; shift ;;
13125 # Strip any option that makedepend may not understand. Remove
13126 # the object too, otherwise makedepend will parse it as a source file.
13127 + -arch)
13128 + eat=yes ;;
13129 -*|$object)
13130 ;;
13131 *)
13132 set fnord "$@" "$arg"; shift ;;
13133 esac
13134 done
13135 - obj_suffix="`echo $object | sed 's/^.*\././'`"
13136 + obj_suffix=`echo "$object" | sed 's/^.*\././'`
13137 touch "$tmpdepfile"
13138 ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
13139 rm -f "$depfile"
13140 @@ -434,7 +519,7 @@ cpp)
13141
13142 # Remove the call to Libtool.
13143 if test "$libtool" = yes; then
13144 - while test $1 != '--mode=compile'; do
13145 + while test "X$1" != 'X--mode=compile'; do
13146 shift
13147 done
13148 shift
13149 @@ -460,7 +545,8 @@ cpp)
13150 done
13151
13152 "$@" -E |
13153 - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
13154 + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
13155 + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
13156 sed '$ s: \\$::' > "$tmpdepfile"
13157 rm -f "$depfile"
13158 echo "$object : \\" > "$depfile"
13159 @@ -471,13 +557,27 @@ cpp)
13160
13161 msvisualcpp)
13162 # Important note: in order to support this mode, a compiler *must*
13163 - # always write the preprocessed file to stdout, regardless of -o,
13164 - # because we must use -o when running libtool.
13165 + # always write the preprocessed file to stdout.
13166 "$@" || exit $?
13167 +
13168 + # Remove the call to Libtool.
13169 + if test "$libtool" = yes; then
13170 + while test "X$1" != 'X--mode=compile'; do
13171 + shift
13172 + done
13173 + shift
13174 + fi
13175 +
13176 IFS=" "
13177 for arg
13178 do
13179 case "$arg" in
13180 + -o)
13181 + shift
13182 + ;;
13183 + $object)
13184 + shift
13185 + ;;
13186 "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
13187 set fnord "$@"
13188 shift
13189 @@ -490,16 +590,23 @@ msvisualcpp)
13190 ;;
13191 esac
13192 done
13193 - "$@" -E |
13194 - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
13195 + "$@" -E 2>/dev/null |
13196 + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
13197 rm -f "$depfile"
13198 echo "$object : \\" > "$depfile"
13199 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
13200 + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
13201 echo " " >> "$depfile"
13202 - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
13203 + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
13204 rm -f "$tmpdepfile"
13205 ;;
13206
13207 +msvcmsys)
13208 + # This case exists only to let depend.m4 do its work. It works by
13209 + # looking at the text of this script. This case will never be run,
13210 + # since it is checked for above.
13211 + exit 1
13212 + ;;
13213 +
13214 none)
13215 exec "$@"
13216 ;;
13217 @@ -518,5 +625,6 @@ exit 0
13218 # eval: (add-hook 'write-file-hooks 'time-stamp)
13219 # time-stamp-start: "scriptversion="
13220 # time-stamp-format: "%:y-%02m-%02d.%02H"
13221 -# time-stamp-end: "$"
13222 +# time-stamp-time-zone: "UTC"
13223 +# time-stamp-end: "; # UTC"
13224 # End:
13225 diff --git a/doc/Makefile.in b/doc/Makefile.in
13226 index 9d80826..9986a58 100644
13227 --- a/doc/Makefile.in
13228 +++ b/doc/Makefile.in
13229 @@ -1,8 +1,9 @@
13230 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
13231 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
13232 # @configure_input@
13233
13234 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
13235 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
13236 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
13237 +# Inc.
13238 # This Makefile.in is free software; the Free Software Foundation
13239 # gives unlimited permission to copy and/or distribute it,
13240 # with or without modifications, as long as this notice is preserved.
13241 @@ -16,8 +17,9 @@
13242
13243 VPATH = @srcdir@
13244 pkgdatadir = $(datadir)/@PACKAGE@
13245 -pkglibdir = $(libdir)/@PACKAGE@
13246 pkgincludedir = $(includedir)/@PACKAGE@
13247 +pkglibdir = $(libdir)/@PACKAGE@
13248 +pkglibexecdir = $(libexecdir)/@PACKAGE@
13249 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13250 install_sh_DATA = $(install_sh) -c -m 644
13251 install_sh_PROGRAM = $(install_sh) -c
13252 @@ -45,6 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
13253 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13254 CONFIG_HEADER = $(top_builddir)/src/conf.h
13255 CONFIG_CLEAN_FILES =
13256 +CONFIG_CLEAN_VPATH_FILES =
13257 SOURCES =
13258 DIST_SOURCES =
13259 INFO_DEPS = cfengine-Reference.info cfengine-Tutorial.info
13260 @@ -63,17 +66,31 @@ am__vpath_adj = case $$p in \
13261 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
13262 *) f=$$p;; \
13263 esac;
13264 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
13265 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
13266 +am__install_max = 40
13267 +am__nobase_strip_setup = \
13268 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
13269 +am__nobase_strip = \
13270 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
13271 +am__nobase_list = $(am__nobase_strip_setup); \
13272 + for p in $$list; do echo "$$p $$p"; done | \
13273 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
13274 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
13275 + if (++n[$$2] == $(am__install_max)) \
13276 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
13277 + END { for (dir in files) print dir, files[dir] }'
13278 +am__base_list = \
13279 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
13280 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
13281 man8dir = $(mandir)/man8
13282 NROFF = nroff
13283 MANS = $(man_MANS)
13284 -docDATA_INSTALL = $(INSTALL_DATA)
13285 -htmlDATA_INSTALL = $(INSTALL_DATA)
13286 DATA = $(doc_DATA) $(html_DATA)
13287 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13288 ACLOCAL = @ACLOCAL@
13289 AMTAR = @AMTAR@
13290 AR = @AR@
13291 +ARGZ_H = @ARGZ_H@
13292 AUTOCONF = @AUTOCONF@
13293 AUTOHEADER = @AUTOHEADER@
13294 AUTOMAKE = @AUTOMAKE@
13295 @@ -104,6 +121,7 @@ GETCONF = @GETCONF@
13296 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
13297 GREP = @GREP@
13298 HOSTNAME = @HOSTNAME@
13299 +INCLTDL = @INCLTDL@
13300 INSTALL = @INSTALL@
13301 INSTALL_DATA = @INSTALL_DATA@
13302 INSTALL_PROGRAM = @INSTALL_PROGRAM@
13303 @@ -116,13 +134,25 @@ LDFLAGS = @LDFLAGS@
13304 LEX = @LEX@
13305 LEXLIB = @LEXLIB@
13306 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
13307 +LIBADD_DL = @LIBADD_DL@
13308 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
13309 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
13310 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
13311 +LIBLTDL = @LIBLTDL@
13312 LIBOBJS = @LIBOBJS@
13313 LIBS = @LIBS@
13314 LIBTOOL = @LIBTOOL@
13315 LIB_SELINUX = @LIB_SELINUX@
13316 LIPO = @LIPO@
13317 LN_S = @LN_S@
13318 +LTDLDEPS = @LTDLDEPS@
13319 +LTDLINCL = @LTDLINCL@
13320 +LTDLOPEN = @LTDLOPEN@
13321 LTLIBOBJS = @LTLIBOBJS@
13322 +LT_CONFIG_H = @LT_CONFIG_H@
13323 +LT_DLLOADERS = @LT_DLLOADERS@
13324 +LT_DLPREOPEN = @LT_DLPREOPEN@
13325 +MAINT = @MAINT@
13326 MAKEINFO = @MAKEINFO@
13327 MKDIR_P = @MKDIR_P@
13328 NEED_SETGID = @NEED_SETGID@
13329 @@ -194,6 +224,8 @@ libexecdir = @libexecdir@
13330 localedir = @localedir@
13331 localstatedir = @localstatedir@
13332 lt_ECHO = @lt_ECHO@
13333 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
13334 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
13335 mandir = @mandir@
13336 mkdir_p = @mkdir_p@
13337 oldincludedir = @oldincludedir@
13338 @@ -204,6 +236,8 @@ psdir = @psdir@
13339 sbindir = @sbindir@
13340 sharedstatedir = @sharedstatedir@
13341 srcdir = @srcdir@
13342 +subdirs = @subdirs@
13343 +sys_symbol_underscore = @sys_symbol_underscore@
13344 sysconfdir = @sysconfdir@
13345 target = @target@
13346 target_alias = @target_alias@
13347 @@ -263,18 +297,18 @@ all: all-am
13348
13349 .SUFFIXES:
13350 .SUFFIXES: html latex pdf ps dvi .dvi .ps
13351 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
13352 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
13353 @for dep in $?; do \
13354 case '$(am__configure_deps)' in \
13355 *$$dep*) \
13356 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
13357 - && exit 0; \
13358 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
13359 + && { if test -f $@; then exit 0; else break; fi; }; \
13360 exit 1;; \
13361 esac; \
13362 done; \
13363 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
13364 - cd $(top_srcdir) && \
13365 - $(AUTOMAKE) --gnu doc/Makefile
13366 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
13367 + $(am__cd) $(top_srcdir) && \
13368 + $(AUTOMAKE) --gnu doc/Makefile
13369 .PRECIOUS: Makefile
13370 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13371 @case '$?' in \
13372 @@ -288,10 +322,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13373 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
13374 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13375
13376 -$(top_srcdir)/configure: $(am__configure_deps)
13377 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
13378 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13379 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
13380 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
13381 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
13382 +$(am__aclocal_m4_deps):
13383
13384 mostlyclean-libtool:
13385 -rm -f *.lo
13386 @@ -340,7 +375,7 @@ cfengine-Reference.html: cfengine-Reference.texinfo $(srcdir)/version1.texi
13387 rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
13388 exit 1; \
13389 fi
13390 -$(srcdir)/version1.texi: $(srcdir)/stamp-vti
13391 +$(srcdir)/version1.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
13392 $(srcdir)/stamp-vti: cfengine-Reference.texinfo $(top_srcdir)/configure
13393 @(dir=.; test -f ./cfengine-Reference.texinfo || dir=$(srcdir); \
13394 set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Reference.texinfo`; \
13395 @@ -358,7 +393,7 @@ mostlyclean-vti:
13396 -rm -f vti.tmp
13397
13398 maintainer-clean-vti:
13399 - -rm -f $(srcdir)/stamp-vti $(srcdir)/version1.texi
13400 +@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-vti $(srcdir)/version1.texi
13401
13402 cfengine-Tutorial.info: cfengine-Tutorial.texinfo $(srcdir)/version2.texi
13403 restore=: && backupdir="$(am__leading_dot)am$$$$" && \
13404 @@ -401,7 +436,7 @@ cfengine-Tutorial.html: cfengine-Tutorial.texinfo $(srcdir)/version2.texi
13405 rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
13406 exit 1; \
13407 fi
13408 -$(srcdir)/version2.texi: $(srcdir)/stamp-1
13409 +$(srcdir)/version2.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-1
13410 $(srcdir)/stamp-1: cfengine-Tutorial.texinfo $(top_srcdir)/configure
13411 @(dir=.; test -f ./cfengine-Tutorial.texinfo || dir=$(srcdir); \
13412 set `$(SHELL) $(srcdir)/mdate-sh $$dir/cfengine-Tutorial.texinfo`; \
13413 @@ -419,23 +454,25 @@ mostlyclean-1:
13414 -rm -f 1.tmp
13415
13416 maintainer-clean-1:
13417 - -rm -f $(srcdir)/stamp-1 $(srcdir)/version2.texi
13418 +@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/stamp-1 $(srcdir)/version2.texi
13419 .dvi.ps:
13420 TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
13421 $(DVIPS) -o $@ $<
13422
13423 uninstall-dvi-am:
13424 @$(NORMAL_UNINSTALL)
13425 - @list='$(DVIS)'; for p in $$list; do \
13426 - f=$(am__strip_dir) \
13427 + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
13428 + for p in $$list; do \
13429 + $(am__strip_dir) \
13430 echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
13431 rm -f "$(DESTDIR)$(dvidir)/$$f"; \
13432 done
13433
13434 uninstall-html-am:
13435 @$(NORMAL_UNINSTALL)
13436 - @list='$(HTMLS)'; for p in $$list; do \
13437 - f=$(am__strip_dir) \
13438 + @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
13439 + for p in $$list; do \
13440 + $(am__strip_dir) \
13441 echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
13442 rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
13443 done
13444 @@ -449,7 +486,8 @@ uninstall-info-am:
13445 for file in $$list; do \
13446 relfile=`echo "$$file" | sed 's|^.*/||'`; \
13447 echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
13448 - install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
13449 + if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
13450 + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
13451 done; \
13452 else :; fi
13453 @$(NORMAL_UNINSTALL)
13454 @@ -465,16 +503,18 @@ uninstall-info-am:
13455
13456 uninstall-pdf-am:
13457 @$(NORMAL_UNINSTALL)
13458 - @list='$(PDFS)'; for p in $$list; do \
13459 - f=$(am__strip_dir) \
13460 + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
13461 + for p in $$list; do \
13462 + $(am__strip_dir) \
13463 echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
13464 rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
13465 done
13466
13467 uninstall-ps-am:
13468 @$(NORMAL_UNINSTALL)
13469 - @list='$(PSS)'; for p in $$list; do \
13470 - f=$(am__strip_dir) \
13471 + @list='$(PSS)'; test -n "$(psdir)" || list=; \
13472 + for p in $$list; do \
13473 + $(am__strip_dir) \
13474 echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
13475 rm -f "$(DESTDIR)$(psdir)/$$f"; \
13476 done
13477 @@ -491,8 +531,8 @@ dist-info: $(INFO_DEPS)
13478 for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
13479 if test -f $$file; then \
13480 relfile=`expr "$$file" : "$$d/\(.*\)"`; \
13481 - test -f $(distdir)/$$relfile || \
13482 - cp -p $$file $(distdir)/$$relfile; \
13483 + test -f "$(distdir)/$$relfile" || \
13484 + cp -p $$file "$(distdir)/$$relfile"; \
13485 else :; fi; \
13486 done; \
13487 done
13488 @@ -506,9 +546,7 @@ mostlyclean-aminfo:
13489 cfengine-Reference.pgs cfengine-Reference.tmp \
13490 cfengine-Reference.toc cfengine-Reference.tp \
13491 cfengine-Reference.tps cfengine-Reference.vr \
13492 - cfengine-Reference.vrs cfengine-Reference.dvi \
13493 - cfengine-Reference.pdf cfengine-Reference.ps \
13494 - cfengine-Reference.html cfengine-Tutorial.aux \
13495 + cfengine-Reference.vrs cfengine-Tutorial.aux \
13496 cfengine-Tutorial.cp cfengine-Tutorial.cps \
13497 cfengine-Tutorial.fn cfengine-Tutorial.fns \
13498 cfengine-Tutorial.ky cfengine-Tutorial.kys \
13499 @@ -517,7 +555,15 @@ mostlyclean-aminfo:
13500 cfengine-Tutorial.pgs cfengine-Tutorial.tmp \
13501 cfengine-Tutorial.toc cfengine-Tutorial.tp \
13502 cfengine-Tutorial.tps cfengine-Tutorial.vr \
13503 - cfengine-Tutorial.vrs cfengine-Tutorial.dvi \
13504 + cfengine-Tutorial.vrs
13505 +
13506 +clean-aminfo:
13507 + -test -z "cfengine-Reference.dvi cfengine-Reference.pdf cfengine-Reference.ps \
13508 + cfengine-Reference.html cfengine-Tutorial.dvi \
13509 + cfengine-Tutorial.pdf cfengine-Tutorial.ps \
13510 + cfengine-Tutorial.html" \
13511 + || rm -rf cfengine-Reference.dvi cfengine-Reference.pdf cfengine-Reference.ps \
13512 + cfengine-Reference.html cfengine-Tutorial.dvi \
13513 cfengine-Tutorial.pdf cfengine-Tutorial.ps \
13514 cfengine-Tutorial.html
13515
13516 @@ -527,85 +573,84 @@ maintainer-clean-aminfo:
13517 echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
13518 rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
13519 done
13520 -install-man8: $(man8_MANS) $(man_MANS)
13521 +install-man8: $(man_MANS)
13522 @$(NORMAL_INSTALL)
13523 test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
13524 - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
13525 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
13526 - for i in $$l2; do \
13527 - case "$$i" in \
13528 - *.8*) list="$$list $$i" ;; \
13529 - esac; \
13530 + @list=''; test -n "$(man8dir)" || exit 0; \
13531 + { for i in $$list; do echo "$$i"; done; \
13532 + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
13533 + sed -n '/\.8[a-z]*$$/p'; \
13534 + } | while read p; do \
13535 + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
13536 + echo "$$d$$p"; echo "$$p"; \
13537 + done | \
13538 + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
13539 + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
13540 + sed 'N;N;s,\n, ,g' | { \
13541 + list=; while read file base inst; do \
13542 + if test "$$base" = "$$inst"; then list="$$list $$file"; else \
13543 + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
13544 + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
13545 + fi; \
13546 done; \
13547 - for i in $$list; do \
13548 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
13549 - else file=$$i; fi; \
13550 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
13551 - case "$$ext" in \
13552 - 8*) ;; \
13553 - *) ext='8' ;; \
13554 - esac; \
13555 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
13556 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
13557 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
13558 - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
13559 - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
13560 - done
13561 + for i in $$list; do echo "$$i"; done | $(am__base_list) | \
13562 + while read files; do \
13563 + test -z "$$files" || { \
13564 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
13565 + $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
13566 + done; }
13567 +
13568 uninstall-man8:
13569 @$(NORMAL_UNINSTALL)
13570 - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
13571 - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
13572 - for i in $$l2; do \
13573 - case "$$i" in \
13574 - *.8*) list="$$list $$i" ;; \
13575 - esac; \
13576 - done; \
13577 - for i in $$list; do \
13578 - ext=`echo $$i | sed -e 's/^.*\\.//'`; \
13579 - case "$$ext" in \
13580 - 8*) ;; \
13581 - *) ext='8' ;; \
13582 - esac; \
13583 - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
13584 - inst=`echo $$inst | sed -e 's/^.*\///'`; \
13585 - inst=`echo $$inst | sed '$(transform)'`.$$ext; \
13586 - echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
13587 - rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
13588 - done
13589 + @list=''; test -n "$(man8dir)" || exit 0; \
13590 + files=`{ for i in $$list; do echo "$$i"; done; \
13591 + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
13592 + sed -n '/\.8[a-z]*$$/p'; \
13593 + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
13594 + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
13595 + test -z "$$files" || { \
13596 + echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
13597 + cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
13598 install-docDATA: $(doc_DATA)
13599 @$(NORMAL_INSTALL)
13600 test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
13601 - @list='$(doc_DATA)'; for p in $$list; do \
13602 + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
13603 + for p in $$list; do \
13604 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13605 - f=$(am__strip_dir) \
13606 - echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
13607 - $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
13608 + echo "$$d$$p"; \
13609 + done | $(am__base_list) | \
13610 + while read files; do \
13611 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
13612 + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
13613 done
13614
13615 uninstall-docDATA:
13616 @$(NORMAL_UNINSTALL)
13617 - @list='$(doc_DATA)'; for p in $$list; do \
13618 - f=$(am__strip_dir) \
13619 - echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
13620 - rm -f "$(DESTDIR)$(docdir)/$$f"; \
13621 - done
13622 + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
13623 + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13624 + test -n "$$files" || exit 0; \
13625 + echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
13626 + cd "$(DESTDIR)$(docdir)" && rm -f $$files
13627 install-htmlDATA: $(html_DATA)
13628 @$(NORMAL_INSTALL)
13629 test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
13630 - @list='$(html_DATA)'; for p in $$list; do \
13631 + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
13632 + for p in $$list; do \
13633 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13634 - f=$(am__strip_dir) \
13635 - echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
13636 - $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
13637 + echo "$$d$$p"; \
13638 + done | $(am__base_list) | \
13639 + while read files; do \
13640 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
13641 + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
13642 done
13643
13644 uninstall-htmlDATA:
13645 @$(NORMAL_UNINSTALL)
13646 - @list='$(html_DATA)'; for p in $$list; do \
13647 - f=$(am__strip_dir) \
13648 - echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
13649 - rm -f "$(DESTDIR)$(htmldir)/$$f"; \
13650 - done
13651 + @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
13652 + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
13653 + test -n "$$files" || exit 0; \
13654 + echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
13655 + cd "$(DESTDIR)$(htmldir)" && rm -f $$files
13656 tags: TAGS
13657 TAGS:
13658
13659 @@ -614,6 +659,19 @@ CTAGS:
13660
13661
13662 distdir: $(DISTFILES)
13663 + @list='$(MANS)'; if test -n "$$list"; then \
13664 + list=`for p in $$list; do \
13665 + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
13666 + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
13667 + if test -n "$$list" && \
13668 + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
13669 + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
13670 + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
13671 + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
13672 + echo " typically \`make maintainer-clean' will remove them" >&2; \
13673 + exit 1; \
13674 + else :; fi; \
13675 + else :; fi
13676 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
13677 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
13678 list='$(DISTFILES)'; \
13679 @@ -629,13 +687,17 @@ distdir: $(DISTFILES)
13680 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13681 if test -d $$d/$$file; then \
13682 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
13683 + if test -d "$(distdir)/$$file"; then \
13684 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13685 + fi; \
13686 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13687 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13688 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
13689 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
13690 fi; \
13691 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13692 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
13693 else \
13694 - test -f $(distdir)/$$file \
13695 - || cp -p $$d/$$file $(distdir)/$$file \
13696 + test -f "$(distdir)/$$file" \
13697 + || cp -p $$d/$$file "$(distdir)/$$file" \
13698 || exit 1; \
13699 fi; \
13700 done
13701 @@ -671,6 +733,7 @@ clean-generic:
13702
13703 distclean-generic:
13704 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
13705 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
13706 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
13707
13708 maintainer-clean-generic:
13709 @@ -679,7 +742,7 @@ maintainer-clean-generic:
13710 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
13711 clean: clean-am
13712
13713 -clean-am: clean-generic clean-libtool mostlyclean-am
13714 +clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am
13715
13716 distclean: distclean-am
13717 -rm -f Makefile
13718 @@ -705,11 +768,14 @@ install-dvi: install-dvi-am
13719 install-dvi-am: $(DVIS)
13720 @$(NORMAL_INSTALL)
13721 test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
13722 - @list='$(DVIS)'; for p in $$list; do \
13723 + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
13724 + for p in $$list; do \
13725 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13726 - f=$(am__strip_dir) \
13727 - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
13728 - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
13729 + echo "$$d$$p"; \
13730 + done | $(am__base_list) | \
13731 + while read files; do \
13732 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
13733 + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
13734 done
13735 install-exec-am:
13736
13737 @@ -718,26 +784,31 @@ install-html: install-html-am
13738 install-html-am: $(HTMLS)
13739 @$(NORMAL_INSTALL)
13740 test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
13741 - @list='$(HTMLS)'; for p in $$list; do \
13742 + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
13743 + for p in $$list; do \
13744 if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
13745 - f=$(am__strip_dir) \
13746 + $(am__strip_dir) \
13747 if test -d "$$d$$p"; then \
13748 echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
13749 $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
13750 echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
13751 - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
13752 + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
13753 else \
13754 - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
13755 - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
13756 + list2="$$list2 $$d$$p"; \
13757 fi; \
13758 - done
13759 + done; \
13760 + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
13761 + while read files; do \
13762 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
13763 + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
13764 + done; }
13765 install-info: install-info-am
13766
13767 install-info-am: $(INFO_DEPS)
13768 @$(NORMAL_INSTALL)
13769 test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
13770 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
13771 - list='$(INFO_DEPS)'; \
13772 + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
13773 for file in $$list; do \
13774 case $$file in \
13775 $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
13776 @@ -745,18 +816,19 @@ install-info-am: $(INFO_DEPS)
13777 if test -f $$file; then d=.; else d=$(srcdir); fi; \
13778 file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
13779 for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
13780 - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
13781 + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
13782 if test -f $$ifile; then \
13783 - relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
13784 - echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
13785 - $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
13786 + echo "$$ifile"; \
13787 else : ; fi; \
13788 done; \
13789 - done
13790 + done | $(am__base_list) | \
13791 + while read files; do \
13792 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
13793 + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
13794 @$(POST_INSTALL)
13795 @if (install-info --version && \
13796 install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
13797 - list='$(INFO_DEPS)'; \
13798 + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
13799 for file in $$list; do \
13800 relfile=`echo "$$file" | sed 's|^.*/||'`; \
13801 echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
13802 @@ -770,23 +842,27 @@ install-pdf: install-pdf-am
13803 install-pdf-am: $(PDFS)
13804 @$(NORMAL_INSTALL)
13805 test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
13806 - @list='$(PDFS)'; for p in $$list; do \
13807 + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
13808 + for p in $$list; do \
13809 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13810 - f=$(am__strip_dir) \
13811 - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
13812 - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
13813 - done
13814 + echo "$$d$$p"; \
13815 + done | $(am__base_list) | \
13816 + while read files; do \
13817 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
13818 + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
13819 install-ps: install-ps-am
13820
13821 install-ps-am: $(PSS)
13822 @$(NORMAL_INSTALL)
13823 test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
13824 - @list='$(PSS)'; for p in $$list; do \
13825 + @list='$(PSS)'; test -n "$(psdir)" || list=; \
13826 + for p in $$list; do \
13827 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13828 - f=$(am__strip_dir) \
13829 - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
13830 - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
13831 - done
13832 + echo "$$d$$p"; \
13833 + done | $(am__base_list) | \
13834 + while read files; do \
13835 + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
13836 + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
13837 installcheck-am:
13838
13839 maintainer-clean: maintainer-clean-am
13840 @@ -816,16 +892,16 @@ uninstall-man: uninstall-man8
13841
13842 .MAKE: install-am install-strip
13843
13844 -.PHONY: all all-am check check-am clean clean-generic clean-libtool \
13845 - dist-info distclean distclean-generic distclean-libtool \
13846 - distdir dvi dvi-am html html-am info info-am install \
13847 - install-am install-data install-data-am install-docDATA \
13848 - install-dvi install-dvi-am install-exec install-exec-am \
13849 - install-html install-html-am install-htmlDATA install-info \
13850 - install-info-am install-man install-man8 install-pdf \
13851 - install-pdf-am install-ps install-ps-am install-strip \
13852 - installcheck installcheck-am installdirs maintainer-clean \
13853 - maintainer-clean-1 maintainer-clean-aminfo \
13854 +.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
13855 + clean-libtool dist-info distclean distclean-generic \
13856 + distclean-libtool distdir dvi dvi-am html html-am info info-am \
13857 + install install-am install-data install-data-am \
13858 + install-docDATA install-dvi install-dvi-am install-exec \
13859 + install-exec-am install-html install-html-am install-htmlDATA \
13860 + install-info install-info-am install-man install-man8 \
13861 + install-pdf install-pdf-am install-ps install-ps-am \
13862 + install-strip installcheck installcheck-am installdirs \
13863 + maintainer-clean maintainer-clean-1 maintainer-clean-aminfo \
13864 maintainer-clean-generic maintainer-clean-vti mostlyclean \
13865 mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \
13866 mostlyclean-libtool mostlyclean-vti pdf pdf-am ps ps-am \
13867 @@ -845,6 +921,7 @@ uninstall-man: uninstall-man8
13868
13869 %.pdf : %.ps
13870 ${PS2PDF} $<
13871 +
13872 # Tell versions [3.59,3.63) of GNU make to not export all variables.
13873 # Otherwise a system limit (for SysV at least) may be exceeded.
13874 .NOEXPORT:
13875 diff --git a/doc/mdate-sh b/doc/mdate-sh
13876 index 37171f2..e631b22 100755
13877 --- a/doc/mdate-sh
13878 +++ b/doc/mdate-sh
13879 @@ -1,6 +1,10 @@
13880 #!/bin/sh
13881 # Get modification time of a file or directory and pretty-print it.
13882 -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
13883 +
13884 +scriptversion=2009-04-28.21; # UTC
13885 +
13886 +# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007, 2009 Free
13887 +# Software Foundation, Inc.
13888 # written by Ulrich Drepper <[email protected]>, June 1995
13889 #
13890 # This program is free software; you can redistribute it and/or modify
13891 @@ -14,8 +18,37 @@
13892 # GNU General Public License for more details.
13893 #
13894 # You should have received a copy of the GNU General Public License
13895 -# along with this program; if not, write to the Free Software Foundation,
13896 -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
13897 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
13898 +
13899 +# As a special exception to the GNU General Public License, if you
13900 +# distribute this file as part of a program that contains a
13901 +# configuration script generated by Autoconf, you may include it under
13902 +# the same distribution terms that you use for the rest of that program.
13903 +
13904 +# This file is maintained in Automake, please report
13905 +# bugs to <[email protected]> or send patches to
13906 +# <[email protected]>.
13907 +
13908 +case $1 in
13909 + '')
13910 + echo "$0: No file. Try \`$0 --help' for more information." 1>&2
13911 + exit 1;
13912 + ;;
13913 + -h | --h*)
13914 + cat <<\EOF
13915 +Usage: mdate-sh [--help] [--version] FILE
13916 +
13917 +Pretty-print the modification time of FILE.
13918 +
13919 +Report bugs to <[email protected]>.
13920 +EOF
13921 + exit $?
13922 + ;;
13923 + -v | --v*)
13924 + echo "mdate-sh $scriptversion"
13925 + exit $?
13926 + ;;
13927 +esac
13928
13929 # Prevent date giving response in another language.
13930 LANG=C
13931 @@ -25,24 +58,50 @@ export LC_ALL
13932 LC_TIME=C
13933 export LC_TIME
13934
13935 -# Get the extended ls output of the file or directory.
13936 -# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
13937 +# GNU ls changes its time format in response to the TIME_STYLE
13938 +# variable. Since we cannot assume `unset' works, revert this
13939 +# variable to its documented default.
13940 +if test "${TIME_STYLE+set}" = set; then
13941 + TIME_STYLE=posix-long-iso
13942 + export TIME_STYLE
13943 +fi
13944 +
13945 +save_arg1=$1
13946 +
13947 +# Find out how to get the extended ls output of a file or directory.
13948 if ls -L /dev/null 1>/dev/null 2>&1; then
13949 - set - x`ls -L -l -d $1`
13950 + ls_command='ls -L -l -d'
13951 else
13952 - set - x`ls -l -d $1`
13953 + ls_command='ls -l -d'
13954 +fi
13955 +# Avoid user/group names that might have spaces, when possible.
13956 +if ls -n /dev/null 1>/dev/null 2>&1; then
13957 + ls_command="$ls_command -n"
13958 fi
13959 -# The month is at least the fourth argument
13960 -# (3 shifts here, the next inside the loop).
13961 -shift
13962 -shift
13963 -shift
13964
13965 -# Find the month. Next argument is day, followed by the year or time.
13966 +# A `ls -l' line looks as follows on OS/2.
13967 +# drwxrwx--- 0 Aug 11 2001 foo
13968 +# This differs from Unix, which adds ownership information.
13969 +# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
13970 +#
13971 +# To find the date, we split the line on spaces and iterate on words
13972 +# until we find a month. This cannot work with files whose owner is a
13973 +# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
13974 +# will be owned by a user whose name is a month. So we first look at
13975 +# the extended ls output of the root directory to decide how many
13976 +# words should be skipped to get the date.
13977 +
13978 +# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
13979 +set x`$ls_command /`
13980 +
13981 +# Find which argument is the month.
13982 month=
13983 +command=
13984 until test $month
13985 do
13986 shift
13987 + # Add another shift to the command.
13988 + command="$command shift;"
13989 case $1 in
13990 Jan) month=January; nummonth=1;;
13991 Feb) month=February; nummonth=2;;
13992 @@ -59,7 +118,51 @@ do
13993 esac
13994 done
13995
13996 -day=$2
13997 +# Get the extended ls output of the file or directory.
13998 +set dummy x`eval "$ls_command \"\$save_arg1\""`
13999 +
14000 +# Remove all preceding arguments
14001 +eval $command
14002 +
14003 +# Because of the dummy argument above, month is in $2.
14004 +#
14005 +# On a POSIX system, we should have
14006 +#
14007 +# $# = 5
14008 +# $1 = file size
14009 +# $2 = month
14010 +# $3 = day
14011 +# $4 = year or time
14012 +# $5 = filename
14013 +#
14014 +# On Darwin 7.7.0 and 7.6.0, we have
14015 +#
14016 +# $# = 4
14017 +# $1 = day
14018 +# $2 = month
14019 +# $3 = year or time
14020 +# $4 = filename
14021 +
14022 +# Get the month.
14023 +case $2 in
14024 + Jan) month=January; nummonth=1;;
14025 + Feb) month=February; nummonth=2;;
14026 + Mar) month=March; nummonth=3;;
14027 + Apr) month=April; nummonth=4;;
14028 + May) month=May; nummonth=5;;
14029 + Jun) month=June; nummonth=6;;
14030 + Jul) month=July; nummonth=7;;
14031 + Aug) month=August; nummonth=8;;
14032 + Sep) month=September; nummonth=9;;
14033 + Oct) month=October; nummonth=10;;
14034 + Nov) month=November; nummonth=11;;
14035 + Dec) month=December; nummonth=12;;
14036 +esac
14037 +
14038 +case $3 in
14039 + ???*) day=$1;;
14040 + *) day=$3; shift;;
14041 +esac
14042
14043 # Here we have to deal with the problem that the ls output gives either
14044 # the time of day or the year.
14045 @@ -90,3 +193,13 @@ esac
14046
14047 # The result.
14048 echo $day $month $year
14049 +
14050 +# Local Variables:
14051 +# mode: shell-script
14052 +# sh-indentation: 2
14053 +# eval: (add-hook 'write-file-hooks 'time-stamp)
14054 +# time-stamp-start: "scriptversion="
14055 +# time-stamp-format: "%:y-%02m-%02d.%02H"
14056 +# time-stamp-time-zone: "UTC"
14057 +# time-stamp-end: "; # UTC"
14058 +# End:
14059 diff --git a/doc/texinfo.tex b/doc/texinfo.tex
14060 index d93d432..9140826 100644
14061 --- a/doc/texinfo.tex
14062 +++ b/doc/texinfo.tex
14063 @@ -1,18 +1,18 @@
14064 % texinfo.tex -- TeX macros to handle Texinfo files.
14065 -%
14066 +%
14067 % Load plain if necessary, i.e., if running under initex.
14068 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
14069 %
14070 -\def\texinfoversion{2004-04-07.08}
14071 +\def\texinfoversion{2009-08-14.15}
14072 %
14073 -% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
14074 -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
14075 -% Foundation, Inc.
14076 +% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
14077 +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
14078 +% 2007, 2008, 2009 Free Software Foundation, Inc.
14079 %
14080 -% This texinfo.tex file is free software; you can redistribute it and/or
14081 +% This texinfo.tex file is free software: you can redistribute it and/or
14082 % modify it under the terms of the GNU General Public License as
14083 -% published by the Free Software Foundation; either version 2, or (at
14084 -% your option) any later version.
14085 +% published by the Free Software Foundation, either version 3 of the
14086 +% License, or (at your option) any later version.
14087 %
14088 % This texinfo.tex file is distributed in the hope that it will be
14089 % useful, but WITHOUT ANY WARRANTY; without even the implied warranty
14090 @@ -20,14 +20,12 @@
14091 % General Public License for more details.
14092 %
14093 % You should have received a copy of the GNU General Public License
14094 -% along with this texinfo.tex file; see the file COPYING. If not, write
14095 -% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
14096 -% Boston, MA 02111-1307, USA.
14097 +% along with this program. If not, see <http://www.gnu.org/licenses/>.
14098 %
14099 % As a special exception, when this file is read by TeX when processing
14100 % a Texinfo source document, you may use the result without
14101 % restriction. (This has been our intent since Texinfo was invented.)
14102 -%
14103 +%
14104 % Please try the latest version of texinfo.tex before submitting bug
14105 % reports; you can get the latest version from:
14106 % http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
14107 @@ -55,7 +53,7 @@
14108 % It is possible to adapt texinfo.tex for other languages, to some
14109 % extent. You can get the existing language-specific files from the
14110 % full Texinfo distribution.
14111 -%
14112 +%
14113 % The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
14114
14115
14116 @@ -67,7 +65,7 @@
14117 \everyjob{\message{[Texinfo version \texinfoversion]}%
14118 \catcode`+=\active \catcode`\_=\active}
14119
14120 -\message{Basics,}
14121 +
14122 \chardef\other=12
14123
14124 % We never want plain's \outer definition of \+ in Texinfo.
14125 @@ -89,15 +87,20 @@
14126 \let\ptexhat=^
14127 \let\ptexi=\i
14128 \let\ptexindent=\indent
14129 -\let\ptexnoindent=\noindent
14130 \let\ptexinsert=\insert
14131 \let\ptexlbrace=\{
14132 \let\ptexless=<
14133 +\let\ptexnewwrite\newwrite
14134 +\let\ptexnoindent=\noindent
14135 \let\ptexplus=+
14136 \let\ptexrbrace=\}
14137 \let\ptexslash=\/
14138 \let\ptexstar=\*
14139 \let\ptext=\t
14140 +\let\ptextop=\top
14141 +{\catcode`\'=\active
14142 +\global\let\ptexquoteright'}% Math-mode def from plain.tex.
14143 +\let\ptexraggedright=\raggedright
14144
14145 % If this character appears in an error message or help string, it
14146 % starts a new line in the output.
14147 @@ -152,20 +155,22 @@
14148 \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
14149 \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
14150
14151 -% In some macros, we cannot use the `\? notation---the left quote is
14152 -% in some cases the escape char.
14153 +% Since the category of space is not known, we have to be careful.
14154 +\chardef\spacecat = 10
14155 +\def\spaceisspace{\catcode`\ =\spacecat}
14156 +
14157 +% sometimes characters are active, so we need control sequences.
14158 \chardef\colonChar = `\:
14159 \chardef\commaChar = `\,
14160 +\chardef\dashChar = `\-
14161 \chardef\dotChar = `\.
14162 \chardef\exclamChar= `\!
14163 +\chardef\lquoteChar= `\`
14164 \chardef\questChar = `\?
14165 +\chardef\rquoteChar= `\'
14166 \chardef\semiChar = `\;
14167 \chardef\underChar = `\_
14168
14169 -\chardef\spaceChar = `\ %
14170 -\chardef\spacecat = 10
14171 -\def\spaceisspace{\catcode\spaceChar=\spacecat}
14172 -
14173 % Ignore a token.
14174 %
14175 \def\gobble#1{}
14176 @@ -276,6 +281,50 @@
14177 \newdimen\cornerthick \cornerthick=.3pt
14178 \newdimen\topandbottommargin \topandbottommargin=.75in
14179
14180 +% Output a mark which sets \thischapter, \thissection and \thiscolor.
14181 +% We dump everything together because we only have one kind of mark.
14182 +% This works because we only use \botmark / \topmark, not \firstmark.
14183 +%
14184 +% A mark contains a subexpression of the \ifcase ... \fi construct.
14185 +% \get*marks macros below extract the needed part using \ifcase.
14186 +%
14187 +% Another complication is to let the user choose whether \thischapter
14188 +% (\thissection) refers to the chapter (section) in effect at the top
14189 +% of a page, or that at the bottom of a page. The solution is
14190 +% described on page 260 of The TeXbook. It involves outputting two
14191 +% marks for the sectioning macros, one before the section break, and
14192 +% one after. I won't pretend I can describe this better than DEK...
14193 +\def\domark{%
14194 + \toks0=\expandafter{\lastchapterdefs}%
14195 + \toks2=\expandafter{\lastsectiondefs}%
14196 + \toks4=\expandafter{\prevchapterdefs}%
14197 + \toks6=\expandafter{\prevsectiondefs}%
14198 + \toks8=\expandafter{\lastcolordefs}%
14199 + \mark{%
14200 + \the\toks0 \the\toks2
14201 + \noexpand\or \the\toks4 \the\toks6
14202 + \noexpand\else \the\toks8
14203 + }%
14204 +}
14205 +% \topmark doesn't work for the very first chapter (after the title
14206 +% page or the contents), so we use \firstmark there -- this gets us
14207 +% the mark with the chapter defs, unless the user sneaks in, e.g.,
14208 +% @setcolor (or @url, or @link, etc.) between @contents and the very
14209 +% first @chapter.
14210 +\def\gettopheadingmarks{%
14211 + \ifcase0\topmark\fi
14212 + \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
14213 +}
14214 +\def\getbottomheadingmarks{\ifcase1\botmark\fi}
14215 +\def\getcolormarks{\ifcase2\topmark\fi}
14216 +
14217 +% Avoid "undefined control sequence" errors.
14218 +\def\lastchapterdefs{}
14219 +\def\lastsectiondefs{}
14220 +\def\prevchapterdefs{}
14221 +\def\prevsectiondefs{}
14222 +\def\lastcolordefs{}
14223 +
14224 % Main output routine.
14225 \chardef\PAGE = 255
14226 \output = {\onepageout{\pagecontents\PAGE}}
14227 @@ -293,7 +342,9 @@
14228 %
14229 % Do this outside of the \shipout so @code etc. will be expanded in
14230 % the headline as they should be, not taken literally (outputting ''code).
14231 + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
14232 \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
14233 + \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
14234 \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
14235 %
14236 {%
14237 @@ -301,10 +352,14 @@
14238 % take effect in \write's, yet the group defined by the \vbox ends
14239 % before the \shipout runs.
14240 %
14241 - \escapechar = `\\ % use backslash in output files.
14242 \indexdummies % don't expand commands in the output.
14243 \normalturnoffactive % \ in index entries must not stay \, e.g., if
14244 - % the page break happens to be in the middle of an example.
14245 + % the page break happens to be in the middle of an example.
14246 + % We don't want .vr (or whatever) entries like this:
14247 + % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
14248 + % "\acronym" won't work when it's read back in;
14249 + % it needs to be
14250 + % {\code {{\tt \backslashcurfont }acronym}
14251 \shipout\vbox{%
14252 % Do this early so pdf references go to the beginning of the page.
14253 \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
14254 @@ -332,9 +387,9 @@
14255 \pagebody{#1}%
14256 \ifdim\ht\footlinebox > 0pt
14257 % Only leave this space if the footline is nonempty.
14258 - % (We lessened \vsize for it in \oddfootingxxx.)
14259 + % (We lessened \vsize for it in \oddfootingyyy.)
14260 % The \baselineskip=24pt in plain's \makefootline has no effect.
14261 - \vskip 2\baselineskip
14262 + \vskip 24pt
14263 \unvbox\footlinebox
14264 \fi
14265 %
14266 @@ -355,7 +410,7 @@
14267 \egroup % \vbox from first cropmarks clause
14268 \fi
14269 }% end of \shipout\vbox
14270 - }% end of group with \normalturnoffactive
14271 + }% end of group with \indexdummies
14272 \advancepageno
14273 \ifnum\outputpenalty>-20000 \else\dosupereject\fi
14274 }
14275 @@ -368,7 +423,7 @@
14276 % marginal hacks, [email protected] (Juha Takala)
14277 \ifvoid\margin\else % marginal info is present
14278 \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
14279 -\dimen@=\dp#1 \unvbox#1
14280 +\dimen@=\dp#1\relax \unvbox#1\relax
14281 \ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
14282 \ifr@ggedbottom \kern-\dimen@ \vfil \fi}
14283 }
14284 @@ -390,7 +445,7 @@
14285 %
14286 \def\parsearg{\parseargusing{}}
14287 \def\parseargusing#1#2{%
14288 - \def\next{#2}%
14289 + \def\argtorun{#2}%
14290 \begingroup
14291 \obeylines
14292 \spaceisspace
14293 @@ -409,7 +464,7 @@
14294 \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
14295 \def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
14296
14297 -% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
14298 +% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
14299 %
14300 % \argremovec might leave us with trailing space, e.g.,
14301 % @end itemize @c foo
14302 @@ -421,8 +476,7 @@
14303 \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
14304 \def\temp{#3}%
14305 \ifx\temp\empty
14306 - % We cannot use \next here, as it holds the macro to run;
14307 - % thus we reuse \temp.
14308 + % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
14309 \let\temp\finishparsearg
14310 \else
14311 \let\temp\argcheckspaces
14312 @@ -434,14 +488,14 @@
14313 % If a _delimited_ argument is enclosed in braces, they get stripped; so
14314 % to get _exactly_ the rest of the line, we had to prevent such situation.
14315 % We prepended an \empty token at the very beginning and we expand it now,
14316 -% just before passing the control to \next.
14317 -% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
14318 +% just before passing the control to \argtorun.
14319 +% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
14320 % either the null string, or it ends with \^^M---thus there is no danger
14321 % that a pair of braces would be stripped.
14322 %
14323 % But first, we have to remove the trailing space token.
14324 %
14325 -\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
14326 +\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
14327
14328 % \parseargdef\foo{...}
14329 % is roughly equivalent to
14330 @@ -481,23 +535,23 @@
14331 \def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
14332
14333 % Define the framework for environments in texinfo.tex. It's used like this:
14334 -%
14335 +%
14336 % \envdef\foo{...}
14337 % \def\Efoo{...}
14338 -%
14339 +%
14340 % It's the responsibility of \envdef to insert \begingroup before the
14341 % actual body; @end closes the group after calling \Efoo. \envdef also
14342 % defines \thisenv, so the current environment is known; @end checks
14343 % whether the environment name matches. The \checkenv macro can also be
14344 % used to check whether the current environment is the one expected.
14345 -%
14346 +%
14347 % Non-false conditionals (@iftex, @ifset) don't fit into this, so they
14348 -% are not treated as enviroments; they don't open a group. (The
14349 +% are not treated as environments; they don't open a group. (The
14350 % implementation of @end takes care not to call \endgroup in this
14351 % special case.)
14352
14353
14354 -% At runtime, environments start with this:
14355 +% At run-time, environments start with this:
14356 \def\startenvironment#1{\begingroup\def\thisenv{#1}}
14357 % initialize
14358 \let\thisenv\empty
14359 @@ -515,7 +569,7 @@
14360 \fi
14361 }
14362
14363 -% Evironment mismatch, #1 expected:
14364 +% Environment mismatch, #1 expected:
14365 \def\badenverr{%
14366 \errhelp = \EMsimple
14367 \errmessage{This command can appear only \inenvironment\temp,
14368 @@ -565,7 +619,7 @@
14369 \let\}=\myrbrace
14370 \begingroup
14371 % Definitions to produce \{ and \} commands for indices,
14372 - % and @{ and @} for the aux file.
14373 + % and @{ and @} for the aux/toc files.
14374 \catcode`\{ = \other \catcode`\} = \other
14375 \catcode`\[ = 1 \catcode`\] = 2
14376 \catcode`\! = 0 \catcode`\\ = \other
14377 @@ -599,23 +653,23 @@
14378 \def\jmacro{j}
14379 \def\dotless#1{%
14380 \def\temp{#1}%
14381 - \ifx\temp\imacro \ptexi
14382 - \else\ifx\temp\jmacro \j
14383 + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
14384 + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
14385 \else \errmessage{@dotless can be used only with i or j}%
14386 \fi\fi
14387 }
14388
14389 % The \TeX{} logo, as in plain, but resetting the spacing so that a
14390 % period following counts as ending a sentence. (Idea found in latex.)
14391 -%
14392 -\edef\TeX{\TeX \spacefactor=3000 }
14393 +%
14394 +\edef\TeX{\TeX \spacefactor=1000 }
14395
14396 % @LaTeX{} logo. Not quite the same results as the definition in
14397 % latex.ltx, since we use a different font for the raised A; it's most
14398 % convenient for us to use an explicitly smaller font, rather than using
14399 % the \scriptstyle font (since we don't reset \scriptstyle and
14400 % \scriptscriptstyle).
14401 -%
14402 +%
14403 \def\LaTeX{%
14404 L\kern-.36em
14405 {\setbox0=\hbox{T}%
14406 @@ -646,13 +700,28 @@
14407 \let\/=\allowbreak
14408
14409 % @. is an end-of-sentence period.
14410 -\def\.{.\spacefactor=3000 }
14411 +\def\.{.\spacefactor=\endofsentencespacefactor\space}
14412
14413 % @! is an end-of-sentence bang.
14414 -\def\!{!\spacefactor=3000 }
14415 +\def\!{!\spacefactor=\endofsentencespacefactor\space}
14416
14417 % @? is an end-of-sentence query.
14418 -\def\?{?\spacefactor=3000 }
14419 +\def\?{?\spacefactor=\endofsentencespacefactor\space}
14420 +
14421 +% @frenchspacing on|off says whether to put extra space after punctuation.
14422 +%
14423 +\def\onword{on}
14424 +\def\offword{off}
14425 +%
14426 +\parseargdef\frenchspacing{%
14427 + \def\temp{#1}%
14428 + \ifx\temp\onword \plainfrenchspacing
14429 + \else\ifx\temp\offword \plainnonfrenchspacing
14430 + \else
14431 + \errhelp = \EMsimple
14432 + \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
14433 + \fi\fi
14434 +}
14435
14436 % @w prevents a word break. Without the \leavevmode, @w at the
14437 % beginning of a paragraph, when TeX is still in vertical mode, would
14438 @@ -851,15 +920,20 @@ where each line of input produces a line of output.}
14439 \temp
14440 }
14441
14442 -% @include file insert text of that file as input.
14443 +% @include FILE -- \input text of FILE.
14444 %
14445 \def\include{\parseargusing\filenamecatcodes\includezzz}
14446 \def\includezzz#1{%
14447 \pushthisfilestack
14448 \def\thisfile{#1}%
14449 {%
14450 - \makevalueexpandable
14451 - \def\temp{\input #1 }%
14452 + \makevalueexpandable % we want to expand any @value in FILE.
14453 + \turnoffactive % and allow special characters in the expansion
14454 + \indexnofonts % Allow `@@' and other weird things in file names.
14455 + \edef\temp{\noexpand\input #1 }%
14456 + %
14457 + % This trickery is to read FILE outside of a group, in case it makes
14458 + % definitions, etc.
14459 \expandafter
14460 }\temp
14461 \popthisfilestack
14462 @@ -874,6 +948,8 @@ where each line of input produces a line of output.}
14463 \catcode`>=\other
14464 \catcode`+=\other
14465 \catcode`-=\other
14466 + \catcode`\`=\other
14467 + \catcode`\'=\other
14468 }
14469
14470 \def\pushthisfilestack{%
14471 @@ -1030,9 +1106,9 @@ where each line of input produces a line of output.}
14472 % _ active, and distinguish by seeing if the current family is \slfam,
14473 % which is what @var uses.
14474 {
14475 - \catcode\underChar = \active
14476 + \catcode`\_ = \active
14477 \gdef\mathunderscore{%
14478 - \catcode\underChar=\active
14479 + \catcode`\_=\active
14480 \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
14481 }
14482 }
14483 @@ -1049,6 +1125,16 @@ where each line of input produces a line of output.}
14484 \mathunderscore
14485 \let\\ = \mathbackslash
14486 \mathactive
14487 + % make the texinfo accent commands work in math mode
14488 + \let\"=\ddot
14489 + \let\'=\acute
14490 + \let\==\bar
14491 + \let\^=\hat
14492 + \let\`=\grave
14493 + \let\u=\breve
14494 + \let\v=\check
14495 + \let\~=\tilde
14496 + \let\dotaccent=\dot
14497 $\finishmath
14498 }
14499 \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex.
14500 @@ -1062,28 +1148,41 @@ where each line of input produces a line of output.}
14501 \catcode`< = \active
14502 \catcode`> = \active
14503 \catcode`+ = \active
14504 + \catcode`' = \active
14505 \gdef\mathactive{%
14506 \let^ = \ptexhat
14507 \let< = \ptexless
14508 \let> = \ptexgtr
14509 \let+ = \ptexplus
14510 + \let' = \ptexquoteright
14511 }
14512 }
14513
14514 -% @bullet and @minus need the same treatment as @math, just above.
14515 +% Some math mode symbols.
14516 \def\bullet{$\ptexbullet$}
14517 -\def\minus{$-$}
14518 +\def\geq{\ifmmode \ge\else $\ge$\fi}
14519 +\def\leq{\ifmmode \le\else $\le$\fi}
14520 +\def\minus{\ifmmode -\else $-$\fi}
14521
14522 % @dots{} outputs an ellipsis using the current font.
14523 -% We do .5em per period so that it has the same spacing in a typewriter
14524 -% font as three actual period characters.
14525 +% We do .5em per period so that it has the same spacing in the cm
14526 +% typewriter fonts as three actual period characters; on the other hand,
14527 +% in other typewriter fonts three periods are wider than 1.5em. So do
14528 +% whichever is larger.
14529 %
14530 \def\dots{%
14531 \leavevmode
14532 - \hbox to 1.5em{%
14533 - \hskip 0pt plus 0.25fil
14534 - .\hfil.\hfil.%
14535 - \hskip 0pt plus 0.5fil
14536 + \setbox0=\hbox{...}% get width of three periods
14537 + \ifdim\wd0 > 1.5em
14538 + \dimen0 = \wd0
14539 + \else
14540 + \dimen0 = 1.5em
14541 + \fi
14542 + \hbox to \dimen0{%
14543 + \hskip 0pt plus.25fil
14544 + .\hskip 0pt plus1fil
14545 + .\hskip 0pt plus1fil
14546 + .\hskip 0pt plus.5fil
14547 }%
14548 }
14549
14550 @@ -1091,12 +1190,12 @@ where each line of input produces a line of output.}
14551 %
14552 \def\enddots{%
14553 \dots
14554 - \spacefactor=3000
14555 + \spacefactor=\endofsentencespacefactor
14556 }
14557
14558 % @comma{} is so commas can be inserted into text without messing up
14559 % Texinfo's parsing.
14560 -%
14561 +%
14562 \let\comma = ,
14563
14564 % @refill is a no-op.
14565 @@ -1175,40 +1274,182 @@ where each line of input produces a line of output.}
14566 \fi
14567 \fi
14568 \fi
14569 -%
14570 +
14571 +% PDF uses PostScript string constants for the names of xref targets,
14572 +% for display in the outlines, and in other places. Thus, we have to
14573 +% double any backslashes. Otherwise, a name like "\node" will be
14574 +% interpreted as a newline (\n), followed by o, d, e. Not good.
14575 +% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
14576 +% (and related messages, the final outcome is that it is up to the TeX
14577 +% user to double the backslashes and otherwise make the string valid, so
14578 +% that's what we do).
14579 +
14580 +% double active backslashes.
14581 +%
14582 +{\catcode`\@=0 \catcode`\\=\active
14583 + @gdef@activebackslashdouble{%
14584 + @catcode`@\=@active
14585 + @let\=@doublebackslash}
14586 +}
14587 +
14588 +% To handle parens, we must adopt a different approach, since parens are
14589 +% not active characters. hyperref.dtx (which has the same problem as
14590 +% us) handles it with this amazing macro to replace tokens, with minor
14591 +% changes for Texinfo. It is included here under the GPL by permission
14592 +% from the author, Heiko Oberdiek.
14593 +%
14594 +% #1 is the tokens to replace.
14595 +% #2 is the replacement.
14596 +% #3 is the control sequence with the string.
14597 +%
14598 +\def\HyPsdSubst#1#2#3{%
14599 + \def\HyPsdReplace##1#1##2\END{%
14600 + ##1%
14601 + \ifx\\##2\\%
14602 + \else
14603 + #2%
14604 + \HyReturnAfterFi{%
14605 + \HyPsdReplace##2\END
14606 + }%
14607 + \fi
14608 + }%
14609 + \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
14610 +}
14611 +\long\def\HyReturnAfterFi#1\fi{\fi#1}
14612 +
14613 +% #1 is a control sequence in which to do the replacements.
14614 +\def\backslashparens#1{%
14615 + \xdef#1{#1}% redefine it as its expansion; the definition is simply
14616 + % \lastnode when called from \setref -> \pdfmkdest.
14617 + \HyPsdSubst{(}{\realbackslash(}{#1}%
14618 + \HyPsdSubst{)}{\realbackslash)}{#1}%
14619 +}
14620 +
14621 +\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
14622 +with PDF output, and none of those formats could be found. (.eps cannot
14623 +be supported due to the design of the PDF format; use regular TeX (DVI
14624 +output) for that.)}
14625 +
14626 \ifpdf
14627 - \input pdfcolor
14628 - \pdfcatalog{/PageMode /UseOutlines}%
14629 + %
14630 + % Color manipulation macros based on pdfcolor.tex,
14631 + % except using rgb instead of cmyk; the latter is said to render as a
14632 + % very dark gray on-screen and a very dark halftone in print, instead
14633 + % of actual black.
14634 + \def\rgbDarkRed{0.50 0.09 0.12}
14635 + \def\rgbBlack{0 0 0}
14636 + %
14637 + % k sets the color for filling (usual text, etc.);
14638 + % K sets the color for stroking (thin rules, e.g., normal _'s).
14639 + \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}}
14640 + %
14641 + % Set color, and create a mark which defines \thiscolor accordingly,
14642 + % so that \makeheadline knows which color to restore.
14643 + \def\setcolor#1{%
14644 + \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
14645 + \domark
14646 + \pdfsetcolor{#1}%
14647 + }
14648 + %
14649 + \def\maincolor{\rgbBlack}
14650 + \pdfsetcolor{\maincolor}
14651 + \edef\thiscolor{\maincolor}
14652 + \def\lastcolordefs{}
14653 + %
14654 + \def\makefootline{%
14655 + \baselineskip24pt
14656 + \line{\pdfsetcolor{\maincolor}\the\footline}%
14657 + }
14658 + %
14659 + \def\makeheadline{%
14660 + \vbox to 0pt{%
14661 + \vskip-22.5pt
14662 + \line{%
14663 + \vbox to8.5pt{}%
14664 + % Extract \thiscolor definition from the marks.
14665 + \getcolormarks
14666 + % Typeset the headline with \maincolor, then restore the color.
14667 + \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
14668 + }%
14669 + \vss
14670 + }%
14671 + \nointerlineskip
14672 + }
14673 + %
14674 + %
14675 + \pdfcatalog{/PageMode /UseOutlines}
14676 + %
14677 + % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
14678 \def\dopdfimage#1#2#3{%
14679 - \def\imagewidth{#2}%
14680 - \def\imageheight{#3}%
14681 - % without \immediate, pdftex seg faults when the same image is
14682 + \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
14683 + \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
14684 + %
14685 + % pdftex (and the PDF format) support .png, .jpg, .pdf (among
14686 + % others). Let's try in that order.
14687 + \let\pdfimgext=\empty
14688 + \begingroup
14689 + \openin 1 #1.png \ifeof 1
14690 + \openin 1 #1.jpg \ifeof 1
14691 + \openin 1 #1.jpeg \ifeof 1
14692 + \openin 1 #1.JPG \ifeof 1
14693 + \openin 1 #1.pdf \ifeof 1
14694 + \openin 1 #1.PDF \ifeof 1
14695 + \errhelp = \nopdfimagehelp
14696 + \errmessage{Could not find image file #1 for pdf}%
14697 + \else \gdef\pdfimgext{PDF}%
14698 + \fi
14699 + \else \gdef\pdfimgext{pdf}%
14700 + \fi
14701 + \else \gdef\pdfimgext{JPG}%
14702 + \fi
14703 + \else \gdef\pdfimgext{jpeg}%
14704 + \fi
14705 + \else \gdef\pdfimgext{jpg}%
14706 + \fi
14707 + \else \gdef\pdfimgext{png}%
14708 + \fi
14709 + \closein 1
14710 + \endgroup
14711 + %
14712 + % without \immediate, ancient pdftex seg faults when the same image is
14713 % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
14714 \ifnum\pdftexversion < 14
14715 \immediate\pdfimage
14716 \else
14717 \immediate\pdfximage
14718 \fi
14719 - \ifx\empty\imagewidth\else width \imagewidth \fi
14720 - \ifx\empty\imageheight\else height \imageheight \fi
14721 + \ifdim \wd0 >0pt width \imagewidth \fi
14722 + \ifdim \wd2 >0pt height \imageheight \fi
14723 \ifnum\pdftexversion<13
14724 - #1.pdf%
14725 + #1.\pdfimgext
14726 \else
14727 - {#1.pdf}%
14728 + {#1.\pdfimgext}%
14729 \fi
14730 \ifnum\pdftexversion < 14 \else
14731 \pdfrefximage \pdflastximage
14732 \fi}
14733 + %
14734 \def\pdfmkdest#1{{%
14735 - % We have to set dummies so commands such as @code in a section title
14736 - % aren't expanded.
14737 - \atdummies
14738 - \normalturnoffactive
14739 - \pdfdest name{#1} xyz%
14740 + % We have to set dummies so commands such as @code, and characters
14741 + % such as \, aren't expanded when present in a section title.
14742 + \indexnofonts
14743 + \turnoffactive
14744 + \activebackslashdouble
14745 + \makevalueexpandable
14746 + \def\pdfdestname{#1}%
14747 + \backslashparens\pdfdestname
14748 + \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
14749 }}
14750 + %
14751 + % used to mark target names; must be expandable.
14752 \def\pdfmkpgn#1{#1}
14753 - \let\linkcolor = \Blue % was Cyan, but that seems light?
14754 - \def\endlink{\Black\pdfendlink}
14755 + %
14756 + % by default, use a color that is dark enough to print on paper as
14757 + % nearly black, but still distinguishable for online viewing.
14758 + \def\urlcolor{\rgbDarkRed}
14759 + \def\linkcolor{\rgbDarkRed}
14760 + \def\endlink{\setcolor{\maincolor}\pdfendlink}
14761 + %
14762 % Adding outlines to PDF; macros for calculating structure of outlines
14763 % come from Petr Olsak
14764 \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
14765 @@ -1217,20 +1458,31 @@ where each line of input produces a line of output.}
14766 \advance\tempnum by 1
14767 \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
14768 %
14769 - % #1 is the section text. #2 is the pdf expression for the number
14770 - % of subentries (or empty, for subsubsections). #3 is the node
14771 - % text, which might be empty if this toc entry had no
14772 - % corresponding node. #4 is the page number.
14773 - %
14774 + % #1 is the section text, which is what will be displayed in the
14775 + % outline by the pdf viewer. #2 is the pdf expression for the number
14776 + % of subentries (or empty, for subsubsections). #3 is the node text,
14777 + % which might be empty if this toc entry had no corresponding node.
14778 + % #4 is the page number
14779 + %
14780 \def\dopdfoutline#1#2#3#4{%
14781 % Generate a link to the node text if that exists; else, use the
14782 % page number. We could generate a destination for the section
14783 % text in the case where a section has no node, but it doesn't
14784 - % seem worthwhile, since most documents are normally structured.
14785 + % seem worth the trouble, since most documents are normally structured.
14786 \def\pdfoutlinedest{#3}%
14787 - \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
14788 + \ifx\pdfoutlinedest\empty
14789 + \def\pdfoutlinedest{#4}%
14790 + \else
14791 + % Doubled backslashes in the name.
14792 + {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
14793 + \backslashparens\pdfoutlinedest}%
14794 + \fi
14795 %
14796 - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
14797 + % Also double the backslashes in the display string.
14798 + {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
14799 + \backslashparens\pdfoutlinetext}%
14800 + %
14801 + \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
14802 }
14803 %
14804 \def\pdfmakeoutlines{%
14805 @@ -1242,13 +1494,13 @@ where each line of input produces a line of output.}
14806 % Read toc silently, to get counts of subentries for \pdfoutline.
14807 \def\numchapentry##1##2##3##4{%
14808 \def\thischapnum{##2}%
14809 - \let\thissecnum\empty
14810 - \let\thissubsecnum\empty
14811 + \def\thissecnum{0}%
14812 + \def\thissubsecnum{0}%
14813 }%
14814 \def\numsecentry##1##2##3##4{%
14815 \advancenumber{chap\thischapnum}%
14816 \def\thissecnum{##2}%
14817 - \let\thissubsecnum\empty
14818 + \def\thissubsecnum{0}%
14819 }%
14820 \def\numsubsecentry##1##2##3##4{%
14821 \advancenumber{sec\thissecnum}%
14822 @@ -1257,9 +1509,9 @@ where each line of input produces a line of output.}
14823 \def\numsubsubsecentry##1##2##3##4{%
14824 \advancenumber{subsec\thissubsecnum}%
14825 }%
14826 - \let\thischapnum\empty
14827 - \let\thissecnum\empty
14828 - \let\thissubsecnum\empty
14829 + \def\thischapnum{0}%
14830 + \def\thissecnum{0}%
14831 + \def\thissubsecnum{0}%
14832 %
14833 % use \def rather than \let here because we redefine \chapentry et
14834 % al. a second time, below.
14835 @@ -1271,12 +1523,12 @@ where each line of input produces a line of output.}
14836 \def\unnsecentry{\numsecentry}%
14837 \def\unnsubsecentry{\numsubsecentry}%
14838 \def\unnsubsubsecentry{\numsubsubsecentry}%
14839 - \input \jobname.toc
14840 + \readdatafile{toc}%
14841 %
14842 % Read toc second time, this time actually producing the outlines.
14843 % The `-' means take the \expnumber as the absolute number of
14844 % subentries, which we calculated on our first read of the .toc above.
14845 - %
14846 + %
14847 % We use the node names as the destinations.
14848 \def\numchapentry##1##2##3##4{%
14849 \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
14850 @@ -1292,46 +1544,17 @@ where each line of input produces a line of output.}
14851 % since the encoding is unknown. For example, the eogonek from
14852 % Latin 2 (0xea) gets translated to a | character. Info from
14853 % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
14854 - %
14855 + %
14856 % xx to do this right, we have to translate 8-bit characters to
14857 % their "best" equivalent, based on the @documentencoding. Right
14858 % now, I guess we'll just let the pdf reader have its way.
14859 \indexnofonts
14860 - \turnoffactive
14861 - \input \jobname.toc
14862 + \setupdatafile
14863 + \catcode`\\=\active \otherbackslash
14864 + \input \tocreadfilename
14865 \endgroup
14866 }
14867 %
14868 - \def\makelinks #1,{%
14869 - \def\params{#1}\def\E{END}%
14870 - \ifx\params\E
14871 - \let\nextmakelinks=\relax
14872 - \else
14873 - \let\nextmakelinks=\makelinks
14874 - \ifnum\lnkcount>0,\fi
14875 - \picknum{#1}%
14876 - \startlink attr{/Border [0 0 0]}
14877 - goto name{\pdfmkpgn{\the\pgn}}%
14878 - \linkcolor #1%
14879 - \advance\lnkcount by 1%
14880 - \endlink
14881 - \fi
14882 - \nextmakelinks
14883 - }
14884 - \def\picknum#1{\expandafter\pn#1}
14885 - \def\pn#1{%
14886 - \def\p{#1}%
14887 - \ifx\p\lbrace
14888 - \let\nextpn=\ppn
14889 - \else
14890 - \let\nextpn=\ppnn
14891 - \def\first{#1}
14892 - \fi
14893 - \nextpn
14894 - }
14895 - \def\ppn#1{\pgn=#1\gobble}
14896 - \def\ppnn{\pgn=\first}
14897 - \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
14898 \def\skipspaces#1{\def\PP{#1}\def\D{|}%
14899 \ifx\PP\D\let\nextsp\relax
14900 \else\let\nextsp\skipspaces
14901 @@ -1346,11 +1569,23 @@ where each line of input produces a line of output.}
14902 \else
14903 \let \startlink \pdfstartlink
14904 \fi
14905 + % make a live url in pdf output.
14906 \def\pdfurl#1{%
14907 \begingroup
14908 - \normalturnoffactive\def\@{@}%
14909 + % it seems we really need yet another set of dummies; have not
14910 + % tried to figure out what each command should do in the context
14911 + % of @url. for now, just make @/ a no-op, that's the only one
14912 + % people have actually reported a problem with.
14913 + %
14914 + \normalturnoffactive
14915 + \def\@{@}%
14916 + \let\/=\empty
14917 \makevalueexpandable
14918 - \leavevmode\Red
14919 + % do we want to go so far as to use \indexnofonts instead of just
14920 + % special-casing \var here?
14921 + \def\var##1{##1}%
14922 + %
14923 + \leavevmode\setcolor{\urlcolor}%
14924 \startlink attr{/Border [0 0 0]}%
14925 user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
14926 \endgroup}
14927 @@ -1377,13 +1612,15 @@ where each line of input produces a line of output.}
14928 {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
14929 \def\pdflink#1{%
14930 \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
14931 - \linkcolor #1\endlink}
14932 + \setcolor{\linkcolor}#1\endlink}
14933 \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
14934 \else
14935 + % non-pdf mode
14936 \let\pdfmkdest = \gobble
14937 \let\pdfurl = \gobble
14938 \let\endlink = \relax
14939 - \let\linkcolor = \relax
14940 + \let\setcolor = \gobble
14941 + \let\pdfsetcolor = \gobble
14942 \let\pdfmakeoutlines = \relax
14943 \fi % \ifx\pdfoutput
14944
14945 @@ -1393,22 +1630,26 @@ where each line of input produces a line of output.}
14946 % Change the current font style to #1, remembering it in \curfontstyle.
14947 % For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
14948 % italics, not bold italics.
14949 -%
14950 +%
14951 \def\setfontstyle#1{%
14952 \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
14953 \csname ten#1\endcsname % change the current font
14954 }
14955
14956 % Select #1 fonts with the current style.
14957 -%
14958 +%
14959 \def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
14960
14961 \def\rm{\fam=0 \setfontstyle{rm}}
14962 \def\it{\fam=\itfam \setfontstyle{it}}
14963 \def\sl{\fam=\slfam \setfontstyle{sl}}
14964 -\def\bf{\fam=\bffam \setfontstyle{bf}}
14965 +\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
14966 \def\tt{\fam=\ttfam \setfontstyle{tt}}
14967
14968 +% Unfortunately, we have to override this for titles and the like, since
14969 +% in those cases "rm" is bold. Sigh.
14970 +\def\rmisbold{\rm\def\curfontstyle{bf}}
14971 +
14972 % Texinfo sort of supports the sans serif font style, which plain TeX does not.
14973 % So we set up a \sf.
14974 \newfam\sffam
14975 @@ -1418,6 +1659,7 @@ where each line of input produces a line of output.}
14976 % We don't need math for this font style.
14977 \def\ttsl{\setfontstyle{ttsl}}
14978
14979 +
14980 % Default leading.
14981 \newdimen\textleading \textleading = 13.2pt
14982
14983 @@ -1429,8 +1671,12 @@ where each line of input produces a line of output.}
14984 \def\strutheightpercent{.70833}
14985 \def\strutdepthpercent {.29167}
14986 %
14987 +% can get a sort of poor man's double spacing by redefining this.
14988 +\def\baselinefactor{1}
14989 +%
14990 \def\setleading#1{%
14991 - \normalbaselineskip = #1\relax
14992 + \dimen0 = #1\relax
14993 + \normalbaselineskip = \baselinefactor\dimen0
14994 \normallineskip = \lineskipfactor\normalbaselineskip
14995 \normalbaselines
14996 \setbox\strutbox =\hbox{%
14997 @@ -1439,10 +1685,279 @@ where each line of input produces a line of output.}
14998 }%
14999 }
15000
15001 +% PDF CMaps. See also LaTeX's t1.cmap.
15002 +%
15003 +% do nothing with this by default.
15004 +\expandafter\let\csname cmapOT1\endcsname\gobble
15005 +\expandafter\let\csname cmapOT1IT\endcsname\gobble
15006 +\expandafter\let\csname cmapOT1TT\endcsname\gobble
15007 +
15008 +% if we are producing pdf, and we have \pdffontattr, then define cmaps.
15009 +% (\pdffontattr was introduced many years ago, but people still run
15010 +% older pdftex's; it's easy to conditionalize, so we do.)
15011 +\ifpdf \ifx\pdffontattr\undefined \else
15012 + \begingroup
15013 + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
15014 + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
15015 +%%DocumentNeededResources: ProcSet (CIDInit)
15016 +%%IncludeResource: ProcSet (CIDInit)
15017 +%%BeginResource: CMap (TeX-OT1-0)
15018 +%%Title: (TeX-OT1-0 TeX OT1 0)
15019 +%%Version: 1.000
15020 +%%EndComments
15021 +/CIDInit /ProcSet findresource begin
15022 +12 dict begin
15023 +begincmap
15024 +/CIDSystemInfo
15025 +<< /Registry (TeX)
15026 +/Ordering (OT1)
15027 +/Supplement 0
15028 +>> def
15029 +/CMapName /TeX-OT1-0 def
15030 +/CMapType 2 def
15031 +1 begincodespacerange
15032 +<00> <7F>
15033 +endcodespacerange
15034 +8 beginbfrange
15035 +<00> <01> <0393>
15036 +<09> <0A> <03A8>
15037 +<23> <26> <0023>
15038 +<28> <3B> <0028>
15039 +<3F> <5B> <003F>
15040 +<5D> <5E> <005D>
15041 +<61> <7A> <0061>
15042 +<7B> <7C> <2013>
15043 +endbfrange
15044 +40 beginbfchar
15045 +<02> <0398>
15046 +<03> <039B>
15047 +<04> <039E>
15048 +<05> <03A0>
15049 +<06> <03A3>
15050 +<07> <03D2>
15051 +<08> <03A6>
15052 +<0B> <00660066>
15053 +<0C> <00660069>
15054 +<0D> <0066006C>
15055 +<0E> <006600660069>
15056 +<0F> <00660066006C>
15057 +<10> <0131>
15058 +<11> <0237>
15059 +<12> <0060>
15060 +<13> <00B4>
15061 +<14> <02C7>
15062 +<15> <02D8>
15063 +<16> <00AF>
15064 +<17> <02DA>
15065 +<18> <00B8>
15066 +<19> <00DF>
15067 +<1A> <00E6>
15068 +<1B> <0153>
15069 +<1C> <00F8>
15070 +<1D> <00C6>
15071 +<1E> <0152>
15072 +<1F> <00D8>
15073 +<21> <0021>
15074 +<22> <201D>
15075 +<27> <2019>
15076 +<3C> <00A1>
15077 +<3D> <003D>
15078 +<3E> <00BF>
15079 +<5C> <201C>
15080 +<5F> <02D9>
15081 +<60> <2018>
15082 +<7D> <02DD>
15083 +<7E> <007E>
15084 +<7F> <00A8>
15085 +endbfchar
15086 +endcmap
15087 +CMapName currentdict /CMap defineresource pop
15088 +end
15089 +end
15090 +%%EndResource
15091 +%%EOF
15092 + }\endgroup
15093 + \expandafter\edef\csname cmapOT1\endcsname#1{%
15094 + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
15095 + }%
15096 +%
15097 +% \cmapOT1IT
15098 + \begingroup
15099 + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
15100 + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
15101 +%%DocumentNeededResources: ProcSet (CIDInit)
15102 +%%IncludeResource: ProcSet (CIDInit)
15103 +%%BeginResource: CMap (TeX-OT1IT-0)
15104 +%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
15105 +%%Version: 1.000
15106 +%%EndComments
15107 +/CIDInit /ProcSet findresource begin
15108 +12 dict begin
15109 +begincmap
15110 +/CIDSystemInfo
15111 +<< /Registry (TeX)
15112 +/Ordering (OT1IT)
15113 +/Supplement 0
15114 +>> def
15115 +/CMapName /TeX-OT1IT-0 def
15116 +/CMapType 2 def
15117 +1 begincodespacerange
15118 +<00> <7F>
15119 +endcodespacerange
15120 +8 beginbfrange
15121 +<00> <01> <0393>
15122 +<09> <0A> <03A8>
15123 +<25> <26> <0025>
15124 +<28> <3B> <0028>
15125 +<3F> <5B> <003F>
15126 +<5D> <5E> <005D>
15127 +<61> <7A> <0061>
15128 +<7B> <7C> <2013>
15129 +endbfrange
15130 +42 beginbfchar
15131 +<02> <0398>
15132 +<03> <039B>
15133 +<04> <039E>
15134 +<05> <03A0>
15135 +<06> <03A3>
15136 +<07> <03D2>
15137 +<08> <03A6>
15138 +<0B> <00660066>
15139 +<0C> <00660069>
15140 +<0D> <0066006C>
15141 +<0E> <006600660069>
15142 +<0F> <00660066006C>
15143 +<10> <0131>
15144 +<11> <0237>
15145 +<12> <0060>
15146 +<13> <00B4>
15147 +<14> <02C7>
15148 +<15> <02D8>
15149 +<16> <00AF>
15150 +<17> <02DA>
15151 +<18> <00B8>
15152 +<19> <00DF>
15153 +<1A> <00E6>
15154 +<1B> <0153>
15155 +<1C> <00F8>
15156 +<1D> <00C6>
15157 +<1E> <0152>
15158 +<1F> <00D8>
15159 +<21> <0021>
15160 +<22> <201D>
15161 +<23> <0023>
15162 +<24> <00A3>
15163 +<27> <2019>
15164 +<3C> <00A1>
15165 +<3D> <003D>
15166 +<3E> <00BF>
15167 +<5C> <201C>
15168 +<5F> <02D9>
15169 +<60> <2018>
15170 +<7D> <02DD>
15171 +<7E> <007E>
15172 +<7F> <00A8>
15173 +endbfchar
15174 +endcmap
15175 +CMapName currentdict /CMap defineresource pop
15176 +end
15177 +end
15178 +%%EndResource
15179 +%%EOF
15180 + }\endgroup
15181 + \expandafter\edef\csname cmapOT1IT\endcsname#1{%
15182 + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
15183 + }%
15184 +%
15185 +% \cmapOT1TT
15186 + \begingroup
15187 + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
15188 + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
15189 +%%DocumentNeededResources: ProcSet (CIDInit)
15190 +%%IncludeResource: ProcSet (CIDInit)
15191 +%%BeginResource: CMap (TeX-OT1TT-0)
15192 +%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
15193 +%%Version: 1.000
15194 +%%EndComments
15195 +/CIDInit /ProcSet findresource begin
15196 +12 dict begin
15197 +begincmap
15198 +/CIDSystemInfo
15199 +<< /Registry (TeX)
15200 +/Ordering (OT1TT)
15201 +/Supplement 0
15202 +>> def
15203 +/CMapName /TeX-OT1TT-0 def
15204 +/CMapType 2 def
15205 +1 begincodespacerange
15206 +<00> <7F>
15207 +endcodespacerange
15208 +5 beginbfrange
15209 +<00> <01> <0393>
15210 +<09> <0A> <03A8>
15211 +<21> <26> <0021>
15212 +<28> <5F> <0028>
15213 +<61> <7E> <0061>
15214 +endbfrange
15215 +32 beginbfchar
15216 +<02> <0398>
15217 +<03> <039B>
15218 +<04> <039E>
15219 +<05> <03A0>
15220 +<06> <03A3>
15221 +<07> <03D2>
15222 +<08> <03A6>
15223 +<0B> <2191>
15224 +<0C> <2193>
15225 +<0D> <0027>
15226 +<0E> <00A1>
15227 +<0F> <00BF>
15228 +<10> <0131>
15229 +<11> <0237>
15230 +<12> <0060>
15231 +<13> <00B4>
15232 +<14> <02C7>
15233 +<15> <02D8>
15234 +<16> <00AF>
15235 +<17> <02DA>
15236 +<18> <00B8>
15237 +<19> <00DF>
15238 +<1A> <00E6>
15239 +<1B> <0153>
15240 +<1C> <00F8>
15241 +<1D> <00C6>
15242 +<1E> <0152>
15243 +<1F> <00D8>
15244 +<20> <2423>
15245 +<27> <2019>
15246 +<60> <2018>
15247 +<7F> <00A8>
15248 +endbfchar
15249 +endcmap
15250 +CMapName currentdict /CMap defineresource pop
15251 +end
15252 +end
15253 +%%EndResource
15254 +%%EOF
15255 + }\endgroup
15256 + \expandafter\edef\csname cmapOT1TT\endcsname#1{%
15257 + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
15258 + }%
15259 +\fi\fi
15260 +
15261 +
15262 % Set the font macro #1 to the font named #2, adding on the
15263 % specified font prefix (normally `cm').
15264 -% #3 is the font's design size, #4 is a scale factor
15265 -\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
15266 +% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
15267 +% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
15268 +% empty to omit).
15269 +\def\setfont#1#2#3#4#5{%
15270 + \font#1=\fontprefix#2#3 scaled #4
15271 + \csname cmap#5\endcsname#1%
15272 +}
15273 +% This is what gets called when #5 of \setfont is empty.
15274 +\let\cmap\gobble
15275 +% emacs-page end of cmaps
15276
15277 % Use cm as the default font prefix.
15278 % To specify the font prefix, you must define \fontprefix
15279 @@ -1467,118 +1982,293 @@ where each line of input produces a line of output.}
15280 \def\scshape{csc}
15281 \def\scbshape{csc}
15282
15283 +% Definitions for a main text size of 11pt. This is the default in
15284 +% Texinfo.
15285 +%
15286 +\def\definetextfontsizexi{%
15287 % Text fonts (11.2pt, magstep1).
15288 -\newcount\mainmagstep
15289 -\ifx\bigger\relax
15290 - % not really supported.
15291 - \mainmagstep=\magstep1
15292 - \setfont\textrm\rmshape{12}{1000}
15293 - \setfont\texttt\ttshape{12}{1000}
15294 -\else
15295 - \mainmagstep=\magstephalf
15296 - \setfont\textrm\rmshape{10}{\mainmagstep}
15297 - \setfont\texttt\ttshape{10}{\mainmagstep}
15298 -\fi
15299 -\setfont\textbf\bfshape{10}{\mainmagstep}
15300 -\setfont\textit\itshape{10}{\mainmagstep}
15301 -\setfont\textsl\slshape{10}{\mainmagstep}
15302 -\setfont\textsf\sfshape{10}{\mainmagstep}
15303 -\setfont\textsc\scshape{10}{\mainmagstep}
15304 -\setfont\textttsl\ttslshape{10}{\mainmagstep}
15305 +\def\textnominalsize{11pt}
15306 +\edef\mainmagstep{\magstephalf}
15307 +\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
15308 +\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
15309 +\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
15310 +\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
15311 +\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
15312 +\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
15313 +\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
15314 +\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
15315 \font\texti=cmmi10 scaled \mainmagstep
15316 \font\textsy=cmsy10 scaled \mainmagstep
15317 +\def\textecsize{1095}
15318
15319 % A few fonts for @defun names and args.
15320 -\setfont\defbf\bfshape{10}{\magstep1}
15321 -\setfont\deftt\ttshape{10}{\magstep1}
15322 -\setfont\defttsl\ttslshape{10}{\magstep1}
15323 +\setfont\defbf\bfshape{10}{\magstep1}{OT1}
15324 +\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
15325 +\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
15326 \def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
15327
15328 % Fonts for indices, footnotes, small examples (9pt).
15329 -\setfont\smallrm\rmshape{9}{1000}
15330 -\setfont\smalltt\ttshape{9}{1000}
15331 -\setfont\smallbf\bfshape{10}{900}
15332 -\setfont\smallit\itshape{9}{1000}
15333 -\setfont\smallsl\slshape{9}{1000}
15334 -\setfont\smallsf\sfshape{9}{1000}
15335 -\setfont\smallsc\scshape{10}{900}
15336 -\setfont\smallttsl\ttslshape{10}{900}
15337 +\def\smallnominalsize{9pt}
15338 +\setfont\smallrm\rmshape{9}{1000}{OT1}
15339 +\setfont\smalltt\ttshape{9}{1000}{OT1TT}
15340 +\setfont\smallbf\bfshape{10}{900}{OT1}
15341 +\setfont\smallit\itshape{9}{1000}{OT1IT}
15342 +\setfont\smallsl\slshape{9}{1000}{OT1}
15343 +\setfont\smallsf\sfshape{9}{1000}{OT1}
15344 +\setfont\smallsc\scshape{10}{900}{OT1}
15345 +\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
15346 \font\smalli=cmmi9
15347 \font\smallsy=cmsy9
15348 +\def\smallecsize{0900}
15349
15350 % Fonts for small examples (8pt).
15351 -\setfont\smallerrm\rmshape{8}{1000}
15352 -\setfont\smallertt\ttshape{8}{1000}
15353 -\setfont\smallerbf\bfshape{10}{800}
15354 -\setfont\smallerit\itshape{8}{1000}
15355 -\setfont\smallersl\slshape{8}{1000}
15356 -\setfont\smallersf\sfshape{8}{1000}
15357 -\setfont\smallersc\scshape{10}{800}
15358 -\setfont\smallerttsl\ttslshape{10}{800}
15359 +\def\smallernominalsize{8pt}
15360 +\setfont\smallerrm\rmshape{8}{1000}{OT1}
15361 +\setfont\smallertt\ttshape{8}{1000}{OT1TT}
15362 +\setfont\smallerbf\bfshape{10}{800}{OT1}
15363 +\setfont\smallerit\itshape{8}{1000}{OT1IT}
15364 +\setfont\smallersl\slshape{8}{1000}{OT1}
15365 +\setfont\smallersf\sfshape{8}{1000}{OT1}
15366 +\setfont\smallersc\scshape{10}{800}{OT1}
15367 +\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
15368 \font\smalleri=cmmi8
15369 \font\smallersy=cmsy8
15370 +\def\smallerecsize{0800}
15371
15372 % Fonts for title page (20.4pt):
15373 -\setfont\titlerm\rmbshape{12}{\magstep3}
15374 -\setfont\titleit\itbshape{10}{\magstep4}
15375 -\setfont\titlesl\slbshape{10}{\magstep4}
15376 -\setfont\titlett\ttbshape{12}{\magstep3}
15377 -\setfont\titlettsl\ttslshape{10}{\magstep4}
15378 -\setfont\titlesf\sfbshape{17}{\magstep1}
15379 +\def\titlenominalsize{20pt}
15380 +\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
15381 +\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
15382 +\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
15383 +\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
15384 +\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
15385 +\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
15386 \let\titlebf=\titlerm
15387 -\setfont\titlesc\scbshape{10}{\magstep4}
15388 +\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
15389 \font\titlei=cmmi12 scaled \magstep3
15390 \font\titlesy=cmsy10 scaled \magstep4
15391 -\def\authorrm{\secrm}
15392 -\def\authortt{\sectt}
15393 +\def\titleecsize{2074}
15394
15395 % Chapter (and unnumbered) fonts (17.28pt).
15396 -\setfont\chaprm\rmbshape{12}{\magstep2}
15397 -\setfont\chapit\itbshape{10}{\magstep3}
15398 -\setfont\chapsl\slbshape{10}{\magstep3}
15399 -\setfont\chaptt\ttbshape{12}{\magstep2}
15400 -\setfont\chapttsl\ttslshape{10}{\magstep3}
15401 -\setfont\chapsf\sfbshape{17}{1000}
15402 +\def\chapnominalsize{17pt}
15403 +\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
15404 +\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
15405 +\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
15406 +\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
15407 +\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
15408 +\setfont\chapsf\sfbshape{17}{1000}{OT1}
15409 \let\chapbf=\chaprm
15410 -\setfont\chapsc\scbshape{10}{\magstep3}
15411 +\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
15412 \font\chapi=cmmi12 scaled \magstep2
15413 \font\chapsy=cmsy10 scaled \magstep3
15414 +\def\chapecsize{1728}
15415
15416 % Section fonts (14.4pt).
15417 -\setfont\secrm\rmbshape{12}{\magstep1}
15418 -\setfont\secit\itbshape{10}{\magstep2}
15419 -\setfont\secsl\slbshape{10}{\magstep2}
15420 -\setfont\sectt\ttbshape{12}{\magstep1}
15421 -\setfont\secttsl\ttslshape{10}{\magstep2}
15422 -\setfont\secsf\sfbshape{12}{\magstep1}
15423 +\def\secnominalsize{14pt}
15424 +\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
15425 +\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
15426 +\setfont\secsl\slbshape{10}{\magstep2}{OT1}
15427 +\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
15428 +\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
15429 +\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
15430 \let\secbf\secrm
15431 -\setfont\secsc\scbshape{10}{\magstep2}
15432 +\setfont\secsc\scbshape{10}{\magstep2}{OT1}
15433 \font\seci=cmmi12 scaled \magstep1
15434 \font\secsy=cmsy10 scaled \magstep2
15435 +\def\sececsize{1440}
15436
15437 % Subsection fonts (13.15pt).
15438 -\setfont\ssecrm\rmbshape{12}{\magstephalf}
15439 -\setfont\ssecit\itbshape{10}{1315}
15440 -\setfont\ssecsl\slbshape{10}{1315}
15441 -\setfont\ssectt\ttbshape{12}{\magstephalf}
15442 -\setfont\ssecttsl\ttslshape{10}{1315}
15443 -\setfont\ssecsf\sfbshape{12}{\magstephalf}
15444 +\def\ssecnominalsize{13pt}
15445 +\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
15446 +\setfont\ssecit\itbshape{10}{1315}{OT1IT}
15447 +\setfont\ssecsl\slbshape{10}{1315}{OT1}
15448 +\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
15449 +\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
15450 +\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
15451 \let\ssecbf\ssecrm
15452 -\setfont\ssecsc\scbshape{10}{1315}
15453 +\setfont\ssecsc\scbshape{10}{1315}{OT1}
15454 \font\sseci=cmmi12 scaled \magstephalf
15455 \font\ssecsy=cmsy10 scaled 1315
15456 +\def\ssececsize{1200}
15457
15458 % Reduced fonts for @acro in text (10pt).
15459 -\setfont\reducedrm\rmshape{10}{1000}
15460 -\setfont\reducedtt\ttshape{10}{1000}
15461 -\setfont\reducedbf\bfshape{10}{1000}
15462 -\setfont\reducedit\itshape{10}{1000}
15463 -\setfont\reducedsl\slshape{10}{1000}
15464 -\setfont\reducedsf\sfshape{10}{1000}
15465 -\setfont\reducedsc\scshape{10}{1000}
15466 -\setfont\reducedttsl\ttslshape{10}{1000}
15467 +\def\reducednominalsize{10pt}
15468 +\setfont\reducedrm\rmshape{10}{1000}{OT1}
15469 +\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
15470 +\setfont\reducedbf\bfshape{10}{1000}{OT1}
15471 +\setfont\reducedit\itshape{10}{1000}{OT1IT}
15472 +\setfont\reducedsl\slshape{10}{1000}{OT1}
15473 +\setfont\reducedsf\sfshape{10}{1000}{OT1}
15474 +\setfont\reducedsc\scshape{10}{1000}{OT1}
15475 +\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
15476 \font\reducedi=cmmi10
15477 \font\reducedsy=cmsy10
15478 +\def\reducedecsize{1000}
15479 +
15480 +% reset the current fonts
15481 +\textfonts
15482 +\rm
15483 +} % end of 11pt text font size definitions
15484 +
15485 +
15486 +% Definitions to make the main text be 10pt Computer Modern, with
15487 +% section, chapter, etc., sizes following suit. This is for the GNU
15488 +% Press printing of the Emacs 22 manual. Maybe other manuals in the
15489 +% future. Used with @smallbook, which sets the leading to 12pt.
15490 +%
15491 +\def\definetextfontsizex{%
15492 +% Text fonts (10pt).
15493 +\def\textnominalsize{10pt}
15494 +\edef\mainmagstep{1000}
15495 +\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
15496 +\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
15497 +\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
15498 +\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
15499 +\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
15500 +\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
15501 +\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
15502 +\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
15503 +\font\texti=cmmi10 scaled \mainmagstep
15504 +\font\textsy=cmsy10 scaled \mainmagstep
15505 +\def\textecsize{1000}
15506 +
15507 +% A few fonts for @defun names and args.
15508 +\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
15509 +\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
15510 +\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
15511 +\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
15512 +
15513 +% Fonts for indices, footnotes, small examples (9pt).
15514 +\def\smallnominalsize{9pt}
15515 +\setfont\smallrm\rmshape{9}{1000}{OT1}
15516 +\setfont\smalltt\ttshape{9}{1000}{OT1TT}
15517 +\setfont\smallbf\bfshape{10}{900}{OT1}
15518 +\setfont\smallit\itshape{9}{1000}{OT1IT}
15519 +\setfont\smallsl\slshape{9}{1000}{OT1}
15520 +\setfont\smallsf\sfshape{9}{1000}{OT1}
15521 +\setfont\smallsc\scshape{10}{900}{OT1}
15522 +\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
15523 +\font\smalli=cmmi9
15524 +\font\smallsy=cmsy9
15525 +\def\smallecsize{0900}
15526 +
15527 +% Fonts for small examples (8pt).
15528 +\def\smallernominalsize{8pt}
15529 +\setfont\smallerrm\rmshape{8}{1000}{OT1}
15530 +\setfont\smallertt\ttshape{8}{1000}{OT1TT}
15531 +\setfont\smallerbf\bfshape{10}{800}{OT1}
15532 +\setfont\smallerit\itshape{8}{1000}{OT1IT}
15533 +\setfont\smallersl\slshape{8}{1000}{OT1}
15534 +\setfont\smallersf\sfshape{8}{1000}{OT1}
15535 +\setfont\smallersc\scshape{10}{800}{OT1}
15536 +\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
15537 +\font\smalleri=cmmi8
15538 +\font\smallersy=cmsy8
15539 +\def\smallerecsize{0800}
15540 +
15541 +% Fonts for title page (20.4pt):
15542 +\def\titlenominalsize{20pt}
15543 +\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
15544 +\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
15545 +\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
15546 +\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
15547 +\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
15548 +\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
15549 +\let\titlebf=\titlerm
15550 +\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
15551 +\font\titlei=cmmi12 scaled \magstep3
15552 +\font\titlesy=cmsy10 scaled \magstep4
15553 +\def\titleecsize{2074}
15554 +
15555 +% Chapter fonts (14.4pt).
15556 +\def\chapnominalsize{14pt}
15557 +\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
15558 +\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
15559 +\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
15560 +\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
15561 +\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
15562 +\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
15563 +\let\chapbf\chaprm
15564 +\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
15565 +\font\chapi=cmmi12 scaled \magstep1
15566 +\font\chapsy=cmsy10 scaled \magstep2
15567 +\def\chapecsize{1440}
15568 +
15569 +% Section fonts (12pt).
15570 +\def\secnominalsize{12pt}
15571 +\setfont\secrm\rmbshape{12}{1000}{OT1}
15572 +\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
15573 +\setfont\secsl\slbshape{10}{\magstep1}{OT1}
15574 +\setfont\sectt\ttbshape{12}{1000}{OT1TT}
15575 +\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
15576 +\setfont\secsf\sfbshape{12}{1000}{OT1}
15577 +\let\secbf\secrm
15578 +\setfont\secsc\scbshape{10}{\magstep1}{OT1}
15579 +\font\seci=cmmi12
15580 +\font\secsy=cmsy10 scaled \magstep1
15581 +\def\sececsize{1200}
15582 +
15583 +% Subsection fonts (10pt).
15584 +\def\ssecnominalsize{10pt}
15585 +\setfont\ssecrm\rmbshape{10}{1000}{OT1}
15586 +\setfont\ssecit\itbshape{10}{1000}{OT1IT}
15587 +\setfont\ssecsl\slbshape{10}{1000}{OT1}
15588 +\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
15589 +\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
15590 +\setfont\ssecsf\sfbshape{10}{1000}{OT1}
15591 +\let\ssecbf\ssecrm
15592 +\setfont\ssecsc\scbshape{10}{1000}{OT1}
15593 +\font\sseci=cmmi10
15594 +\font\ssecsy=cmsy10
15595 +\def\ssececsize{1000}
15596 +
15597 +% Reduced fonts for @acro in text (9pt).
15598 +\def\reducednominalsize{9pt}
15599 +\setfont\reducedrm\rmshape{9}{1000}{OT1}
15600 +\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
15601 +\setfont\reducedbf\bfshape{10}{900}{OT1}
15602 +\setfont\reducedit\itshape{9}{1000}{OT1IT}
15603 +\setfont\reducedsl\slshape{9}{1000}{OT1}
15604 +\setfont\reducedsf\sfshape{9}{1000}{OT1}
15605 +\setfont\reducedsc\scshape{10}{900}{OT1}
15606 +\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
15607 +\font\reducedi=cmmi9
15608 +\font\reducedsy=cmsy9
15609 +\def\reducedecsize{0900}
15610 +
15611 +% reduce space between paragraphs
15612 +\divide\parskip by 2
15613 +
15614 +% reset the current fonts
15615 +\textfonts
15616 +\rm
15617 +} % end of 10pt text font size definitions
15618 +
15619 +
15620 +% We provide the user-level command
15621 +% @fonttextsize 10
15622 +% (or 11) to redefine the text font size. pt is assumed.
15623 +%
15624 +\def\xword{10}
15625 +\def\xiword{11}
15626 +%
15627 +\parseargdef\fonttextsize{%
15628 + \def\textsizearg{#1}%
15629 + \wlog{doing @fonttextsize \textsizearg}%
15630 + %
15631 + % Set \globaldefs so that documents can use this inside @tex, since
15632 + % makeinfo 4.8 does not support it, but we need it nonetheless.
15633 + %
15634 + \begingroup \globaldefs=1
15635 + \ifx\textsizearg\xword \definetextfontsizex
15636 + \else \ifx\textsizearg\xiword \definetextfontsizexi
15637 + \else
15638 + \errhelp=\EMsimple
15639 + \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
15640 + \fi\fi
15641 + \endgroup
15642 +}
15643 +
15644
15645 % In order for the font changes to affect most math symbols and letters,
15646 % we have to define the \textfont of the standard families. Since
15647 @@ -1596,18 +2286,19 @@ where each line of input produces a line of output.}
15648 % of just \STYLE. We do this because \STYLE needs to also set the
15649 % current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
15650 % \tenSTYLE to set the current font.
15651 -%
15652 +%
15653 % Each font-changing command also sets the names \lsize (one size lower)
15654 % and \lllsize (three sizes lower). These relative commands are used in
15655 % the LaTeX logo and acronyms.
15656 -%
15657 +%
15658 % This all needs generalizing, badly.
15659 -%
15660 +%
15661 \def\textfonts{%
15662 \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
15663 \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
15664 \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
15665 \let\tenttsl=\textttsl
15666 + \def\curfontsize{text}%
15667 \def\lsize{reduced}\def\lllsize{smaller}%
15668 \resetmathfonts \setleading{\textleading}}
15669 \def\titlefonts{%
15670 @@ -1615,13 +2306,16 @@ where each line of input produces a line of output.}
15671 \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
15672 \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
15673 \let\tenttsl=\titlettsl
15674 + \def\curfontsize{title}%
15675 \def\lsize{chap}\def\lllsize{subsec}%
15676 \resetmathfonts \setleading{25pt}}
15677 -\def\titlefont#1{{\titlefonts\rm #1}}
15678 +\def\titlefont#1{{\titlefonts\rmisbold #1}}
15679 \def\chapfonts{%
15680 \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
15681 \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
15682 - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
15683 + \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
15684 + \let\tenttsl=\chapttsl
15685 + \def\curfontsize{chap}%
15686 \def\lsize{sec}\def\lllsize{text}%
15687 \resetmathfonts \setleading{19pt}}
15688 \def\secfonts{%
15689 @@ -1629,6 +2323,7 @@ where each line of input produces a line of output.}
15690 \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
15691 \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
15692 \let\tenttsl=\secttsl
15693 + \def\curfontsize{sec}%
15694 \def\lsize{subsec}\def\lllsize{reduced}%
15695 \resetmathfonts \setleading{16pt}}
15696 \def\subsecfonts{%
15697 @@ -1636,6 +2331,7 @@ where each line of input produces a line of output.}
15698 \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
15699 \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
15700 \let\tenttsl=\ssecttsl
15701 + \def\curfontsize{ssec}%
15702 \def\lsize{text}\def\lllsize{small}%
15703 \resetmathfonts \setleading{15pt}}
15704 \let\subsubsecfonts = \subsecfonts
15705 @@ -1644,6 +2340,7 @@ where each line of input produces a line of output.}
15706 \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
15707 \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
15708 \let\tenttsl=\reducedttsl
15709 + \def\curfontsize{reduced}%
15710 \def\lsize{small}\def\lllsize{smaller}%
15711 \resetmathfonts \setleading{10.5pt}}
15712 \def\smallfonts{%
15713 @@ -1651,6 +2348,7 @@ where each line of input produces a line of output.}
15714 \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
15715 \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
15716 \let\tenttsl=\smallttsl
15717 + \def\curfontsize{small}%
15718 \def\lsize{smaller}\def\lllsize{smaller}%
15719 \resetmathfonts \setleading{10.5pt}}
15720 \def\smallerfonts{%
15721 @@ -1658,9 +2356,20 @@ where each line of input produces a line of output.}
15722 \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
15723 \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
15724 \let\tenttsl=\smallerttsl
15725 + \def\curfontsize{smaller}%
15726 \def\lsize{smaller}\def\lllsize{smaller}%
15727 \resetmathfonts \setleading{9.5pt}}
15728
15729 +% Fonts for short table of contents.
15730 +\setfont\shortcontrm\rmshape{12}{1000}{OT1}
15731 +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
15732 +\setfont\shortcontsl\slshape{12}{1000}{OT1}
15733 +\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
15734 +
15735 +% Define these just so they can be easily changed for other fonts.
15736 +\def\angleleft{$\langle$}
15737 +\def\angleright{$\rangle$}
15738 +
15739 % Set the fonts to use with the @small... environments.
15740 \let\smallexamplefonts = \smallfonts
15741
15742 @@ -1674,28 +2383,128 @@ where each line of input produces a line of output.}
15743 %
15744 % By the way, for comparison, here's what fits with @example (10pt):
15745 % 8.5x11=71 smallbook=60 a4=75 a5=58
15746 -%
15747 -% I wish the USA used A4 paper.
15748 % --karl, 24jan03.
15749
15750 -
15751 % Set up the default fonts, so we can use them for creating boxes.
15752 %
15753 -\textfonts \rm
15754 +\definetextfontsizexi
15755
15756 -% Define these so they can be easily changed for other fonts.
15757 -\def\angleleft{$\langle$}
15758 -\def\angleright{$\rangle$}
15759 +
15760 +\message{markup,}
15761 +
15762 +% Check if we are currently using a typewriter font. Since all the
15763 +% Computer Modern typewriter fonts have zero interword stretch (and
15764 +% shrink), and it is reasonable to expect all typewriter fonts to have
15765 +% this property, we can check that font parameter.
15766 +%
15767 +\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
15768 +
15769 +% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
15770 +% define and register \INITMACRO to be called on markup style changes.
15771 +% \INITMACRO can check \currentmarkupstyle for the innermost
15772 +% style and the set of \ifmarkupSTYLE switches for all styles
15773 +% currently in effect.
15774 +\newif\ifmarkupvar
15775 +\newif\ifmarkupsamp
15776 +\newif\ifmarkupkey
15777 +%\newif\ifmarkupfile % @file == @samp.
15778 +%\newif\ifmarkupoption % @option == @samp.
15779 +\newif\ifmarkupcode
15780 +\newif\ifmarkupkbd
15781 +%\newif\ifmarkupenv % @env == @code.
15782 +%\newif\ifmarkupcommand % @command == @code.
15783 +\newif\ifmarkuptex % @tex (and part of @math, for now).
15784 +\newif\ifmarkupexample
15785 +\newif\ifmarkupverb
15786 +\newif\ifmarkupverbatim
15787 +
15788 +\let\currentmarkupstyle\empty
15789 +
15790 +\def\setupmarkupstyle#1{%
15791 + \csname markup#1true\endcsname
15792 + \def\currentmarkupstyle{#1}%
15793 + \markupstylesetup
15794 +}
15795 +
15796 +\let\markupstylesetup\empty
15797 +
15798 +\def\defmarkupstylesetup#1{%
15799 + \expandafter\def\expandafter\markupstylesetup
15800 + \expandafter{\markupstylesetup #1}%
15801 + \def#1%
15802 +}
15803 +
15804 +% Markup style setup for left and right quotes.
15805 +\defmarkupstylesetup\markupsetuplq{%
15806 + \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
15807 + \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
15808 +}
15809 +
15810 +\defmarkupstylesetup\markupsetuprq{%
15811 + \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
15812 + \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
15813 +}
15814 +
15815 +{
15816 +\catcode`\'=\active
15817 +\catcode`\`=\active
15818 +
15819 +\gdef\markupsetuplqdefault{\let`\lq}
15820 +\gdef\markupsetuprqdefault{\let'\rq}
15821 +
15822 +\gdef\markupsetcodequoteleft{\let`\codequoteleft}
15823 +\gdef\markupsetcodequoteright{\let'\codequoteright}
15824 +
15825 +\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
15826 +}
15827 +
15828 +\let\markupsetuplqcode \markupsetcodequoteleft
15829 +\let\markupsetuprqcode \markupsetcodequoteright
15830 +\let\markupsetuplqexample \markupsetcodequoteleft
15831 +\let\markupsetuprqexample \markupsetcodequoteright
15832 +\let\markupsetuplqverb \markupsetcodequoteleft
15833 +\let\markupsetuprqverb \markupsetcodequoteright
15834 +\let\markupsetuplqverbatim \markupsetcodequoteleft
15835 +\let\markupsetuprqverbatim \markupsetcodequoteright
15836 +
15837 +\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
15838 +\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
15839 +
15840 +% Allow an option to not replace quotes with a regular directed right
15841 +% quote/apostrophe (char 0x27), but instead use the undirected quote
15842 +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it
15843 +% the default, but it works for pasting with more pdf viewers (at least
15844 +% evince), the lilypond developers report. xpdf does work with the
15845 +% regular 0x27.
15846 +%
15847 +\def\codequoteright{%
15848 + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
15849 + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
15850 + '%
15851 + \else \char'15 \fi
15852 + \else \char'15 \fi
15853 +}
15854 +%
15855 +% and a similar option for the left quote char vs. a grave accent.
15856 +% Modern fonts display ASCII 0x60 as a grave accent, so some people like
15857 +% the code environments to do likewise.
15858 +%
15859 +\def\codequoteleft{%
15860 + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
15861 + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
15862 + % [Knuth] pp. 380,381,391
15863 + % \relax disables Spanish ligatures ?` and !` of \tt font.
15864 + \relax`%
15865 + \else \char'22 \fi
15866 + \else \char'22 \fi
15867 +}
15868 +
15869 +% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
15870 +\def\noligaturesquoteleft{\relax\lq}
15871
15872 % Count depth in font-changes, for error checks
15873 \newcount\fontdepth \fontdepth=0
15874
15875 -% Fonts for short table of contents.
15876 -\setfont\shortcontrm\rmshape{12}{1000}
15877 -\setfont\shortcontbf\bfshape{10}{\magstep1} % no cmb12
15878 -\setfont\shortcontsl\slshape{12}{1000}
15879 -\setfont\shortconttt\ttshape{12}{1000}
15880 -
15881 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
15882 %% serif) and @ii for TeX italic
15883
15884 @@ -1710,18 +2519,28 @@ where each line of input produces a line of output.}
15885 % @var is set to this for defun arguments.
15886 \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
15887
15888 -% like \smartslanted except unconditionally use \sl. We never want
15889 +% @cite is like \smartslanted except unconditionally use \sl. We never want
15890 % ttsl for book titles, do we?
15891 \def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
15892
15893 \let\i=\smartitalic
15894 -\let\var=\smartslanted
15895 +\let\slanted=\smartslanted
15896 +\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
15897 \let\dfn=\smartslanted
15898 \let\emph=\smartitalic
15899
15900 +% Explicit font changes: @r, @sc, undocumented @ii.
15901 +\def\r#1{{\rm #1}} % roman font
15902 +\def\sc#1{{\smallcaps#1}} % smallcaps font
15903 +\def\ii#1{{\it #1}} % italic font
15904 +
15905 +% @b, explicit bold. Also @strong.
15906 \def\b#1{{\bf #1}}
15907 \let\strong=\b
15908
15909 +% @sansserif, explicit sans.
15910 +\def\sansserif#1{{\sf #1}}
15911 +
15912 % We can't just use \exhyphenpenalty, because that only has effect at
15913 % the end of a paragraph. Restore normal hyphenation at the end of the
15914 % group within which \nohyphenation is presumably called.
15915 @@ -1734,27 +2553,48 @@ where each line of input produces a line of output.}
15916 % sometimes \x has an active definition that messes things up.
15917 %
15918 \catcode`@=11
15919 - \def\frenchspacing{%
15920 + \def\plainfrenchspacing{%
15921 \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
15922 \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
15923 + \def\endofsentencespacefactor{1000}% for @. and friends
15924 + }
15925 + \def\plainnonfrenchspacing{%
15926 + \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
15927 + \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
15928 + \def\endofsentencespacefactor{3000}% for @. and friends
15929 }
15930 \catcode`@=\other
15931 +\def\endofsentencespacefactor{3000}% default
15932
15933 +% @t, explicit typewriter.
15934 \def\t#1{%
15935 - {\tt \rawbackslash \frenchspacing #1}%
15936 + {\tt \rawbackslash \plainfrenchspacing #1}%
15937 \null
15938 }
15939 -\def\samp#1{`\tclose{#1}'\null}
15940 -\setfont\keyrm\rmshape{8}{1000}
15941 -\font\keysy=cmsy9
15942 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
15943 - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
15944 - \vbox{\hrule\kern-0.4pt
15945 - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
15946 - \kern-0.4pt\hrule}%
15947 - \kern-.06em\raise0.4pt\hbox{\angleright}}}}
15948 -% The old definition, with no lozenge:
15949 -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
15950 +
15951 +% @samp.
15952 +\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
15953 +
15954 +% definition of @key that produces a lozenge. Doesn't adjust to text size.
15955 +%\setfont\keyrm\rmshape{8}{1000}{OT1}
15956 +%\font\keysy=cmsy9
15957 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
15958 +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
15959 +% \vbox{\hrule\kern-0.4pt
15960 +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
15961 +% \kern-0.4pt\hrule}%
15962 +% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
15963 +
15964 +% definition of @key with no lozenge. If the current font is already
15965 +% monospace, don't change it; that way, we respect @kbdinputstyle. But
15966 +% if it isn't monospace, then use \tt.
15967 +%
15968 +\def\key#1{{\setupmarkupstyle{key}%
15969 + \nohyphenation
15970 + \ifmonospace\else\tt\fi
15971 + #1}\null}
15972 +
15973 +% ctrl is no longer a Texinfo command.
15974 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
15975
15976 % @file, @option are the same as @samp.
15977 @@ -1778,7 +2618,7 @@ where each line of input produces a line of output.}
15978 \nohyphenation
15979 %
15980 \rawbackslash
15981 - \frenchspacing
15982 + \plainfrenchspacing
15983 #1%
15984 }%
15985 \null
15986 @@ -1794,12 +2634,21 @@ where each line of input produces a line of output.}
15987 % and arrange explicitly to hyphenate at a dash.
15988 % -- rms.
15989 {
15990 - \catcode`\-=\active
15991 - \catcode`\_=\active
15992 + \catcode`\-=\active \catcode`\_=\active
15993 + \catcode`\'=\active \catcode`\`=\active
15994 + \global\let'=\rq \global\let`=\lq % default definitions
15995 %
15996 \global\def\code{\begingroup
15997 - \catcode`\-=\active \let-\codedash
15998 - \catcode`\_=\active \let_\codeunder
15999 + \setupmarkupstyle{code}%
16000 + % The following should really be moved into \setupmarkupstyle handlers.
16001 + \catcode\dashChar=\active \catcode\underChar=\active
16002 + \ifallowcodebreaks
16003 + \let-\codedash
16004 + \let_\codeunder
16005 + \else
16006 + \let-\realdash
16007 + \let_\realunder
16008 + \fi
16009 \codex
16010 }
16011 }
16012 @@ -1819,43 +2668,73 @@ where each line of input produces a line of output.}
16013 }
16014 \def\codex #1{\tclose{#1}\endgroup}
16015
16016 +% An additional complication: the above will allow breaks after, e.g.,
16017 +% each of the four underscores in __typeof__. This is undesirable in
16018 +% some manuals, especially if they don't have long identifiers in
16019 +% general. @allowcodebreaks provides a way to control this.
16020 +%
16021 +\newif\ifallowcodebreaks \allowcodebreakstrue
16022 +
16023 +\def\keywordtrue{true}
16024 +\def\keywordfalse{false}
16025 +
16026 +\parseargdef\allowcodebreaks{%
16027 + \def\txiarg{#1}%
16028 + \ifx\txiarg\keywordtrue
16029 + \allowcodebreakstrue
16030 + \else\ifx\txiarg\keywordfalse
16031 + \allowcodebreaksfalse
16032 + \else
16033 + \errhelp = \EMsimple
16034 + \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
16035 + \fi\fi
16036 +}
16037 +
16038 % @kbd is like @code, except that if the argument is just one @key command,
16039 % then @kbd has no effect.
16040 +\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
16041
16042 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
16043 % `example' (@kbd uses ttsl only inside of @example and friends),
16044 % or `code' (@kbd uses normal tty font always).
16045 \parseargdef\kbdinputstyle{%
16046 - \def\arg{#1}%
16047 - \ifx\arg\worddistinct
16048 + \def\txiarg{#1}%
16049 + \ifx\txiarg\worddistinct
16050 \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
16051 - \else\ifx\arg\wordexample
16052 + \else\ifx\txiarg\wordexample
16053 \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
16054 - \else\ifx\arg\wordcode
16055 + \else\ifx\txiarg\wordcode
16056 \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
16057 \else
16058 \errhelp = \EMsimple
16059 - \errmessage{Unknown @kbdinputstyle option `\arg'}%
16060 + \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
16061 \fi\fi\fi
16062 }
16063 \def\worddistinct{distinct}
16064 \def\wordexample{example}
16065 \def\wordcode{code}
16066
16067 -% Default is `distinct.'
16068 +% Default is `distinct'.
16069 \kbdinputstyle distinct
16070
16071 \def\xkey{\key}
16072 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
16073 \ifx\one\xkey\ifx\threex\three \key{#2}%
16074 -\else{\tclose{\kbdfont\look}}\fi
16075 -\else{\tclose{\kbdfont\look}}\fi}
16076 +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
16077 +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
16078
16079 % For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
16080 \let\indicateurl=\code
16081 \let\env=\code
16082 \let\command=\code
16083
16084 +% @clicksequence{File @click{} Open ...}
16085 +\def\clicksequence#1{\begingroup #1\endgroup}
16086 +
16087 +% @clickstyle @arrow (by default)
16088 +\parseargdef\clickstyle{\def\click{#1}}
16089 +\def\click{\arrow}
16090 +
16091 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
16092 % second argument specifying the text to display and an optional third
16093 % arg as text to display instead of (rather than in addition to) the url
16094 @@ -1885,7 +2764,7 @@ where each line of input produces a line of output.}
16095 \endgroup}
16096
16097 % @url synonym for @uref, since that's how everyone uses it.
16098 -%
16099 +%
16100 \let\url=\uref
16101
16102 % rms does not like angle brackets --karl, 17may97.
16103 @@ -1905,30 +2784,20 @@ where each line of input produces a line of output.}
16104 \let\email=\uref
16105 \fi
16106
16107 -% Check if we are currently using a typewriter font. Since all the
16108 -% Computer Modern typewriter fonts have zero interword stretch (and
16109 -% shrink), and it is reasonable to expect all typewriter fonts to have
16110 -% this property, we can check that font parameter.
16111 -%
16112 -\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
16113 -
16114 % Typeset a dimension, e.g., `in' or `pt'. The only reason for the
16115 % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
16116 %
16117 \def\dmn#1{\thinspace #1}
16118
16119 -\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par}
16120 -
16121 % @l was never documented to mean ``switch to the Lisp font'',
16122 % and it is not used as such in any manual I can find. We need it for
16123 % Polish suppressed-l. --karl, 22sep96.
16124 %\def\l#1{{\li #1}\null}
16125
16126 -% Explicit font changes: @r, @sc, undocumented @ii.
16127 -\def\r#1{{\rm #1}} % roman font
16128 -\def\sc#1{{\smallcaps#1}} % smallcaps font
16129 -\def\ii#1{{\it #1}} % italic font
16130 -
16131 +% @acronym for "FBI", "NATO", and the like.
16132 +% We print this one point size smaller, since it's intended for
16133 +% all-uppercase.
16134 +%
16135 \def\acronym#1{\doacronym #1,,\finish}
16136 \def\doacronym#1,#2,#3\finish{%
16137 {\selectfonts\lsize #1}%
16138 @@ -1938,10 +2807,172 @@ where each line of input produces a line of output.}
16139 \fi
16140 }
16141
16142 -% @pounds{} is a sterling sign, which is in the CM italic font.
16143 -%
16144 +% @abbr for "Comput. J." and the like.
16145 +% No font change, but don't do end-of-sentence spacing.
16146 +%
16147 +\def\abbr#1{\doabbr #1,,\finish}
16148 +\def\doabbr#1,#2,#3\finish{%
16149 + {\plainfrenchspacing #1}%
16150 + \def\temp{#2}%
16151 + \ifx\temp\empty \else
16152 + \space ({\unsepspaces \ignorespaces \temp \unskip})%
16153 + \fi
16154 +}
16155 +
16156 +
16157 +\message{glyphs,}
16158 +
16159 +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
16160 +%
16161 +% Since these characters are used in examples, they should be an even number of
16162 +% \tt widths. Each \tt character is 1en, so two makes it 1em.
16163 +%
16164 +\def\point{$\star$}
16165 +\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
16166 +\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
16167 +\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
16168 +\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
16169 +\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
16170 +
16171 +% The @error{} command.
16172 +% Adapted from the TeXbook's \boxit.
16173 +%
16174 +\newbox\errorbox
16175 +%
16176 +{\tentt \global\dimen0 = 3em}% Width of the box.
16177 +\dimen2 = .55pt % Thickness of rules
16178 +% The text. (`r' is open on the right, `e' somewhat less so on the left.)
16179 +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
16180 +%
16181 +\setbox\errorbox=\hbox to \dimen0{\hfil
16182 + \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
16183 + \advance\hsize by -2\dimen2 % Rules.
16184 + \vbox{%
16185 + \hrule height\dimen2
16186 + \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
16187 + \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
16188 + \kern3pt\vrule width\dimen2}% Space to right.
16189 + \hrule height\dimen2}
16190 + \hfil}
16191 +%
16192 +\def\error{\leavevmode\lower.7ex\copy\errorbox}
16193 +
16194 +% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
16195 +%
16196 \def\pounds{{\it\$}}
16197
16198 +% @euro{} comes from a separate font, depending on the current style.
16199 +% We use the free feym* fonts from the eurosym package by Henrik
16200 +% Theiling, which support regular, slanted, bold and bold slanted (and
16201 +% "outlined" (blackboard board, sort of) versions, which we don't need).
16202 +% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
16203 +%
16204 +% Although only regular is the truly official Euro symbol, we ignore
16205 +% that. The Euro is designed to be slightly taller than the regular
16206 +% font height.
16207 +%
16208 +% feymr - regular
16209 +% feymo - slanted
16210 +% feybr - bold
16211 +% feybo - bold slanted
16212 +%
16213 +% There is no good (free) typewriter version, to my knowledge.
16214 +% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
16215 +% Hmm.
16216 +%
16217 +% Also doesn't work in math. Do we need to do math with euro symbols?
16218 +% Hope not.
16219 +%
16220 +%
16221 +\def\euro{{\eurofont e}}
16222 +\def\eurofont{%
16223 + % We set the font at each command, rather than predefining it in
16224 + % \textfonts and the other font-switching commands, so that
16225 + % installations which never need the symbol don't have to have the
16226 + % font installed.
16227 + %
16228 + % There is only one designed size (nominal 10pt), so we always scale
16229 + % that to the current nominal size.
16230 + %
16231 + % By the way, simply using "at 1em" works for cmr10 and the like, but
16232 + % does not work for cmbx10 and other extended/shrunken fonts.
16233 + %
16234 + \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
16235 + %
16236 + \ifx\curfontstyle\bfstylename
16237 + % bold:
16238 + \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
16239 + \else
16240 + % regular:
16241 + \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
16242 + \fi
16243 + \thiseurofont
16244 +}
16245 +
16246 +% Glyphs from the EC fonts. We don't use \let for the aliases, because
16247 +% sometimes we redefine the original macro, and the alias should reflect
16248 +% the redefinition.
16249 +%
16250 +% Use LaTeX names for the Icelandic letters.
16251 +\def\DH{{\ecfont \char"D0}} % Eth
16252 +\def\dh{{\ecfont \char"F0}} % eth
16253 +\def\TH{{\ecfont \char"DE}} % Thorn
16254 +\def\th{{\ecfont \char"FE}} % thorn
16255 +%
16256 +\def\guillemetleft{{\ecfont \char"13}}
16257 +\def\guillemotleft{\guillemetleft}
16258 +\def\guillemetright{{\ecfont \char"14}}
16259 +\def\guillemotright{\guillemetright}
16260 +\def\guilsinglleft{{\ecfont \char"0E}}
16261 +\def\guilsinglright{{\ecfont \char"0F}}
16262 +\def\quotedblbase{{\ecfont \char"12}}
16263 +\def\quotesinglbase{{\ecfont \char"0D}}
16264 +%
16265 +% This positioning is not perfect (see the ogonek LaTeX package), but
16266 +% we have the precomposed glyphs for the most common cases. We put the
16267 +% tests to use those glyphs in the single \ogonek macro so we have fewer
16268 +% dummy definitions to worry about for index entries, etc.
16269 +%
16270 +% ogonek is also used with other letters in Lithuanian (IOU), but using
16271 +% the precomposed glyphs for those is not so easy since they aren't in
16272 +% the same EC font.
16273 +\def\ogonek#1{{%
16274 + \def\temp{#1}%
16275 + \ifx\temp\macrocharA\Aogonek
16276 + \else\ifx\temp\macrochara\aogonek
16277 + \else\ifx\temp\macrocharE\Eogonek
16278 + \else\ifx\temp\macrochare\eogonek
16279 + \else
16280 + \ecfont \setbox0=\hbox{#1}%
16281 + \ifdim\ht0=1ex\accent"0C #1%
16282 + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}%
16283 + \fi
16284 + \fi\fi\fi\fi
16285 + }%
16286 +}
16287 +\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A}
16288 +\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a}
16289 +\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
16290 +\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
16291 +%
16292 +% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
16293 +\def\ecfont{%
16294 + % We can't distinguish serif/sans and italic/slanted, but this
16295 + % is used for crude hacks anyway (like adding French and German
16296 + % quotes to documents typeset with CM, where we lose kerning), so
16297 + % hopefully nobody will notice/care.
16298 + \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
16299 + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
16300 + \ifx\curfontstyle\bfstylename
16301 + % bold:
16302 + \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
16303 + \else
16304 + % regular:
16305 + \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
16306 + \fi
16307 + \thisecfont
16308 +}
16309 +
16310 % @registeredsymbol - R in a circle. The font for the R should really
16311 % be smaller yet, but lllsize is the best we can do for now.
16312 % Adapted from the plain.tex definition of \copyright.
16313 @@ -1952,6 +2983,24 @@ where each line of input produces a line of output.}
16314 }$%
16315 }
16316
16317 +% @textdegree - the normal degrees sign.
16318 +%
16319 +\def\textdegree{$^\circ$}
16320 +
16321 +% Laurent Siebenmann reports \Orb undefined with:
16322 +% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
16323 +% so we'll define it if necessary.
16324 +%
16325 +\ifx\Orb\undefined
16326 +\def\Orb{\mathhexbox20D}
16327 +\fi
16328 +
16329 +% Quotes.
16330 +\chardef\quotedblleft="5C
16331 +\chardef\quotedblright=`\"
16332 +\chardef\quoteleft=`\`
16333 +\chardef\quoteright=`\'
16334 +
16335
16336 \message{page headings,}
16337
16338 @@ -2036,12 +3085,9 @@ where each line of input produces a line of output.}
16339 \let\subtitlerm=\tenrm
16340 \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
16341
16342 -\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
16343 - \let\tt=\authortt}
16344 -
16345 \parseargdef\title{%
16346 \checkenv\titlepage
16347 - \leftline{\titlefonts\rm #1}
16348 + \leftline{\titlefonts\rmisbold #1}
16349 % print a rule at the page bottom also.
16350 \finishedtitlepagefalse
16351 \vskip4pt \hrule height 4pt width \hsize \vskip4pt
16352 @@ -2054,7 +3100,7 @@ where each line of input produces a line of output.}
16353
16354 % @author should come last, but may come many times.
16355 % It can also be used inside @quotation.
16356 -%
16357 +%
16358 \parseargdef\author{%
16359 \def\temp{\quotation}%
16360 \ifx\thisenv\temp
16361 @@ -2062,7 +3108,7 @@ where each line of input produces a line of output.}
16362 \else
16363 \checkenv\titlepage
16364 \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
16365 - {\authorfont \leftline{#1}}%
16366 + {\secfonts\rmisbold \leftline{#1}}%
16367 \fi
16368 }
16369
16370 @@ -2115,12 +3161,39 @@ where each line of input produces a line of output.}
16371 %
16372 % Leave some space for the footline. Hopefully ok to assume
16373 % @evenfooting will not be used by itself.
16374 - \global\advance\pageheight by -\baselineskip
16375 - \global\advance\vsize by -\baselineskip
16376 + \global\advance\pageheight by -12pt
16377 + \global\advance\vsize by -12pt
16378 }
16379
16380 \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
16381
16382 +% @evenheadingmarks top \thischapter <- chapter at the top of a page
16383 +% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page
16384 +%
16385 +% The same set of arguments for:
16386 +%
16387 +% @oddheadingmarks
16388 +% @evenfootingmarks
16389 +% @oddfootingmarks
16390 +% @everyheadingmarks
16391 +% @everyfootingmarks
16392 +
16393 +\def\evenheadingmarks{\headingmarks{even}{heading}}
16394 +\def\oddheadingmarks{\headingmarks{odd}{heading}}
16395 +\def\evenfootingmarks{\headingmarks{even}{footing}}
16396 +\def\oddfootingmarks{\headingmarks{odd}{footing}}
16397 +\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
16398 + \headingmarks{odd}{heading}{#1} }
16399 +\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
16400 + \headingmarks{odd}{footing}{#1} }
16401 +% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
16402 +\def\headingmarks#1#2#3 {%
16403 + \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
16404 + \global\expandafter\let\csname get#1#2marks\endcsname \temp
16405 +}
16406 +
16407 +\everyheadingmarks bottom
16408 +\everyfootingmarks bottom
16409
16410 % @headings double turns headings on for double-sided printing.
16411 % @headings single turns headings on for single-sided printing.
16412 @@ -2257,17 +3330,13 @@ where each line of input produces a line of output.}
16413 % \parskip glue -- logically it's part of the @item we just started.
16414 \nobreak \vskip-\parskip
16415 %
16416 - % Stop a page break at the \parskip glue coming up. (Unfortunately
16417 - % we can't prevent a possible page break at the following
16418 - % \baselineskip glue.) However, if what follows is an environment
16419 - % such as @example, there will be no \parskip glue; then
16420 - % the negative vskip we just would cause the example and the item to
16421 - % crash together. So we use this bizarre value of 10001 as a signal
16422 - % to \aboveenvbreak to insert \parskip glue after all.
16423 - % (Possibly there are other commands that could be followed by
16424 - % @example which need the same treatment, but not section titles; or
16425 - % maybe section titles are the only special case and they should be
16426 - % penalty 10001...)
16427 + % Stop a page break at the \parskip glue coming up. However, if
16428 + % what follows is an environment such as @example, there will be no
16429 + % \parskip glue; then the negative vskip we just inserted would
16430 + % cause the example and the item to crash together. So we use this
16431 + % bizarre value of 10001 as a signal to \aboveenvbreak to insert
16432 + % \parskip glue after all. Section titles are handled this way also.
16433 + %
16434 \penalty 10001
16435 \endgroup
16436 \itemxneedsnegativevskipfalse
16437 @@ -2293,15 +3362,26 @@ where each line of input produces a line of output.}
16438 % @table, @ftable, @vtable.
16439 \envdef\table{%
16440 \let\itemindex\gobble
16441 - \tablex
16442 + \tablecheck{table}%
16443 }
16444 \envdef\ftable{%
16445 \def\itemindex ##1{\doind {fn}{\code{##1}}}%
16446 - \tablex
16447 + \tablecheck{ftable}%
16448 }
16449 \envdef\vtable{%
16450 \def\itemindex ##1{\doind {vr}{\code{##1}}}%
16451 - \tablex
16452 + \tablecheck{vtable}%
16453 +}
16454 +\def\tablecheck#1{%
16455 + \ifnum \the\catcode`\^^M=\active
16456 + \endgroup
16457 + \errmessage{This command won't work in this context; perhaps the problem is
16458 + that we are \inenvironment\thisenv}%
16459 + \def\next{\doignore{#1}}%
16460 + \else
16461 + \let\next\tablex
16462 + \fi
16463 + \next
16464 }
16465 \def\tablex#1{%
16466 \def\itemindicate{#1}%
16467 @@ -2350,9 +3430,18 @@ where each line of input produces a line of output.}
16468 \parindent=0pt
16469 \parskip=\smallskipamount
16470 \ifdim\parskip=0pt \parskip=2pt \fi
16471 + %
16472 + % Try typesetting the item mark that if the document erroneously says
16473 + % something like @itemize @samp (intending @table), there's an error
16474 + % right away at the @itemize. It's not the best error message in the
16475 + % world, but it's better than leaving it to the @item. This means if
16476 + % the user wants an empty mark, they have to say @w{} not just @w.
16477 \def\itemcontents{#1}%
16478 + \setbox0 = \hbox{\itemcontents}%
16479 + %
16480 % @itemize with no arg is equivalent to @itemize @bullet.
16481 \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
16482 + %
16483 \let\item=\itemizeitem
16484 }
16485
16486 @@ -2373,6 +3462,7 @@ where each line of input produces a line of output.}
16487 \ifnum\lastpenalty<10000 \parskip=0in \fi
16488 \noindent
16489 \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
16490 + %
16491 \vadjust{\penalty 1200}}% not good to break after first line of item.
16492 \flushcr
16493 }
16494 @@ -2554,7 +3644,7 @@ where each line of input produces a line of output.}
16495
16496 % #1 is the @columnfraction, usually a decimal number like .5, but might
16497 % be just 1. We just use it, whatever it is.
16498 -%
16499 +%
16500 \def\pickupwholefraction#1 {%
16501 \global\advance\colcount by 1
16502 \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
16503 @@ -2594,12 +3684,19 @@ where each line of input produces a line of output.}
16504 %
16505 % @headitem starts a heading row, which we typeset in bold.
16506 % Assignments have to be global since we are inside the implicit group
16507 -% of an alignment entry. Note that \everycr resets \everytab.
16508 -\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
16509 +% of an alignment entry. \everycr resets \everytab so we don't have to
16510 +% undo it ourselves.
16511 +\def\headitemfont{\b}% for people to use in the template row; not changeable
16512 +\def\headitem{%
16513 + \checkenv\multitable
16514 + \crcr
16515 + \global\everytab={\bf}% can't use \headitemfont since the parsing differs
16516 + \the\everytab % for the first item
16517 +}%
16518 %
16519 % A \tab used to include \hskip1sp. But then the space in a template
16520 % line is not enough. That is bad. So let's go back to just `&' until
16521 -% we encounter the problem it was intended to solve again.
16522 +% we again encounter the problem the 1sp was intended to solve.
16523 % --karl, [email protected], 20apr99.
16524 \def\tab{\checkenv\multitable &\the\everytab}%
16525
16526 @@ -2612,7 +3709,10 @@ where each line of input produces a line of output.}
16527 \startsavinginserts
16528 %
16529 % @item within a multitable starts a normal row.
16530 - \let\item\crcr
16531 + % We use \def instead of \let so that if one of the multitable entries
16532 + % contains an @itemize, we don't choke on the \item (seen as \crcr aka
16533 + % \endtemplate) expanding \doitemize.
16534 + \def\item{\crcr}%
16535 %
16536 \tolerance=9500
16537 \hbadness=9500
16538 @@ -2697,19 +3797,17 @@ where each line of input produces a line of output.}
16539 \global\setpercentfalse
16540 }
16541
16542 -\def\setmultitablespacing{% test to see if user has set \multitablelinespace.
16543 -% If so, do nothing. If not, give it an appropriate dimension based on
16544 -% current baselineskip.
16545 +\def\setmultitablespacing{%
16546 + \def\multistrut{\strut}% just use the standard line spacing
16547 + %
16548 + % Compute \multitablelinespace (if not defined by user) for use in
16549 + % \multitableparskip calculation. We used define \multistrut based on
16550 + % this, but (ironically) that caused the spacing to be off.
16551 + % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
16552 \ifdim\multitablelinespace=0pt
16553 \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
16554 \global\advance\multitablelinespace by-\ht0
16555 -%% strut to put in table in case some entry doesn't have descenders,
16556 -%% to keep lines equally spaced
16557 -\let\multistrut = \strut
16558 -\else
16559 -%% FIXME: what is \box0 supposed to be?
16560 -\gdef\multistrut{\vrule height\multitablelinespace depth\dp0
16561 -width0pt\relax} \fi
16562 +\fi
16563 %% Test to see if parskip is larger than space between lines of
16564 %% table. If not, do nothing.
16565 %% If so, set to same dimension as multitablelinespace.
16566 @@ -2767,6 +3865,7 @@ width0pt\relax} \fi
16567
16568 \def\doignore#1{\begingroup
16569 % Scan in ``verbatim'' mode:
16570 + \obeylines
16571 \catcode`\@ = \other
16572 \catcode`\{ = \other
16573 \catcode`\} = \other
16574 @@ -2778,25 +3877,25 @@ width0pt\relax} \fi
16575 \doignorecount = 0
16576 %
16577 % Swallow text until we reach the matching `@end #1'.
16578 - \dodoignore {#1}%
16579 + \dodoignore{#1}%
16580 }
16581
16582 { \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
16583 \obeylines %
16584 %
16585 \gdef\dodoignore#1{%
16586 - % #1 contains the string `ifinfo'.
16587 + % #1 contains the command name as a string, e.g., `ifinfo'.
16588 + %
16589 + % Define a command to find the next `@end #1'.
16590 + \long\def\doignoretext##1^^M@end #1{%
16591 + \doignoretextyyy##1^^M@#1\_STOP_}%
16592 %
16593 - % Define a command to find the next `@end #1', which must be on a line
16594 - % by itself.
16595 - \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
16596 % And this command to find another #1 command, at the beginning of a
16597 % line. (Otherwise, we would consider a line `@c @ifset', for
16598 % example, to count as an @ifset for nesting.)
16599 \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
16600 %
16601 % And now expand that command.
16602 - \obeylines %
16603 \doignoretext ^^M%
16604 }%
16605 }
16606 @@ -2814,7 +3913,7 @@ width0pt\relax} \fi
16607 }
16608
16609 % We have to swallow the remaining "\_STOP_".
16610 -%
16611 +%
16612 \def\doignoretextzzz#1{%
16613 \ifnum\doignorecount = 0 % We have just found the outermost @end.
16614 \let\next\enddoignore
16615 @@ -2826,7 +3925,12 @@ width0pt\relax} \fi
16616 }
16617
16618 % Finish off ignored text.
16619 -\def\enddoignore{\endgroup\ignorespaces}
16620 +{ \obeylines%
16621 + % Ignore anything after the last `@end #1'; this matters in verbatim
16622 + % environments, where otherwise the newline after an ignored conditional
16623 + % would result in a blank line in the output.
16624 + \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
16625 +}
16626
16627
16628 % @set VAR sets the variable VAR to an empty value.
16629 @@ -2939,9 +4043,8 @@ width0pt\relax} \fi
16630 % Index generation facilities
16631
16632 % Define \newwrite to be identical to plain tex's \newwrite
16633 -% except not \outer, so it can be used within \newindex.
16634 -{\catcode`\@=11
16635 -\gdef\newwrite{\alloc@7\write\chardef\sixt@@n}}
16636 +% except not \outer, so it can be used within macros and \if's.
16637 +\edef\newwrite{\makecsname{ptexnewwrite}}
16638
16639 % \newindex {foo} defines an index named foo.
16640 % It automatically defines \fooindex such that
16641 @@ -2992,11 +4095,11 @@ width0pt\relax} \fi
16642 \def\dosynindex#1#2#3{%
16643 % Only do \closeout if we haven't already done it, else we'll end up
16644 % closing the target index.
16645 - \expandafter \ifx\csname donesynindex#2\endcsname \undefined
16646 + \expandafter \ifx\csname donesynindex#2\endcsname \relax
16647 % The \closeout helps reduce unnecessary open files; the limit on the
16648 % Acorn RISC OS is a mere 16 files.
16649 \expandafter\closeout\csname#2indfile\endcsname
16650 - \expandafter\let\csname\donesynindex#2\endcsname = 1
16651 + \expandafter\let\csname donesynindex#2\endcsname = 1
16652 \fi
16653 % redefine \fooindfile:
16654 \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
16655 @@ -3027,41 +4130,50 @@ width0pt\relax} \fi
16656 % we have to laboriously prevent expansion for those that we don't.
16657 %
16658 \def\indexdummies{%
16659 + \escapechar = `\\ % use backslash in output files.
16660 \def\@{@}% change to @@ when we switch to @ as escape char in index files.
16661 \def\ {\realbackslash\space }%
16662 + %
16663 % Need these in case \tex is in effect and \{ is a \delimiter again.
16664 % But can't use \lbracecmd and \rbracecmd because texindex assumes
16665 % braces and backslashes are used only as delimiters.
16666 \let\{ = \mylbrace
16667 \let\} = \myrbrace
16668 %
16669 - % \definedummyword defines \#1 as \realbackslash #1\space, thus
16670 - % effectively preventing its expansion. This is used only for control
16671 - % words, not control letters, because the \space would be incorrect
16672 - % for control characters, but is needed to separate the control word
16673 - % from whatever follows.
16674 + % I don't entirely understand this, but when an index entry is
16675 + % generated from a macro call, the \endinput which \scanmacro inserts
16676 + % causes processing to be prematurely terminated. This is,
16677 + % apparently, because \indexsorttmp is fully expanded, and \endinput
16678 + % is an expandable command. The redefinition below makes \endinput
16679 + % disappear altogether for that purpose -- although logging shows that
16680 + % processing continues to some further point. On the other hand, it
16681 + % seems \endinput does not hurt in the printed index arg, since that
16682 + % is still getting written without apparent harm.
16683 %
16684 - % For control letters, we have \definedummyletter, which omits the
16685 - % space.
16686 + % Sample source (mac-idx3.tex, reported by Graham Percival to
16687 + % help-texinfo, 22may06):
16688 + % @macro funindex {WORD}
16689 + % @findex xyz
16690 + % @end macro
16691 + % ...
16692 + % @funindex commtest
16693 %
16694 - % These can be used both for control words that take an argument and
16695 - % those that do not. If it is followed by {arg} in the input, then
16696 - % that will dutifully get written to the index (or wherever).
16697 + % The above is not enough to reproduce the bug, but it gives the flavor.
16698 %
16699 - \def\definedummyword##1{%
16700 - \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
16701 - }%
16702 - \def\definedummyletter##1{%
16703 - \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
16704 - }%
16705 + % Sample whatsit resulting:
16706 + % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
16707 + %
16708 + % So:
16709 + \let\endinput = \empty
16710 %
16711 % Do the redefinitions.
16712 \commondummies
16713 }
16714
16715 -% For the aux file, @ is the escape character. So we want to redefine
16716 -% everything using @ instead of \realbackslash. When everything uses
16717 -% @, this will be simpler.
16718 +% For the aux and toc files, @ is the escape character. So we want to
16719 +% redefine everything using @ as the escape character (instead of
16720 +% \realbackslash, still used for index files). When everything uses @,
16721 +% this will be simpler.
16722 %
16723 \def\atdummies{%
16724 \def\@{@@}%
16725 @@ -3069,144 +4181,169 @@ width0pt\relax} \fi
16726 \let\{ = \lbraceatcmd
16727 \let\} = \rbraceatcmd
16728 %
16729 - % (See comments in \indexdummies.)
16730 - \def\definedummyword##1{%
16731 - \expandafter\def\csname ##1\endcsname{@##1\space}%
16732 - }%
16733 - \def\definedummyletter##1{%
16734 - \expandafter\def\csname ##1\endcsname{@##1}%
16735 - }%
16736 - %
16737 % Do the redefinitions.
16738 \commondummies
16739 + \otherbackslash
16740 }
16741
16742 -% Called from \indexdummies and \atdummies. \definedummyword and
16743 -% \definedummyletter must be defined first.
16744 +% Called from \indexdummies and \atdummies.
16745 %
16746 \def\commondummies{%
16747 %
16748 - \normalturnoffactive
16749 + % \definedummyword defines \#1 as \string\#1\space, thus effectively
16750 + % preventing its expansion. This is used only for control% words,
16751 + % not control letters, because the \space would be incorrect for
16752 + % control characters, but is needed to separate the control word
16753 + % from whatever follows.
16754 + %
16755 + % For control letters, we have \definedummyletter, which omits the
16756 + % space.
16757 + %
16758 + % These can be used both for control words that take an argument and
16759 + % those that do not. If it is followed by {arg} in the input, then
16760 + % that will dutifully get written to the index (or wherever).
16761 + %
16762 + \def\definedummyword ##1{\def##1{\string##1\space}}%
16763 + \def\definedummyletter##1{\def##1{\string##1}}%
16764 + \let\definedummyaccent\definedummyletter
16765 %
16766 \commondummiesnofonts
16767 %
16768 - \definedummyletter{_}%
16769 + \definedummyletter\_%
16770 %
16771 % Non-English letters.
16772 - \definedummyword{AA}%
16773 - \definedummyword{AE}%
16774 - \definedummyword{L}%
16775 - \definedummyword{OE}%
16776 - \definedummyword{O}%
16777 - \definedummyword{aa}%
16778 - \definedummyword{ae}%
16779 - \definedummyword{l}%
16780 - \definedummyword{oe}%
16781 - \definedummyword{o}%
16782 - \definedummyword{ss}%
16783 - \definedummyword{exclamdown}%
16784 - \definedummyword{questiondown}%
16785 - \definedummyword{ordf}%
16786 - \definedummyword{ordm}%
16787 + \definedummyword\AA
16788 + \definedummyword\AE
16789 + \definedummyword\DH
16790 + \definedummyword\L
16791 + \definedummyword\O
16792 + \definedummyword\OE
16793 + \definedummyword\TH
16794 + \definedummyword\aa
16795 + \definedummyword\ae
16796 + \definedummyword\dh
16797 + \definedummyword\exclamdown
16798 + \definedummyword\l
16799 + \definedummyword\o
16800 + \definedummyword\oe
16801 + \definedummyword\ordf
16802 + \definedummyword\ordm
16803 + \definedummyword\questiondown
16804 + \definedummyword\ss
16805 + \definedummyword\th
16806 %
16807 % Although these internal commands shouldn't show up, sometimes they do.
16808 - \definedummyword{bf}%
16809 - \definedummyword{gtr}%
16810 - \definedummyword{hat}%
16811 - \definedummyword{less}%
16812 - \definedummyword{sf}%
16813 - \definedummyword{sl}%
16814 - \definedummyword{tclose}%
16815 - \definedummyword{tt}%
16816 - %
16817 - \definedummyword{LaTeX}%
16818 - \definedummyword{TeX}%
16819 + \definedummyword\bf
16820 + \definedummyword\gtr
16821 + \definedummyword\hat
16822 + \definedummyword\less
16823 + \definedummyword\sf
16824 + \definedummyword\sl
16825 + \definedummyword\tclose
16826 + \definedummyword\tt
16827 + %
16828 + \definedummyword\LaTeX
16829 + \definedummyword\TeX
16830 %
16831 % Assorted special characters.
16832 - \definedummyword{bullet}%
16833 - \definedummyword{copyright}%
16834 - \definedummyword{registeredsymbol}%
16835 - \definedummyword{dots}%
16836 - \definedummyword{enddots}%
16837 - \definedummyword{equiv}%
16838 - \definedummyword{error}%
16839 - \definedummyword{expansion}%
16840 - \definedummyword{minus}%
16841 - \definedummyword{pounds}%
16842 - \definedummyword{point}%
16843 - \definedummyword{print}%
16844 - \definedummyword{result}%
16845 + \definedummyword\bullet
16846 + \definedummyword\comma
16847 + \definedummyword\copyright
16848 + \definedummyword\registeredsymbol
16849 + \definedummyword\dots
16850 + \definedummyword\enddots
16851 + \definedummyword\equiv
16852 + \definedummyword\error
16853 + \definedummyword\euro
16854 + \definedummyword\guillemetleft
16855 + \definedummyword\guillemetright
16856 + \definedummyword\guilsinglleft
16857 + \definedummyword\guilsinglright
16858 + \definedummyword\expansion
16859 + \definedummyword\minus
16860 + \definedummyword\ogonek
16861 + \definedummyword\pounds
16862 + \definedummyword\point
16863 + \definedummyword\print
16864 + \definedummyword\quotedblbase
16865 + \definedummyword\quotedblleft
16866 + \definedummyword\quotedblright
16867 + \definedummyword\quoteleft
16868 + \definedummyword\quoteright
16869 + \definedummyword\quotesinglbase
16870 + \definedummyword\result
16871 + \definedummyword\textdegree
16872 + %
16873 + % We want to disable all macros so that they are not expanded by \write.
16874 + \macrolist
16875 + %
16876 + \normalturnoffactive
16877 %
16878 % Handle some cases of @value -- where it does not contain any
16879 % (non-fully-expandable) commands.
16880 \makevalueexpandable
16881 - %
16882 - % Normal spaces, not active ones.
16883 - \unsepspaces
16884 - %
16885 - % No macro expansion.
16886 - \turnoffmacros
16887 }
16888
16889 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
16890 %
16891 -% Better have this without active chars.
16892 -{
16893 - \catcode`\~=\other
16894 - \gdef\commondummiesnofonts{%
16895 - % Control letters and accents.
16896 - \definedummyletter{!}%
16897 - \definedummyletter{"}%
16898 - \definedummyletter{'}%
16899 - \definedummyletter{*}%
16900 - \definedummyletter{,}%
16901 - \definedummyletter{.}%
16902 - \definedummyletter{/}%
16903 - \definedummyletter{:}%
16904 - \definedummyletter{=}%
16905 - \definedummyletter{?}%
16906 - \definedummyletter{^}%
16907 - \definedummyletter{`}%
16908 - \definedummyletter{~}%
16909 - \definedummyword{u}%
16910 - \definedummyword{v}%
16911 - \definedummyword{H}%
16912 - \definedummyword{dotaccent}%
16913 - \definedummyword{ringaccent}%
16914 - \definedummyword{tieaccent}%
16915 - \definedummyword{ubaraccent}%
16916 - \definedummyword{udotaccent}%
16917 - \definedummyword{dotless}%
16918 - %
16919 - % Texinfo font commands.
16920 - \definedummyword{b}%
16921 - \definedummyword{i}%
16922 - \definedummyword{r}%
16923 - \definedummyword{sc}%
16924 - \definedummyword{t}%
16925 - %
16926 - % Commands that take arguments.
16927 - \definedummyword{acronym}%
16928 - \definedummyword{cite}%
16929 - \definedummyword{code}%
16930 - \definedummyword{command}%
16931 - \definedummyword{dfn}%
16932 - \definedummyword{emph}%
16933 - \definedummyword{env}%
16934 - \definedummyword{file}%
16935 - \definedummyword{kbd}%
16936 - \definedummyword{key}%
16937 - \definedummyword{math}%
16938 - \definedummyword{option}%
16939 - \definedummyword{samp}%
16940 - \definedummyword{strong}%
16941 - \definedummyword{tie}%
16942 - \definedummyword{uref}%
16943 - \definedummyword{url}%
16944 - \definedummyword{var}%
16945 - \definedummyword{verb}%
16946 - \definedummyword{w}%
16947 - }
16948 +\def\commondummiesnofonts{%
16949 + % Control letters and accents.
16950 + \definedummyletter\!%
16951 + \definedummyaccent\"%
16952 + \definedummyaccent\'%
16953 + \definedummyletter\*%
16954 + \definedummyaccent\,%
16955 + \definedummyletter\.%
16956 + \definedummyletter\/%
16957 + \definedummyletter\:%
16958 + \definedummyaccent\=%
16959 + \definedummyletter\?%
16960 + \definedummyaccent\^%
16961 + \definedummyaccent\`%
16962 + \definedummyaccent\~%
16963 + \definedummyword\u
16964 + \definedummyword\v
16965 + \definedummyword\H
16966 + \definedummyword\dotaccent
16967 + \definedummyword\ogonek
16968 + \definedummyword\ringaccent
16969 + \definedummyword\tieaccent
16970 + \definedummyword\ubaraccent
16971 + \definedummyword\udotaccent
16972 + \definedummyword\dotless
16973 + %
16974 + % Texinfo font commands.
16975 + \definedummyword\b
16976 + \definedummyword\i
16977 + \definedummyword\r
16978 + \definedummyword\sc
16979 + \definedummyword\t
16980 + %
16981 + % Commands that take arguments.
16982 + \definedummyword\acronym
16983 + \definedummyword\cite
16984 + \definedummyword\code
16985 + \definedummyword\command
16986 + \definedummyword\dfn
16987 + \definedummyword\email
16988 + \definedummyword\emph
16989 + \definedummyword\env
16990 + \definedummyword\file
16991 + \definedummyword\kbd
16992 + \definedummyword\key
16993 + \definedummyword\math
16994 + \definedummyword\option
16995 + \definedummyword\pxref
16996 + \definedummyword\ref
16997 + \definedummyword\samp
16998 + \definedummyword\strong
16999 + \definedummyword\tie
17000 + \definedummyword\uref
17001 + \definedummyword\url
17002 + \definedummyword\var
17003 + \definedummyword\verb
17004 + \definedummyword\w
17005 + \definedummyword\xref
17006 }
17007
17008 % \indexnofonts is used when outputting the strings to sort the index
17009 @@ -3215,13 +4352,12 @@ width0pt\relax} \fi
17010 % would be for a given command (usually its argument).
17011 %
17012 \def\indexnofonts{%
17013 - \def\definedummyword##1{%
17014 - \expandafter\let\csname ##1\endcsname\asis
17015 - }%
17016 - % We can just ignore the accent commands and other control letters.
17017 - \def\definedummyletter##1{%
17018 - \expandafter\def\csname ##1\endcsname{}%
17019 - }%
17020 + % Accent commands should become @asis.
17021 + \def\definedummyaccent##1{\let##1\asis}%
17022 + % We can just ignore other control letters.
17023 + \def\definedummyletter##1{\let##1\empty}%
17024 + % Hopefully, all control words can become @asis.
17025 + \let\definedummyword\definedummyaccent
17026 %
17027 \commondummiesnofonts
17028 %
17029 @@ -3238,19 +4374,23 @@ width0pt\relax} \fi
17030 % Non-English letters.
17031 \def\AA{AA}%
17032 \def\AE{AE}%
17033 + \def\DH{DZZ}%
17034 \def\L{L}%
17035 \def\OE{OE}%
17036 \def\O{O}%
17037 + \def\TH{ZZZ}%
17038 \def\aa{aa}%
17039 \def\ae{ae}%
17040 + \def\dh{dzz}%
17041 + \def\exclamdown{!}%
17042 \def\l{l}%
17043 \def\oe{oe}%
17044 - \def\o{o}%
17045 - \def\ss{ss}%
17046 - \def\exclamdown{!}%
17047 - \def\questiondown{?}%
17048 \def\ordf{a}%
17049 \def\ordm{o}%
17050 + \def\o{o}%
17051 + \def\questiondown{?}%
17052 + \def\ss{ss}%
17053 + \def\th{zzz}%
17054 %
17055 \def\LaTeX{LaTeX}%
17056 \def\TeX{TeX}%
17057 @@ -3258,18 +4398,43 @@ width0pt\relax} \fi
17058 % Assorted special characters.
17059 % (The following {} will end up in the sort string, but that's ok.)
17060 \def\bullet{bullet}%
17061 + \def\comma{,}%
17062 \def\copyright{copyright}%
17063 - \def\registeredsymbol{R}%
17064 \def\dots{...}%
17065 \def\enddots{...}%
17066 \def\equiv{==}%
17067 \def\error{error}%
17068 + \def\euro{euro}%
17069 \def\expansion{==>}%
17070 + \def\guillemetleft{<<}%
17071 + \def\guillemetright{>>}%
17072 + \def\guilsinglleft{<}%
17073 + \def\guilsinglright{>}%
17074 \def\minus{-}%
17075 - \def\pounds{pounds}%
17076 \def\point{.}%
17077 + \def\pounds{pounds}%
17078 \def\print{-|}%
17079 + \def\quotedblbase{"}%
17080 + \def\quotedblleft{"}%
17081 + \def\quotedblright{"}%
17082 + \def\quoteleft{`}%
17083 + \def\quoteright{'}%
17084 + \def\quotesinglbase{,}%
17085 + \def\registeredsymbol{R}%
17086 \def\result{=>}%
17087 + \def\textdegree{o}%
17088 + %
17089 + % We need to get rid of all macros, leaving only the arguments (if present).
17090 + % Of course this is not nearly correct, but it is the best we can do for now.
17091 + % makeinfo does not expand macros in the argument to @deffn, which ends up
17092 + % writing an index entry, and texindex isn't prepared for an index sort entry
17093 + % that starts with \.
17094 + %
17095 + % Since macro invocations are followed by braces, we can just redefine them
17096 + % to take a single TeX argument. The case of a macro invocation that
17097 + % goes to end-of-line is not handled.
17098 + %
17099 + \macrolist
17100 }
17101
17102 \let\indexbackslash=0 %overridden during \printindex.
17103 @@ -3297,11 +4462,7 @@ width0pt\relax} \fi
17104 %
17105 \edef\writeto{\csname#1indfile\endcsname}%
17106 %
17107 - \ifvmode
17108 - \dosubindsanitize
17109 - \else
17110 - \dosubindwrite
17111 - \fi
17112 + \safewhatsit\dosubindwrite
17113 }%
17114 \fi
17115 }
17116 @@ -3316,7 +4477,6 @@ width0pt\relax} \fi
17117 %
17118 % Remember, we are within a group.
17119 \indexdummies % Must do this here, since \bf, etc expand at this stage
17120 - \escapechar=`\\
17121 \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
17122 % so it will be output as is; and it will print as backslash.
17123 %
17124 @@ -3339,13 +4499,13 @@ width0pt\relax} \fi
17125 \temp
17126 }
17127
17128 -% Take care of unwanted page breaks:
17129 +% Take care of unwanted page breaks/skips around a whatsit:
17130 %
17131 % If a skip is the last thing on the list now, preserve it
17132 % by backing up by \lastskip, doing the \write, then inserting
17133 % the skip again. Otherwise, the whatsit generated by the
17134 -% \write will make \lastskip zero. The result is that sequences
17135 -% like this:
17136 +% \write or \pdfdest will make \lastskip zero. The result is that
17137 +% sequences like this:
17138 % @end defun
17139 % @tindex whatever
17140 % @defun ...
17141 @@ -3369,44 +4529,52 @@ width0pt\relax} \fi
17142 %
17143 \edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
17144 %
17145 +\newskip\whatsitskip
17146 +\newcount\whatsitpenalty
17147 +%
17148 % ..., ready, GO:
17149 %
17150 -\def\dosubindsanitize{%
17151 +\def\safewhatsit#1{%
17152 +\ifhmode
17153 + #1%
17154 +\else
17155 % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
17156 - \skip0 = \lastskip
17157 + \whatsitskip = \lastskip
17158 \edef\lastskipmacro{\the\lastskip}%
17159 - \count255 = \lastpenalty
17160 + \whatsitpenalty = \lastpenalty
17161 %
17162 % If \lastskip is nonzero, that means the last item was a
17163 % skip. And since a skip is discardable, that means this
17164 - % -\skip0 glue we're inserting is preceded by a
17165 + % -\whatsitskip glue we're inserting is preceded by a
17166 % non-discardable item, therefore it is not a potential
17167 % breakpoint, therefore no \nobreak needed.
17168 \ifx\lastskipmacro\zeroskipmacro
17169 \else
17170 - \vskip-\skip0
17171 + \vskip-\whatsitskip
17172 \fi
17173 %
17174 - \dosubindwrite
17175 + #1%
17176 %
17177 \ifx\lastskipmacro\zeroskipmacro
17178 - % if \lastskip was zero, perhaps the last item was a
17179 - % penalty, and perhaps it was >=10000, e.g., a \nobreak.
17180 - % In that case, we want to re-insert the penalty; since we
17181 - % just inserted a non-discardable item, any following glue
17182 - % (such as a \parskip) would be a breakpoint. For example:
17183 + % If \lastskip was zero, perhaps the last item was a penalty, and
17184 + % perhaps it was >=10000, e.g., a \nobreak. In that case, we want
17185 + % to re-insert the same penalty (values >10000 are used for various
17186 + % signals); since we just inserted a non-discardable item, any
17187 + % following glue (such as a \parskip) would be a breakpoint. For example:
17188 + %
17189 % @deffn deffn-whatever
17190 % @vindex index-whatever
17191 % Description.
17192 % would allow a break between the index-whatever whatsit
17193 % and the "Description." paragraph.
17194 - \ifnum\count255>9999 \nobreak \fi
17195 + \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
17196 \else
17197 % On the other hand, if we had a nonzero \lastskip,
17198 % this make-up glue would be preceded by a non-discardable item
17199 % (the whatsit from the \write), so we must insert a \nobreak.
17200 - \nobreak\vskip\skip0
17201 + \nobreak\vskip\whatsitskip
17202 \fi
17203 +\fi
17204 }
17205
17206 % The index entry written in the file actually looks like
17207 @@ -3449,6 +4617,7 @@ width0pt\relax} \fi
17208 %
17209 \smallfonts \rm
17210 \tolerance = 9500
17211 + \plainfrenchspacing
17212 \everypar = {}% don't want the \kern\-parindent from indentation suppression.
17213 %
17214 % See if the index file exists and is nonempty.
17215 @@ -3498,7 +4667,10 @@ width0pt\relax} \fi
17216 \removelastskip
17217 %
17218 % We like breaks before the index initials, so insert a bonus.
17219 - \penalty -300
17220 + \nobreak
17221 + \vskip 0pt plus 3\baselineskip
17222 + \penalty 0
17223 + \vskip 0pt plus -3\baselineskip
17224 %
17225 % Typeset the initial. Making this add up to a whole number of
17226 % baselineskips increases the chance of the dots lining up from column
17227 @@ -3508,10 +4680,9 @@ width0pt\relax} \fi
17228 % No shrink because it confuses \balancecolumns.
17229 \vskip 1.67\baselineskip plus .5\baselineskip
17230 \leftline{\secbf #1}%
17231 - \vskip .33\baselineskip plus .1\baselineskip
17232 - %
17233 % Do our best not to break after the initial.
17234 \nobreak
17235 + \vskip .33\baselineskip plus .1\baselineskip
17236 }}
17237
17238 % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
17239 @@ -3520,10 +4691,10 @@ width0pt\relax} \fi
17240 %
17241 % A straightforward implementation would start like this:
17242 % \def\entry#1#2{...
17243 -% But this frozes the catcodes in the argument, and can cause problems to
17244 +% But this freezes the catcodes in the argument, and can cause problems to
17245 % @code, which sets - active. This problem was fixed by a kludge---
17246 % ``-'' was active throughout whole index, but this isn't really right.
17247 -%
17248 +%
17249 % The right solution is to prevent \entry from swallowing the whole text.
17250 % --kasal, 21nov03
17251 \def\entry{%
17252 @@ -3576,11 +4747,8 @@ width0pt\relax} \fi
17253 % The following is kludged to not output a line of dots in the index if
17254 % there are no page numbers. The next person who breaks this will be
17255 % cursed by a Unix daemon.
17256 - \def\tempa{{\rm }}%
17257 - \def\tempb{#1}%
17258 - \edef\tempc{\tempa}%
17259 - \edef\tempd{\tempb}%
17260 - \ifx\tempc\tempd
17261 + \setbox\boxA = \hbox{#1}%
17262 + \ifdim\wd\boxA = 0pt
17263 \ %
17264 \else
17265 %
17266 @@ -3604,9 +4772,9 @@ width0pt\relax} \fi
17267 \endgroup
17268 }
17269
17270 -% Like \dotfill except takes at least 1 em.
17271 +% Like plain.tex's \dotfill, except uses up at least 1 em.
17272 \def\indexdotfill{\cleaders
17273 - \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
17274 + \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
17275
17276 \def\primary #1{\line{#1\hfil}}
17277
17278 @@ -3716,6 +4884,34 @@ width0pt\relax} \fi
17279 %
17280 % All done with double columns.
17281 \def\enddoublecolumns{%
17282 + % The following penalty ensures that the page builder is exercised
17283 + % _before_ we change the output routine. This is necessary in the
17284 + % following situation:
17285 + %
17286 + % The last section of the index consists only of a single entry.
17287 + % Before this section, \pagetotal is less than \pagegoal, so no
17288 + % break occurs before the last section starts. However, the last
17289 + % section, consisting of \initial and the single \entry, does not
17290 + % fit on the page and has to be broken off. Without the following
17291 + % penalty the page builder will not be exercised until \eject
17292 + % below, and by that time we'll already have changed the output
17293 + % routine to the \balancecolumns version, so the next-to-last
17294 + % double-column page will be processed with \balancecolumns, which
17295 + % is wrong: The two columns will go to the main vertical list, with
17296 + % the broken-off section in the recent contributions. As soon as
17297 + % the output routine finishes, TeX starts reconsidering the page
17298 + % break. The two columns and the broken-off section both fit on the
17299 + % page, because the two columns now take up only half of the page
17300 + % goal. When TeX sees \eject from below which follows the final
17301 + % section, it invokes the new output routine that we've set after
17302 + % \balancecolumns below; \onepageout will try to fit the two columns
17303 + % and the final section into the vbox of \pageheight (see
17304 + % \pagebody), causing an overfull box.
17305 + %
17306 + % Note that glue won't work here, because glue does not exercise the
17307 + % page builder, unlike penalties (see The TeXbook, pp. 280-281).
17308 + \penalty0
17309 + %
17310 \output = {%
17311 % Split the last of the double-column material. Leave it on the
17312 % current page, no automatic page break.
17313 @@ -3789,7 +4985,7 @@ width0pt\relax} \fi
17314 % We do the following ugly conditional instead of the above simple
17315 % construct for the sake of pdftex, which needs the actual
17316 % letter in the expansion, not just typeset.
17317 -%
17318 +%
17319 \def\appendixletter{%
17320 \ifnum\appendixno=`A A%
17321 \else\ifnum\appendixno=`B B%
17322 @@ -3825,11 +5021,15 @@ width0pt\relax} \fi
17323 \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
17324 \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
17325
17326 -% Each @chapter defines this as the name of the chapter.
17327 -% page headings and footings can use it. @section does likewise.
17328 -% However, they are not reliable, because we don't use marks.
17329 +% Each @chapter defines these (using marks) as the number+name, number
17330 +% and name of the chapter. Page headings and footings can use
17331 +% these. @section does likewise.
17332 \def\thischapter{}
17333 +\def\thischapternum{}
17334 +\def\thischaptername{}
17335 \def\thissection{}
17336 +\def\thissectionnum{}
17337 +\def\thissectionname{}
17338
17339 \newcount\absseclevel % used to calculate proper heading level
17340 \newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
17341 @@ -3926,11 +5126,11 @@ width0pt\relax} \fi
17342
17343 % @chapter, @appendix, @unnumbered. Increment top-level counter, reset
17344 % all lower-level sectioning counters to zero.
17345 -%
17346 +%
17347 % Also set \chaplevelprefix, which we prepend to @float sequence numbers
17348 % (e.g., figures), q.v. By default (before any chapter), that is empty.
17349 \let\chaplevelprefix = \empty
17350 -%
17351 +%
17352 \outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
17353 \def\chapterzzz#1{%
17354 % section resetting is \global in case the chapter is in a group, such
17355 @@ -3942,7 +5142,9 @@ width0pt\relax} \fi
17356 \gdef\chaplevelprefix{\the\chapno.}%
17357 \resetallfloatnos
17358 %
17359 - \message{\putwordChapter\space \the\chapno}%
17360 + % \putwordChapter can contain complex things in translations.
17361 + \toks0=\expandafter{\putwordChapter}%
17362 + \message{\the\toks0 \space \the\chapno}%
17363 %
17364 % Write the actual heading.
17365 \chapmacro{#1}{Ynumbered}{\the\chapno}%
17366 @@ -3953,15 +5155,17 @@ width0pt\relax} \fi
17367 \global\let\subsubsection = \numberedsubsubsec
17368 }
17369
17370 -\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
17371 +\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
17372 +%
17373 \def\appendixzzz#1{%
17374 \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
17375 \global\advance\appendixno by 1
17376 \gdef\chaplevelprefix{\appendixletter.}%
17377 \resetallfloatnos
17378 %
17379 - \def\appendixnum{\putwordAppendix\space \appendixletter}%
17380 - \message{\appendixnum}%
17381 + % \putwordAppendix can contain complex things in translations.
17382 + \toks0=\expandafter{\putwordAppendix}%
17383 + \message{\the\toks0 \space \appendixletter}%
17384 %
17385 \chapmacro{#1}{Yappendix}{\appendixletter}%
17386 %
17387 @@ -4093,7 +5297,6 @@ width0pt\relax} \fi
17388 % 3) Likewise, headings look best if no \parindent is used, and
17389 % if justification is not attempted. Hence \raggedright.
17390
17391 -
17392 \def\majorheading{%
17393 {\advance\chapheadingskip by 10pt \chapbreak }%
17394 \parsearg\chapheadingzzz
17395 @@ -4102,8 +5305,8 @@ width0pt\relax} \fi
17396 \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
17397 \def\chapheadingzzz#1{%
17398 {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
17399 - \parindent=0pt\raggedright
17400 - \rm #1\hfill}}%
17401 + \parindent=0pt\ptexraggedright
17402 + \rmisbold #1\hfill}}%
17403 \bigskip \par\penalty 200\relax
17404 \suppressfirstparagraphindent
17405 }
17406 @@ -4130,7 +5333,20 @@ width0pt\relax} \fi
17407
17408 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
17409 \def\chappager{\par\vfill\supereject}
17410 -\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
17411 +% Because \domark is called before \chapoddpage, the filler page will
17412 +% get the headings for the next chapter, which is wrong. But we don't
17413 +% care -- we just disable all headings on the filler page.
17414 +\def\chapoddpage{%
17415 + \chappager
17416 + \ifodd\pageno \else
17417 + \begingroup
17418 + \evenheadline={\hfil}\evenfootline={\hfil}%
17419 + \oddheadline={\hfil}\oddfootline={\hfil}%
17420 + \hbox to 0pt{}%
17421 + \chappager
17422 + \endgroup
17423 + \fi
17424 +}
17425
17426 \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
17427
17428 @@ -4154,51 +5370,88 @@ width0pt\relax} \fi
17429 \CHAPPAGon
17430
17431 % Chapter opening.
17432 -%
17433 +%
17434 % #1 is the text, #2 is the section type (Ynumbered, Ynothing,
17435 % Yappendix, Yomitfromtoc), #3 the chapter number.
17436 -%
17437 +%
17438 % To test against our argument.
17439 \def\Ynothingkeyword{Ynothing}
17440 \def\Yomitfromtockeyword{Yomitfromtoc}
17441 \def\Yappendixkeyword{Yappendix}
17442 %
17443 \def\chapmacro#1#2#3{%
17444 + % Insert the first mark before the heading break (see notes for \domark).
17445 + \let\prevchapterdefs=\lastchapterdefs
17446 + \let\prevsectiondefs=\lastsectiondefs
17447 + \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
17448 + \gdef\thissection{}}%
17449 + %
17450 + \def\temptype{#2}%
17451 + \ifx\temptype\Ynothingkeyword
17452 + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
17453 + \gdef\thischapter{\thischaptername}}%
17454 + \else\ifx\temptype\Yomitfromtockeyword
17455 + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
17456 + \gdef\thischapter{}}%
17457 + \else\ifx\temptype\Yappendixkeyword
17458 + \toks0={#1}%
17459 + \xdef\lastchapterdefs{%
17460 + \gdef\noexpand\thischaptername{\the\toks0}%
17461 + \gdef\noexpand\thischapternum{\appendixletter}%
17462 + % \noexpand\putwordAppendix avoids expanding indigestible
17463 + % commands in some of the translations.
17464 + \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
17465 + \noexpand\thischapternum:
17466 + \noexpand\thischaptername}%
17467 + }%
17468 + \else
17469 + \toks0={#1}%
17470 + \xdef\lastchapterdefs{%
17471 + \gdef\noexpand\thischaptername{\the\toks0}%
17472 + \gdef\noexpand\thischapternum{\the\chapno}%
17473 + % \noexpand\putwordChapter avoids expanding indigestible
17474 + % commands in some of the translations.
17475 + \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
17476 + \noexpand\thischapternum:
17477 + \noexpand\thischaptername}%
17478 + }%
17479 + \fi\fi\fi
17480 + %
17481 + % Output the mark. Pass it through \safewhatsit, to take care of
17482 + % the preceding space.
17483 + \safewhatsit\domark
17484 + %
17485 + % Insert the chapter heading break.
17486 \pchapsepmacro
17487 + %
17488 + % Now the second mark, after the heading break. No break points
17489 + % between here and the heading.
17490 + \let\prevchapterdefs=\lastchapterdefs
17491 + \let\prevsectiondefs=\lastsectiondefs
17492 + \domark
17493 + %
17494 {%
17495 - \chapfonts \rm
17496 + \chapfonts \rmisbold
17497 %
17498 - % Have to define \thissection before calling \donoderef, because the
17499 + % Have to define \lastsection before calling \donoderef, because the
17500 % xref code eventually uses it. On the other hand, it has to be called
17501 % after \pchapsepmacro, or the headline will change too soon.
17502 - \gdef\thissection{#1}%
17503 - \gdef\thischaptername{#1}%
17504 + \gdef\lastsection{#1}%
17505 %
17506 % Only insert the separating space if we have a chapter/appendix
17507 % number, and don't print the unnumbered ``number''.
17508 - \def\temptype{#2}%
17509 \ifx\temptype\Ynothingkeyword
17510 \setbox0 = \hbox{}%
17511 \def\toctype{unnchap}%
17512 - \def\thischapter{#1}%
17513 \else\ifx\temptype\Yomitfromtockeyword
17514 \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
17515 \def\toctype{omit}%
17516 - \xdef\thischapter{}%
17517 \else\ifx\temptype\Yappendixkeyword
17518 \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
17519 \def\toctype{app}%
17520 - % We don't substitute the actual chapter name into \thischapter
17521 - % because we don't want its macros evaluated now. And we don't
17522 - % use \thissection because that changes with each section.
17523 - %
17524 - \xdef\thischapter{\putwordAppendix{} \appendixletter:
17525 - \noexpand\thischaptername}%
17526 \else
17527 \setbox0 = \hbox{#3\enspace}%
17528 \def\toctype{numchap}%
17529 - \xdef\thischapter{\putwordChapter{} \the\chapno:
17530 - \noexpand\thischaptername}%
17531 \fi\fi\fi
17532 %
17533 % Write the toc entry for this chapter. Must come before the
17534 @@ -4214,7 +5467,8 @@ width0pt\relax} \fi
17535 \donoderef{#2}%
17536 %
17537 % Typeset the actual heading.
17538 - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
17539 + \nobreak % Avoid page breaks at the interline glue.
17540 + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
17541 \hangindent=\wd0 \centerparametersmaybe
17542 \unhbox0 #1\par}%
17543 }%
17544 @@ -4233,13 +5487,13 @@ width0pt\relax} \fi
17545
17546 % I don't think this chapter style is supported any more, so I'm not
17547 % updating it with the new noderef stuff. We'll see. --karl, 11aug03.
17548 -%
17549 +%
17550 \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
17551 %
17552 \def\unnchfopen #1{%
17553 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
17554 - \parindent=0pt\raggedright
17555 - \rm #1\hfill}}\bigskip \par\nobreak
17556 + \parindent=0pt\ptexraggedright
17557 + \rmisbold #1\hfill}}\bigskip \par\nobreak
17558 }
17559 \def\chfopen #1#2{\chapoddpage {\chapfonts
17560 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
17561 @@ -4248,7 +5502,7 @@ width0pt\relax} \fi
17562 \def\centerchfopen #1{%
17563 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
17564 \parindent=0pt
17565 - \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
17566 + \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
17567 }
17568 \def\CHAPFopen{%
17569 \global\let\chapmacro=\chfopen
17570 @@ -4257,7 +5511,7 @@ width0pt\relax} \fi
17571
17572 % Section titles. These macros combine the section number parts and
17573 % call the generic \sectionheading to do the printing.
17574 -%
17575 +%
17576 \newskip\secheadingskip
17577 \def\secheadingbreak{\dobreak \secheadingskip{-1000}}
17578
17579 @@ -4271,52 +5525,113 @@ width0pt\relax} \fi
17580
17581
17582 % Print any size, any type, section title.
17583 -%
17584 +%
17585 % #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
17586 % the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
17587 % section number.
17588 -%
17589 +%
17590 +\def\seckeyword{sec}
17591 +%
17592 \def\sectionheading#1#2#3#4{%
17593 {%
17594 % Switch to the right set of fonts.
17595 - \csname #2fonts\endcsname \rm
17596 + \csname #2fonts\endcsname \rmisbold
17597 + %
17598 + \def\sectionlevel{#2}%
17599 + \def\temptype{#3}%
17600 + %
17601 + % Insert first mark before the heading break (see notes for \domark).
17602 + \let\prevsectiondefs=\lastsectiondefs
17603 + \ifx\temptype\Ynothingkeyword
17604 + \ifx\sectionlevel\seckeyword
17605 + \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
17606 + \gdef\thissection{\thissectionname}}%
17607 + \fi
17608 + \else\ifx\temptype\Yomitfromtockeyword
17609 + % Don't redefine \thissection.
17610 + \else\ifx\temptype\Yappendixkeyword
17611 + \ifx\sectionlevel\seckeyword
17612 + \toks0={#1}%
17613 + \xdef\lastsectiondefs{%
17614 + \gdef\noexpand\thissectionname{\the\toks0}%
17615 + \gdef\noexpand\thissectionnum{#4}%
17616 + % \noexpand\putwordSection avoids expanding indigestible
17617 + % commands in some of the translations.
17618 + \gdef\noexpand\thissection{\noexpand\putwordSection{}
17619 + \noexpand\thissectionnum:
17620 + \noexpand\thissectionname}%
17621 + }%
17622 + \fi
17623 + \else
17624 + \ifx\sectionlevel\seckeyword
17625 + \toks0={#1}%
17626 + \xdef\lastsectiondefs{%
17627 + \gdef\noexpand\thissectionname{\the\toks0}%
17628 + \gdef\noexpand\thissectionnum{#4}%
17629 + % \noexpand\putwordSection avoids expanding indigestible
17630 + % commands in some of the translations.
17631 + \gdef\noexpand\thissection{\noexpand\putwordSection{}
17632 + \noexpand\thissectionnum:
17633 + \noexpand\thissectionname}%
17634 + }%
17635 + \fi
17636 + \fi\fi\fi
17637 + %
17638 + % Go into vertical mode. Usually we'll already be there, but we
17639 + % don't want the following whatsit to end up in a preceding paragraph
17640 + % if the document didn't happen to have a blank line.
17641 + \par
17642 + %
17643 + % Output the mark. Pass it through \safewhatsit, to take care of
17644 + % the preceding space.
17645 + \safewhatsit\domark
17646 %
17647 % Insert space above the heading.
17648 \csname #2headingbreak\endcsname
17649 %
17650 - % Only insert the space after the number if we have a section number.
17651 - \def\sectionlevel{#2}%
17652 - \def\temptype{#3}%
17653 + % Now the second mark, after the heading break. No break points
17654 + % between here and the heading.
17655 + \let\prevsectiondefs=\lastsectiondefs
17656 + \domark
17657 %
17658 + % Only insert the space after the number if we have a section number.
17659 \ifx\temptype\Ynothingkeyword
17660 \setbox0 = \hbox{}%
17661 \def\toctype{unn}%
17662 - \gdef\thissection{#1}%
17663 + \gdef\lastsection{#1}%
17664 \else\ifx\temptype\Yomitfromtockeyword
17665 % for @headings -- no section number, don't include in toc,
17666 - % and don't redefine \thissection.
17667 + % and don't redefine \lastsection.
17668 \setbox0 = \hbox{}%
17669 \def\toctype{omit}%
17670 \let\sectionlevel=\empty
17671 \else\ifx\temptype\Yappendixkeyword
17672 \setbox0 = \hbox{#4\enspace}%
17673 \def\toctype{app}%
17674 - \gdef\thissection{#1}%
17675 + \gdef\lastsection{#1}%
17676 \else
17677 \setbox0 = \hbox{#4\enspace}%
17678 \def\toctype{num}%
17679 - \gdef\thissection{#1}%
17680 + \gdef\lastsection{#1}%
17681 \fi\fi\fi
17682 %
17683 - % Write the toc entry (before \donoderef). See comments in \chfplain.
17684 + % Write the toc entry (before \donoderef). See comments in \chapmacro.
17685 \writetocentry{\toctype\sectionlevel}{#1}{#4}%
17686 %
17687 % Write the node reference (= pdf destination for pdftex).
17688 - % Again, see comments in \chfplain.
17689 + % Again, see comments in \chapmacro.
17690 \donoderef{#3}%
17691 %
17692 + % Interline glue will be inserted when the vbox is completed.
17693 + % That glue will be a valid breakpoint for the page, since it'll be
17694 + % preceded by a whatsit (usually from the \donoderef, or from the
17695 + % \writetocentry if there was no node). We don't want to allow that
17696 + % break, since then the whatsits could end up on page n while the
17697 + % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000.
17698 + \nobreak
17699 + %
17700 % Output the actual section heading.
17701 - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
17702 + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
17703 \hangindent=\wd0 % zero if no section number
17704 \unhbox0 #1}%
17705 }%
17706 @@ -4333,13 +5648,13 @@ width0pt\relax} \fi
17707 % discardable item.)
17708 \vskip-\parskip
17709 %
17710 - % This \nobreak is purely so the last item on the list is a \penalty
17711 - % of 10000. This is so other code, for instance \parsebodycommon, can
17712 - % check for and avoid allowing breakpoints. Otherwise, it would
17713 - % insert a valid breakpoint between:
17714 + % This is purely so the last item on the list is a known \penalty >
17715 + % 10000. This is so \startdefun can avoid allowing breakpoints after
17716 + % section headings. Otherwise, it would insert a valid breakpoint between:
17717 + %
17718 % @section sec-whatever
17719 % @deffn def-whatever
17720 - \nobreak
17721 + \penalty 10001
17722 }
17723
17724
17725 @@ -4348,14 +5663,14 @@ width0pt\relax} \fi
17726 \newwrite\tocfile
17727
17728 % Write an entry to the toc file, opening it if necessary.
17729 -% Called from @chapter, etc.
17730 -%
17731 +% Called from @chapter, etc.
17732 +%
17733 % Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
17734 % We append the current node name (if any) and page number as additional
17735 % arguments for the \{chap,sec,...}entry macros which will eventually
17736 % read this. The node name is used in the pdf outlines as the
17737 % destination to jump to.
17738 -%
17739 +%
17740 % We open the .toc file for writing here instead of at @setfilename (or
17741 % any other fixed time) so that @contents can be anywhere in the document.
17742 % But if #1 is `omit', then we don't do anything. This is used for the
17743 @@ -4373,11 +5688,11 @@ width0pt\relax} \fi
17744 \fi
17745 %
17746 \iflinks
17747 - \toks0 = {#2}%
17748 - \toks2 = \expandafter{\lastnode}%
17749 - \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
17750 - {\the\toks2}{\noexpand\folio}}}%
17751 - \temp
17752 + {\atdummies
17753 + \edef\temp{%
17754 + \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
17755 + \temp
17756 + }%
17757 \fi
17758 \fi
17759 %
17760 @@ -4390,6 +5705,31 @@ width0pt\relax} \fi
17761 \ifpdf \global\pdfmakepagedesttrue \fi
17762 }
17763
17764 +
17765 +% These characters do not print properly in the Computer Modern roman
17766 +% fonts, so we must take special care. This is more or less redundant
17767 +% with the Texinfo input format setup at the end of this file.
17768 +%
17769 +\def\activecatcodes{%
17770 + \catcode`\"=\active
17771 + \catcode`\$=\active
17772 + \catcode`\<=\active
17773 + \catcode`\>=\active
17774 + \catcode`\\=\active
17775 + \catcode`\^=\active
17776 + \catcode`\_=\active
17777 + \catcode`\|=\active
17778 + \catcode`\~=\active
17779 +}
17780 +
17781 +
17782 +% Read the toc file, which is essentially Texinfo input.
17783 +\def\readtocfile{%
17784 + \setupdatafile
17785 + \activecatcodes
17786 + \input \tocreadfilename
17787 +}
17788 +
17789 \newskip\contentsrightmargin \contentsrightmargin=1in
17790 \newcount\savepageno
17791 \newcount\lastnegativepageno \lastnegativepageno = -1
17792 @@ -4406,29 +5746,29 @@ width0pt\relax} \fi
17793 %
17794 % Don't need to put `Contents' or `Short Contents' in the headline.
17795 % It is abundantly clear what they are.
17796 - \def\thischapter{}%
17797 \chapmacro{#1}{Yomitfromtoc}{}%
17798 %
17799 \savepageno = \pageno
17800 \begingroup % Set up to handle contents files properly.
17801 - \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11
17802 - % We can't do this, because then an actual ^ in a section
17803 - % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97.
17804 - %\catcode`\^=7 % to see ^^e4 as \"a etc. [email protected]
17805 - \raggedbottom % Worry more about breakpoints than the bottom.
17806 + \raggedbottom % Worry more about breakpoints than the bottom.
17807 \advance\hsize by -\contentsrightmargin % Don't use the full line length.
17808 %
17809 % Roman numerals for page numbers.
17810 \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
17811 }
17812
17813 +% redefined for the two-volume lispref. We always output on
17814 +% \jobname.toc even if this is redefined.
17815 +%
17816 +\def\tocreadfilename{\jobname.toc}
17817
17818 % Normal (long) toc.
17819 +%
17820 \def\contents{%
17821 \startcontents{\putwordTOC}%
17822 - \openin 1 \jobname.toc
17823 + \openin 1 \tocreadfilename\space
17824 \ifeof 1 \else
17825 - \input \jobname.toc
17826 + \readtocfile
17827 \fi
17828 \vfill \eject
17829 \contentsalignmacro % in case @setchapternewpage odd is in effect
17830 @@ -4464,9 +5804,9 @@ width0pt\relax} \fi
17831 \let\numsubsubsecentry = \numsecentry
17832 \let\appsubsubsecentry = \numsecentry
17833 \let\unnsubsubsecentry = \numsecentry
17834 - \openin 1 \jobname.toc
17835 + \openin 1 \tocreadfilename\space
17836 \ifeof 1 \else
17837 - \input \jobname.toc
17838 + \readtocfile
17839 \fi
17840 \closein 1
17841 \vfill \eject
17842 @@ -4486,7 +5826,7 @@ width0pt\relax} \fi
17843 % But use \hss just in case.
17844 % (This space doesn't include the extra space that gets added after
17845 % the label; that gets put in by \shortchapentry above.)
17846 - %
17847 + %
17848 % We'd like to right-justify chapter numbers, but that looks strange
17849 % with appendix letters. And right-justifying numbers and
17850 % left-justifying letters looks strange when there is less than 10
17851 @@ -4511,7 +5851,7 @@ width0pt\relax} \fi
17852
17853 % Appendices, in the main contents.
17854 % Need the word Appendix, and a fixed-size box.
17855 -%
17856 +%
17857 \def\appendixbox#1{%
17858 % We use M since it's probably the widest letter.
17859 \setbox0 = \hbox{\putwordAppendix{} M}%
17860 @@ -4589,45 +5929,12 @@ width0pt\relax} \fi
17861 \message{environments,}
17862 % @foo ... @end foo.
17863
17864 -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
17865 -%
17866 -% Since these characters are used in examples, it should be an even number of
17867 -% \tt widths. Each \tt character is 1en, so two makes it 1em.
17868 -%
17869 -\def\point{$\star$}
17870 -\def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
17871 -\def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
17872 -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
17873 -\def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
17874 -
17875 -% The @error{} command.
17876 -% Adapted from the TeXbook's \boxit.
17877 -%
17878 -\newbox\errorbox
17879 -%
17880 -{\tentt \global\dimen0 = 3em}% Width of the box.
17881 -\dimen2 = .55pt % Thickness of rules
17882 -% The text. (`r' is open on the right, `e' somewhat less so on the left.)
17883 -\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
17884 -%
17885 -\setbox\errorbox=\hbox to \dimen0{\hfil
17886 - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
17887 - \advance\hsize by -2\dimen2 % Rules.
17888 - \vbox{%
17889 - \hrule height\dimen2
17890 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
17891 - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
17892 - \kern3pt\vrule width\dimen2}% Space to right.
17893 - \hrule height\dimen2}
17894 - \hfil}
17895 -%
17896 -\def\error{\leavevmode\lower.7ex\copy\errorbox}
17897 -
17898 % @tex ... @end tex escapes into raw Tex temporarily.
17899 % One exception: @ is still an escape character, so that @end tex works.
17900 % But \@ or @@ will get a plain tex @ character.
17901
17902 \envdef\tex{%
17903 + \setupmarkupstyle{tex}%
17904 \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
17905 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
17906 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
17907 @@ -4637,6 +5944,8 @@ width0pt\relax} \fi
17908 \catcode `\|=\other
17909 \catcode `\<=\other
17910 \catcode `\>=\other
17911 + \catcode`\`=\other
17912 + \catcode`\'=\other
17913 \escapechar=`\\
17914 %
17915 \let\b=\ptexb
17916 @@ -4656,6 +5965,8 @@ width0pt\relax} \fi
17917 \let\/=\ptexslash
17918 \let\*=\ptexstar
17919 \let\t=\ptext
17920 + \expandafter \let\csname top\endcsname=\ptextop % outer
17921 + \let\frenchspacing=\plainfrenchspacing
17922 %
17923 \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
17924 \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
17925 @@ -4684,7 +5995,8 @@ width0pt\relax} \fi
17926 % start of the next paragraph will insert \parskip.
17927 %
17928 \def\aboveenvbreak{{%
17929 - % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
17930 + % =10000 instead of <10000 because of a special case in \itemzzz and
17931 + % \sectionheading, q.v.
17932 \ifnum \lastpenalty=10000 \else
17933 \advance\envskipamount by \parskip
17934 \endgraf
17935 @@ -4700,7 +6012,8 @@ width0pt\relax} \fi
17936
17937 \let\afterenvbreak = \aboveenvbreak
17938
17939 -% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins.
17940 +% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will
17941 +% also clear it, so that its embedded environments do the narrowing again.
17942 \let\nonarrowing=\relax
17943
17944 % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
17945 @@ -4737,7 +6050,7 @@ width0pt\relax} \fi
17946 % each corner char, and rule thickness
17947 \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
17948 % Flag to tell @lisp, etc., not to narrow margin.
17949 - \let\nonarrowing=\comment
17950 + \let\nonarrowing = t%
17951 \vbox\bgroup
17952 \baselineskip=0pt\parskip=0pt\lineskip=0pt
17953 \carttop
17954 @@ -4768,6 +6081,7 @@ width0pt\relax} \fi
17955
17956 % This macro is called at the beginning of all the @example variants,
17957 % inside a group.
17958 +\newdimen\nonfillparindent
17959 \def\nonfillstart{%
17960 \aboveenvbreak
17961 \hfuzz = 12pt % Don't be fussy
17962 @@ -4775,17 +6089,40 @@ width0pt\relax} \fi
17963 \let\par = \lisppar % don't ignore blank lines
17964 \obeylines % each line of input is a line of output
17965 \parskip = 0pt
17966 + % Turn off paragraph indentation but redefine \indent to emulate
17967 + % the normal \indent.
17968 + \nonfillparindent=\parindent
17969 \parindent = 0pt
17970 + \let\indent\nonfillindent
17971 + %
17972 \emergencystretch = 0pt % don't try to avoid overfull boxes
17973 - % @cartouche defines \nonarrowing to inhibit narrowing
17974 - % at next level down.
17975 \ifx\nonarrowing\relax
17976 \advance \leftskip by \lispnarrowing
17977 \exdentamount=\lispnarrowing
17978 + \else
17979 + \let\nonarrowing = \relax
17980 \fi
17981 \let\exdent=\nofillexdent
17982 }
17983
17984 +\begingroup
17985 +\obeyspaces
17986 +% We want to swallow spaces (but not other tokens) after the fake
17987 +% @indent in our nonfill-environments, where spaces are normally
17988 +% active and set to @tie, resulting in them not being ignored after
17989 +% @indent.
17990 +\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
17991 +\gdef\nonfillindentcheck{%
17992 +\ifx\temp %
17993 +\expandafter\nonfillindentgobble%
17994 +\else%
17995 +\leavevmode\nonfillindentbox%
17996 +\fi%
17997 +}%
17998 +\endgroup
17999 +\def\nonfillindentgobble#1{\nonfillindent}
18000 +\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
18001 +
18002 % If you want all examples etc. small: @set dispenvsize small.
18003 % If you want even small examples the full size: @set dispenvsize nosmall.
18004 % This affects the following displayed environments:
18005 @@ -4796,12 +6133,18 @@ width0pt\relax} \fi
18006 \let\SETdispenvsize\relax
18007 \def\setnormaldispenv{%
18008 \ifx\SETdispenvsize\smallword
18009 + % end paragraph for sake of leading, in case document has no blank
18010 + % line. This is redundant with what happens in \aboveenvbreak, but
18011 + % we need to do it before changing the fonts, and it's inconvenient
18012 + % to change the fonts afterward.
18013 + \ifnum \lastpenalty=10000 \else \endgraf \fi
18014 \smallexamplefonts \rm
18015 \fi
18016 }
18017 \def\setsmalldispenv{%
18018 \ifx\SETdispenvsize\nosmallword
18019 \else
18020 + \ifnum \lastpenalty=10000 \else \endgraf \fi
18021 \smallexamplefonts \rm
18022 \fi
18023 }
18024 @@ -4828,11 +6171,10 @@ width0pt\relax} \fi
18025 %
18026 \maketwodispenvs {lisp}{example}{%
18027 \nonfillstart
18028 - \tt
18029 + \tt\setupmarkupstyle{example}%
18030 \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
18031 \gobble % eat return
18032 }
18033 -
18034 % @display/@smalldisplay: same as @lisp except keep current font.
18035 %
18036 \makedispenv {display}{%
18037 @@ -4867,12 +6209,36 @@ width0pt\relax} \fi
18038 \let\Eflushright = \afterenvbreak
18039
18040
18041 +% @raggedright does more-or-less normal line breaking but no right
18042 +% justification. From plain.tex.
18043 +\envdef\raggedright{%
18044 + \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
18045 +}
18046 +\let\Eraggedright\par
18047 +
18048 +\envdef\raggedleft{%
18049 + \parindent=0pt \leftskip0pt plus2em
18050 + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
18051 + \hbadness=10000 % Last line will usually be underfull, so turn off
18052 + % badness reporting.
18053 +}
18054 +\let\Eraggedleft\par
18055 +
18056 +\envdef\raggedcenter{%
18057 + \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
18058 + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
18059 + \hbadness=10000 % Last line will usually be underfull, so turn off
18060 + % badness reporting.
18061 +}
18062 +\let\Eraggedcenter\par
18063 +
18064 +
18065 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
18066 % and narrows the margins. We keep \parskip nonzero in general, since
18067 % we're doing normal filling. So, when using \aboveenvbreak and
18068 % \afterenvbreak, temporarily make \parskip 0.
18069 %
18070 -\envdef\quotation{%
18071 +\def\quotationstart{%
18072 {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
18073 \parindent=0pt
18074 %
18075 @@ -4881,14 +6247,26 @@ width0pt\relax} \fi
18076 \advance\leftskip by \lispnarrowing
18077 \advance\rightskip by \lispnarrowing
18078 \exdentamount = \lispnarrowing
18079 + \else
18080 \let\nonarrowing = \relax
18081 \fi
18082 \parsearg\quotationlabel
18083 }
18084
18085 +\envdef\quotation{%
18086 + \setnormaldispenv
18087 + \quotationstart
18088 +}
18089 +
18090 +\envdef\smallquotation{%
18091 + \setsmalldispenv
18092 + \quotationstart
18093 +}
18094 +\let\Esmallquotation = \Equotation
18095 +
18096 % We have retained a nonzero parskip for the environment, since we're
18097 % doing normal filling.
18098 -%
18099 +%
18100 \def\Equotation{%
18101 \par
18102 \ifx\quotationauthor\undefined\else
18103 @@ -4921,18 +6299,16 @@ width0pt\relax} \fi
18104 \do\ \do\\\do\{\do\}\do\$\do\&%
18105 \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
18106 \do\<\do\>\do\|\do\@\do+\do\"%
18107 + % Don't do the quotes -- if we do, @set txicodequoteundirected and
18108 + % @set txicodequotebacktick will not have effect on @verb and
18109 + % @verbatim, and ?` and !` ligatures won't get disabled.
18110 + %\do\`\do\'%
18111 }
18112 %
18113 % [Knuth] p. 380
18114 \def\uncatcodespecials{%
18115 \def\do##1{\catcode`##1=\other}\dospecials}
18116 %
18117 -% [Knuth] pp. 380,381,391
18118 -% Disable Spanish ligatures ?` and !` of \tt font
18119 -\begingroup
18120 - \catcode`\`=\active\gdef`{\relax\lq}
18121 -\endgroup
18122 -%
18123 % Setup for the @verb command.
18124 %
18125 % Eight spaces for a tab
18126 @@ -4944,7 +6320,7 @@ width0pt\relax} \fi
18127 \def\setupverb{%
18128 \tt % easiest (and conventionally used) font for verbatim
18129 \def\par{\leavevmode\endgraf}%
18130 - \catcode`\`=\active
18131 + \setupmarkupstyle{verb}%
18132 \tabeightspaces
18133 % Respect line breaks,
18134 % print special symbols as themselves, and
18135 @@ -4959,6 +6335,7 @@ width0pt\relax} \fi
18136 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
18137 %
18138 \def\starttabbox{\setbox0=\hbox\bgroup}
18139 +%
18140 \begingroup
18141 \catcode`\^^I=\active
18142 \gdef\tabexpand{%
18143 @@ -4972,14 +6349,16 @@ width0pt\relax} \fi
18144 }%
18145 }
18146 \endgroup
18147 +
18148 +% start the verbatim environment.
18149 \def\setupverbatim{%
18150 + \let\nonarrowing = t%
18151 \nonfillstart
18152 - \advance\leftskip by -\defbodyindent
18153 % Easiest (and conventionally used) font for verbatim
18154 \tt
18155 \def\par{\leavevmode\egroup\box0\endgraf}%
18156 - \catcode`\`=\active
18157 \tabexpand
18158 + \setupmarkupstyle{verbatim}%
18159 % Respect line breaks,
18160 % print special symbols as themselves, and
18161 % make each space count
18162 @@ -5039,14 +6418,14 @@ width0pt\relax} \fi
18163 {%
18164 \makevalueexpandable
18165 \setupverbatim
18166 + \indexnofonts % Allow `@@' and other weird things in file names.
18167 \input #1
18168 \afterenvbreak
18169 }%
18170 }
18171
18172 % @copying ... @end copying.
18173 -% Save the text away for @insertcopying later. Many commands won't be
18174 -% allowed in this context, but that's ok.
18175 +% Save the text away for @insertcopying later.
18176 %
18177 % We save the uninterpreted tokens, rather than creating a box.
18178 % Saving the text in a box would be much easier, but then all the
18179 @@ -5055,84 +6434,45 @@ width0pt\relax} \fi
18180 % file; b) letting users define the frontmatter in as flexible order as
18181 % possible is very desirable.
18182 %
18183 -\def\copying{\begingroup
18184 - % Define a command to swallow text until we reach `@end copying'.
18185 - % \ is the escape char in this texinfo.tex file, so it is the
18186 - % delimiter for the command; @ will be the escape char when we read
18187 - % it, but that doesn't matter.
18188 - \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}%
18189 - %
18190 - % We must preserve ^^M's in the input file; see \insertcopying below.
18191 - \catcode`\^^M = \active
18192 - \docopying
18193 -}
18194 -
18195 -% What we do to finish off the copying text.
18196 -%
18197 -\def\enddocopying{\endgroup\ignorespaces}
18198 -
18199 -% @insertcopying. Here we must play games with ^^M's. On the one hand,
18200 -% we need them to delimit commands such as `@end quotation', so they
18201 -% must be active. On the other hand, we certainly don't want every
18202 -% end-of-line to be a \par, as would happen with the normal active
18203 -% definition of ^^M. On the third hand, two ^^M's in a row should still
18204 -% generate a \par.
18205 -%
18206 -% Our approach is to make ^^M insert a space and a penalty1 normally;
18207 -% then it can also check if \lastpenalty=1. If it does, then manually
18208 -% do \par.
18209 -%
18210 -% This messes up the normal definitions of @c[omment], so we redefine
18211 -% it. Similarly for @ignore. (These commands are used in the gcc
18212 -% manual for man page generation.)
18213 -%
18214 -% Seems pretty fragile, most line-oriented commands will presumably
18215 -% fail, but for the limited use of getting the copying text (which
18216 -% should be quite simple) inserted, we can hope it's ok.
18217 -%
18218 -{\catcode`\^^M=\active %
18219 -\gdef\insertcopying{\begingroup %
18220 - \parindent = 0pt % looks wrong on title page
18221 - \def^^M{%
18222 - \ifnum \lastpenalty=1 %
18223 - \par %
18224 - \else %
18225 - \space \penalty 1 %
18226 - \fi %
18227 - }%
18228 - %
18229 - % Fix @c[omment] for catcode 13 ^^M's.
18230 - \def\c##1^^M{\ignorespaces}%
18231 - \let\comment = \c %
18232 - %
18233 - % Don't bother jumping through all the hoops that \doignore does, it
18234 - % would be very hard since the catcodes are already set.
18235 - \long\def\ignore##1\end ignore{\ignorespaces}%
18236 - %
18237 - \copyingtext %
18238 -\endgroup}%
18239 +\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
18240 +\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}}
18241 +%
18242 +\def\insertcopying{%
18243 + \begingroup
18244 + \parindent = 0pt % paragraph indentation looks wrong on title page
18245 + \scanexp\copyingtext
18246 + \endgroup
18247 }
18248
18249 +
18250 \message{defuns,}
18251 % @defun etc.
18252
18253 \newskip\defbodyindent \defbodyindent=.4in
18254 \newskip\defargsindent \defargsindent=50pt
18255 \newskip\deflastargmargin \deflastargmargin=18pt
18256 +\newcount\defunpenalty
18257
18258 % Start the processing of @deffn:
18259 \def\startdefun{%
18260 \ifnum\lastpenalty<10000
18261 \medbreak
18262 + \defunpenalty=10003 % Will keep this @deffn together with the
18263 + % following @def command, see below.
18264 \else
18265 % If there are two @def commands in a row, we'll have a \nobreak,
18266 % which is there to keep the function description together with its
18267 % header. But if there's nothing but headers, we need to allow a
18268 - % break somewhere. Check for penalty 10002 (inserted by
18269 - % \defargscommonending) instead of 10000, since the sectioning
18270 - % commands insert a \penalty10000, and we don't want to allow a break
18271 - % between a section heading and a defun.
18272 - \ifnum\lastpenalty=10002 \penalty2000 \fi
18273 + % break somewhere. Check specifically for penalty 10002, inserted
18274 + % by \printdefunline, instead of 10000, since the sectioning
18275 + % commands also insert a nobreak penalty, and we don't want to allow
18276 + % a break between a section heading and a defun.
18277 + %
18278 + % As a minor refinement, we avoid "club" headers by signalling
18279 + % with penalty of 10003 after the very first @deffn in the
18280 + % sequence (see above), and penalty of 10002 after any following
18281 + % @def command.
18282 + \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
18283 %
18284 % Similarly, after a section heading, do not allow a break.
18285 % But do insert the glue.
18286 @@ -5150,7 +6490,7 @@ width0pt\relax} \fi
18287 %
18288 % As above, allow line break if we have multiple x headers in a row.
18289 % It's not a great place, though.
18290 - \ifnum\lastpenalty=10002 \penalty3000 \fi
18291 + \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
18292 %
18293 % And now, it's time to reuse the body of the original defun:
18294 \expandafter\gobbledefun#1%
18295 @@ -5168,7 +6508,7 @@ width0pt\relax} \fi
18296 \advance\rightskip by 0pt plus 1fil
18297 \endgraf
18298 \nobreak\vskip -\parskip
18299 - \penalty 10002 % signal to \startdefun and \dodefunx
18300 + \penalty\defunpenalty % signal to \startdefun and \dodefunx
18301 % Some of the @defun-type tags do not enable magic parentheses,
18302 % rendering the following check redundant. But we don't optimize.
18303 \checkparencounts
18304 @@ -5178,7 +6518,7 @@ width0pt\relax} \fi
18305 \def\Edefun{\endgraf\medbreak}
18306
18307 % \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
18308 -% the only thing remainnig is to define \deffnheader.
18309 +% the only thing remaining is to define \deffnheader.
18310 %
18311 \def\makedefun#1{%
18312 \expandafter\let\csname E#1\endcsname = \Edefun
18313 @@ -5291,7 +6631,7 @@ width0pt\relax} \fi
18314 % #1 is the category, such as "Function".
18315 % #2 is the return type, if any.
18316 % #3 is the function name.
18317 -%
18318 +%
18319 % We are followed by (but not passed) the arguments, if any.
18320 %
18321 \def\defname#1#2#3{%
18322 @@ -5349,15 +6689,15 @@ width0pt\relax} \fi
18323 % tt for the name. This is because literal text is sometimes needed in
18324 % the argument list (groff manual), and ttsl and tt are not very
18325 % distinguishable. Prevent hyphenation at `-' chars.
18326 -%
18327 +%
18328 \def\defunargs#1{%
18329 - % use sl by default (not ttsl),
18330 + % use sl by default (not ttsl),
18331 % tt for the names.
18332 \df \sl \hyphenchar\font=0
18333 %
18334 % On the other hand, if an argument has two dashes (for instance), we
18335 % want a way to get ttsl. Let's try @var for that.
18336 - \let\var=\ttslanted
18337 + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
18338 #1%
18339 \sl\hyphenchar\font=45
18340 }
18341 @@ -5437,12 +6777,14 @@ width0pt\relax} \fi
18342 \ifnum\parencount=0 \else \badparencount \fi
18343 \ifnum\brackcount=0 \else \badbrackcount \fi
18344 }
18345 +% these should not use \errmessage; the glibc manual, at least, actually
18346 +% has such constructs (when documenting function pointers).
18347 \def\badparencount{%
18348 - \errmessage{Unbalanced parentheses in @def}%
18349 + \message{Warning: unbalanced parentheses in @def...}%
18350 \global\parencount=0
18351 }
18352 \def\badbrackcount{%
18353 - \errmessage{Unbalanced square braces in @def}%
18354 + \message{Warning: unbalanced square brackets in @def...}%
18355 \global\brackcount=0
18356 }
18357
18358 @@ -5455,7 +6797,7 @@ width0pt\relax} \fi
18359 \ifx\eTeXversion\undefined
18360 \newwrite\macscribble
18361 \def\scantokens#1{%
18362 - \toks0={#1\endinput}%
18363 + \toks0={#1}%
18364 \immediate\openout\macscribble=\jobname.tmp
18365 \immediate\write\macscribble{\the\toks0}%
18366 \immediate\closeout\macscribble
18367 @@ -5468,32 +6810,53 @@ width0pt\relax} \fi
18368 \newlinechar`\^^M
18369 \let\xeatspaces\eatspaces
18370 % Undo catcode changes of \startcontents and \doprintindex
18371 - \catcode`\@=0 \catcode`\\=\other \escapechar=`\@
18372 + % When called from @insertcopying or (short)caption, we need active
18373 + % backslash to get it printed correctly. Previously, we had
18374 + % \catcode`\\=\other instead. We'll see whether a problem appears
18375 + % with macro expansion. --kasal, 19aug04
18376 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
18377 % ... and \example
18378 \spaceisspace
18379 %
18380 % Append \endinput to make sure that TeX does not see the ending newline.
18381 - %
18382 % I've verified that it is necessary both for e-TeX and for ordinary TeX
18383 % --kasal, 29nov03
18384 \scantokens{#1\endinput}%
18385 \endgroup
18386 }
18387
18388 +\def\scanexp#1{%
18389 + \edef\temp{\noexpand\scanmacro{#1}}%
18390 + \temp
18391 +}
18392 +
18393 \newcount\paramno % Count of parameters
18394 \newtoks\macname % Macro name
18395 \newif\ifrecursive % Is it recursive?
18396 -\def\macrolist{} % List of all defined macros in the form
18397 - % \do\macro1\do\macro2...
18398 +
18399 +% List of all defined macros in the form
18400 +% \definedummyword\macro1\definedummyword\macro2...
18401 +% Currently is also contains all @aliases; the list can be split
18402 +% if there is a need.
18403 +\def\macrolist{}
18404 +
18405 +% Add the macro to \macrolist
18406 +\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
18407 +\def\addtomacrolistxxx#1{%
18408 + \toks0 = \expandafter{\macrolist\definedummyword#1}%
18409 + \xdef\macrolist{\the\toks0}%
18410 +}
18411
18412 % Utility routines.
18413 -% This does \let #1 = #2, except with \csnames.
18414 +% This does \let #1 = #2, with \csnames; that is,
18415 +% \let \csname#1\endcsname = \csname#2\endcsname
18416 +% (except of course we have to play expansion games).
18417 +%
18418 \def\cslet#1#2{%
18419 -\expandafter\expandafter
18420 -\expandafter\let
18421 -\expandafter\expandafter
18422 -\csname#1\endcsname
18423 -\csname#2\endcsname}
18424 + \expandafter\let
18425 + \csname#1\expandafter\endcsname
18426 + \csname#2\endcsname
18427 +}
18428
18429 % Trim leading and trailing spaces off a string.
18430 % Concepts from aro-bend problem 15 (see CTAN).
18431 @@ -5516,34 +6879,45 @@ width0pt\relax} \fi
18432 % all characters are catcode 10, 11 or 12, except \ which is active
18433 % (as in normal texinfo). It is necessary to change the definition of \.
18434
18435 +% Non-ASCII encodings make 8-bit characters active, so un-activate
18436 +% them to avoid their expansion. Must do this non-globally, to
18437 +% confine the change to the current group.
18438 +
18439 % It's necessary to have hard CRs when the macro is executed. This is
18440 % done by making ^^M (\endlinechar) catcode 12 when reading the macro
18441 % body, and then making it the \newlinechar in \scanmacro.
18442
18443 -\def\macrobodyctxt{%
18444 - \catcode`\~=\other
18445 +\def\scanctxt{%
18446 + \catcode`\"=\other
18447 + \catcode`\+=\other
18448 + \catcode`\<=\other
18449 + \catcode`\>=\other
18450 + \catcode`\@=\other
18451 \catcode`\^=\other
18452 \catcode`\_=\other
18453 \catcode`\|=\other
18454 - \catcode`\<=\other
18455 - \catcode`\>=\other
18456 - \catcode`\+=\other
18457 + \catcode`\~=\other
18458 + \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
18459 +}
18460 +
18461 +\def\scanargctxt{%
18462 + \scanctxt
18463 + \catcode`\\=\other
18464 + \catcode`\^^M=\other
18465 +}
18466 +
18467 +\def\macrobodyctxt{%
18468 + \scanctxt
18469 \catcode`\{=\other
18470 \catcode`\}=\other
18471 - \catcode`\@=\other
18472 \catcode`\^^M=\other
18473 - \usembodybackslash}
18474 + \usembodybackslash
18475 +}
18476
18477 \def\macroargctxt{%
18478 - \catcode`\~=\other
18479 - \catcode`\^=\other
18480 - \catcode`\_=\other
18481 - \catcode`\|=\other
18482 - \catcode`\<=\other
18483 - \catcode`\>=\other
18484 - \catcode`\+=\other
18485 - \catcode`\@=\other
18486 - \catcode`\\=\other}
18487 + \scanctxt
18488 + \catcode`\\=\other
18489 +}
18490
18491 % \mbodybackslash is the definition of \ in @macro bodies.
18492 % It maps \foo\ => \csname macarg.foo\endcsname => #N
18493 @@ -5574,10 +6948,7 @@ width0pt\relax} \fi
18494 \else \errmessage{Macro name \the\macname\space already defined}\fi
18495 \global\cslet{macsave.\the\macname}{\the\macname}%
18496 \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
18497 - % Add the macroname to \macrolist
18498 - \toks0 = \expandafter{\macrolist\do}%
18499 - \xdef\macrolist{\the\toks0
18500 - \expandafter\noexpand\csname\the\macname\endcsname}%
18501 + \addtomacrolist{\the\macname}%
18502 \fi
18503 \begingroup \macrobodyctxt
18504 \ifrecursive \expandafter\parsermacbody
18505 @@ -5591,7 +6962,7 @@ width0pt\relax} \fi
18506 % Remove the macro name from \macrolist:
18507 \begingroup
18508 \expandafter\let\csname#1\endcsname \relax
18509 - \let\do\unmacrodo
18510 + \let\definedummyword\unmacrodo
18511 \xdef\macrolist{\macrolist}%
18512 \endgroup
18513 \else
18514 @@ -5603,10 +6974,10 @@ width0pt\relax} \fi
18515 % macro definitions that have been changed to \relax.
18516 %
18517 \def\unmacrodo#1{%
18518 - \ifx#1\relax
18519 + \ifx #1\relax
18520 % remove this
18521 \else
18522 - \noexpand\do \noexpand #1%
18523 + \noexpand\definedummyword \noexpand#1%
18524 \fi
18525 }
18526
18527 @@ -5719,16 +7090,11 @@ width0pt\relax} \fi
18528 % {. If so it reads up to the closing }, if not, it reads the whole
18529 % line. Whatever was read is then fed to the next control sequence
18530 % as an argument (by \parsebrace or \parsearg)
18531 -\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
18532 +\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
18533 \def\braceorlinexxx{%
18534 \ifx\nchar\bgroup\else
18535 \expandafter\parsearg
18536 - \fi \next}
18537 -
18538 -% We mant to disable all macros during \shipout so that they are not
18539 -% expanded by \write.
18540 -\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
18541 - \edef\next{\macrolist}\expandafter\endgroup\next}
18542 + \fi \macnamexxx}
18543
18544
18545 % @alias.
18546 @@ -5739,6 +7105,7 @@ width0pt\relax} \fi
18547 \def\aliasyyy #1=#2\relax{%
18548 {%
18549 \expandafter\let\obeyedspace=\empty
18550 + \addtomacrolist{#1}%
18551 \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
18552 }%
18553 \next
18554 @@ -5748,7 +7115,6 @@ width0pt\relax} \fi
18555 \message{cross references,}
18556
18557 \newwrite\auxfile
18558 -
18559 \newif\ifhavexrefs % True if xref values are known.
18560 \newif\ifwarnedxrefs % True if we warned once that they aren't known.
18561
18562 @@ -5762,7 +7128,7 @@ width0pt\relax} \fi
18563 % might or might not have spaces before the first comma, like:
18564 % @node foo , bar , ...
18565 % We don't want such trailing spaces in the node name.
18566 -%
18567 +%
18568 \parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
18569 %
18570 % also remove a trailing comma, in case of something like this:
18571 @@ -5775,7 +7141,7 @@ width0pt\relax} \fi
18572
18573 % Write a cross-reference definition for the current node. #1 is the
18574 % type (Ynumbered, Yappendix, Ynothing).
18575 -%
18576 +%
18577 \def\donoderef#1{%
18578 \ifx\lastnode\empty\else
18579 \setref{\lastnode}{#1}%
18580 @@ -5793,31 +7159,29 @@ width0pt\relax} \fi
18581
18582 % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
18583 % anchor), which consists of three parts:
18584 -% 1) NAME-title - the current sectioning name taken from \thissection,
18585 +% 1) NAME-title - the current sectioning name taken from \lastsection,
18586 % or the anchor name.
18587 % 2) NAME-snt - section number and type, passed as the SNT arg, or
18588 % empty for anchors.
18589 % 3) NAME-pg - the page number.
18590 -%
18591 +%
18592 % This is called from \donoderef, \anchor, and \dofloat. In the case of
18593 % floats, there is an additional part, which is not written here:
18594 % 4) NAME-lof - the text as it should appear in a @listoffloats.
18595 -%
18596 +%
18597 \def\setref#1#2{%
18598 \pdfmkdest{#1}%
18599 \iflinks
18600 {%
18601 \atdummies % preserve commands, but don't expand them
18602 - \turnoffactive
18603 - \otherbackslash
18604 \edef\writexrdef##1##2{%
18605 \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
18606 ##1}{##2}}% these are parameters of \writexrdef
18607 }%
18608 - \toks0 = \expandafter{\thissection}%
18609 + \toks0 = \expandafter{\lastsection}%
18610 \immediate \writexrdef{title}{\the\toks0 }%
18611 \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
18612 - \writexrdef{pg}{\folio}% will be written later, during \shipout
18613 + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
18614 }%
18615 \fi
18616 }
18617 @@ -5861,18 +7225,25 @@ width0pt\relax} \fi
18618 %
18619 % Make link in pdf output.
18620 \ifpdf
18621 - \leavevmode
18622 - \getfilename{#4}%
18623 - {\turnoffactive \otherbackslash
18624 + {\indexnofonts
18625 + \turnoffactive
18626 + % This expands tokens, so do it after making catcode changes, so _
18627 + % etc. don't get their TeX definitions.
18628 + \getfilename{#4}%
18629 + %
18630 + % See comments at \activebackslashdouble.
18631 + {\activebackslashdouble \xdef\pdfxrefdest{#1}%
18632 + \backslashparens\pdfxrefdest}%
18633 + %
18634 + \leavevmode
18635 + \startlink attr{/Border [0 0 0]}%
18636 \ifnum\filenamelength>0
18637 - \startlink attr{/Border [0 0 0]}%
18638 - goto file{\the\filename.pdf} name{#1}%
18639 + goto file{\the\filename.pdf} name{\pdfxrefdest}%
18640 \else
18641 - \startlink attr{/Border [0 0 0]}%
18642 - goto name{\pdfmkpgn{#1}}%
18643 + goto name{\pdfmkpgn{\pdfxrefdest}}%
18644 \fi
18645 }%
18646 - \linkcolor
18647 + \setcolor{\linkcolor}%
18648 \fi
18649 %
18650 % Float references are printed completely differently: "Figure 1.2"
18651 @@ -5883,7 +7254,6 @@ width0pt\relax} \fi
18652 % include an _ in the xref name, etc.
18653 \indexnofonts
18654 \turnoffactive
18655 - \otherbackslash
18656 \expandafter\global\expandafter\let\expandafter\Xthisreftitle
18657 \csname XR#1-title\endcsname
18658 }%
18659 @@ -5891,19 +7261,19 @@ width0pt\relax} \fi
18660 % If the user specified the print name (third arg) to the ref,
18661 % print it instead of our usual "Figure 1.2".
18662 \ifdim\wd0 = 0pt
18663 - \refx{#1-snt}%
18664 + \refx{#1-snt}{}%
18665 \else
18666 \printedrefname
18667 \fi
18668 %
18669 % if the user also gave the printed manual name (fifth arg), append
18670 - % "in MANUALNAME".
18671 + % "in MANUALNAME".
18672 \ifdim \wd1 > 0pt
18673 \space \putwordin{} \cite{\printedmanual}%
18674 \fi
18675 \else
18676 % node/anchor (non-float) references.
18677 - %
18678 + %
18679 % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
18680 % insert empty discretionaries after hyphens, which means that it will
18681 % not find a line break at a hyphen in a node names. Since some manuals
18682 @@ -5911,14 +7281,14 @@ width0pt\relax} \fi
18683 % is a loss. Therefore, we give the text of the node name again, so it
18684 % is as if TeX is seeing it for the first time.
18685 \ifdim \wd1 > 0pt
18686 - \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
18687 + \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
18688 \else
18689 % _ (for example) has to be the character _ for the purposes of the
18690 % control sequence corresponding to the node, but it has to expand
18691 % into the usual \leavevmode...\vrule stuff for purposes of
18692 % printing. So we \turnoffactive for the \refx-snt, back on for the
18693 % printing, back off for the \refx-pg.
18694 - {\turnoffactive \otherbackslash
18695 + {\turnoffactive
18696 % Only output a following space if the -snt ref is nonempty; for
18697 % @unnumbered and @anchor, it won't be.
18698 \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
18699 @@ -5931,7 +7301,7 @@ width0pt\relax} \fi
18700 ,\space
18701 %
18702 % output the `page 3'.
18703 - \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
18704 + \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
18705 \fi
18706 \fi
18707 \endlink
18708 @@ -6007,14 +7377,22 @@ width0pt\relax} \fi
18709 % collisions). But if this is a float type, we have more work to do.
18710 %
18711 \def\xrdef#1#2{%
18712 - \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
18713 + {% The node name might contain 8-bit characters, which in our current
18714 + % implementation are changed to commands like @'e. Don't let these
18715 + % mess up the control sequence name.
18716 + \indexnofonts
18717 + \turnoffactive
18718 + \xdef\safexrefname{#1}%
18719 + }%
18720 + %
18721 + \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
18722 %
18723 % Was that xref control sequence that we just defined for a float?
18724 - \expandafter\iffloat\csname XR#1\endcsname
18725 + \expandafter\iffloat\csname XR\safexrefname\endcsname
18726 % it was a float, and we have the (safe) float type in \iffloattype.
18727 \expandafter\let\expandafter\floatlist
18728 \csname floatlist\iffloattype\endcsname
18729 - %
18730 + %
18731 % Is this the first time we've seen this float type?
18732 \expandafter\ifx\floatlist\relax
18733 \toks0 = {\do}% yes, so just \do
18734 @@ -6025,22 +7403,23 @@ width0pt\relax} \fi
18735 %
18736 % Remember this xref in the control sequence \floatlistFLOATTYPE,
18737 % for later use in \listoffloats.
18738 - \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
18739 + \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
18740 + {\safexrefname}}%
18741 \fi
18742 }
18743
18744 % Read the last existing aux file, if any. No error if none exists.
18745 -%
18746 +%
18747 \def\tryauxfile{%
18748 \openin 1 \jobname.aux
18749 \ifeof 1 \else
18750 - \readauxfile
18751 + \readdatafile{aux}%
18752 \global\havexrefstrue
18753 \fi
18754 \closein 1
18755 }
18756
18757 -\def\readauxfile{\begingroup
18758 +\def\setupdatafile{%
18759 \catcode`\^^@=\other
18760 \catcode`\^^A=\other
18761 \catcode`\^^B=\other
18762 @@ -6109,11 +7488,11 @@ width0pt\relax} \fi
18763 %
18764 % Make the characters 128-255 be printing characters.
18765 {%
18766 - \count 1=128
18767 + \count1=128
18768 \def\loop{%
18769 - \catcode\count 1=\other
18770 - \advance\count 1 by 1
18771 - \ifnum \count 1<256 \loop \fi
18772 + \catcode\count1=\other
18773 + \advance\count1 by 1
18774 + \ifnum \count1<256 \loop \fi
18775 }%
18776 }%
18777 %
18778 @@ -6121,8 +7500,12 @@ width0pt\relax} \fi
18779 \catcode`\{=1
18780 \catcode`\}=2
18781 \catcode`\@=0
18782 - %
18783 - \input \jobname.aux
18784 +}
18785 +
18786 +\def\readdatafile#1{%
18787 +\begingroup
18788 + \setupdatafile
18789 + \input\jobname.#1
18790 \endgroup}
18791
18792
18793 @@ -6208,7 +7591,7 @@ width0pt\relax} \fi
18794 % In case a @footnote appears in a vbox, save the footnote text and create
18795 % the real \insert just after the vbox finished. Otherwise, the insertion
18796 % would be lost.
18797 -% Similarily, if a @footnote appears inside an alignment, save the footnote
18798 +% Similarly, if a @footnote appears inside an alignment, save the footnote
18799 % text to a box and make the \insert when a row of the table is finished.
18800 % And the same can be done for other insert classes. --kasal, 16nov03.
18801
18802 @@ -6312,15 +7695,19 @@ width0pt\relax} \fi
18803 % If the image is by itself, center it.
18804 \ifvmode
18805 \imagevmodetrue
18806 - \nobreak\bigskip
18807 + \nobreak\medskip
18808 % Usually we'll have text after the image which will insert
18809 % \parskip glue, so insert it here too to equalize the space
18810 % above and below.
18811 \nobreak\vskip\parskip
18812 \nobreak
18813 - \line\bgroup\hss
18814 \fi
18815 %
18816 + % Leave vertical mode so that indentation from an enclosing
18817 + % environment such as @quotation is respected. On the other hand, if
18818 + % it's at the top level, we don't want the normal paragraph indentation.
18819 + \noindent
18820 + %
18821 % Output the image.
18822 \ifpdf
18823 \dopdfimage{#1}{#2}{#3}%
18824 @@ -6331,26 +7718,29 @@ width0pt\relax} \fi
18825 \epsfbox{#1.eps}%
18826 \fi
18827 %
18828 - \ifimagevmode \hss \egroup \bigbreak \fi % space after the image
18829 + \ifimagevmode \medskip \fi % space after the standalone image
18830 \endgroup}
18831
18832
18833 -% @float FLOATTYPE,LOC ... @end float for displayed figures, tables, etc.
18834 -% We don't actually implement floating yet, we just plop the float "here".
18835 -% But it seemed the best name for the future.
18836 -%
18837 -\envparseargdef\float{\dofloat #1,,,\finish}
18838 +% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
18839 +% etc. We don't actually implement floating yet, we always include the
18840 +% float "here". But it seemed the best name for the future.
18841 +%
18842 +\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
18843 +
18844 +% There may be a space before second and/or third parameter; delete it.
18845 +\def\eatcommaspace#1, {#1,}
18846
18847 % #1 is the optional FLOATTYPE, the text label for this float, typically
18848 % "Figure", "Table", "Example", etc. Can't contain commas. If omitted,
18849 % this float will not be numbered and cannot be referred to.
18850 -%
18851 +%
18852 % #2 is the optional xref label. Also must be present for the float to
18853 % be referable.
18854 -%
18855 +%
18856 % #3 is the optional positioning argument; for now, it is ignored. It
18857 % will somehow specify the positions allowed to float to (here, top, bottom).
18858 -%
18859 +%
18860 % We keep a separate counter for each FLOATTYPE, which we reset at each
18861 % chapter-level command.
18862 \let\resetallfloatnos=\empty
18863 @@ -6360,6 +7750,10 @@ width0pt\relax} \fi
18864 \let\thisshortcaption=\empty
18865 %
18866 % don't lose footnotes inside @float.
18867 + %
18868 + % BEWARE: when the floats start float, we have to issue warning whenever an
18869 + % insert appears inside a float which could possibly float. --kasal, 26may04
18870 + %
18871 \startsavinginserts
18872 %
18873 % We can't be used inside a paragraph.
18874 @@ -6386,18 +7780,18 @@ width0pt\relax} \fi
18875 \ifx\floatlabel\empty \else
18876 % We want each FLOATTYPE to be numbered separately (Figure 1,
18877 % Table 1, Figure 2, ...). (And if no label, no number.)
18878 - %
18879 + %
18880 \expandafter\getfloatno\csname\safefloattype floatno\endcsname
18881 \global\advance\floatno by 1
18882 %
18883 {%
18884 - % This magic value for \thissection is output by \setref as the
18885 + % This magic value for \lastsection is output by \setref as the
18886 % XREFLABEL-title value. \xrefX uses it to distinguish float
18887 % labels (which have a completely different output format) from
18888 % node and anchor labels. And \xrdef uses it to construct the
18889 % lists of floats.
18890 - %
18891 - \edef\thissection{\floatmagic=\safefloattype}%
18892 + %
18893 + \edef\lastsection{\floatmagic=\safefloattype}%
18894 \setref{\floatlabel}{Yfloat}%
18895 }%
18896 \fi
18897 @@ -6444,7 +7838,7 @@ width0pt\relax} \fi
18898 \fi
18899 %
18900 % caption text.
18901 - \appendtomacro\captionline\thiscaption
18902 + \appendtomacro\captionline{\scanexp\thiscaption}%
18903 \fi
18904 %
18905 % If we have anything to print, print it, with space before.
18906 @@ -6452,6 +7846,9 @@ width0pt\relax} \fi
18907 \ifx\captionline\empty \else
18908 \vskip.5\parskip
18909 \captionline
18910 + %
18911 + % Space below caption.
18912 + \vskip\parskip
18913 \fi
18914 %
18915 % If have an xref label, write the list of floats info. Do this
18916 @@ -6461,38 +7858,47 @@ width0pt\relax} \fi
18917 % \floatlabel-lof. Besides \floatident, we include the short
18918 % caption if specified, else the full caption if specified, else nothing.
18919 {%
18920 - \atdummies \turnoffactive \otherbackslash
18921 - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{%
18922 - \floatident
18923 - \ifx\thisshortcaption\empty
18924 - \ifx\thiscaption\empty \else : \thiscaption \fi
18925 - \else
18926 - : \thisshortcaption
18927 - \fi
18928 - }}%
18929 + \atdummies
18930 + %
18931 + % since we read the caption text in the macro world, where ^^M
18932 + % is turned into a normal character, we have to scan it back, so
18933 + % we don't write the literal three characters "^^M" into the aux file.
18934 + \scanexp{%
18935 + \xdef\noexpand\gtemp{%
18936 + \ifx\thisshortcaption\empty
18937 + \thiscaption
18938 + \else
18939 + \thisshortcaption
18940 + \fi
18941 + }%
18942 + }%
18943 + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
18944 + \ifx\gtemp\empty \else : \gtemp \fi}}%
18945 }%
18946 \fi
18947 - %
18948 - % Space below caption, if we printed anything.
18949 - \ifx\printedsomething\empty \else \vskip\parskip \fi
18950 \egroup % end of \vtop
18951 + %
18952 + % place the captured inserts
18953 + %
18954 + % BEWARE: when the floats start floating, we have to issue warning
18955 + % whenever an insert appears inside a float which could possibly
18956 + % float. --kasal, 26may04
18957 + %
18958 \checkinserts
18959 }
18960
18961 % Append the tokens #2 to the definition of macro #1, not expanding either.
18962 -%
18963 -\newtoks\appendtomacroAtoks
18964 -\newtoks\appendtomacroBtoks
18965 +%
18966 \def\appendtomacro#1#2{%
18967 - \appendtomacroAtoks = \expandafter{#1}%
18968 - \appendtomacroBtoks = {#2}%
18969 - \edef#1{\the\appendtomacroAtoks \the\appendtomacroBtoks}%
18970 + \expandafter\def\expandafter#1\expandafter{#1#2}%
18971 }
18972
18973 -% @caption, @shortcaption are easy.
18974 -%
18975 -\long\def\caption#1{\checkenv\float \def\thiscaption{#1}}
18976 -\def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
18977 +% @caption, @shortcaption
18978 +%
18979 +\def\caption{\docaption\thiscaption}
18980 +\def\shortcaption{\docaption\thisshortcaption}
18981 +\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
18982 +\def\defcaption#1#2{\egroup \def#1{#2}}
18983
18984 % The parameter is the control sequence identifying the counter we are
18985 % going to use. Create it if it doesn't exist and assign it to \floatno.
18986 @@ -6511,7 +7917,7 @@ width0pt\relax} \fi
18987 % \setref calls this to get the XREFLABEL-snt value. We want an @xref
18988 % to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we
18989 % first read the @float command.
18990 -%
18991 +%
18992 \def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
18993
18994 % Magic string used for the XREFLABEL-title value, so \xrefX can
18995 @@ -6520,13 +7926,13 @@ width0pt\relax} \fi
18996
18997 % #1 is the control sequence we are passed; we expand into a conditional
18998 % which is true if #1 represents a float ref. That is, the magic
18999 -% \thissection value which we \setref above.
19000 -%
19001 +% \lastsection value which we \setref above.
19002 +%
19003 \def\iffloat#1{\expandafter\doiffloat#1==\finish}
19004 %
19005 % #1 is (maybe) the \floatmagic string. If so, #2 will be the
19006 % (safe) float type for this float. We set \iffloattype to #2.
19007 -%
19008 +%
19009 \def\doiffloat#1=#2=#3\finish{%
19010 \def\temp{#1}%
19011 \def\iffloattype{#2}%
19012 @@ -6534,7 +7940,7 @@ width0pt\relax} \fi
19013 }
19014
19015 % @listoffloats FLOATTYPE - print a list of floats like a table of contents.
19016 -%
19017 +%
19018 \parseargdef\listoffloats{%
19019 \def\floattype{#1}% floattype
19020 {%
19021 @@ -6564,10 +7970,10 @@ width0pt\relax} \fi
19022 % xref label, in the form LABEL-title, which is how we save it in the
19023 % aux file. We strip off the -title and look up \XRLABEL-lof, which
19024 % has the text we're supposed to typeset here.
19025 -%
19026 +%
19027 % Figures without xref labels will not be included in the list (since
19028 % they won't appear in the aux file).
19029 -%
19030 +%
19031 \def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
19032 \def\listoffloatsdoentry#1-title\finish{{%
19033 % Can't fully expand XR#1-lof because it can contain anything. Just
19034 @@ -6581,39 +7987,909 @@ width0pt\relax} \fi
19035 \writeentry
19036 }}
19037
19038 +
19039 \message{localization,}
19040 -% and i18n.
19041
19042 -% @documentlanguage is usually given very early, just after
19043 -% @setfilename. If done too late, it may not override everything
19044 -% properly. Single argument is the language abbreviation.
19045 -% It would be nice if we could set up a hyphenation file here.
19046 +% For single-language documents, @documentlanguage is usually given very
19047 +% early, just after @documentencoding. Single argument is the language
19048 +% (de) or locale (de_DE) abbreviation.
19049 %
19050 -\parseargdef\documentlanguage{%
19051 +{
19052 + \catcode`\_ = \active
19053 + \globaldefs=1
19054 +\parseargdef\documentlanguage{\begingroup
19055 + \let_=\normalunderscore % normal _ character for filenames
19056 \tex % read txi-??.tex file in plain TeX.
19057 - % Read the file if it exists.
19058 + % Read the file by the name they passed if it exists.
19059 \openin 1 txi-#1.tex
19060 \ifeof 1
19061 - \errhelp = \nolanghelp
19062 - \errmessage{Cannot read language file txi-#1.tex}%
19063 + \documentlanguagetrywithoutunderscore{#1_\finish}%
19064 \else
19065 + \globaldefs = 1 % everything in the txi-LL files needs to persist
19066 \input txi-#1.tex
19067 \fi
19068 \closein 1
19069 - \endgroup
19070 + \endgroup % end raw TeX
19071 +\endgroup}
19072 +%
19073 +% If they passed de_DE, and txi-de_DE.tex doesn't exist,
19074 +% try txi-de.tex.
19075 +%
19076 +\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
19077 + \openin 1 txi-#1.tex
19078 + \ifeof 1
19079 + \errhelp = \nolanghelp
19080 + \errmessage{Cannot read language file txi-#1.tex}%
19081 + \else
19082 + \globaldefs = 1 % everything in the txi-LL files needs to persist
19083 + \input txi-#1.tex
19084 + \fi
19085 + \closein 1
19086 }
19087 +}% end of special _ catcode
19088 +%
19089 \newhelp\nolanghelp{The given language definition file cannot be found or
19090 -is empty. Maybe you need to install it? In the current directory
19091 -should work if nowhere else does.}
19092 +is empty. Maybe you need to install it? Putting it in the current
19093 +directory should work if nowhere else does.}
19094
19095 +% This macro is called from txi-??.tex files; the first argument is the
19096 +% \language name to set (without the "\lang@" prefix), the second and
19097 +% third args are \{left,right}hyphenmin.
19098 +%
19099 +% The language names to pass are determined when the format is built.
19100 +% See the etex.log file created at that time, e.g.,
19101 +% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
19102 +%
19103 +% With TeX Live 2008, etex now includes hyphenation patterns for all
19104 +% available languages. This means we can support hyphenation in
19105 +% Texinfo, at least to some extent. (This still doesn't solve the
19106 +% accented characters problem.)
19107 +%
19108 +\catcode`@=11
19109 +\def\txisetlanguage#1#2#3{%
19110 + % do not set the language if the name is undefined in the current TeX.
19111 + \expandafter\ifx\csname lang@#1\endcsname \relax
19112 + \message{no patterns for #1}%
19113 + \else
19114 + \global\language = \csname lang@#1\endcsname
19115 + \fi
19116 + % but there is no harm in adjusting the hyphenmin values regardless.
19117 + \global\lefthyphenmin = #2\relax
19118 + \global\righthyphenmin = #3\relax
19119 +}
19120
19121 -% @documentencoding should change something in TeX eventually, most
19122 -% likely, but for now just recognize it.
19123 -\let\documentencoding = \comment
19124 +% Helpers for encodings.
19125 +% Set the catcode of characters 128 through 255 to the specified number.
19126 +%
19127 +\def\setnonasciicharscatcode#1{%
19128 + \count255=128
19129 + \loop\ifnum\count255<256
19130 + \global\catcode\count255=#1\relax
19131 + \advance\count255 by 1
19132 + \repeat
19133 +}
19134
19135 +\def\setnonasciicharscatcodenonglobal#1{%
19136 + \count255=128
19137 + \loop\ifnum\count255<256
19138 + \catcode\count255=#1\relax
19139 + \advance\count255 by 1
19140 + \repeat
19141 +}
19142
19143 -% Page size parameters.
19144 +% @documentencoding sets the definition of non-ASCII characters
19145 +% according to the specified encoding.
19146 %
19147 +\parseargdef\documentencoding{%
19148 + % Encoding being declared for the document.
19149 + \def\declaredencoding{\csname #1.enc\endcsname}%
19150 + %
19151 + % Supported encodings: names converted to tokens in order to be able
19152 + % to compare them with \ifx.
19153 + \def\ascii{\csname US-ASCII.enc\endcsname}%
19154 + \def\latnine{\csname ISO-8859-15.enc\endcsname}%
19155 + \def\latone{\csname ISO-8859-1.enc\endcsname}%
19156 + \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
19157 + \def\utfeight{\csname UTF-8.enc\endcsname}%
19158 + %
19159 + \ifx \declaredencoding \ascii
19160 + \asciichardefs
19161 + %
19162 + \else \ifx \declaredencoding \lattwo
19163 + \setnonasciicharscatcode\active
19164 + \lattwochardefs
19165 + %
19166 + \else \ifx \declaredencoding \latone
19167 + \setnonasciicharscatcode\active
19168 + \latonechardefs
19169 + %
19170 + \else \ifx \declaredencoding \latnine
19171 + \setnonasciicharscatcode\active
19172 + \latninechardefs
19173 + %
19174 + \else \ifx \declaredencoding \utfeight
19175 + \setnonasciicharscatcode\active
19176 + \utfeightchardefs
19177 + %
19178 + \else
19179 + \message{Unknown document encoding #1, ignoring.}%
19180 + %
19181 + \fi % utfeight
19182 + \fi % latnine
19183 + \fi % latone
19184 + \fi % lattwo
19185 + \fi % ascii
19186 +}
19187 +
19188 +% A message to be logged when using a character that isn't available
19189 +% the default font encoding (OT1).
19190 +%
19191 +\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
19192 +
19193 +% Take account of \c (plain) vs. \, (Texinfo) difference.
19194 +\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
19195 +
19196 +% First, make active non-ASCII characters in order for them to be
19197 +% correctly categorized when TeX reads the replacement text of
19198 +% macros containing the character definitions.
19199 +\setnonasciicharscatcode\active
19200 +%
19201 +% Latin1 (ISO-8859-1) character definitions.
19202 +\def\latonechardefs{%
19203 + \gdef^^a0{~}
19204 + \gdef^^a1{\exclamdown}
19205 + \gdef^^a2{\missingcharmsg{CENT SIGN}}
19206 + \gdef^^a3{{\pounds}}
19207 + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
19208 + \gdef^^a5{\missingcharmsg{YEN SIGN}}
19209 + \gdef^^a6{\missingcharmsg{BROKEN BAR}}
19210 + \gdef^^a7{\S}
19211 + \gdef^^a8{\"{}}
19212 + \gdef^^a9{\copyright}
19213 + \gdef^^aa{\ordf}
19214 + \gdef^^ab{\guillemetleft}
19215 + \gdef^^ac{$\lnot$}
19216 + \gdef^^ad{\-}
19217 + \gdef^^ae{\registeredsymbol}
19218 + \gdef^^af{\={}}
19219 + %
19220 + \gdef^^b0{\textdegree}
19221 + \gdef^^b1{$\pm$}
19222 + \gdef^^b2{$^2$}
19223 + \gdef^^b3{$^3$}
19224 + \gdef^^b4{\'{}}
19225 + \gdef^^b5{$\mu$}
19226 + \gdef^^b6{\P}
19227 + %
19228 + \gdef^^b7{$^.$}
19229 + \gdef^^b8{\cedilla\ }
19230 + \gdef^^b9{$^1$}
19231 + \gdef^^ba{\ordm}
19232 + %
19233 + \gdef^^bb{\guilletright}
19234 + \gdef^^bc{$1\over4$}
19235 + \gdef^^bd{$1\over2$}
19236 + \gdef^^be{$3\over4$}
19237 + \gdef^^bf{\questiondown}
19238 + %
19239 + \gdef^^c0{\`A}
19240 + \gdef^^c1{\'A}
19241 + \gdef^^c2{\^A}
19242 + \gdef^^c3{\~A}
19243 + \gdef^^c4{\"A}
19244 + \gdef^^c5{\ringaccent A}
19245 + \gdef^^c6{\AE}
19246 + \gdef^^c7{\cedilla C}
19247 + \gdef^^c8{\`E}
19248 + \gdef^^c9{\'E}
19249 + \gdef^^ca{\^E}
19250 + \gdef^^cb{\"E}
19251 + \gdef^^cc{\`I}
19252 + \gdef^^cd{\'I}
19253 + \gdef^^ce{\^I}
19254 + \gdef^^cf{\"I}
19255 + %
19256 + \gdef^^d0{\DH}
19257 + \gdef^^d1{\~N}
19258 + \gdef^^d2{\`O}
19259 + \gdef^^d3{\'O}
19260 + \gdef^^d4{\^O}
19261 + \gdef^^d5{\~O}
19262 + \gdef^^d6{\"O}
19263 + \gdef^^d7{$\times$}
19264 + \gdef^^d8{\O}
19265 + \gdef^^d9{\`U}
19266 + \gdef^^da{\'U}
19267 + \gdef^^db{\^U}
19268 + \gdef^^dc{\"U}
19269 + \gdef^^dd{\'Y}
19270 + \gdef^^de{\TH}
19271 + \gdef^^df{\ss}
19272 + %
19273 + \gdef^^e0{\`a}
19274 + \gdef^^e1{\'a}
19275 + \gdef^^e2{\^a}
19276 + \gdef^^e3{\~a}
19277 + \gdef^^e4{\"a}
19278 + \gdef^^e5{\ringaccent a}
19279 + \gdef^^e6{\ae}
19280 + \gdef^^e7{\cedilla c}
19281 + \gdef^^e8{\`e}
19282 + \gdef^^e9{\'e}
19283 + \gdef^^ea{\^e}
19284 + \gdef^^eb{\"e}
19285 + \gdef^^ec{\`{\dotless i}}
19286 + \gdef^^ed{\'{\dotless i}}
19287 + \gdef^^ee{\^{\dotless i}}
19288 + \gdef^^ef{\"{\dotless i}}
19289 + %
19290 + \gdef^^f0{\dh}
19291 + \gdef^^f1{\~n}
19292 + \gdef^^f2{\`o}
19293 + \gdef^^f3{\'o}
19294 + \gdef^^f4{\^o}
19295 + \gdef^^f5{\~o}
19296 + \gdef^^f6{\"o}
19297 + \gdef^^f7{$\div$}
19298 + \gdef^^f8{\o}
19299 + \gdef^^f9{\`u}
19300 + \gdef^^fa{\'u}
19301 + \gdef^^fb{\^u}
19302 + \gdef^^fc{\"u}
19303 + \gdef^^fd{\'y}
19304 + \gdef^^fe{\th}
19305 + \gdef^^ff{\"y}
19306 +}
19307 +
19308 +% Latin9 (ISO-8859-15) encoding character definitions.
19309 +\def\latninechardefs{%
19310 + % Encoding is almost identical to Latin1.
19311 + \latonechardefs
19312 + %
19313 + \gdef^^a4{\euro}
19314 + \gdef^^a6{\v S}
19315 + \gdef^^a8{\v s}
19316 + \gdef^^b4{\v Z}
19317 + \gdef^^b8{\v z}
19318 + \gdef^^bc{\OE}
19319 + \gdef^^bd{\oe}
19320 + \gdef^^be{\"Y}
19321 +}
19322 +
19323 +% Latin2 (ISO-8859-2) character definitions.
19324 +\def\lattwochardefs{%
19325 + \gdef^^a0{~}
19326 + \gdef^^a1{\ogonek{A}}
19327 + \gdef^^a2{\u{}}
19328 + \gdef^^a3{\L}
19329 + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
19330 + \gdef^^a5{\v L}
19331 + \gdef^^a6{\'S}
19332 + \gdef^^a7{\S}
19333 + \gdef^^a8{\"{}}
19334 + \gdef^^a9{\v S}
19335 + \gdef^^aa{\cedilla S}
19336 + \gdef^^ab{\v T}
19337 + \gdef^^ac{\'Z}
19338 + \gdef^^ad{\-}
19339 + \gdef^^ae{\v Z}
19340 + \gdef^^af{\dotaccent Z}
19341 + %
19342 + \gdef^^b0{\textdegree}
19343 + \gdef^^b1{\ogonek{a}}
19344 + \gdef^^b2{\ogonek{ }}
19345 + \gdef^^b3{\l}
19346 + \gdef^^b4{\'{}}
19347 + \gdef^^b5{\v l}
19348 + \gdef^^b6{\'s}
19349 + \gdef^^b7{\v{}}
19350 + \gdef^^b8{\cedilla\ }
19351 + \gdef^^b9{\v s}
19352 + \gdef^^ba{\cedilla s}
19353 + \gdef^^bb{\v t}
19354 + \gdef^^bc{\'z}
19355 + \gdef^^bd{\H{}}
19356 + \gdef^^be{\v z}
19357 + \gdef^^bf{\dotaccent z}
19358 + %
19359 + \gdef^^c0{\'R}
19360 + \gdef^^c1{\'A}
19361 + \gdef^^c2{\^A}
19362 + \gdef^^c3{\u A}
19363 + \gdef^^c4{\"A}
19364 + \gdef^^c5{\'L}
19365 + \gdef^^c6{\'C}
19366 + \gdef^^c7{\cedilla C}
19367 + \gdef^^c8{\v C}
19368 + \gdef^^c9{\'E}
19369 + \gdef^^ca{\ogonek{E}}
19370 + \gdef^^cb{\"E}
19371 + \gdef^^cc{\v E}
19372 + \gdef^^cd{\'I}
19373 + \gdef^^ce{\^I}
19374 + \gdef^^cf{\v D}
19375 + %
19376 + \gdef^^d0{\DH}
19377 + \gdef^^d1{\'N}
19378 + \gdef^^d2{\v N}
19379 + \gdef^^d3{\'O}
19380 + \gdef^^d4{\^O}
19381 + \gdef^^d5{\H O}
19382 + \gdef^^d6{\"O}
19383 + \gdef^^d7{$\times$}
19384 + \gdef^^d8{\v R}
19385 + \gdef^^d9{\ringaccent U}
19386 + \gdef^^da{\'U}
19387 + \gdef^^db{\H U}
19388 + \gdef^^dc{\"U}
19389 + \gdef^^dd{\'Y}
19390 + \gdef^^de{\cedilla T}
19391 + \gdef^^df{\ss}
19392 + %
19393 + \gdef^^e0{\'r}
19394 + \gdef^^e1{\'a}
19395 + \gdef^^e2{\^a}
19396 + \gdef^^e3{\u a}
19397 + \gdef^^e4{\"a}
19398 + \gdef^^e5{\'l}
19399 + \gdef^^e6{\'c}
19400 + \gdef^^e7{\cedilla c}
19401 + \gdef^^e8{\v c}
19402 + \gdef^^e9{\'e}
19403 + \gdef^^ea{\ogonek{e}}
19404 + \gdef^^eb{\"e}
19405 + \gdef^^ec{\v e}
19406 + \gdef^^ed{\'\i}
19407 + \gdef^^ee{\^\i}
19408 + \gdef^^ef{\v d}
19409 + %
19410 + \gdef^^f0{\dh}
19411 + \gdef^^f1{\'n}
19412 + \gdef^^f2{\v n}
19413 + \gdef^^f3{\'o}
19414 + \gdef^^f4{\^o}
19415 + \gdef^^f5{\H o}
19416 + \gdef^^f6{\"o}
19417 + \gdef^^f7{$\div$}
19418 + \gdef^^f8{\v r}
19419 + \gdef^^f9{\ringaccent u}
19420 + \gdef^^fa{\'u}
19421 + \gdef^^fb{\H u}
19422 + \gdef^^fc{\"u}
19423 + \gdef^^fd{\'y}
19424 + \gdef^^fe{\cedilla t}
19425 + \gdef^^ff{\dotaccent{}}
19426 +}
19427 +
19428 +% UTF-8 character definitions.
19429 +%
19430 +% This code to support UTF-8 is based on LaTeX's utf8.def, with some
19431 +% changes for Texinfo conventions. It is included here under the GPL by
19432 +% permission from Frank Mittelbach and the LaTeX team.
19433 +%
19434 +\newcount\countUTFx
19435 +\newcount\countUTFy
19436 +\newcount\countUTFz
19437 +
19438 +\gdef\UTFviiiTwoOctets#1#2{\expandafter
19439 + \UTFviiiDefined\csname u8:#1\string #2\endcsname}
19440 +%
19441 +\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
19442 + \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
19443 +%
19444 +\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
19445 + \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
19446 +
19447 +\gdef\UTFviiiDefined#1{%
19448 + \ifx #1\relax
19449 + \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
19450 + \else
19451 + \expandafter #1%
19452 + \fi
19453 +}
19454 +
19455 +\begingroup
19456 + \catcode`\~13
19457 + \catcode`\"12
19458 +
19459 + \def\UTFviiiLoop{%
19460 + \global\catcode\countUTFx\active
19461 + \uccode`\~\countUTFx
19462 + \uppercase\expandafter{\UTFviiiTmp}%
19463 + \advance\countUTFx by 1
19464 + \ifnum\countUTFx < \countUTFy
19465 + \expandafter\UTFviiiLoop
19466 + \fi}
19467 +
19468 + \countUTFx = "C2
19469 + \countUTFy = "E0
19470 + \def\UTFviiiTmp{%
19471 + \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
19472 + \UTFviiiLoop
19473 +
19474 + \countUTFx = "E0
19475 + \countUTFy = "F0
19476 + \def\UTFviiiTmp{%
19477 + \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
19478 + \UTFviiiLoop
19479 +
19480 + \countUTFx = "F0
19481 + \countUTFy = "F4
19482 + \def\UTFviiiTmp{%
19483 + \xdef~{\noexpand\UTFviiiFourOctets\string~}}
19484 + \UTFviiiLoop
19485 +\endgroup
19486 +
19487 +\begingroup
19488 + \catcode`\"=12
19489 + \catcode`\<=12
19490 + \catcode`\.=12
19491 + \catcode`\,=12
19492 + \catcode`\;=12
19493 + \catcode`\!=12
19494 + \catcode`\~=13
19495 +
19496 + \gdef\DeclareUnicodeCharacter#1#2{%
19497 + \countUTFz = "#1\relax
19498 + \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
19499 + \begingroup
19500 + \parseXMLCharref
19501 + \def\UTFviiiTwoOctets##1##2{%
19502 + \csname u8:##1\string ##2\endcsname}%
19503 + \def\UTFviiiThreeOctets##1##2##3{%
19504 + \csname u8:##1\string ##2\string ##3\endcsname}%
19505 + \def\UTFviiiFourOctets##1##2##3##4{%
19506 + \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
19507 + \expandafter\expandafter\expandafter\expandafter
19508 + \expandafter\expandafter\expandafter
19509 + \gdef\UTFviiiTmp{#2}%
19510 + \endgroup}
19511 +
19512 + \gdef\parseXMLCharref{%
19513 + \ifnum\countUTFz < "A0\relax
19514 + \errhelp = \EMsimple
19515 + \errmessage{Cannot define Unicode char value < 00A0}%
19516 + \else\ifnum\countUTFz < "800\relax
19517 + \parseUTFviiiA,%
19518 + \parseUTFviiiB C\UTFviiiTwoOctets.,%
19519 + \else\ifnum\countUTFz < "10000\relax
19520 + \parseUTFviiiA;%
19521 + \parseUTFviiiA,%
19522 + \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
19523 + \else
19524 + \parseUTFviiiA;%
19525 + \parseUTFviiiA,%
19526 + \parseUTFviiiA!%
19527 + \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
19528 + \fi\fi\fi
19529 + }
19530 +
19531 + \gdef\parseUTFviiiA#1{%
19532 + \countUTFx = \countUTFz
19533 + \divide\countUTFz by 64
19534 + \countUTFy = \countUTFz
19535 + \multiply\countUTFz by 64
19536 + \advance\countUTFx by -\countUTFz
19537 + \advance\countUTFx by 128
19538 + \uccode `#1\countUTFx
19539 + \countUTFz = \countUTFy}
19540 +
19541 + \gdef\parseUTFviiiB#1#2#3#4{%
19542 + \advance\countUTFz by "#10\relax
19543 + \uccode `#3\countUTFz
19544 + \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
19545 +\endgroup
19546 +
19547 +\def\utfeightchardefs{%
19548 + \DeclareUnicodeCharacter{00A0}{\tie}
19549 + \DeclareUnicodeCharacter{00A1}{\exclamdown}
19550 + \DeclareUnicodeCharacter{00A3}{\pounds}
19551 + \DeclareUnicodeCharacter{00A8}{\"{ }}
19552 + \DeclareUnicodeCharacter{00A9}{\copyright}
19553 + \DeclareUnicodeCharacter{00AA}{\ordf}
19554 + \DeclareUnicodeCharacter{00AB}{\guillemetleft}
19555 + \DeclareUnicodeCharacter{00AD}{\-}
19556 + \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
19557 + \DeclareUnicodeCharacter{00AF}{\={ }}
19558 +
19559 + \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
19560 + \DeclareUnicodeCharacter{00B4}{\'{ }}
19561 + \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
19562 + \DeclareUnicodeCharacter{00BA}{\ordm}
19563 + \DeclareUnicodeCharacter{00BB}{\guillemetright}
19564 + \DeclareUnicodeCharacter{00BF}{\questiondown}
19565 +
19566 + \DeclareUnicodeCharacter{00C0}{\`A}
19567 + \DeclareUnicodeCharacter{00C1}{\'A}
19568 + \DeclareUnicodeCharacter{00C2}{\^A}
19569 + \DeclareUnicodeCharacter{00C3}{\~A}
19570 + \DeclareUnicodeCharacter{00C4}{\"A}
19571 + \DeclareUnicodeCharacter{00C5}{\AA}
19572 + \DeclareUnicodeCharacter{00C6}{\AE}
19573 + \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
19574 + \DeclareUnicodeCharacter{00C8}{\`E}
19575 + \DeclareUnicodeCharacter{00C9}{\'E}
19576 + \DeclareUnicodeCharacter{00CA}{\^E}
19577 + \DeclareUnicodeCharacter{00CB}{\"E}
19578 + \DeclareUnicodeCharacter{00CC}{\`I}
19579 + \DeclareUnicodeCharacter{00CD}{\'I}
19580 + \DeclareUnicodeCharacter{00CE}{\^I}
19581 + \DeclareUnicodeCharacter{00CF}{\"I}
19582 +
19583 + \DeclareUnicodeCharacter{00D0}{\DH}
19584 + \DeclareUnicodeCharacter{00D1}{\~N}
19585 + \DeclareUnicodeCharacter{00D2}{\`O}
19586 + \DeclareUnicodeCharacter{00D3}{\'O}
19587 + \DeclareUnicodeCharacter{00D4}{\^O}
19588 + \DeclareUnicodeCharacter{00D5}{\~O}
19589 + \DeclareUnicodeCharacter{00D6}{\"O}
19590 + \DeclareUnicodeCharacter{00D8}{\O}
19591 + \DeclareUnicodeCharacter{00D9}{\`U}
19592 + \DeclareUnicodeCharacter{00DA}{\'U}
19593 + \DeclareUnicodeCharacter{00DB}{\^U}
19594 + \DeclareUnicodeCharacter{00DC}{\"U}
19595 + \DeclareUnicodeCharacter{00DD}{\'Y}
19596 + \DeclareUnicodeCharacter{00DE}{\TH}
19597 + \DeclareUnicodeCharacter{00DF}{\ss}
19598 +
19599 + \DeclareUnicodeCharacter{00E0}{\`a}
19600 + \DeclareUnicodeCharacter{00E1}{\'a}
19601 + \DeclareUnicodeCharacter{00E2}{\^a}
19602 + \DeclareUnicodeCharacter{00E3}{\~a}
19603 + \DeclareUnicodeCharacter{00E4}{\"a}
19604 + \DeclareUnicodeCharacter{00E5}{\aa}
19605 + \DeclareUnicodeCharacter{00E6}{\ae}
19606 + \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
19607 + \DeclareUnicodeCharacter{00E8}{\`e}
19608 + \DeclareUnicodeCharacter{00E9}{\'e}
19609 + \DeclareUnicodeCharacter{00EA}{\^e}
19610 + \DeclareUnicodeCharacter{00EB}{\"e}
19611 + \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
19612 + \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
19613 + \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
19614 + \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
19615 +
19616 + \DeclareUnicodeCharacter{00F0}{\dh}
19617 + \DeclareUnicodeCharacter{00F1}{\~n}
19618 + \DeclareUnicodeCharacter{00F2}{\`o}
19619 + \DeclareUnicodeCharacter{00F3}{\'o}
19620 + \DeclareUnicodeCharacter{00F4}{\^o}
19621 + \DeclareUnicodeCharacter{00F5}{\~o}
19622 + \DeclareUnicodeCharacter{00F6}{\"o}
19623 + \DeclareUnicodeCharacter{00F8}{\o}
19624 + \DeclareUnicodeCharacter{00F9}{\`u}
19625 + \DeclareUnicodeCharacter{00FA}{\'u}
19626 + \DeclareUnicodeCharacter{00FB}{\^u}
19627 + \DeclareUnicodeCharacter{00FC}{\"u}
19628 + \DeclareUnicodeCharacter{00FD}{\'y}
19629 + \DeclareUnicodeCharacter{00FE}{\th}
19630 + \DeclareUnicodeCharacter{00FF}{\"y}
19631 +
19632 + \DeclareUnicodeCharacter{0100}{\=A}
19633 + \DeclareUnicodeCharacter{0101}{\=a}
19634 + \DeclareUnicodeCharacter{0102}{\u{A}}
19635 + \DeclareUnicodeCharacter{0103}{\u{a}}
19636 + \DeclareUnicodeCharacter{0104}{\ogonek{A}}
19637 + \DeclareUnicodeCharacter{0105}{\ogonek{a}}
19638 + \DeclareUnicodeCharacter{0106}{\'C}
19639 + \DeclareUnicodeCharacter{0107}{\'c}
19640 + \DeclareUnicodeCharacter{0108}{\^C}
19641 + \DeclareUnicodeCharacter{0109}{\^c}
19642 + \DeclareUnicodeCharacter{0118}{\ogonek{E}}
19643 + \DeclareUnicodeCharacter{0119}{\ogonek{e}}
19644 + \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
19645 + \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
19646 + \DeclareUnicodeCharacter{010C}{\v{C}}
19647 + \DeclareUnicodeCharacter{010D}{\v{c}}
19648 + \DeclareUnicodeCharacter{010E}{\v{D}}
19649 +
19650 + \DeclareUnicodeCharacter{0112}{\=E}
19651 + \DeclareUnicodeCharacter{0113}{\=e}
19652 + \DeclareUnicodeCharacter{0114}{\u{E}}
19653 + \DeclareUnicodeCharacter{0115}{\u{e}}
19654 + \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
19655 + \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
19656 + \DeclareUnicodeCharacter{011A}{\v{E}}
19657 + \DeclareUnicodeCharacter{011B}{\v{e}}
19658 + \DeclareUnicodeCharacter{011C}{\^G}
19659 + \DeclareUnicodeCharacter{011D}{\^g}
19660 + \DeclareUnicodeCharacter{011E}{\u{G}}
19661 + \DeclareUnicodeCharacter{011F}{\u{g}}
19662 +
19663 + \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
19664 + \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
19665 + \DeclareUnicodeCharacter{0124}{\^H}
19666 + \DeclareUnicodeCharacter{0125}{\^h}
19667 + \DeclareUnicodeCharacter{0128}{\~I}
19668 + \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
19669 + \DeclareUnicodeCharacter{012A}{\=I}
19670 + \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
19671 + \DeclareUnicodeCharacter{012C}{\u{I}}
19672 + \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
19673 +
19674 + \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
19675 + \DeclareUnicodeCharacter{0131}{\dotless{i}}
19676 + \DeclareUnicodeCharacter{0132}{IJ}
19677 + \DeclareUnicodeCharacter{0133}{ij}
19678 + \DeclareUnicodeCharacter{0134}{\^J}
19679 + \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
19680 + \DeclareUnicodeCharacter{0139}{\'L}
19681 + \DeclareUnicodeCharacter{013A}{\'l}
19682 +
19683 + \DeclareUnicodeCharacter{0141}{\L}
19684 + \DeclareUnicodeCharacter{0142}{\l}
19685 + \DeclareUnicodeCharacter{0143}{\'N}
19686 + \DeclareUnicodeCharacter{0144}{\'n}
19687 + \DeclareUnicodeCharacter{0147}{\v{N}}
19688 + \DeclareUnicodeCharacter{0148}{\v{n}}
19689 + \DeclareUnicodeCharacter{014C}{\=O}
19690 + \DeclareUnicodeCharacter{014D}{\=o}
19691 + \DeclareUnicodeCharacter{014E}{\u{O}}
19692 + \DeclareUnicodeCharacter{014F}{\u{o}}
19693 +
19694 + \DeclareUnicodeCharacter{0150}{\H{O}}
19695 + \DeclareUnicodeCharacter{0151}{\H{o}}
19696 + \DeclareUnicodeCharacter{0152}{\OE}
19697 + \DeclareUnicodeCharacter{0153}{\oe}
19698 + \DeclareUnicodeCharacter{0154}{\'R}
19699 + \DeclareUnicodeCharacter{0155}{\'r}
19700 + \DeclareUnicodeCharacter{0158}{\v{R}}
19701 + \DeclareUnicodeCharacter{0159}{\v{r}}
19702 + \DeclareUnicodeCharacter{015A}{\'S}
19703 + \DeclareUnicodeCharacter{015B}{\'s}
19704 + \DeclareUnicodeCharacter{015C}{\^S}
19705 + \DeclareUnicodeCharacter{015D}{\^s}
19706 + \DeclareUnicodeCharacter{015E}{\cedilla{S}}
19707 + \DeclareUnicodeCharacter{015F}{\cedilla{s}}
19708 +
19709 + \DeclareUnicodeCharacter{0160}{\v{S}}
19710 + \DeclareUnicodeCharacter{0161}{\v{s}}
19711 + \DeclareUnicodeCharacter{0162}{\cedilla{t}}
19712 + \DeclareUnicodeCharacter{0163}{\cedilla{T}}
19713 + \DeclareUnicodeCharacter{0164}{\v{T}}
19714 +
19715 + \DeclareUnicodeCharacter{0168}{\~U}
19716 + \DeclareUnicodeCharacter{0169}{\~u}
19717 + \DeclareUnicodeCharacter{016A}{\=U}
19718 + \DeclareUnicodeCharacter{016B}{\=u}
19719 + \DeclareUnicodeCharacter{016C}{\u{U}}
19720 + \DeclareUnicodeCharacter{016D}{\u{u}}
19721 + \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
19722 + \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
19723 +
19724 + \DeclareUnicodeCharacter{0170}{\H{U}}
19725 + \DeclareUnicodeCharacter{0171}{\H{u}}
19726 + \DeclareUnicodeCharacter{0174}{\^W}
19727 + \DeclareUnicodeCharacter{0175}{\^w}
19728 + \DeclareUnicodeCharacter{0176}{\^Y}
19729 + \DeclareUnicodeCharacter{0177}{\^y}
19730 + \DeclareUnicodeCharacter{0178}{\"Y}
19731 + \DeclareUnicodeCharacter{0179}{\'Z}
19732 + \DeclareUnicodeCharacter{017A}{\'z}
19733 + \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
19734 + \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
19735 + \DeclareUnicodeCharacter{017D}{\v{Z}}
19736 + \DeclareUnicodeCharacter{017E}{\v{z}}
19737 +
19738 + \DeclareUnicodeCharacter{01C4}{D\v{Z}}
19739 + \DeclareUnicodeCharacter{01C5}{D\v{z}}
19740 + \DeclareUnicodeCharacter{01C6}{d\v{z}}
19741 + \DeclareUnicodeCharacter{01C7}{LJ}
19742 + \DeclareUnicodeCharacter{01C8}{Lj}
19743 + \DeclareUnicodeCharacter{01C9}{lj}
19744 + \DeclareUnicodeCharacter{01CA}{NJ}
19745 + \DeclareUnicodeCharacter{01CB}{Nj}
19746 + \DeclareUnicodeCharacter{01CC}{nj}
19747 + \DeclareUnicodeCharacter{01CD}{\v{A}}
19748 + \DeclareUnicodeCharacter{01CE}{\v{a}}
19749 + \DeclareUnicodeCharacter{01CF}{\v{I}}
19750 +
19751 + \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
19752 + \DeclareUnicodeCharacter{01D1}{\v{O}}
19753 + \DeclareUnicodeCharacter{01D2}{\v{o}}
19754 + \DeclareUnicodeCharacter{01D3}{\v{U}}
19755 + \DeclareUnicodeCharacter{01D4}{\v{u}}
19756 +
19757 + \DeclareUnicodeCharacter{01E2}{\={\AE}}
19758 + \DeclareUnicodeCharacter{01E3}{\={\ae}}
19759 + \DeclareUnicodeCharacter{01E6}{\v{G}}
19760 + \DeclareUnicodeCharacter{01E7}{\v{g}}
19761 + \DeclareUnicodeCharacter{01E8}{\v{K}}
19762 + \DeclareUnicodeCharacter{01E9}{\v{k}}
19763 +
19764 + \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
19765 + \DeclareUnicodeCharacter{01F1}{DZ}
19766 + \DeclareUnicodeCharacter{01F2}{Dz}
19767 + \DeclareUnicodeCharacter{01F3}{dz}
19768 + \DeclareUnicodeCharacter{01F4}{\'G}
19769 + \DeclareUnicodeCharacter{01F5}{\'g}
19770 + \DeclareUnicodeCharacter{01F8}{\`N}
19771 + \DeclareUnicodeCharacter{01F9}{\`n}
19772 + \DeclareUnicodeCharacter{01FC}{\'{\AE}}
19773 + \DeclareUnicodeCharacter{01FD}{\'{\ae}}
19774 + \DeclareUnicodeCharacter{01FE}{\'{\O}}
19775 + \DeclareUnicodeCharacter{01FF}{\'{\o}}
19776 +
19777 + \DeclareUnicodeCharacter{021E}{\v{H}}
19778 + \DeclareUnicodeCharacter{021F}{\v{h}}
19779 +
19780 + \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
19781 + \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
19782 + \DeclareUnicodeCharacter{0228}{\cedilla{E}}
19783 + \DeclareUnicodeCharacter{0229}{\cedilla{e}}
19784 + \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
19785 + \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
19786 +
19787 + \DeclareUnicodeCharacter{0232}{\=Y}
19788 + \DeclareUnicodeCharacter{0233}{\=y}
19789 + \DeclareUnicodeCharacter{0237}{\dotless{j}}
19790 +
19791 + \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
19792 +
19793 + \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
19794 + \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
19795 + \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
19796 + \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
19797 + \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
19798 + \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
19799 + \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
19800 + \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
19801 + \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
19802 + \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
19803 + \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
19804 + \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
19805 +
19806 + \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
19807 + \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
19808 +
19809 + \DeclareUnicodeCharacter{1E20}{\=G}
19810 + \DeclareUnicodeCharacter{1E21}{\=g}
19811 + \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
19812 + \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
19813 + \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
19814 + \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
19815 + \DeclareUnicodeCharacter{1E26}{\"H}
19816 + \DeclareUnicodeCharacter{1E27}{\"h}
19817 +
19818 + \DeclareUnicodeCharacter{1E30}{\'K}
19819 + \DeclareUnicodeCharacter{1E31}{\'k}
19820 + \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
19821 + \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
19822 + \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
19823 + \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
19824 + \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
19825 + \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
19826 + \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
19827 + \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
19828 + \DeclareUnicodeCharacter{1E3E}{\'M}
19829 + \DeclareUnicodeCharacter{1E3F}{\'m}
19830 +
19831 + \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
19832 + \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
19833 + \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
19834 + \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
19835 + \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
19836 + \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
19837 + \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
19838 + \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
19839 + \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
19840 + \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
19841 +
19842 + \DeclareUnicodeCharacter{1E54}{\'P}
19843 + \DeclareUnicodeCharacter{1E55}{\'p}
19844 + \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
19845 + \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
19846 + \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
19847 + \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
19848 + \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
19849 + \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
19850 + \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
19851 + \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
19852 +
19853 + \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
19854 + \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
19855 + \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
19856 + \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
19857 + \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
19858 + \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
19859 + \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
19860 + \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
19861 + \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
19862 + \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
19863 +
19864 + \DeclareUnicodeCharacter{1E7C}{\~V}
19865 + \DeclareUnicodeCharacter{1E7D}{\~v}
19866 + \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
19867 + \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
19868 +
19869 + \DeclareUnicodeCharacter{1E80}{\`W}
19870 + \DeclareUnicodeCharacter{1E81}{\`w}
19871 + \DeclareUnicodeCharacter{1E82}{\'W}
19872 + \DeclareUnicodeCharacter{1E83}{\'w}
19873 + \DeclareUnicodeCharacter{1E84}{\"W}
19874 + \DeclareUnicodeCharacter{1E85}{\"w}
19875 + \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
19876 + \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
19877 + \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
19878 + \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
19879 + \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
19880 + \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
19881 + \DeclareUnicodeCharacter{1E8C}{\"X}
19882 + \DeclareUnicodeCharacter{1E8D}{\"x}
19883 + \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
19884 + \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
19885 +
19886 + \DeclareUnicodeCharacter{1E90}{\^Z}
19887 + \DeclareUnicodeCharacter{1E91}{\^z}
19888 + \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
19889 + \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
19890 + \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
19891 + \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
19892 + \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
19893 + \DeclareUnicodeCharacter{1E97}{\"t}
19894 + \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
19895 + \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
19896 +
19897 + \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
19898 + \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
19899 +
19900 + \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
19901 + \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
19902 + \DeclareUnicodeCharacter{1EBC}{\~E}
19903 + \DeclareUnicodeCharacter{1EBD}{\~e}
19904 +
19905 + \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
19906 + \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
19907 + \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
19908 + \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
19909 +
19910 + \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
19911 + \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
19912 +
19913 + \DeclareUnicodeCharacter{1EF2}{\`Y}
19914 + \DeclareUnicodeCharacter{1EF3}{\`y}
19915 + \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
19916 +
19917 + \DeclareUnicodeCharacter{1EF8}{\~Y}
19918 + \DeclareUnicodeCharacter{1EF9}{\~y}
19919 +
19920 + \DeclareUnicodeCharacter{2013}{--}
19921 + \DeclareUnicodeCharacter{2014}{---}
19922 + \DeclareUnicodeCharacter{2018}{\quoteleft}
19923 + \DeclareUnicodeCharacter{2019}{\quoteright}
19924 + \DeclareUnicodeCharacter{201A}{\quotesinglbase}
19925 + \DeclareUnicodeCharacter{201C}{\quotedblleft}
19926 + \DeclareUnicodeCharacter{201D}{\quotedblright}
19927 + \DeclareUnicodeCharacter{201E}{\quotedblbase}
19928 + \DeclareUnicodeCharacter{2022}{\bullet}
19929 + \DeclareUnicodeCharacter{2026}{\dots}
19930 + \DeclareUnicodeCharacter{2039}{\guilsinglleft}
19931 + \DeclareUnicodeCharacter{203A}{\guilsinglright}
19932 + \DeclareUnicodeCharacter{20AC}{\euro}
19933 +
19934 + \DeclareUnicodeCharacter{2192}{\expansion}
19935 + \DeclareUnicodeCharacter{21D2}{\result}
19936 +
19937 + \DeclareUnicodeCharacter{2212}{\minus}
19938 + \DeclareUnicodeCharacter{2217}{\point}
19939 + \DeclareUnicodeCharacter{2261}{\equiv}
19940 +}% end of \utfeightchardefs
19941 +
19942 +
19943 +% US-ASCII character definitions.
19944 +\def\asciichardefs{% nothing need be done
19945 + \relax
19946 +}
19947 +
19948 +% Make non-ASCII characters printable again for compatibility with
19949 +% existing Texinfo documents that may use them, even without declaring a
19950 +% document encoding.
19951 +%
19952 +\setnonasciicharscatcode \other
19953 +
19954 +
19955 +\message{formatting,}
19956 +
19957 \newdimen\defaultparindent \defaultparindent = 15pt
19958
19959 \chapheadingskip = 15pt plus 4pt minus 2pt
19960 @@ -6626,7 +8902,7 @@ should work if nowhere else does.}
19961 % Don't be so finicky about underfull hboxes, either.
19962 \hbadness = 2000
19963
19964 -% Following George Bush, just get rid of widows and orphans.
19965 +% Following George Bush, get rid of widows and orphans.
19966 \widowpenalty=10000
19967 \clubpenalty=10000
19968
19969 @@ -6644,9 +8920,9 @@ should work if nowhere else does.}
19970 \fi
19971 }
19972
19973 -% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
19974 -% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
19975 -% physical page width.
19976 +% Parameters in order: 1) textheight; 2) textwidth;
19977 +% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
19978 +% 7) physical page height; 8) physical page width.
19979 %
19980 % We also call \setleading{\textleading}, so the caller should define
19981 % \textleading. The caller should also set \parskip.
19982 @@ -6673,6 +8949,10 @@ should work if nowhere else does.}
19983 \ifpdf
19984 \pdfpageheight #7\relax
19985 \pdfpagewidth #8\relax
19986 + % if we don't reset these, they will remain at "1 true in" of
19987 + % whatever layout pdftex was dumped with.
19988 + \pdfhorigin = 1 true in
19989 + \pdfvorigin = 1 true in
19990 \fi
19991 %
19992 \setleading{\textleading}
19993 @@ -6687,19 +8967,19 @@ should work if nowhere else does.}
19994 \textleading = 13.2pt
19995 %
19996 % If page is nothing but text, make it come out even.
19997 - \internalpagesizes{46\baselineskip}{6in}%
19998 + \internalpagesizes{607.2pt}{6in}% that's 46 lines
19999 {\voffset}{.25in}%
20000 {\bindingoffset}{36pt}%
20001 {11in}{8.5in}%
20002 }}
20003
20004 -% Use @smallbook to reset parameters for 7x9.5 (or so) format.
20005 +% Use @smallbook to reset parameters for 7x9.25 trim size.
20006 \def\smallbook{{\globaldefs = 1
20007 \parskip = 2pt plus 1pt
20008 \textleading = 12pt
20009 %
20010 \internalpagesizes{7.5in}{5in}%
20011 - {\voffset}{.25in}%
20012 + {-.2in}{0in}%
20013 {\bindingoffset}{16pt}%
20014 {9.25in}{7in}%
20015 %
20016 @@ -6710,6 +8990,24 @@ should work if nowhere else does.}
20017 \defbodyindent = .5cm
20018 }}
20019
20020 +% Use @smallerbook to reset parameters for 6x9 trim size.
20021 +% (Just testing, parameters still in flux.)
20022 +\def\smallerbook{{\globaldefs = 1
20023 + \parskip = 1.5pt plus 1pt
20024 + \textleading = 12pt
20025 + %
20026 + \internalpagesizes{7.4in}{4.8in}%
20027 + {-.2in}{-.4in}%
20028 + {0pt}{14pt}%
20029 + {9in}{6in}%
20030 + %
20031 + \lispnarrowing = 0.25in
20032 + \tolerance = 700
20033 + \hfuzz = 1pt
20034 + \contentsrightmargin = 0pt
20035 + \defbodyindent = .4cm
20036 +}}
20037 +
20038 % Use @afourpaper to print on European A4 paper.
20039 \def\afourpaper{{\globaldefs = 1
20040 \parskip = 3pt plus 2pt minus 1pt
20041 @@ -6725,7 +9023,7 @@ should work if nowhere else does.}
20042 % \global\normaloffset = -6mm
20043 % \global\bindingoffset = 10mm
20044 % @end tex
20045 - \internalpagesizes{51\baselineskip}{160mm}
20046 + \internalpagesizes{673.2pt}{160mm}% that's 51 lines
20047 {\voffset}{\hoffset}%
20048 {\bindingoffset}{44pt}%
20049 {297mm}{210mm}%
20050 @@ -6790,7 +9088,7 @@ should work if nowhere else does.}
20051 \parskip = 3pt plus 2pt minus 1pt
20052 \setleading{\textleading}%
20053 %
20054 - \dimen0 = #1
20055 + \dimen0 = #1\relax
20056 \advance\dimen0 by \voffset
20057 %
20058 \dimen2 = \hsize
20059 @@ -6809,6 +9107,9 @@ should work if nowhere else does.}
20060
20061 \message{and turning on texinfo input format.}
20062
20063 +% DEL is a comment character, in case @c does not suffice.
20064 +\catcode`\^^? = 14
20065 +
20066 % Define macros to output various characters with catcode for normal text.
20067 \catcode`\"=\other
20068 \catcode`\~=\other
20069 @@ -6862,6 +9163,7 @@ should work if nowhere else does.}
20070
20071 \catcode`\_=\active
20072 \def_{\ifusingtt\normalunderscore\_}
20073 +\let\realunder=_
20074 % Subroutine for the previous macro.
20075 \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
20076
20077 @@ -6884,6 +9186,13 @@ should work if nowhere else does.}
20078 % \otherifyactive is called near the end of this file.
20079 \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
20080
20081 +% Used sometimes to turn off (effectively) the active characters even after
20082 +% parsing them.
20083 +\def\turnoffactive{%
20084 + \normalturnoffactive
20085 + \otherbackslash
20086 +}
20087 +
20088 \catcode`\@=0
20089
20090 % \backslashcurfont outputs one backslash character in current font,
20091 @@ -6891,27 +9200,29 @@ should work if nowhere else does.}
20092 \global\chardef\backslashcurfont=`\\
20093 \global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
20094
20095 +% \realbackslash is an actual character `\' with catcode other, and
20096 +% \doublebackslash is two of them (for the pdf outlines).
20097 +{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
20098 +
20099 +% In texinfo, backslash is an active character; it prints the backslash
20100 +% in fixed width font.
20101 +\catcode`\\=\active
20102 +@def@normalbackslash{{@tt@backslashcurfont}}
20103 +% On startup, @fixbackslash assigns:
20104 +% @let \ = @normalbackslash
20105 +
20106 % \rawbackslash defines an active \ to do \backslashcurfont.
20107 % \otherbackslash defines an active \ to be a literal `\' character with
20108 % catcode other.
20109 -{\catcode`\\=\active
20110 - @gdef@rawbackslash{@let\=@backslashcurfont}
20111 - @gdef@otherbackslash{@let\=@realbackslash}
20112 -}
20113 -
20114 -% \realbackslash is an actual character `\' with catcode other.
20115 -{\catcode`\\=\other @gdef@realbackslash{\}}
20116 -
20117 -% \normalbackslash outputs one backslash in fixed width font.
20118 -\def\normalbackslash{{\tt\backslashcurfont}}
20119 -
20120 -\catcode`\\=\active
20121 +@gdef@rawbackslash{@let\=@backslashcurfont}
20122 +@gdef@otherbackslash{@let\=@realbackslash}
20123
20124 -% Used sometimes to turn off (effectively) the active characters
20125 -% even after parsing them.
20126 -@def@turnoffactive{%
20127 +% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
20128 +% the literal character `\'.
20129 +%
20130 +@def@normalturnoffactive{%
20131 + @let\=@normalbackslash
20132 @let"=@normaldoublequote
20133 - @let\=@realbackslash
20134 @let~=@normaltilde
20135 @let^=@normalcaret
20136 @let_=@normalunderscore
20137 @@ -6920,15 +9231,11 @@ should work if nowhere else does.}
20138 @let>=@normalgreater
20139 @let+=@normalplus
20140 @let$=@normaldollar %$ font-lock fix
20141 + @markupsetuplqdefault
20142 + @markupsetuprqdefault
20143 @unsepspaces
20144 }
20145
20146 -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
20147 -% the literal character `\'. (Thus, \ is not expandable when this is in
20148 -% effect.)
20149 -%
20150 -@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
20151 -
20152 % Make _ and + \other characters, temporarily.
20153 % This is canceled by @fixbackslash.
20154 @otherifyactive
20155 @@ -6941,9 +9248,9 @@ should work if nowhere else does.}
20156 @global@let\ = @eatinput
20157
20158 % On the other hand, perhaps the file did not have a `\input texinfo'. Then
20159 -% the first `\{ in the file would cause an error. This macro tries to fix
20160 +% the first `\' in the file would cause an error. This macro tries to fix
20161 % that, assuming it is called before the first `\' could plausibly occur.
20162 -% Also back turn on active characters that might appear in the input
20163 +% Also turn back on active characters that might appear in the input
20164 % file name, in case not using a pre-dumped format.
20165 %
20166 @gdef@fixbackslash{%
20167 @@ -6960,6 +9267,14 @@ should work if nowhere else does.}
20168 @catcode`@# = @other
20169 @catcode`@% = @other
20170
20171 +@c Finally, make ` and ' active, so that txicodequoteundirected and
20172 +@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we
20173 +@c don't make ` and ' active, @code will not get them as active chars.
20174 +@c Do this last of all since we use ` in the previous @catcode assignments.
20175 +@catcode`@'=@active
20176 +@catcode`@`=@active
20177 +@markupsetuplqdefault
20178 +@markupsetuprqdefault
20179
20180 @c Local variables:
20181 @c eval: (add-hook 'write-file-hooks 'time-stamp)
20182 diff --git a/inputs/Makefile.in b/inputs/Makefile.in
20183 index 1fb6b8f..c307fd8 100644
20184 --- a/inputs/Makefile.in
20185 +++ b/inputs/Makefile.in
20186 @@ -1,8 +1,9 @@
20187 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
20188 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
20189 # @configure_input@
20190
20191 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
20192 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
20193 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
20194 +# Inc.
20195 # This Makefile.in is free software; the Free Software Foundation
20196 # gives unlimited permission to copy and/or distribute it,
20197 # with or without modifications, as long as this notice is preserved.
20198 @@ -16,8 +17,9 @@
20199
20200 VPATH = @srcdir@
20201 pkgdatadir = $(datadir)/@PACKAGE@
20202 -pkglibdir = $(libdir)/@PACKAGE@
20203 pkgincludedir = $(includedir)/@PACKAGE@
20204 +pkglibdir = $(libdir)/@PACKAGE@
20205 +pkglibexecdir = $(libexecdir)/@PACKAGE@
20206 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
20207 install_sh_DATA = $(install_sh) -c -m 644
20208 install_sh_PROGRAM = $(install_sh) -c
20209 @@ -43,8 +45,29 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
20210 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
20211 CONFIG_HEADER = $(top_builddir)/src/conf.h
20212 CONFIG_CLEAN_FILES =
20213 +CONFIG_CLEAN_VPATH_FILES =
20214 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
20215 +am__vpath_adj = case $$p in \
20216 + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
20217 + *) f=$$p;; \
20218 + esac;
20219 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
20220 +am__install_max = 40
20221 +am__nobase_strip_setup = \
20222 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
20223 +am__nobase_strip = \
20224 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
20225 +am__nobase_list = $(am__nobase_strip_setup); \
20226 + for p in $$list; do echo "$$p $$p"; done | \
20227 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
20228 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
20229 + if (++n[$$2] == $(am__install_max)) \
20230 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
20231 + END { for (dir in files) print dir, files[dir] }'
20232 +am__base_list = \
20233 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
20234 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
20235 am__installdirs = "$(DESTDIR)$(pkgdatadir)"
20236 -pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
20237 SCRIPTS = $(pkgdata_SCRIPTS)
20238 SOURCES =
20239 DIST_SOURCES =
20240 @@ -52,6 +75,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
20241 ACLOCAL = @ACLOCAL@
20242 AMTAR = @AMTAR@
20243 AR = @AR@
20244 +ARGZ_H = @ARGZ_H@
20245 AUTOCONF = @AUTOCONF@
20246 AUTOHEADER = @AUTOHEADER@
20247 AUTOMAKE = @AUTOMAKE@
20248 @@ -82,6 +106,7 @@ GETCONF = @GETCONF@
20249 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
20250 GREP = @GREP@
20251 HOSTNAME = @HOSTNAME@
20252 +INCLTDL = @INCLTDL@
20253 INSTALL = @INSTALL@
20254 INSTALL_DATA = @INSTALL_DATA@
20255 INSTALL_PROGRAM = @INSTALL_PROGRAM@
20256 @@ -94,13 +119,25 @@ LDFLAGS = @LDFLAGS@
20257 LEX = @LEX@
20258 LEXLIB = @LEXLIB@
20259 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
20260 +LIBADD_DL = @LIBADD_DL@
20261 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
20262 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
20263 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
20264 +LIBLTDL = @LIBLTDL@
20265 LIBOBJS = @LIBOBJS@
20266 LIBS = @LIBS@
20267 LIBTOOL = @LIBTOOL@
20268 LIB_SELINUX = @LIB_SELINUX@
20269 LIPO = @LIPO@
20270 LN_S = @LN_S@
20271 +LTDLDEPS = @LTDLDEPS@
20272 +LTDLINCL = @LTDLINCL@
20273 +LTDLOPEN = @LTDLOPEN@
20274 LTLIBOBJS = @LTLIBOBJS@
20275 +LT_CONFIG_H = @LT_CONFIG_H@
20276 +LT_DLLOADERS = @LT_DLLOADERS@
20277 +LT_DLPREOPEN = @LT_DLPREOPEN@
20278 +MAINT = @MAINT@
20279 MAKEINFO = @MAKEINFO@
20280 MKDIR_P = @MKDIR_P@
20281 NEED_SETGID = @NEED_SETGID@
20282 @@ -172,6 +209,8 @@ libexecdir = @libexecdir@
20283 localedir = @localedir@
20284 localstatedir = @localstatedir@
20285 lt_ECHO = @lt_ECHO@
20286 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
20287 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
20288 mandir = @mandir@
20289 mkdir_p = @mkdir_p@
20290 oldincludedir = @oldincludedir@
20291 @@ -182,6 +221,8 @@ psdir = @psdir@
20292 sbindir = @sbindir@
20293 sharedstatedir = @sharedstatedir@
20294 srcdir = @srcdir@
20295 +subdirs = @subdirs@
20296 +sys_symbol_underscore = @sys_symbol_underscore@
20297 sysconfdir = @sysconfdir@
20298 target = @target@
20299 target_alias = @target_alias@
20300 @@ -240,18 +281,18 @@ MAINTAINERCLEANFILES = Makefile.in
20301 all: all-am
20302
20303 .SUFFIXES:
20304 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
20305 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
20306 @for dep in $?; do \
20307 case '$(am__configure_deps)' in \
20308 *$$dep*) \
20309 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
20310 - && exit 0; \
20311 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
20312 + && { if test -f $@; then exit 0; else break; fi; }; \
20313 exit 1;; \
20314 esac; \
20315 done; \
20316 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu inputs/Makefile'; \
20317 - cd $(top_srcdir) && \
20318 - $(AUTOMAKE) --gnu inputs/Makefile
20319 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu inputs/Makefile'; \
20320 + $(am__cd) $(top_srcdir) && \
20321 + $(AUTOMAKE) --gnu inputs/Makefile
20322 .PRECIOUS: Makefile
20323 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
20324 @case '$?' in \
20325 @@ -265,29 +306,45 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
20326 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
20327 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
20328
20329 -$(top_srcdir)/configure: $(am__configure_deps)
20330 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
20331 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
20332 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
20333 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
20334 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
20335 +$(am__aclocal_m4_deps):
20336 install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
20337 @$(NORMAL_INSTALL)
20338 test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
20339 - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
20340 + @list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \
20341 + for p in $$list; do \
20342 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
20343 - if test -f $$d$$p; then \
20344 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
20345 - echo " $(pkgdataSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
20346 - $(pkgdataSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
20347 - else :; fi; \
20348 - done
20349 + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
20350 + done | \
20351 + sed -e 'p;s,.*/,,;n' \
20352 + -e 'h;s|.*|.|' \
20353 + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
20354 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
20355 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
20356 + if ($$2 == $$4) { files[d] = files[d] " " $$1; \
20357 + if (++n[d] == $(am__install_max)) { \
20358 + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
20359 + else { print "f", d "/" $$4, $$1 } } \
20360 + END { for (d in files) print "f", d, files[d] }' | \
20361 + while read type dir files; do \
20362 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
20363 + test -z "$$files" || { \
20364 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \
20365 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \
20366 + } \
20367 + ; done
20368
20369 uninstall-pkgdataSCRIPTS:
20370 @$(NORMAL_UNINSTALL)
20371 - @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \
20372 - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
20373 - echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
20374 - rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
20375 - done
20376 + @list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \
20377 + files=`for p in $$list; do echo "$$p"; done | \
20378 + sed -e 's,.*/,,;$(transform)'`; \
20379 + test -n "$$list" || exit 0; \
20380 + echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
20381 + cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
20382
20383 mostlyclean-libtool:
20384 -rm -f *.lo
20385 @@ -317,13 +374,17 @@ distdir: $(DISTFILES)
20386 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
20387 if test -d $$d/$$file; then \
20388 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
20389 + if test -d "$(distdir)/$$file"; then \
20390 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
20391 + fi; \
20392 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
20393 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
20394 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
20395 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
20396 fi; \
20397 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
20398 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
20399 else \
20400 - test -f $(distdir)/$$file \
20401 - || cp -p $$d/$$file $(distdir)/$$file \
20402 + test -f "$(distdir)/$$file" \
20403 + || cp -p $$d/$$file "$(distdir)/$$file" \
20404 || exit 1; \
20405 fi; \
20406 done
20407 @@ -356,6 +417,7 @@ clean-generic:
20408
20409 distclean-generic:
20410 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
20411 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
20412 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
20413
20414 maintainer-clean-generic:
20415 @@ -376,6 +438,8 @@ dvi-am:
20416
20417 html: html-am
20418
20419 +html-am:
20420 +
20421 info: info-am
20422
20423 info-am:
20424 @@ -384,18 +448,28 @@ install-data-am: install-pkgdataSCRIPTS
20425
20426 install-dvi: install-dvi-am
20427
20428 +install-dvi-am:
20429 +
20430 install-exec-am:
20431
20432 install-html: install-html-am
20433
20434 +install-html-am:
20435 +
20436 install-info: install-info-am
20437
20438 +install-info-am:
20439 +
20440 install-man:
20441
20442 install-pdf: install-pdf-am
20443
20444 +install-pdf-am:
20445 +
20446 install-ps: install-ps-am
20447
20448 +install-ps-am:
20449 +
20450 installcheck-am:
20451
20452 maintainer-clean: maintainer-clean-am
20453 @@ -430,6 +504,7 @@ uninstall-am: uninstall-pkgdataSCRIPTS
20454 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
20455 uninstall uninstall-am uninstall-pkgdataSCRIPTS
20456
20457 +
20458 # Tell versions [3.59,3.63) of GNU make to not export all variables.
20459 # Otherwise a system limit (for SysV at least) may be exceeded.
20460 .NOEXPORT:
20461 diff --git a/install-sh b/install-sh
20462 index 398a88e..6781b98 100755
20463 --- a/install-sh
20464 +++ b/install-sh
20465 @@ -1,251 +1,520 @@
20466 #!/bin/sh
20467 -#
20468 # install - install a program, script, or datafile
20469 -# This comes from X11R5 (mit/util/scripts/install.sh).
20470 +
20471 +scriptversion=2009-04-28.21; # UTC
20472 +
20473 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
20474 +# later released in X11R6 (xc/config/util/install.sh) with the
20475 +# following copyright and license.
20476 +#
20477 +# Copyright (C) 1994 X Consortium
20478 +#
20479 +# Permission is hereby granted, free of charge, to any person obtaining a copy
20480 +# of this software and associated documentation files (the "Software"), to
20481 +# deal in the Software without restriction, including without limitation the
20482 +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
20483 +# sell copies of the Software, and to permit persons to whom the Software is
20484 +# furnished to do so, subject to the following conditions:
20485 +#
20486 +# The above copyright notice and this permission notice shall be included in
20487 +# all copies or substantial portions of the Software.
20488 +#
20489 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20490 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20491 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20492 +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
20493 +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
20494 +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20495 #
20496 -# Copyright 1991 by the Massachusetts Institute of Technology
20497 +# Except as contained in this notice, the name of the X Consortium shall not
20498 +# be used in advertising or otherwise to promote the sale, use or other deal-
20499 +# ings in this Software without prior written authorization from the X Consor-
20500 +# tium.
20501 #
20502 -# Permission to use, copy, modify, distribute, and sell this software and its
20503 -# documentation for any purpose is hereby granted without fee, provided that
20504 -# the above copyright notice appear in all copies and that both that
20505 -# copyright notice and this permission notice appear in supporting
20506 -# documentation, and that the name of M.I.T. not be used in advertising or
20507 -# publicity pertaining to distribution of the software without specific,
20508 -# written prior permission. M.I.T. makes no representations about the
20509 -# suitability of this software for any purpose. It is provided "as is"
20510 -# without express or implied warranty.
20511 +#
20512 +# FSF changes to this file are in the public domain.
20513 #
20514 # Calling this script install-sh is preferred over install.sh, to prevent
20515 # `make' implicit rules from creating a file called install from it
20516 # when there is no Makefile.
20517 #
20518 # This script is compatible with the BSD install script, but was written
20519 -# from scratch. It can only install one file at a time, a restriction
20520 -# shared with many OS's install programs.
20521 +# from scratch.
20522
20523 +nl='
20524 +'
20525 +IFS=" "" $nl"
20526
20527 # set DOITPROG to echo to test this script
20528
20529 # Don't use :- since 4.3BSD and earlier shells don't like it.
20530 -doit="${DOITPROG-}"
20531 -
20532 -
20533 -# put in absolute paths if you don't have them in your path; or use env. vars.
20534 -
20535 -mvprog="${MVPROG-mv}"
20536 -cpprog="${CPPROG-cp}"
20537 -chmodprog="${CHMODPROG-chmod}"
20538 -chownprog="${CHOWNPROG-chown}"
20539 -chgrpprog="${CHGRPPROG-chgrp}"
20540 -stripprog="${STRIPPROG-strip}"
20541 -rmprog="${RMPROG-rm}"
20542 -mkdirprog="${MKDIRPROG-mkdir}"
20543 -
20544 -transformbasename=""
20545 -transform_arg=""
20546 -instcmd="$mvprog"
20547 -chmodcmd="$chmodprog 0755"
20548 -chowncmd=""
20549 -chgrpcmd=""
20550 -stripcmd=""
20551 -rmcmd="$rmprog -f"
20552 -mvcmd="$mvprog"
20553 -src=""
20554 -dst=""
20555 -dir_arg=""
20556 -
20557 -while [ x"$1" != x ]; do
20558 - case $1 in
20559 - -c) instcmd="$cpprog"
20560 - shift
20561 - continue;;
20562 -
20563 - -d) dir_arg=true
20564 - shift
20565 - continue;;
20566 -
20567 - -m) chmodcmd="$chmodprog $2"
20568 - shift
20569 - shift
20570 - continue;;
20571 -
20572 - -o) chowncmd="$chownprog $2"
20573 - shift
20574 - shift
20575 - continue;;
20576 -
20577 - -g) chgrpcmd="$chgrpprog $2"
20578 - shift
20579 - shift
20580 - continue;;
20581 -
20582 - -s) stripcmd="$stripprog"
20583 - shift
20584 - continue;;
20585 -
20586 - -t=*) transformarg=`echo $1 | sed 's/-t=//'`
20587 - shift
20588 - continue;;
20589 -
20590 - -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
20591 - shift
20592 - continue;;
20593 -
20594 - *) if [ x"$src" = x ]
20595 - then
20596 - src=$1
20597 - else
20598 - # this colon is to work around a 386BSD /bin/sh bug
20599 - :
20600 - dst=$1
20601 - fi
20602 - shift
20603 - continue;;
20604 - esac
20605 -done
20606 -
20607 -if [ x"$src" = x ]
20608 -then
20609 - echo "install: no input file specified"
20610 - exit 1
20611 +doit=${DOITPROG-}
20612 +if test -z "$doit"; then
20613 + doit_exec=exec
20614 else
20615 - :
20616 + doit_exec=$doit
20617 fi
20618
20619 -if [ x"$dir_arg" != x ]; then
20620 - dst=$src
20621 - src=""
20622 -
20623 - if [ -d $dst ]; then
20624 - instcmd=:
20625 - chmodcmd=""
20626 - else
20627 - instcmd=$mkdirprog
20628 - fi
20629 -else
20630 +# Put in absolute file names if you don't have them in your path;
20631 +# or use environment vars.
20632 +
20633 +chgrpprog=${CHGRPPROG-chgrp}
20634 +chmodprog=${CHMODPROG-chmod}
20635 +chownprog=${CHOWNPROG-chown}
20636 +cmpprog=${CMPPROG-cmp}
20637 +cpprog=${CPPROG-cp}
20638 +mkdirprog=${MKDIRPROG-mkdir}
20639 +mvprog=${MVPROG-mv}
20640 +rmprog=${RMPROG-rm}
20641 +stripprog=${STRIPPROG-strip}
20642 +
20643 +posix_glob='?'
20644 +initialize_posix_glob='
20645 + test "$posix_glob" != "?" || {
20646 + if (set -f) 2>/dev/null; then
20647 + posix_glob=
20648 + else
20649 + posix_glob=:
20650 + fi
20651 + }
20652 +'
20653 +
20654 +posix_mkdir=
20655 +
20656 +# Desired mode of installed file.
20657 +mode=0755
20658 +
20659 +chgrpcmd=
20660 +chmodcmd=$chmodprog
20661 +chowncmd=
20662 +mvcmd=$mvprog
20663 +rmcmd="$rmprog -f"
20664 +stripcmd=
20665
20666 -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
20667 -# might cause directories to be created, which would be especially bad
20668 -# if $src (and thus $dsttmp) contains '*'.
20669 +src=
20670 +dst=
20671 +dir_arg=
20672 +dst_arg=
20673
20674 - if [ -f $src -o -d $src ]
20675 - then
20676 - :
20677 - else
20678 - echo "install: $src does not exist"
20679 - exit 1
20680 - fi
20681 -
20682 - if [ x"$dst" = x ]
20683 - then
20684 - echo "install: no destination specified"
20685 - exit 1
20686 - else
20687 - :
20688 - fi
20689 +copy_on_change=false
20690 +no_target_directory=
20691
20692 -# If destination is a directory, append the input filename; if your system
20693 -# does not like double slashes in filenames, you may need to add some logic
20694 +usage="\
20695 +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
20696 + or: $0 [OPTION]... SRCFILES... DIRECTORY
20697 + or: $0 [OPTION]... -t DIRECTORY SRCFILES...
20698 + or: $0 [OPTION]... -d DIRECTORIES...
20699
20700 - if [ -d $dst ]
20701 - then
20702 - dst="$dst"/`basename $src`
20703 - else
20704 - :
20705 - fi
20706 -fi
20707 +In the 1st form, copy SRCFILE to DSTFILE.
20708 +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
20709 +In the 4th, create DIRECTORIES.
20710
20711 -## this sed command emulates the dirname command
20712 -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
20713 +Options:
20714 + --help display this help and exit.
20715 + --version display version info and exit.
20716
20717 -# Make sure that the destination directory exists.
20718 -# this part is taken from Noah Friedman's mkinstalldirs script
20719 + -c (ignored)
20720 + -C install only if different (preserve the last data modification time)
20721 + -d create directories instead of installing files.
20722 + -g GROUP $chgrpprog installed files to GROUP.
20723 + -m MODE $chmodprog installed files to MODE.
20724 + -o USER $chownprog installed files to USER.
20725 + -s $stripprog installed files.
20726 + -t DIRECTORY install into DIRECTORY.
20727 + -T report an error if DSTFILE is a directory.
20728
20729 -# Skip lots of stat calls in the usual case.
20730 -if [ ! -d "$dstdir" ]; then
20731 -defaultIFS='
20732 - '
20733 -IFS="${IFS-${defaultIFS}}"
20734 +Environment variables override the default commands:
20735 + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
20736 + RMPROG STRIPPROG
20737 +"
20738
20739 -oIFS="${IFS}"
20740 -# Some sh's can't handle IFS=/ for some reason.
20741 -IFS='%'
20742 -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
20743 -IFS="${oIFS}"
20744 +while test $# -ne 0; do
20745 + case $1 in
20746 + -c) ;;
20747
20748 -pathcomp=''
20749 + -C) copy_on_change=true;;
20750
20751 -while [ $# -ne 0 ] ; do
20752 - pathcomp="${pathcomp}${1}"
20753 - shift
20754 + -d) dir_arg=true;;
20755
20756 - if [ ! -d "${pathcomp}" ] ;
20757 - then
20758 - $mkdirprog "${pathcomp}"
20759 - else
20760 - :
20761 - fi
20762 + -g) chgrpcmd="$chgrpprog $2"
20763 + shift;;
20764
20765 - pathcomp="${pathcomp}/"
20766 -done
20767 -fi
20768 + --help) echo "$usage"; exit $?;;
20769
20770 -if [ x"$dir_arg" != x ]
20771 -then
20772 - $doit $instcmd $dst &&
20773 + -m) mode=$2
20774 + case $mode in
20775 + *' '* | *' '* | *'
20776 +'* | *'*'* | *'?'* | *'['*)
20777 + echo "$0: invalid mode: $mode" >&2
20778 + exit 1;;
20779 + esac
20780 + shift;;
20781
20782 - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
20783 - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
20784 - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
20785 - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
20786 -else
20787 + -o) chowncmd="$chownprog $2"
20788 + shift;;
20789
20790 -# If we're going to rename the final executable, determine the name now.
20791 + -s) stripcmd=$stripprog;;
20792
20793 - if [ x"$transformarg" = x ]
20794 - then
20795 - dstfile=`basename $dst`
20796 - else
20797 - dstfile=`basename $dst $transformbasename |
20798 - sed $transformarg`$transformbasename
20799 - fi
20800 + -t) dst_arg=$2
20801 + shift;;
20802
20803 -# don't allow the sed command to completely eliminate the filename
20804 + -T) no_target_directory=true;;
20805
20806 - if [ x"$dstfile" = x ]
20807 - then
20808 - dstfile=`basename $dst`
20809 - else
20810 - :
20811 - fi
20812 -
20813 -# Make a temp file name in the proper directory.
20814 + --version) echo "$0 $scriptversion"; exit $?;;
20815
20816 - dsttmp=$dstdir/#inst.$$#
20817 + --) shift
20818 + break;;
20819
20820 -# Move or copy the file name to the temp name
20821 + -*) echo "$0: invalid option: $1" >&2
20822 + exit 1;;
20823
20824 - $doit $instcmd $src $dsttmp &&
20825 -
20826 - trap "rm -f ${dsttmp}" 0 &&
20827 + *) break;;
20828 + esac
20829 + shift
20830 +done
20831
20832 -# and set any options; do chmod last to preserve setuid bits
20833 +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
20834 + # When -d is used, all remaining arguments are directories to create.
20835 + # When -t is used, the destination is already specified.
20836 + # Otherwise, the last argument is the destination. Remove it from $@.
20837 + for arg
20838 + do
20839 + if test -n "$dst_arg"; then
20840 + # $@ is not empty: it contains at least $arg.
20841 + set fnord "$@" "$dst_arg"
20842 + shift # fnord
20843 + fi
20844 + shift # arg
20845 + dst_arg=$arg
20846 + done
20847 +fi
20848
20849 -# If any of these fail, we abort the whole thing. If we want to
20850 -# ignore errors from any of these, just make sure not to ignore
20851 -# errors from the above "$doit $instcmd $src $dsttmp" command.
20852 +if test $# -eq 0; then
20853 + if test -z "$dir_arg"; then
20854 + echo "$0: no input file specified." >&2
20855 + exit 1
20856 + fi
20857 + # It's OK to call `install-sh -d' without argument.
20858 + # This can happen when creating conditional directories.
20859 + exit 0
20860 +fi
20861
20862 - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
20863 - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
20864 - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
20865 - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
20866 +if test -z "$dir_arg"; then
20867 + trap '(exit $?); exit' 1 2 13 15
20868 +
20869 + # Set umask so as not to create temps with too-generous modes.
20870 + # However, 'strip' requires both read and write access to temps.
20871 + case $mode in
20872 + # Optimize common cases.
20873 + *644) cp_umask=133;;
20874 + *755) cp_umask=22;;
20875 +
20876 + *[0-7])
20877 + if test -z "$stripcmd"; then
20878 + u_plus_rw=
20879 + else
20880 + u_plus_rw='% 200'
20881 + fi
20882 + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
20883 + *)
20884 + if test -z "$stripcmd"; then
20885 + u_plus_rw=
20886 + else
20887 + u_plus_rw=,u+rw
20888 + fi
20889 + cp_umask=$mode$u_plus_rw;;
20890 + esac
20891 +fi
20892
20893 -# Now rename the file to the real destination.
20894 +for src
20895 +do
20896 + # Protect names starting with `-'.
20897 + case $src in
20898 + -*) src=./$src;;
20899 + esac
20900 +
20901 + if test -n "$dir_arg"; then
20902 + dst=$src
20903 + dstdir=$dst
20904 + test -d "$dstdir"
20905 + dstdir_status=$?
20906 + else
20907 +
20908 + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
20909 + # might cause directories to be created, which would be especially bad
20910 + # if $src (and thus $dsttmp) contains '*'.
20911 + if test ! -f "$src" && test ! -d "$src"; then
20912 + echo "$0: $src does not exist." >&2
20913 + exit 1
20914 + fi
20915 +
20916 + if test -z "$dst_arg"; then
20917 + echo "$0: no destination specified." >&2
20918 + exit 1
20919 + fi
20920 +
20921 + dst=$dst_arg
20922 + # Protect names starting with `-'.
20923 + case $dst in
20924 + -*) dst=./$dst;;
20925 + esac
20926
20927 - $doit $rmcmd -f $dstdir/$dstfile &&
20928 - $doit $mvcmd $dsttmp $dstdir/$dstfile
20929 + # If destination is a directory, append the input filename; won't work
20930 + # if double slashes aren't ignored.
20931 + if test -d "$dst"; then
20932 + if test -n "$no_target_directory"; then
20933 + echo "$0: $dst_arg: Is a directory" >&2
20934 + exit 1
20935 + fi
20936 + dstdir=$dst
20937 + dst=$dstdir/`basename "$src"`
20938 + dstdir_status=0
20939 + else
20940 + # Prefer dirname, but fall back on a substitute if dirname fails.
20941 + dstdir=`
20942 + (dirname "$dst") 2>/dev/null ||
20943 + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20944 + X"$dst" : 'X\(//\)[^/]' \| \
20945 + X"$dst" : 'X\(//\)$' \| \
20946 + X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
20947 + echo X"$dst" |
20948 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20949 + s//\1/
20950 + q
20951 + }
20952 + /^X\(\/\/\)[^/].*/{
20953 + s//\1/
20954 + q
20955 + }
20956 + /^X\(\/\/\)$/{
20957 + s//\1/
20958 + q
20959 + }
20960 + /^X\(\/\).*/{
20961 + s//\1/
20962 + q
20963 + }
20964 + s/.*/./; q'
20965 + `
20966 +
20967 + test -d "$dstdir"
20968 + dstdir_status=$?
20969 + fi
20970 + fi
20971 +
20972 + obsolete_mkdir_used=false
20973 +
20974 + if test $dstdir_status != 0; then
20975 + case $posix_mkdir in
20976 + '')
20977 + # Create intermediate dirs using mode 755 as modified by the umask.
20978 + # This is like FreeBSD 'install' as of 1997-10-28.
20979 + umask=`umask`
20980 + case $stripcmd.$umask in
20981 + # Optimize common cases.
20982 + *[2367][2367]) mkdir_umask=$umask;;
20983 + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
20984 +
20985 + *[0-7])
20986 + mkdir_umask=`expr $umask + 22 \
20987 + - $umask % 100 % 40 + $umask % 20 \
20988 + - $umask % 10 % 4 + $umask % 2
20989 + `;;
20990 + *) mkdir_umask=$umask,go-w;;
20991 + esac
20992 +
20993 + # With -d, create the new directory with the user-specified mode.
20994 + # Otherwise, rely on $mkdir_umask.
20995 + if test -n "$dir_arg"; then
20996 + mkdir_mode=-m$mode
20997 + else
20998 + mkdir_mode=
20999 + fi
21000
21001 -fi &&
21002 + posix_mkdir=false
21003 + case $umask in
21004 + *[123567][0-7][0-7])
21005 + # POSIX mkdir -p sets u+wx bits regardless of umask, which
21006 + # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
21007 + ;;
21008 + *)
21009 + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
21010 + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
21011 +
21012 + if (umask $mkdir_umask &&
21013 + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
21014 + then
21015 + if test -z "$dir_arg" || {
21016 + # Check for POSIX incompatibilities with -m.
21017 + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
21018 + # other-writeable bit of parent directory when it shouldn't.
21019 + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
21020 + ls_ld_tmpdir=`ls -ld "$tmpdir"`
21021 + case $ls_ld_tmpdir in
21022 + d????-?r-*) different_mode=700;;
21023 + d????-?--*) different_mode=755;;
21024 + *) false;;
21025 + esac &&
21026 + $mkdirprog -m$different_mode -p -- "$tmpdir" && {
21027 + ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
21028 + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
21029 + }
21030 + }
21031 + then posix_mkdir=:
21032 + fi
21033 + rmdir "$tmpdir/d" "$tmpdir"
21034 + else
21035 + # Remove any dirs left behind by ancient mkdir implementations.
21036 + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
21037 + fi
21038 + trap '' 0;;
21039 + esac;;
21040 + esac
21041
21042 + if
21043 + $posix_mkdir && (
21044 + umask $mkdir_umask &&
21045 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
21046 + )
21047 + then :
21048 + else
21049 +
21050 + # The umask is ridiculous, or mkdir does not conform to POSIX,
21051 + # or it failed possibly due to a race condition. Create the
21052 + # directory the slow way, step by step, checking for races as we go.
21053 +
21054 + case $dstdir in
21055 + /*) prefix='/';;
21056 + -*) prefix='./';;
21057 + *) prefix='';;
21058 + esac
21059 +
21060 + eval "$initialize_posix_glob"
21061 +
21062 + oIFS=$IFS
21063 + IFS=/
21064 + $posix_glob set -f
21065 + set fnord $dstdir
21066 + shift
21067 + $posix_glob set +f
21068 + IFS=$oIFS
21069 +
21070 + prefixes=
21071 +
21072 + for d
21073 + do
21074 + test -z "$d" && continue
21075 +
21076 + prefix=$prefix$d
21077 + if test -d "$prefix"; then
21078 + prefixes=
21079 + else
21080 + if $posix_mkdir; then
21081 + (umask=$mkdir_umask &&
21082 + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
21083 + # Don't fail if two instances are running concurrently.
21084 + test -d "$prefix" || exit 1
21085 + else
21086 + case $prefix in
21087 + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
21088 + *) qprefix=$prefix;;
21089 + esac
21090 + prefixes="$prefixes '$qprefix'"
21091 + fi
21092 + fi
21093 + prefix=$prefix/
21094 + done
21095 +
21096 + if test -n "$prefixes"; then
21097 + # Don't fail if two instances are running concurrently.
21098 + (umask $mkdir_umask &&
21099 + eval "\$doit_exec \$mkdirprog $prefixes") ||
21100 + test -d "$dstdir" || exit 1
21101 + obsolete_mkdir_used=true
21102 + fi
21103 + fi
21104 + fi
21105 +
21106 + if test -n "$dir_arg"; then
21107 + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
21108 + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
21109 + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
21110 + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
21111 + else
21112 +
21113 + # Make a couple of temp file names in the proper directory.
21114 + dsttmp=$dstdir/_inst.$$_
21115 + rmtmp=$dstdir/_rm.$$_
21116 +
21117 + # Trap to clean up those temp files at exit.
21118 + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
21119 +
21120 + # Copy the file name to the temp name.
21121 + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
21122 +
21123 + # and set any options; do chmod last to preserve setuid bits.
21124 + #
21125 + # If any of these fail, we abort the whole thing. If we want to
21126 + # ignore errors from any of these, just make sure not to ignore
21127 + # errors from the above "$doit $cpprog $src $dsttmp" command.
21128 + #
21129 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
21130 + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
21131 + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
21132 + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
21133 +
21134 + # If -C, don't bother to copy if it wouldn't change the file.
21135 + if $copy_on_change &&
21136 + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
21137 + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
21138 +
21139 + eval "$initialize_posix_glob" &&
21140 + $posix_glob set -f &&
21141 + set X $old && old=:$2:$4:$5:$6 &&
21142 + set X $new && new=:$2:$4:$5:$6 &&
21143 + $posix_glob set +f &&
21144 +
21145 + test "$old" = "$new" &&
21146 + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
21147 + then
21148 + rm -f "$dsttmp"
21149 + else
21150 + # Rename the file to the real destination.
21151 + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
21152 +
21153 + # The rename failed, perhaps because mv can't rename something else
21154 + # to itself, or perhaps because mv is so ancient that it does not
21155 + # support -f.
21156 + {
21157 + # Now remove or move aside any old file at destination location.
21158 + # We try this two ways since rm can't unlink itself on some
21159 + # systems and the destination file might be busy for other
21160 + # reasons. In this case, the final cleanup might fail but the new
21161 + # file should still install successfully.
21162 + {
21163 + test ! -f "$dst" ||
21164 + $doit $rmcmd -f "$dst" 2>/dev/null ||
21165 + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
21166 + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
21167 + } ||
21168 + { echo "$0: cannot unlink or rename $dst" >&2
21169 + (exit 1); exit 1
21170 + }
21171 + } &&
21172 +
21173 + # Now rename the file to the real destination.
21174 + $doit $mvcmd "$dsttmp" "$dst"
21175 + }
21176 + fi || exit 1
21177 +
21178 + trap '' 0
21179 + fi
21180 +done
21181
21182 -exit 0
21183 +# Local variables:
21184 +# eval: (add-hook 'write-file-hooks 'time-stamp)
21185 +# time-stamp-start: "scriptversion="
21186 +# time-stamp-format: "%:y-%02m-%02d.%02H"
21187 +# time-stamp-time-zone: "UTC"
21188 +# time-stamp-end: "; # UTC"
21189 +# End:
21190 diff --git a/missing b/missing
21191 index 3aef1fb..28055d2 100755
21192 --- a/missing
21193 +++ b/missing
21194 @@ -1,6 +1,10 @@
21195 #! /bin/sh
21196 # Common stub for a few missing GNU programs while installing.
21197 -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
21198 +
21199 +scriptversion=2009-04-28.21; # UTC
21200 +
21201 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
21202 +# 2008, 2009 Free Software Foundation, Inc.
21203 # Originally by Fran,cois Pinard <[email protected]>, 1996.
21204
21205 # This program is free software; you can redistribute it and/or modify
21206 @@ -14,9 +18,7 @@
21207 # GNU General Public License for more details.
21208
21209 # You should have received a copy of the GNU General Public License
21210 -# along with this program; if not, write to the Free Software
21211 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
21212 -# 02111-1307, USA.
21213 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
21214
21215 # As a special exception to the GNU General Public License, if you
21216 # distribute this file as part of a program that contains a
21217 @@ -29,6 +31,8 @@ if test $# -eq 0; then
21218 fi
21219
21220 run=:
21221 +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
21222 +sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
21223
21224 # In the cases where this matters, `missing' is being run in the
21225 # srcdir already.
21226 @@ -38,18 +42,24 @@ else
21227 configure_ac=configure.in
21228 fi
21229
21230 -case "$1" in
21231 +msg="missing on your system"
21232 +
21233 +case $1 in
21234 --run)
21235 # Try to run requested program, and just exit if it succeeds.
21236 run=
21237 shift
21238 "$@" && exit 0
21239 + # Exit code 63 means version mismatch. This often happens
21240 + # when the user try to use an ancient version of a tool on
21241 + # a file that requires a minimum version. In this case we
21242 + # we should proceed has if the program had been absent, or
21243 + # if --run hadn't been passed.
21244 + if test $? = 63; then
21245 + run=:
21246 + msg="probably too old"
21247 + fi
21248 ;;
21249 -esac
21250 -
21251 -# If it does not exist, or fails to run (possibly an outdated version),
21252 -# try to emulate it.
21253 -case "$1" in
21254
21255 -h|--h|--he|--hel|--help)
21256 echo "\
21257 @@ -67,6 +77,7 @@ Supported PROGRAM values:
21258 aclocal touch file \`aclocal.m4'
21259 autoconf touch file \`configure'
21260 autoheader touch file \`config.h.in'
21261 + autom4te touch the output file, or create a stub one
21262 automake touch all \`Makefile.in' files
21263 bison create \`y.tab.[ch]', if possible, from existing .[ch]
21264 flex create \`lex.yy.c', if possible, from existing .c
21265 @@ -74,11 +85,18 @@ Supported PROGRAM values:
21266 lex create \`lex.yy.c', if possible, from existing .c
21267 makeinfo touch the output file
21268 tar try tar, gnutar, gtar, then tar without non-portable flags
21269 - yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
21270 + yacc create \`y.tab.[ch]', if possible, from existing .[ch]
21271 +
21272 +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
21273 +\`g' are ignored when checking the name.
21274 +
21275 +Send bug reports to <[email protected]>."
21276 + exit $?
21277 ;;
21278
21279 -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
21280 - echo "missing 0.3 - GNU automake"
21281 + echo "missing $scriptversion (GNU Automake)"
21282 + exit $?
21283 ;;
21284
21285 -*)
21286 @@ -87,27 +105,69 @@ Supported PROGRAM values:
21287 exit 1
21288 ;;
21289
21290 - aclocal)
21291 +esac
21292 +
21293 +# normalize program name to check for.
21294 +program=`echo "$1" | sed '
21295 + s/^gnu-//; t
21296 + s/^gnu//; t
21297 + s/^g//; t'`
21298 +
21299 +# Now exit if we have it, but it failed. Also exit now if we
21300 +# don't have it and --version was passed (most likely to detect
21301 +# the program). This is about non-GNU programs, so use $1 not
21302 +# $program.
21303 +case $1 in
21304 + lex*|yacc*)
21305 + # Not GNU programs, they don't have --version.
21306 + ;;
21307 +
21308 + tar*)
21309 + if test -n "$run"; then
21310 + echo 1>&2 "ERROR: \`tar' requires --run"
21311 + exit 1
21312 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
21313 + exit 1
21314 + fi
21315 + ;;
21316 +
21317 + *)
21318 + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
21319 + # We have it, but it failed.
21320 + exit 1
21321 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
21322 + # Could not run --version or --help. This is probably someone
21323 + # running `$TOOL --version' or `$TOOL --help' to check whether
21324 + # $TOOL exists and not knowing $TOOL uses missing.
21325 + exit 1
21326 + fi
21327 + ;;
21328 +esac
21329 +
21330 +# If it does not exist, or fails to run (possibly an outdated version),
21331 +# try to emulate it.
21332 +case $program in
21333 + aclocal*)
21334 echo 1>&2 "\
21335 -WARNING: \`$1' is missing on your system. You should only need it if
21336 +WARNING: \`$1' is $msg. You should only need it if
21337 you modified \`acinclude.m4' or \`${configure_ac}'. You might want
21338 to install the \`Automake' and \`Perl' packages. Grab them from
21339 any GNU archive site."
21340 touch aclocal.m4
21341 ;;
21342
21343 - autoconf)
21344 + autoconf*)
21345 echo 1>&2 "\
21346 -WARNING: \`$1' is missing on your system. You should only need it if
21347 +WARNING: \`$1' is $msg. You should only need it if
21348 you modified \`${configure_ac}'. You might want to install the
21349 \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
21350 archive site."
21351 touch configure
21352 ;;
21353
21354 - autoheader)
21355 + autoheader*)
21356 echo 1>&2 "\
21357 -WARNING: \`$1' is missing on your system. You should only need it if
21358 +WARNING: \`$1' is $msg. You should only need it if
21359 you modified \`acconfig.h' or \`${configure_ac}'. You might want
21360 to install the \`Autoconf' and \`GNU m4' packages. Grab them
21361 from any GNU archive site."
21362 @@ -115,7 +175,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
21363 test -z "$files" && files="config.h"
21364 touch_files=
21365 for f in $files; do
21366 - case "$f" in
21367 + case $f in
21368 *:*) touch_files="$touch_files "`echo "$f" |
21369 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
21370 *) touch_files="$touch_files $f.in";;
21371 @@ -124,9 +184,9 @@ WARNING: \`$1' is missing on your system. You should only need it if
21372 touch $touch_files
21373 ;;
21374
21375 - automake)
21376 + automake*)
21377 echo 1>&2 "\
21378 -WARNING: \`$1' is missing on your system. You should only need it if
21379 +WARNING: \`$1' is $msg. You should only need it if
21380 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
21381 You might want to install the \`Automake' and \`Perl' packages.
21382 Grab them from any GNU archive site."
21383 @@ -135,128 +195,153 @@ WARNING: \`$1' is missing on your system. You should only need it if
21384 while read f; do touch "$f"; done
21385 ;;
21386
21387 - bison|yacc)
21388 + autom4te*)
21389 + echo 1>&2 "\
21390 +WARNING: \`$1' is needed, but is $msg.
21391 + You might have modified some files without having the
21392 + proper tools for further handling them.
21393 + You can get \`$1' as part of \`Autoconf' from any GNU
21394 + archive site."
21395 +
21396 + file=`echo "$*" | sed -n "$sed_output"`
21397 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21398 + if test -f "$file"; then
21399 + touch $file
21400 + else
21401 + test -z "$file" || exec >$file
21402 + echo "#! /bin/sh"
21403 + echo "# Created by GNU Automake missing as a replacement of"
21404 + echo "# $ $@"
21405 + echo "exit 0"
21406 + chmod +x $file
21407 + exit 1
21408 + fi
21409 + ;;
21410 +
21411 + bison*|yacc*)
21412 echo 1>&2 "\
21413 -WARNING: \`$1' is missing on your system. You should only need it if
21414 +WARNING: \`$1' $msg. You should only need it if
21415 you modified a \`.y' file. You may need the \`Bison' package
21416 in order for those modifications to take effect. You can get
21417 \`Bison' from any GNU archive site."
21418 rm -f y.tab.c y.tab.h
21419 - if [ $# -ne 1 ]; then
21420 + if test $# -ne 1; then
21421 eval LASTARG="\${$#}"
21422 - case "$LASTARG" in
21423 + case $LASTARG in
21424 *.y)
21425 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
21426 - if [ -f "$SRCFILE" ]; then
21427 + if test -f "$SRCFILE"; then
21428 cp "$SRCFILE" y.tab.c
21429 fi
21430 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
21431 - if [ -f "$SRCFILE" ]; then
21432 + if test -f "$SRCFILE"; then
21433 cp "$SRCFILE" y.tab.h
21434 fi
21435 ;;
21436 esac
21437 fi
21438 - if [ ! -f y.tab.h ]; then
21439 + if test ! -f y.tab.h; then
21440 echo >y.tab.h
21441 fi
21442 - if [ ! -f y.tab.c ]; then
21443 + if test ! -f y.tab.c; then
21444 echo 'main() { return 0; }' >y.tab.c
21445 fi
21446 ;;
21447
21448 - lex|flex)
21449 + lex*|flex*)
21450 echo 1>&2 "\
21451 -WARNING: \`$1' is missing on your system. You should only need it if
21452 +WARNING: \`$1' is $msg. You should only need it if
21453 you modified a \`.l' file. You may need the \`Flex' package
21454 in order for those modifications to take effect. You can get
21455 \`Flex' from any GNU archive site."
21456 rm -f lex.yy.c
21457 - if [ $# -ne 1 ]; then
21458 + if test $# -ne 1; then
21459 eval LASTARG="\${$#}"
21460 - case "$LASTARG" in
21461 + case $LASTARG in
21462 *.l)
21463 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
21464 - if [ -f "$SRCFILE" ]; then
21465 + if test -f "$SRCFILE"; then
21466 cp "$SRCFILE" lex.yy.c
21467 fi
21468 ;;
21469 esac
21470 fi
21471 - if [ ! -f lex.yy.c ]; then
21472 + if test ! -f lex.yy.c; then
21473 echo 'main() { return 0; }' >lex.yy.c
21474 fi
21475 ;;
21476
21477 - help2man)
21478 + help2man*)
21479 echo 1>&2 "\
21480 -WARNING: \`$1' is missing on your system. You should only need it if
21481 +WARNING: \`$1' is $msg. You should only need it if
21482 you modified a dependency of a manual page. You may need the
21483 \`Help2man' package in order for those modifications to take
21484 effect. You can get \`Help2man' from any GNU archive site."
21485
21486 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
21487 - if test -z "$file"; then
21488 - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
21489 - fi
21490 - if [ -f "$file" ]; then
21491 + file=`echo "$*" | sed -n "$sed_output"`
21492 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21493 + if test -f "$file"; then
21494 touch $file
21495 else
21496 test -z "$file" || exec >$file
21497 echo ".ab help2man is required to generate this page"
21498 - exit 1
21499 + exit $?
21500 fi
21501 ;;
21502
21503 - makeinfo)
21504 - if test -z "$run" && (makeinfo --version > /dev/null 2>&1); then
21505 - # We have makeinfo, but it failed.
21506 - exit 1
21507 - fi
21508 -
21509 + makeinfo*)
21510 echo 1>&2 "\
21511 -WARNING: \`$1' is missing on your system. You should only need it if
21512 +WARNING: \`$1' is $msg. You should only need it if
21513 you modified a \`.texi' or \`.texinfo' file, or any other file
21514 indirectly affecting the aspect of the manual. The spurious
21515 call might also be the consequence of using a buggy \`make' (AIX,
21516 DU, IRIX). You might want to install the \`Texinfo' package or
21517 the \`GNU make' package. Grab either from any GNU archive site."
21518 - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
21519 + # The file to touch is that specified with -o ...
21520 + file=`echo "$*" | sed -n "$sed_output"`
21521 + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
21522 if test -z "$file"; then
21523 - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
21524 - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
21525 + # ... or it is the one specified with @setfilename ...
21526 + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
21527 + file=`sed -n '
21528 + /^@setfilename/{
21529 + s/.* \([^ ]*\) *$/\1/
21530 + p
21531 + q
21532 + }' $infile`
21533 + # ... or it is derived from the source name (dir/f.texi becomes f.info)
21534 + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
21535 fi
21536 + # If the file does not exist, the user really needs makeinfo;
21537 + # let's fail without touching anything.
21538 + test -f $file || exit 1
21539 touch $file
21540 ;;
21541
21542 - tar)
21543 + tar*)
21544 shift
21545 - if test -n "$run"; then
21546 - echo 1>&2 "ERROR: \`tar' requires --run"
21547 - exit 1
21548 - fi
21549
21550 # We have already tried tar in the generic part.
21551 # Look for gnutar/gtar before invocation to avoid ugly error
21552 # messages.
21553 if (gnutar --version > /dev/null 2>&1); then
21554 - gnutar ${1+"$@"} && exit 0
21555 + gnutar "$@" && exit 0
21556 fi
21557 if (gtar --version > /dev/null 2>&1); then
21558 - gtar ${1+"$@"} && exit 0
21559 + gtar "$@" && exit 0
21560 fi
21561 firstarg="$1"
21562 if shift; then
21563 - case "$firstarg" in
21564 + case $firstarg in
21565 *o*)
21566 firstarg=`echo "$firstarg" | sed s/o//`
21567 - tar "$firstarg" ${1+"$@"} && exit 0
21568 + tar "$firstarg" "$@" && exit 0
21569 ;;
21570 esac
21571 - case "$firstarg" in
21572 + case $firstarg in
21573 *h*)
21574 firstarg=`echo "$firstarg" | sed s/h//`
21575 - tar "$firstarg" ${1+"$@"} && exit 0
21576 + tar "$firstarg" "$@" && exit 0
21577 ;;
21578 esac
21579 fi
21580 @@ -270,10 +355,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
21581
21582 *)
21583 echo 1>&2 "\
21584 -WARNING: \`$1' is needed, and you do not seem to have it handy on your
21585 - system. You might have modified some files without having the
21586 +WARNING: \`$1' is needed, and is $msg.
21587 + You might have modified some files without having the
21588 proper tools for further handling them. Check the \`README' file,
21589 - it often tells you about the needed prerequirements for installing
21590 + it often tells you about the needed prerequisites for installing
21591 this package. You may also peek at any GNU archive site, in case
21592 some other package would contain this missing \`$1' program."
21593 exit 1
21594 @@ -281,3 +366,11 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
21595 esac
21596
21597 exit 0
21598 +
21599 +# Local variables:
21600 +# eval: (add-hook 'write-file-hooks 'time-stamp)
21601 +# time-stamp-start: "scriptversion="
21602 +# time-stamp-format: "%:y-%02m-%02d.%02H"
21603 +# time-stamp-time-zone: "UTC"
21604 +# time-stamp-end: "; # UTC"
21605 +# End:
21606 diff --git a/mkinstalldirs b/mkinstalldirs
21607 index 4f58503..4191a45 100755
21608 --- a/mkinstalldirs
21609 +++ b/mkinstalldirs
21610 @@ -1,40 +1,162 @@
21611 #! /bin/sh
21612 # mkinstalldirs --- make directory hierarchy
21613 -# Author: Noah Friedman <[email protected]>
21614 -# Created: 1993-05-16
21615 -# Public domain
21616
21617 -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
21618 +scriptversion=2009-04-28.21; # UTC
21619 +
21620 +# Original author: Noah Friedman <[email protected]>
21621 +# Created: 1993-05-16
21622 +# Public domain.
21623 +#
21624 +# This file is maintained in Automake, please report
21625 +# bugs to <[email protected]> or send patches to
21626 +# <[email protected]>.
21627
21628 +nl='
21629 +'
21630 +IFS=" "" $nl"
21631 errstatus=0
21632 +dirmode=
21633 +
21634 +usage="\
21635 +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
21636 +
21637 +Create each directory DIR (with mode MODE, if specified), including all
21638 +leading file name components.
21639 +
21640 +Report bugs to <[email protected]>."
21641 +
21642 +# process command line arguments
21643 +while test $# -gt 0 ; do
21644 + case $1 in
21645 + -h | --help | --h*) # -h for help
21646 + echo "$usage"
21647 + exit $?
21648 + ;;
21649 + -m) # -m PERM arg
21650 + shift
21651 + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
21652 + dirmode=$1
21653 + shift
21654 + ;;
21655 + --version)
21656 + echo "$0 $scriptversion"
21657 + exit $?
21658 + ;;
21659 + --) # stop option processing
21660 + shift
21661 + break
21662 + ;;
21663 + -*) # unknown option
21664 + echo "$usage" 1>&2
21665 + exit 1
21666 + ;;
21667 + *) # first non-opt arg
21668 + break
21669 + ;;
21670 + esac
21671 +done
21672
21673 for file
21674 do
21675 - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
21676 - shift
21677 + if test -d "$file"; then
21678 + shift
21679 + else
21680 + break
21681 + fi
21682 +done
21683 +
21684 +case $# in
21685 + 0) exit 0 ;;
21686 +esac
21687 +
21688 +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
21689 +# mkdir -p a/c at the same time, both will detect that a is missing,
21690 +# one will create a, then the other will try to create a and die with
21691 +# a "File exists" error. This is a problem when calling mkinstalldirs
21692 +# from a parallel make. We use --version in the probe to restrict
21693 +# ourselves to GNU mkdir, which is thread-safe.
21694 +case $dirmode in
21695 + '')
21696 + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
21697 + echo "mkdir -p -- $*"
21698 + exec mkdir -p -- "$@"
21699 + else
21700 + # On NextStep and OpenStep, the `mkdir' command does not
21701 + # recognize any option. It will interpret all options as
21702 + # directories to create, and then abort because `.' already
21703 + # exists.
21704 + test -d ./-p && rmdir ./-p
21705 + test -d ./--version && rmdir ./--version
21706 + fi
21707 + ;;
21708 + *)
21709 + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
21710 + test ! -d ./--version; then
21711 + echo "mkdir -m $dirmode -p -- $*"
21712 + exec mkdir -m "$dirmode" -p -- "$@"
21713 + else
21714 + # Clean up after NextStep and OpenStep mkdir.
21715 + for d in ./-m ./-p ./--version "./$dirmode";
21716 + do
21717 + test -d $d && rmdir $d
21718 + done
21719 + fi
21720 + ;;
21721 +esac
21722 +
21723 +for file
21724 +do
21725 + case $file in
21726 + /*) pathcomp=/ ;;
21727 + *) pathcomp= ;;
21728 + esac
21729 + oIFS=$IFS
21730 + IFS=/
21731 + set fnord $file
21732 + shift
21733 + IFS=$oIFS
21734 +
21735 + for d
21736 + do
21737 + test "x$d" = x && continue
21738 +
21739 + pathcomp=$pathcomp$d
21740 + case $pathcomp in
21741 + -*) pathcomp=./$pathcomp ;;
21742 + esac
21743
21744 - pathcomp=
21745 - for d
21746 - do
21747 - pathcomp="$pathcomp$d"
21748 - case "$pathcomp" in
21749 - -* ) pathcomp=./$pathcomp ;;
21750 - esac
21751 + if test ! -d "$pathcomp"; then
21752 + echo "mkdir $pathcomp"
21753
21754 - if test ! -d "$pathcomp"; then
21755 - echo "mkdir $pathcomp"
21756 + mkdir "$pathcomp" || lasterr=$?
21757
21758 - mkdir "$pathcomp" || lasterr=$?
21759 + if test ! -d "$pathcomp"; then
21760 + errstatus=$lasterr
21761 + else
21762 + if test ! -z "$dirmode"; then
21763 + echo "chmod $dirmode $pathcomp"
21764 + lasterr=
21765 + chmod "$dirmode" "$pathcomp" || lasterr=$?
21766
21767 - if test ! -d "$pathcomp"; then
21768 - errstatus=$lasterr
21769 - fi
21770 - fi
21771 + if test ! -z "$lasterr"; then
21772 + errstatus=$lasterr
21773 + fi
21774 + fi
21775 + fi
21776 + fi
21777
21778 - pathcomp="$pathcomp/"
21779 - done
21780 + pathcomp=$pathcomp/
21781 + done
21782 done
21783
21784 exit $errstatus
21785
21786 -# mkinstalldirs ends here
21787 +# Local Variables:
21788 +# mode: shell-script
21789 +# sh-indentation: 2
21790 +# eval: (add-hook 'write-file-hooks 'time-stamp)
21791 +# time-stamp-start: "scriptversion="
21792 +# time-stamp-format: "%:y-%02m-%02d.%02H"
21793 +# time-stamp-time-zone: "UTC"
21794 +# time-stamp-end: "; # UTC"
21795 +# End:
21796 diff --git a/pub/Makefile.in b/pub/Makefile.in
21797 index 84cc0dc..724a516 100644
21798 --- a/pub/Makefile.in
21799 +++ b/pub/Makefile.in
21800 @@ -1,8 +1,9 @@
21801 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
21802 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
21803 # @configure_input@
21804
21805 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
21806 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
21807 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
21808 +# Inc.
21809 # This Makefile.in is free software; the Free Software Foundation
21810 # gives unlimited permission to copy and/or distribute it,
21811 # with or without modifications, as long as this notice is preserved.
21812 @@ -16,8 +17,9 @@
21813
21814 VPATH = @srcdir@
21815 pkgdatadir = $(datadir)/@PACKAGE@
21816 -pkglibdir = $(libdir)/@PACKAGE@
21817 pkgincludedir = $(includedir)/@PACKAGE@
21818 +pkglibdir = $(libdir)/@PACKAGE@
21819 +pkglibexecdir = $(libexecdir)/@PACKAGE@
21820 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
21821 install_sh_DATA = $(install_sh) -c -m 644
21822 install_sh_PROGRAM = $(install_sh) -c
21823 @@ -43,6 +45,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
21824 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21825 CONFIG_HEADER = $(top_builddir)/src/conf.h
21826 CONFIG_CLEAN_FILES =
21827 +CONFIG_CLEAN_VPATH_FILES =
21828 LIBRARIES = $(noinst_LIBRARIES)
21829 ARFLAGS = cru
21830 libcfpub_a_AR = $(AR) $(ARFLAGS)
21831 @@ -55,6 +58,7 @@ libcfpub_a_OBJECTS = $(am_libcfpub_a_OBJECTS)
21832 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
21833 depcomp = $(SHELL) $(top_srcdir)/depcomp
21834 am__depfiles_maybe = depfiles
21835 +am__mv = mv -f
21836 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
21837 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21838 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
21839 @@ -72,6 +76,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
21840 ACLOCAL = @ACLOCAL@
21841 AMTAR = @AMTAR@
21842 AR = @AR@
21843 +ARGZ_H = @ARGZ_H@
21844 AUTOCONF = @AUTOCONF@
21845 AUTOHEADER = @AUTOHEADER@
21846 AUTOMAKE = @AUTOMAKE@
21847 @@ -102,6 +107,7 @@ GETCONF = @GETCONF@
21848 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
21849 GREP = @GREP@
21850 HOSTNAME = @HOSTNAME@
21851 +INCLTDL = @INCLTDL@
21852 INSTALL = @INSTALL@
21853 INSTALL_DATA = @INSTALL_DATA@
21854 INSTALL_PROGRAM = @INSTALL_PROGRAM@
21855 @@ -114,13 +120,25 @@ LDFLAGS = @LDFLAGS@
21856 LEX = @LEX@
21857 LEXLIB = @LEXLIB@
21858 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
21859 +LIBADD_DL = @LIBADD_DL@
21860 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
21861 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
21862 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
21863 +LIBLTDL = @LIBLTDL@
21864 LIBOBJS = @LIBOBJS@
21865 LIBS = @LIBS@
21866 LIBTOOL = @LIBTOOL@
21867 LIB_SELINUX = @LIB_SELINUX@
21868 LIPO = @LIPO@
21869 LN_S = @LN_S@
21870 +LTDLDEPS = @LTDLDEPS@
21871 +LTDLINCL = @LTDLINCL@
21872 +LTDLOPEN = @LTDLOPEN@
21873 LTLIBOBJS = @LTLIBOBJS@
21874 +LT_CONFIG_H = @LT_CONFIG_H@
21875 +LT_DLLOADERS = @LT_DLLOADERS@
21876 +LT_DLPREOPEN = @LT_DLPREOPEN@
21877 +MAINT = @MAINT@
21878 MAKEINFO = @MAKEINFO@
21879 MKDIR_P = @MKDIR_P@
21880 NEED_SETGID = @NEED_SETGID@
21881 @@ -192,6 +210,8 @@ libexecdir = @libexecdir@
21882 localedir = @localedir@
21883 localstatedir = @localstatedir@
21884 lt_ECHO = @lt_ECHO@
21885 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
21886 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
21887 mandir = @mandir@
21888 mkdir_p = @mkdir_p@
21889 oldincludedir = @oldincludedir@
21890 @@ -202,6 +222,8 @@ psdir = @psdir@
21891 sbindir = @sbindir@
21892 sharedstatedir = @sharedstatedir@
21893 srcdir = @srcdir@
21894 +subdirs = @subdirs@
21895 +sys_symbol_underscore = @sys_symbol_underscore@
21896 sysconfdir = @sysconfdir@
21897 target = @target@
21898 target_alias = @target_alias@
21899 @@ -258,18 +280,18 @@ all: all-am
21900
21901 .SUFFIXES:
21902 .SUFFIXES: .c .lo .o .obj
21903 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
21904 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
21905 @for dep in $?; do \
21906 case '$(am__configure_deps)' in \
21907 *$$dep*) \
21908 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
21909 - && exit 0; \
21910 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
21911 + && { if test -f $@; then exit 0; else break; fi; }; \
21912 exit 1;; \
21913 esac; \
21914 done; \
21915 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pub/Makefile'; \
21916 - cd $(top_srcdir) && \
21917 - $(AUTOMAKE) --gnu pub/Makefile
21918 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pub/Makefile'; \
21919 + $(am__cd) $(top_srcdir) && \
21920 + $(AUTOMAKE) --gnu pub/Makefile
21921 .PRECIOUS: Makefile
21922 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21923 @case '$?' in \
21924 @@ -283,10 +305,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21925 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
21926 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
21927
21928 -$(top_srcdir)/configure: $(am__configure_deps)
21929 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
21930 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
21931 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
21932 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
21933 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
21934 +$(am__aclocal_m4_deps):
21935
21936 clean-noinstLIBRARIES:
21937 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
21938 @@ -310,105 +333,105 @@ distclean-compile:
21939
21940 .c.o:
21941 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
21942 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21943 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21944 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21945 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21946 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
21947
21948 .c.obj:
21949 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
21950 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21951 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
21952 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
21953 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21954 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
21955
21956 .c.lo:
21957 @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
21958 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
21959 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
21960 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
21961 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21962 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
21963
21964 libcfpub_a-getopt.o: getopt.c
21965 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getopt.o -MD -MP -MF $(DEPDIR)/libcfpub_a-getopt.Tpo -c -o libcfpub_a-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
21966 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getopt.Tpo $(DEPDIR)/libcfpub_a-getopt.Po
21967 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getopt.Tpo $(DEPDIR)/libcfpub_a-getopt.Po
21968 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt.c' object='libcfpub_a-getopt.o' libtool=no @AMDEPBACKSLASH@
21969 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21970 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c
21971
21972 libcfpub_a-getopt.obj: getopt.c
21973 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getopt.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-getopt.Tpo -c -o libcfpub_a-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi`
21974 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getopt.Tpo $(DEPDIR)/libcfpub_a-getopt.Po
21975 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getopt.Tpo $(DEPDIR)/libcfpub_a-getopt.Po
21976 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt.c' object='libcfpub_a-getopt.obj' libtool=no @AMDEPBACKSLASH@
21977 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21978 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi`
21979
21980 libcfpub_a-getopt1.o: getopt1.c
21981 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getopt1.o -MD -MP -MF $(DEPDIR)/libcfpub_a-getopt1.Tpo -c -o libcfpub_a-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
21982 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getopt1.Tpo $(DEPDIR)/libcfpub_a-getopt1.Po
21983 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getopt1.Tpo $(DEPDIR)/libcfpub_a-getopt1.Po
21984 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt1.c' object='libcfpub_a-getopt1.o' libtool=no @AMDEPBACKSLASH@
21985 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21986 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c
21987
21988 libcfpub_a-getopt1.obj: getopt1.c
21989 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getopt1.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-getopt1.Tpo -c -o libcfpub_a-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi`
21990 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getopt1.Tpo $(DEPDIR)/libcfpub_a-getopt1.Po
21991 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getopt1.Tpo $(DEPDIR)/libcfpub_a-getopt1.Po
21992 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getopt1.c' object='libcfpub_a-getopt1.obj' libtool=no @AMDEPBACKSLASH@
21993 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
21994 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi`
21995
21996 libcfpub_a-full-write.o: full-write.c
21997 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-full-write.o -MD -MP -MF $(DEPDIR)/libcfpub_a-full-write.Tpo -c -o libcfpub_a-full-write.o `test -f 'full-write.c' || echo '$(srcdir)/'`full-write.c
21998 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-full-write.Tpo $(DEPDIR)/libcfpub_a-full-write.Po
21999 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-full-write.Tpo $(DEPDIR)/libcfpub_a-full-write.Po
22000 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='full-write.c' object='libcfpub_a-full-write.o' libtool=no @AMDEPBACKSLASH@
22001 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22002 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-full-write.o `test -f 'full-write.c' || echo '$(srcdir)/'`full-write.c
22003
22004 libcfpub_a-full-write.obj: full-write.c
22005 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-full-write.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-full-write.Tpo -c -o libcfpub_a-full-write.obj `if test -f 'full-write.c'; then $(CYGPATH_W) 'full-write.c'; else $(CYGPATH_W) '$(srcdir)/full-write.c'; fi`
22006 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-full-write.Tpo $(DEPDIR)/libcfpub_a-full-write.Po
22007 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-full-write.Tpo $(DEPDIR)/libcfpub_a-full-write.Po
22008 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='full-write.c' object='libcfpub_a-full-write.obj' libtool=no @AMDEPBACKSLASH@
22009 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22010 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-full-write.obj `if test -f 'full-write.c'; then $(CYGPATH_W) 'full-write.c'; else $(CYGPATH_W) '$(srcdir)/full-write.c'; fi`
22011
22012 libcfpub_a-regex.o: regex.c
22013 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-regex.o -MD -MP -MF $(DEPDIR)/libcfpub_a-regex.Tpo -c -o libcfpub_a-regex.o `test -f 'regex.c' || echo '$(srcdir)/'`regex.c
22014 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-regex.Tpo $(DEPDIR)/libcfpub_a-regex.Po
22015 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-regex.Tpo $(DEPDIR)/libcfpub_a-regex.Po
22016 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regex.c' object='libcfpub_a-regex.o' libtool=no @AMDEPBACKSLASH@
22017 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22018 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-regex.o `test -f 'regex.c' || echo '$(srcdir)/'`regex.c
22019
22020 libcfpub_a-regex.obj: regex.c
22021 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-regex.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-regex.Tpo -c -o libcfpub_a-regex.obj `if test -f 'regex.c'; then $(CYGPATH_W) 'regex.c'; else $(CYGPATH_W) '$(srcdir)/regex.c'; fi`
22022 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-regex.Tpo $(DEPDIR)/libcfpub_a-regex.Po
22023 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-regex.Tpo $(DEPDIR)/libcfpub_a-regex.Po
22024 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='regex.c' object='libcfpub_a-regex.obj' libtool=no @AMDEPBACKSLASH@
22025 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22026 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-regex.obj `if test -f 'regex.c'; then $(CYGPATH_W) 'regex.c'; else $(CYGPATH_W) '$(srcdir)/regex.c'; fi`
22027
22028 libcfpub_a-getloadavg.o: getloadavg.c
22029 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getloadavg.o -MD -MP -MF $(DEPDIR)/libcfpub_a-getloadavg.Tpo -c -o libcfpub_a-getloadavg.o `test -f 'getloadavg.c' || echo '$(srcdir)/'`getloadavg.c
22030 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getloadavg.Tpo $(DEPDIR)/libcfpub_a-getloadavg.Po
22031 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getloadavg.Tpo $(DEPDIR)/libcfpub_a-getloadavg.Po
22032 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getloadavg.c' object='libcfpub_a-getloadavg.o' libtool=no @AMDEPBACKSLASH@
22033 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22034 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getloadavg.o `test -f 'getloadavg.c' || echo '$(srcdir)/'`getloadavg.c
22035
22036 libcfpub_a-getloadavg.obj: getloadavg.c
22037 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-getloadavg.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-getloadavg.Tpo -c -o libcfpub_a-getloadavg.obj `if test -f 'getloadavg.c'; then $(CYGPATH_W) 'getloadavg.c'; else $(CYGPATH_W) '$(srcdir)/getloadavg.c'; fi`
22038 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-getloadavg.Tpo $(DEPDIR)/libcfpub_a-getloadavg.Po
22039 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-getloadavg.Tpo $(DEPDIR)/libcfpub_a-getloadavg.Po
22040 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getloadavg.c' object='libcfpub_a-getloadavg.obj' libtool=no @AMDEPBACKSLASH@
22041 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22042 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-getloadavg.obj `if test -f 'getloadavg.c'; then $(CYGPATH_W) 'getloadavg.c'; else $(CYGPATH_W) '$(srcdir)/getloadavg.c'; fi`
22043
22044 libcfpub_a-snprintf.o: snprintf.c
22045 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-snprintf.o -MD -MP -MF $(DEPDIR)/libcfpub_a-snprintf.Tpo -c -o libcfpub_a-snprintf.o `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c
22046 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-snprintf.Tpo $(DEPDIR)/libcfpub_a-snprintf.Po
22047 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-snprintf.Tpo $(DEPDIR)/libcfpub_a-snprintf.Po
22048 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='snprintf.c' object='libcfpub_a-snprintf.o' libtool=no @AMDEPBACKSLASH@
22049 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22050 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-snprintf.o `test -f 'snprintf.c' || echo '$(srcdir)/'`snprintf.c
22051
22052 libcfpub_a-snprintf.obj: snprintf.c
22053 @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -MT libcfpub_a-snprintf.obj -MD -MP -MF $(DEPDIR)/libcfpub_a-snprintf.Tpo -c -o libcfpub_a-snprintf.obj `if test -f 'snprintf.c'; then $(CYGPATH_W) 'snprintf.c'; else $(CYGPATH_W) '$(srcdir)/snprintf.c'; fi`
22054 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfpub_a-snprintf.Tpo $(DEPDIR)/libcfpub_a-snprintf.Po
22055 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfpub_a-snprintf.Tpo $(DEPDIR)/libcfpub_a-snprintf.Po
22056 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='snprintf.c' object='libcfpub_a-snprintf.obj' libtool=no @AMDEPBACKSLASH@
22057 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22058 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfpub_a_CFLAGS) $(CFLAGS) -c -o libcfpub_a-snprintf.obj `if test -f 'snprintf.c'; then $(CYGPATH_W) 'snprintf.c'; else $(CYGPATH_W) '$(srcdir)/snprintf.c'; fi`
22059 @@ -424,14 +447,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
22060 unique=`for i in $$list; do \
22061 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
22062 done | \
22063 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
22064 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
22065 END { if (nonempty) { for (i in files) print i; }; }'`; \
22066 mkid -fID $$unique
22067 tags: TAGS
22068
22069 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
22070 $(TAGS_FILES) $(LISP)
22071 - tags=; \
22072 + set x; \
22073 here=`pwd`; \
22074 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
22075 unique=`for i in $$list; do \
22076 @@ -439,29 +462,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
22077 done | \
22078 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
22079 END { if (nonempty) { for (i in files) print i; }; }'`; \
22080 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
22081 + shift; \
22082 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
22083 test -n "$$unique" || unique=$$empty_fix; \
22084 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
22085 - $$tags $$unique; \
22086 + if test $$# -gt 0; then \
22087 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
22088 + "$$@" $$unique; \
22089 + else \
22090 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
22091 + $$unique; \
22092 + fi; \
22093 fi
22094 ctags: CTAGS
22095 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
22096 $(TAGS_FILES) $(LISP)
22097 - tags=; \
22098 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
22099 unique=`for i in $$list; do \
22100 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
22101 done | \
22102 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
22103 END { if (nonempty) { for (i in files) print i; }; }'`; \
22104 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
22105 + test -z "$(CTAGS_ARGS)$$unique" \
22106 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
22107 - $$tags $$unique
22108 + $$unique
22109
22110 GTAGS:
22111 here=`$(am__cd) $(top_builddir) && pwd` \
22112 - && cd $(top_srcdir) \
22113 - && gtags -i $(GTAGS_ARGS) $$here
22114 + && $(am__cd) $(top_srcdir) \
22115 + && gtags -i $(GTAGS_ARGS) "$$here"
22116
22117 distclean-tags:
22118 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
22119 @@ -482,13 +510,17 @@ distdir: $(DISTFILES)
22120 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
22121 if test -d $$d/$$file; then \
22122 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
22123 + if test -d "$(distdir)/$$file"; then \
22124 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
22125 + fi; \
22126 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
22127 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
22128 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
22129 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
22130 fi; \
22131 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
22132 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
22133 else \
22134 - test -f $(distdir)/$$file \
22135 - || cp -p $$d/$$file $(distdir)/$$file \
22136 + test -f "$(distdir)/$$file" \
22137 + || cp -p $$d/$$file "$(distdir)/$$file" \
22138 || exit 1; \
22139 fi; \
22140 done
22141 @@ -518,6 +550,7 @@ clean-generic:
22142
22143 distclean-generic:
22144 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
22145 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
22146 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
22147
22148 maintainer-clean-generic:
22149 @@ -541,6 +574,8 @@ dvi-am:
22150
22151 html: html-am
22152
22153 +html-am:
22154 +
22155 info: info-am
22156
22157 info-am:
22158 @@ -549,18 +584,28 @@ install-data-am:
22159
22160 install-dvi: install-dvi-am
22161
22162 +install-dvi-am:
22163 +
22164 install-exec-am:
22165
22166 install-html: install-html-am
22167
22168 +install-html-am:
22169 +
22170 install-info: install-info-am
22171
22172 +install-info-am:
22173 +
22174 install-man:
22175
22176 install-pdf: install-pdf-am
22177
22178 +install-pdf-am:
22179 +
22180 install-ps: install-ps-am
22181
22182 +install-ps-am:
22183 +
22184 installcheck-am:
22185
22186 maintainer-clean: maintainer-clean-am
22187 @@ -598,6 +643,7 @@ uninstall-am:
22188 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
22189 pdf pdf-am ps ps-am tags uninstall uninstall-am
22190
22191 +
22192 # Tell versions [3.59,3.63) of GNU make to not export all variables.
22193 # Otherwise a system limit (for SysV at least) may be exceeded.
22194 .NOEXPORT:
22195 diff --git a/src/Makefile.in b/src/Makefile.in
22196 index 8218703..05424f2 100644
22197 --- a/src/Makefile.in
22198 +++ b/src/Makefile.in
22199 @@ -1,8 +1,9 @@
22200 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
22201 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
22202 # @configure_input@
22203
22204 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
22205 -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
22206 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
22207 +# Inc.
22208 # This Makefile.in is free software; the Free Software Foundation
22209 # gives unlimited permission to copy and/or distribute it,
22210 # with or without modifications, as long as this notice is preserved.
22211 @@ -18,8 +19,9 @@
22212
22213 VPATH = @srcdir@
22214 pkgdatadir = $(datadir)/@PACKAGE@
22215 -pkglibdir = $(libdir)/@PACKAGE@
22216 pkgincludedir = $(includedir)/@PACKAGE@
22217 +pkglibdir = $(libdir)/@PACKAGE@
22218 +pkglibexecdir = $(libexecdir)/@PACKAGE@
22219 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
22220 install_sh_DATA = $(install_sh) -c -m 644
22221 install_sh_PROGRAM = $(install_sh) -c
22222 @@ -51,14 +53,29 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
22223 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
22224 CONFIG_HEADER = conf.h
22225 CONFIG_CLEAN_FILES = cflex.l
22226 +CONFIG_CLEAN_VPATH_FILES =
22227 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
22228 am__vpath_adj = case $$p in \
22229 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
22230 *) f=$$p;; \
22231 esac;
22232 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
22233 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
22234 +am__install_max = 40
22235 +am__nobase_strip_setup = \
22236 + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
22237 +am__nobase_strip = \
22238 + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
22239 +am__nobase_list = $(am__nobase_strip_setup); \
22240 + for p in $$list; do echo "$$p $$p"; done | \
22241 + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
22242 + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
22243 + if (++n[$$2] == $(am__install_max)) \
22244 + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
22245 + END { for (dir in files) print dir, files[dir] }'
22246 +am__base_list = \
22247 + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
22248 + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
22249 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"
22250 -libLTLIBRARIES_INSTALL = $(INSTALL)
22251 LTLIBRARIES = $(lib_LTLIBRARIES)
22252 am__DEPENDENCIES_1 =
22253 libcfengine_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
22254 @@ -103,61 +120,71 @@ libcfengine_la_OBJECTS = $(am_libcfengine_la_OBJECTS)
22255 libcfengine_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
22256 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libcfengine_la_CFLAGS) \
22257 $(CFLAGS) $(libcfengine_la_LDFLAGS) $(LDFLAGS) -o $@
22258 -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
22259 PROGRAMS = $(sbin_PROGRAMS)
22260 am_cfagent_OBJECTS = cfagent.$(OBJEXT) wrapper.$(OBJEXT) do.$(OBJEXT)
22261 cfagent_OBJECTS = $(am_cfagent_OBJECTS)
22262 cfagent_LDADD = $(LDADD)
22263 cfagent_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22264 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22265 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22266 + $(am__DEPENDENCIES_1)
22267 am_cfenvd_OBJECTS = cfenvd.$(OBJEXT) env_monitor.$(OBJEXT)
22268 cfenvd_OBJECTS = $(am_cfenvd_OBJECTS)
22269 cfenvd_LDADD = $(LDADD)
22270 cfenvd_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22271 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22272 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22273 + $(am__DEPENDENCIES_1)
22274 am_cfenvgraph_OBJECTS = cfenvgraph.$(OBJEXT)
22275 cfenvgraph_OBJECTS = $(am_cfenvgraph_OBJECTS)
22276 cfenvgraph_LDADD = $(LDADD)
22277 cfenvgraph_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22278 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22279 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22280 + $(am__DEPENDENCIES_1)
22281 am_cfetool_OBJECTS = cfetool.$(OBJEXT)
22282 cfetool_OBJECTS = $(am_cfetool_OBJECTS)
22283 cfetool_LDADD = $(LDADD)
22284 cfetool_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22285 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22286 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22287 + $(am__DEPENDENCIES_1)
22288 am_cfetoolgraph_OBJECTS = cfetoolgraph.$(OBJEXT)
22289 cfetoolgraph_OBJECTS = $(am_cfetoolgraph_OBJECTS)
22290 cfetoolgraph_LDADD = $(LDADD)
22291 cfetoolgraph_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22292 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22293 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22294 + $(am__DEPENDENCIES_1)
22295 am_cfexecd_OBJECTS = cfexecd.$(OBJEXT)
22296 cfexecd_OBJECTS = $(am_cfexecd_OBJECTS)
22297 cfexecd_LDADD = $(LDADD)
22298 cfexecd_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22299 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22300 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22301 + $(am__DEPENDENCIES_1)
22302 am_cfkey_OBJECTS = cfkey.$(OBJEXT)
22303 cfkey_OBJECTS = $(am_cfkey_OBJECTS)
22304 cfkey_LDADD = $(LDADD)
22305 cfkey_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22306 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22307 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22308 + $(am__DEPENDENCIES_1)
22309 am_cfrun_OBJECTS = cfrun.$(OBJEXT)
22310 cfrun_OBJECTS = $(am_cfrun_OBJECTS)
22311 cfrun_LDADD = $(LDADD)
22312 cfrun_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22313 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22314 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22315 + $(am__DEPENDENCIES_1)
22316 am_cfservd_OBJECTS = cfservd.$(OBJEXT)
22317 cfservd_OBJECTS = $(am_cfservd_OBJECTS)
22318 cfservd_LDADD = $(LDADD)
22319 cfservd_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22320 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22321 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22322 + $(am__DEPENDENCIES_1)
22323 am_cfshow_OBJECTS = cfshow.$(OBJEXT)
22324 cfshow_OBJECTS = $(am_cfshow_OBJECTS)
22325 cfshow_LDADD = $(LDADD)
22326 cfshow_DEPENDENCIES = libcfengine.la $(am__DEPENDENCIES_1) \
22327 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
22328 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
22329 + $(am__DEPENDENCIES_1)
22330 DEFAULT_INCLUDES = -I.@am__isrc@
22331 depcomp = $(SHELL) $(top_srcdir)/depcomp
22332 am__depfiles_maybe = depfiles
22333 +am__mv = mv -f
22334 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
22335 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
22336 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22337 @@ -167,10 +194,12 @@ CCLD = $(CC)
22338 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22339 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
22340 $(LDFLAGS) -o $@
22341 +@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
22342 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
22343 LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22344 --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
22345 YLWRAP = $(top_srcdir)/ylwrap
22346 +@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
22347 YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
22348 LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
22349 --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
22350 @@ -189,6 +218,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
22351 ACLOCAL = @ACLOCAL@
22352 AMTAR = @AMTAR@
22353 AR = @AR@
22354 +ARGZ_H = @ARGZ_H@
22355 AUTOCONF = @AUTOCONF@
22356 AUTOHEADER = @AUTOHEADER@
22357 AUTOMAKE = @AUTOMAKE@
22358 @@ -219,6 +249,7 @@ GETCONF = @GETCONF@
22359 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
22360 GREP = @GREP@
22361 HOSTNAME = @HOSTNAME@
22362 +INCLTDL = @INCLTDL@
22363 INSTALL = @INSTALL@
22364 INSTALL_DATA = @INSTALL_DATA@
22365 INSTALL_PROGRAM = @INSTALL_PROGRAM@
22366 @@ -231,13 +262,25 @@ LDFLAGS = @LDFLAGS@
22367 LEX = @LEX@
22368 LEXLIB = @LEXLIB@
22369 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
22370 +LIBADD_DL = @LIBADD_DL@
22371 +LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
22372 +LIBADD_DLOPEN = @LIBADD_DLOPEN@
22373 +LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
22374 +LIBLTDL = @LIBLTDL@
22375 LIBOBJS = @LIBOBJS@
22376 LIBS = @LIBS@
22377 LIBTOOL = @LIBTOOL@
22378 LIB_SELINUX = @LIB_SELINUX@
22379 LIPO = @LIPO@
22380 LN_S = @LN_S@
22381 +LTDLDEPS = @LTDLDEPS@
22382 +LTDLINCL = @LTDLINCL@
22383 +LTDLOPEN = @LTDLOPEN@
22384 LTLIBOBJS = @LTLIBOBJS@
22385 +LT_CONFIG_H = @LT_CONFIG_H@
22386 +LT_DLLOADERS = @LT_DLLOADERS@
22387 +LT_DLPREOPEN = @LT_DLPREOPEN@
22388 +MAINT = @MAINT@
22389 MAKEINFO = @MAKEINFO@
22390 MKDIR_P = @MKDIR_P@
22391 NEED_SETGID = @NEED_SETGID@
22392 @@ -309,6 +352,8 @@ libexecdir = @libexecdir@
22393 localedir = @localedir@
22394 localstatedir = @localstatedir@
22395 lt_ECHO = @lt_ECHO@
22396 +ltdl_LIBOBJS = @ltdl_LIBOBJS@
22397 +ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
22398 mandir = @mandir@
22399 mkdir_p = @mkdir_p@
22400 oldincludedir = @oldincludedir@
22401 @@ -319,6 +364,8 @@ psdir = @psdir@
22402 sbindir = @sbindir@
22403 sharedstatedir = @sharedstatedir@
22404 srcdir = @srcdir@
22405 +subdirs = @subdirs@
22406 +sys_symbol_underscore = @sys_symbol_underscore@
22407 sysconfdir = @sysconfdir@
22408 target = @target@
22409 target_alias = @target_alias@
22410 @@ -328,11 +375,11 @@ target_vendor = @target_vendor@
22411 top_build_prefix = @top_build_prefix@
22412 top_builddir = @top_builddir@
22413 top_srcdir = @top_srcdir@
22414 -AM_CFLAGS = $(GCC_CFLAG) @CFLAGS@
22415 +AM_CFLAGS = $(GCC_CFLAG) -DPKGLIBDIR=\"$(pkglibdir)\" @CFLAGS@
22416 AM_YFLAGS = -d
22417 -LDADD = libcfengine.la $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB)
22418 +LDADD = libcfengine.la $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB) $(LIBLTDL)
22419 INCLUDES = $(BERKELEY_DB_CFLAGS) $(OPENSSL_LIB_CPPFLAGS)
22420 -AM_LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@
22421 +AM_LDFLAGS = -Wl,--export-dynamic $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@
22422
22423 #
22424 # Fix this generically
22425 @@ -340,7 +387,7 @@ AM_LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@
22426 lib_LTLIBRARIES = libcfengine.la
22427 libcfengine_la_LDFLAGS = -version-info 1:0:0 -no-undefined
22428 libcfengine_la_LIBADD = $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB)
22429 -libcfengine_la_CFLAGS = $(AM_CFLAGS)
22430 +libcfengine_la_CFLAGS = $(INCLTDL) $(AM_CFLAGS)
22431
22432 # Separate out a library
22433 libcfengine_la_SOURCES = \
22434 @@ -493,18 +540,18 @@ all: conf.h
22435
22436 .SUFFIXES:
22437 .SUFFIXES: .c .l .lo .o .obj .y
22438 -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
22439 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
22440 @for dep in $?; do \
22441 case '$(am__configure_deps)' in \
22442 *$$dep*) \
22443 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
22444 - && exit 0; \
22445 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
22446 + && { if test -f $@; then exit 0; else break; fi; }; \
22447 exit 1;; \
22448 esac; \
22449 done; \
22450 - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
22451 - cd $(top_srcdir) && \
22452 - $(AUTOMAKE) --gnu src/Makefile
22453 + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
22454 + $(am__cd) $(top_srcdir) && \
22455 + $(AUTOMAKE) --gnu src/Makefile
22456 .PRECIOUS: Makefile
22457 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
22458 @case '$?' in \
22459 @@ -518,10 +565,11 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
22460 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
22461 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22462
22463 -$(top_srcdir)/configure: $(am__configure_deps)
22464 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
22465 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22466 -$(ACLOCAL_M4): $(am__aclocal_m4_deps)
22467 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
22468 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
22469 +$(am__aclocal_m4_deps):
22470
22471 conf.h: stamp-h1
22472 @if test ! -f $@; then \
22473 @@ -532,8 +580,8 @@ conf.h: stamp-h1
22474 stamp-h1: $(srcdir)/conf.h.in $(top_builddir)/config.status
22475 @rm -f stamp-h1
22476 cd $(top_builddir) && $(SHELL) ./config.status src/conf.h
22477 -$(srcdir)/conf.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h
22478 - cd $(top_srcdir) && $(AUTOHEADER)
22479 +$(srcdir)/conf.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
22480 + ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
22481 rm -f stamp-h1
22482 touch $@
22483
22484 @@ -544,20 +592,24 @@ cflex.l: $(top_builddir)/config.status $(srcdir)/cflex.l.in
22485 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
22486 @$(NORMAL_INSTALL)
22487 test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
22488 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
22489 + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
22490 + list2=; for p in $$list; do \
22491 if test -f $$p; then \
22492 - f=$(am__strip_dir) \
22493 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
22494 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
22495 + list2="$$list2 $$p"; \
22496 else :; fi; \
22497 - done
22498 + done; \
22499 + test -z "$$list2" || { \
22500 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
22501 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
22502 + }
22503
22504 uninstall-libLTLIBRARIES:
22505 @$(NORMAL_UNINSTALL)
22506 - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
22507 - p=$(am__strip_dir) \
22508 - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
22509 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
22510 + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
22511 + for p in $$list; do \
22512 + $(am__strip_dir) \
22513 + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
22514 + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
22515 done
22516
22517 clean-libLTLIBRARIES:
22518 @@ -578,31 +630,46 @@ libcfengine.la: $(libcfengine_la_OBJECTS) $(libcfengine_la_DEPENDENCIES)
22519 install-sbinPROGRAMS: $(sbin_PROGRAMS)
22520 @$(NORMAL_INSTALL)
22521 test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
22522 - @list='$(sbin_PROGRAMS)'; for p in $$list; do \
22523 - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
22524 - if test -f $$p \
22525 - || test -f $$p1 \
22526 - ; then \
22527 - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
22528 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
22529 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
22530 - else :; fi; \
22531 - done
22532 + @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
22533 + for p in $$list; do echo "$$p $$p"; done | \
22534 + sed 's/$(EXEEXT)$$//' | \
22535 + while read p p1; do if test -f $$p || test -f $$p1; \
22536 + then echo "$$p"; echo "$$p"; else :; fi; \
22537 + done | \
22538 + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
22539 + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
22540 + sed 'N;N;N;s,\n, ,g' | \
22541 + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
22542 + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
22543 + if ($$2 == $$4) files[d] = files[d] " " $$1; \
22544 + else { print "f", $$3 "/" $$4, $$1; } } \
22545 + END { for (d in files) print "f", d, files[d] }' | \
22546 + while read type dir files; do \
22547 + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
22548 + test -z "$$files" || { \
22549 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
22550 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
22551 + } \
22552 + ; done
22553
22554 uninstall-sbinPROGRAMS:
22555 @$(NORMAL_UNINSTALL)
22556 - @list='$(sbin_PROGRAMS)'; for p in $$list; do \
22557 - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
22558 - echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
22559 - rm -f "$(DESTDIR)$(sbindir)/$$f"; \
22560 - done
22561 + @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
22562 + files=`for p in $$list; do echo "$$p"; done | \
22563 + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
22564 + -e 's/$$/$(EXEEXT)/' `; \
22565 + test -n "$$list" || exit 0; \
22566 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
22567 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
22568
22569 clean-sbinPROGRAMS:
22570 - @list='$(sbin_PROGRAMS)'; for p in $$list; do \
22571 - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
22572 - echo " rm -f $$p $$f"; \
22573 - rm -f $$p $$f ; \
22574 - done
22575 + @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
22576 + echo " rm -f" $$list; \
22577 + rm -f $$list || exit $$?; \
22578 + test -n "$(EXEEXT)" || exit 0; \
22579 + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
22580 + echo " rm -f" $$list; \
22581 + rm -f $$list
22582 cfagent$(EXEEXT): $(cfagent_OBJECTS) $(cfagent_DEPENDENCIES)
22583 @rm -f cfagent$(EXEEXT)
22584 $(LINK) $(cfagent_OBJECTS) $(cfagent_LDADD) $(LIBS)
22585 @@ -726,514 +793,514 @@ distclean-compile:
22586
22587 .c.o:
22588 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22589 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22590 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22591 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22592 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22593 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
22594
22595 .c.obj:
22596 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
22597 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22598 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
22599 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
22600 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22601 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
22602
22603 .c.lo:
22604 @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
22605 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
22606 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
22607 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
22608 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22609 @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
22610
22611 libcfengine_la-init.lo: init.c
22612 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-init.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-init.Tpo -c -o libcfengine_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c
22613 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-init.Tpo $(DEPDIR)/libcfengine_la-init.Plo
22614 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-init.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-init.Tpo -c -o libcfengine_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c
22615 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-init.Tpo $(DEPDIR)/libcfengine_la-init.Plo
22616 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='init.c' object='libcfengine_la-init.lo' libtool=yes @AMDEPBACKSLASH@
22617 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22618 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c
22619 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-init.lo `test -f 'init.c' || echo '$(srcdir)/'`init.c
22620
22621 libcfengine_la-modules.lo: modules.c
22622 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-modules.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-modules.Tpo -c -o libcfengine_la-modules.lo `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
22623 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-modules.Tpo $(DEPDIR)/libcfengine_la-modules.Plo
22624 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-modules.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-modules.Tpo -c -o libcfengine_la-modules.lo `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
22625 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-modules.Tpo $(DEPDIR)/libcfengine_la-modules.Plo
22626 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modules.c' object='libcfengine_la-modules.lo' libtool=yes @AMDEPBACKSLASH@
22627 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22628 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-modules.lo `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
22629 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-modules.lo `test -f 'modules.c' || echo '$(srcdir)/'`modules.c
22630
22631 libcfengine_la-alerts.lo: alerts.c
22632 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-alerts.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-alerts.Tpo -c -o libcfengine_la-alerts.lo `test -f 'alerts.c' || echo '$(srcdir)/'`alerts.c
22633 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-alerts.Tpo $(DEPDIR)/libcfengine_la-alerts.Plo
22634 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-alerts.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-alerts.Tpo -c -o libcfengine_la-alerts.lo `test -f 'alerts.c' || echo '$(srcdir)/'`alerts.c
22635 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-alerts.Tpo $(DEPDIR)/libcfengine_la-alerts.Plo
22636 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alerts.c' object='libcfengine_la-alerts.lo' libtool=yes @AMDEPBACKSLASH@
22637 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22638 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-alerts.lo `test -f 'alerts.c' || echo '$(srcdir)/'`alerts.c
22639 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-alerts.lo `test -f 'alerts.c' || echo '$(srcdir)/'`alerts.c
22640
22641 libcfengine_la-report.lo: report.c
22642 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-report.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-report.Tpo -c -o libcfengine_la-report.lo `test -f 'report.c' || echo '$(srcdir)/'`report.c
22643 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-report.Tpo $(DEPDIR)/libcfengine_la-report.Plo
22644 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-report.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-report.Tpo -c -o libcfengine_la-report.lo `test -f 'report.c' || echo '$(srcdir)/'`report.c
22645 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-report.Tpo $(DEPDIR)/libcfengine_la-report.Plo
22646 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='report.c' object='libcfengine_la-report.lo' libtool=yes @AMDEPBACKSLASH@
22647 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22648 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-report.lo `test -f 'report.c' || echo '$(srcdir)/'`report.c
22649 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-report.lo `test -f 'report.c' || echo '$(srcdir)/'`report.c
22650
22651 libcfengine_la-client.lo: client.c
22652 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-client.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-client.Tpo -c -o libcfengine_la-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c
22653 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-client.Tpo $(DEPDIR)/libcfengine_la-client.Plo
22654 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-client.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-client.Tpo -c -o libcfengine_la-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c
22655 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-client.Tpo $(DEPDIR)/libcfengine_la-client.Plo
22656 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='client.c' object='libcfengine_la-client.lo' libtool=yes @AMDEPBACKSLASH@
22657 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22658 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c
22659 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-client.lo `test -f 'client.c' || echo '$(srcdir)/'`client.c
22660
22661 libcfengine_la-ip.lo: ip.c
22662 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ip.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ip.Tpo -c -o libcfengine_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c
22663 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-ip.Tpo $(DEPDIR)/libcfengine_la-ip.Plo
22664 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ip.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ip.Tpo -c -o libcfengine_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c
22665 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-ip.Tpo $(DEPDIR)/libcfengine_la-ip.Plo
22666 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ip.c' object='libcfengine_la-ip.lo' libtool=yes @AMDEPBACKSLASH@
22667 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22668 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c
22669 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ip.lo `test -f 'ip.c' || echo '$(srcdir)/'`ip.c
22670
22671 libcfengine_la-ipname.lo: ipname.c
22672 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ipname.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ipname.Tpo -c -o libcfengine_la-ipname.lo `test -f 'ipname.c' || echo '$(srcdir)/'`ipname.c
22673 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-ipname.Tpo $(DEPDIR)/libcfengine_la-ipname.Plo
22674 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ipname.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ipname.Tpo -c -o libcfengine_la-ipname.lo `test -f 'ipname.c' || echo '$(srcdir)/'`ipname.c
22675 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-ipname.Tpo $(DEPDIR)/libcfengine_la-ipname.Plo
22676 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ipname.c' object='libcfengine_la-ipname.lo' libtool=yes @AMDEPBACKSLASH@
22677 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22678 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ipname.lo `test -f 'ipname.c' || echo '$(srcdir)/'`ipname.c
22679 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ipname.lo `test -f 'ipname.c' || echo '$(srcdir)/'`ipname.c
22680
22681 libcfengine_la-instrument.lo: instrument.c
22682 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-instrument.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-instrument.Tpo -c -o libcfengine_la-instrument.lo `test -f 'instrument.c' || echo '$(srcdir)/'`instrument.c
22683 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-instrument.Tpo $(DEPDIR)/libcfengine_la-instrument.Plo
22684 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-instrument.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-instrument.Tpo -c -o libcfengine_la-instrument.lo `test -f 'instrument.c' || echo '$(srcdir)/'`instrument.c
22685 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-instrument.Tpo $(DEPDIR)/libcfengine_la-instrument.Plo
22686 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='instrument.c' object='libcfengine_la-instrument.lo' libtool=yes @AMDEPBACKSLASH@
22687 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22688 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-instrument.lo `test -f 'instrument.c' || echo '$(srcdir)/'`instrument.c
22689 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-instrument.lo `test -f 'instrument.c' || echo '$(srcdir)/'`instrument.c
22690
22691 libcfengine_la-process.lo: process.c
22692 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-process.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-process.Tpo -c -o libcfengine_la-process.lo `test -f 'process.c' || echo '$(srcdir)/'`process.c
22693 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-process.Tpo $(DEPDIR)/libcfengine_la-process.Plo
22694 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-process.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-process.Tpo -c -o libcfengine_la-process.lo `test -f 'process.c' || echo '$(srcdir)/'`process.c
22695 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-process.Tpo $(DEPDIR)/libcfengine_la-process.Plo
22696 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='process.c' object='libcfengine_la-process.lo' libtool=yes @AMDEPBACKSLASH@
22697 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22698 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-process.lo `test -f 'process.c' || echo '$(srcdir)/'`process.c
22699 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-process.lo `test -f 'process.c' || echo '$(srcdir)/'`process.c
22700
22701 libcfengine_la-timeout.lo: timeout.c
22702 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-timeout.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-timeout.Tpo -c -o libcfengine_la-timeout.lo `test -f 'timeout.c' || echo '$(srcdir)/'`timeout.c
22703 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-timeout.Tpo $(DEPDIR)/libcfengine_la-timeout.Plo
22704 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-timeout.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-timeout.Tpo -c -o libcfengine_la-timeout.lo `test -f 'timeout.c' || echo '$(srcdir)/'`timeout.c
22705 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-timeout.Tpo $(DEPDIR)/libcfengine_la-timeout.Plo
22706 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='timeout.c' object='libcfengine_la-timeout.lo' libtool=yes @AMDEPBACKSLASH@
22707 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22708 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-timeout.lo `test -f 'timeout.c' || echo '$(srcdir)/'`timeout.c
22709 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-timeout.lo `test -f 'timeout.c' || echo '$(srcdir)/'`timeout.c
22710
22711 libcfengine_la-ifconf.lo: ifconf.c
22712 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ifconf.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ifconf.Tpo -c -o libcfengine_la-ifconf.lo `test -f 'ifconf.c' || echo '$(srcdir)/'`ifconf.c
22713 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-ifconf.Tpo $(DEPDIR)/libcfengine_la-ifconf.Plo
22714 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-ifconf.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-ifconf.Tpo -c -o libcfengine_la-ifconf.lo `test -f 'ifconf.c' || echo '$(srcdir)/'`ifconf.c
22715 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-ifconf.Tpo $(DEPDIR)/libcfengine_la-ifconf.Plo
22716 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ifconf.c' object='libcfengine_la-ifconf.lo' libtool=yes @AMDEPBACKSLASH@
22717 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22718 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ifconf.lo `test -f 'ifconf.c' || echo '$(srcdir)/'`ifconf.c
22719 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-ifconf.lo `test -f 'ifconf.c' || echo '$(srcdir)/'`ifconf.c
22720
22721 libcfengine_la-image.lo: image.c
22722 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-image.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-image.Tpo -c -o libcfengine_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
22723 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-image.Tpo $(DEPDIR)/libcfengine_la-image.Plo
22724 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-image.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-image.Tpo -c -o libcfengine_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
22725 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-image.Tpo $(DEPDIR)/libcfengine_la-image.Plo
22726 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='image.c' object='libcfengine_la-image.lo' libtool=yes @AMDEPBACKSLASH@
22727 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22728 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
22729 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-image.lo `test -f 'image.c' || echo '$(srcdir)/'`image.c
22730
22731 libcfengine_la-item.lo: item.c
22732 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item.Tpo -c -o libcfengine_la-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c
22733 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-item.Tpo $(DEPDIR)/libcfengine_la-item.Plo
22734 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item.Tpo -c -o libcfengine_la-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c
22735 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-item.Tpo $(DEPDIR)/libcfengine_la-item.Plo
22736 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item.c' object='libcfengine_la-item.lo' libtool=yes @AMDEPBACKSLASH@
22737 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22738 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c
22739 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item.lo `test -f 'item.c' || echo '$(srcdir)/'`item.c
22740
22741 libcfengine_la-item-ext.lo: item-ext.c
22742 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item-ext.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item-ext.Tpo -c -o libcfengine_la-item-ext.lo `test -f 'item-ext.c' || echo '$(srcdir)/'`item-ext.c
22743 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-item-ext.Tpo $(DEPDIR)/libcfengine_la-item-ext.Plo
22744 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item-ext.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item-ext.Tpo -c -o libcfengine_la-item-ext.lo `test -f 'item-ext.c' || echo '$(srcdir)/'`item-ext.c
22745 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-item-ext.Tpo $(DEPDIR)/libcfengine_la-item-ext.Plo
22746 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item-ext.c' object='libcfengine_la-item-ext.lo' libtool=yes @AMDEPBACKSLASH@
22747 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22748 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item-ext.lo `test -f 'item-ext.c' || echo '$(srcdir)/'`item-ext.c
22749 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item-ext.lo `test -f 'item-ext.c' || echo '$(srcdir)/'`item-ext.c
22750
22751 libcfengine_la-item-file.lo: item-file.c
22752 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item-file.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item-file.Tpo -c -o libcfengine_la-item-file.lo `test -f 'item-file.c' || echo '$(srcdir)/'`item-file.c
22753 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-item-file.Tpo $(DEPDIR)/libcfengine_la-item-file.Plo
22754 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-item-file.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-item-file.Tpo -c -o libcfengine_la-item-file.lo `test -f 'item-file.c' || echo '$(srcdir)/'`item-file.c
22755 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-item-file.Tpo $(DEPDIR)/libcfengine_la-item-file.Plo
22756 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='item-file.c' object='libcfengine_la-item-file.lo' libtool=yes @AMDEPBACKSLASH@
22757 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22758 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item-file.lo `test -f 'item-file.c' || echo '$(srcdir)/'`item-file.c
22759 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-item-file.lo `test -f 'item-file.c' || echo '$(srcdir)/'`item-file.c
22760
22761 libcfengine_la-2Dlist.lo: 2Dlist.c
22762 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-2Dlist.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-2Dlist.Tpo -c -o libcfengine_la-2Dlist.lo `test -f '2Dlist.c' || echo '$(srcdir)/'`2Dlist.c
22763 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-2Dlist.Tpo $(DEPDIR)/libcfengine_la-2Dlist.Plo
22764 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-2Dlist.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-2Dlist.Tpo -c -o libcfengine_la-2Dlist.lo `test -f '2Dlist.c' || echo '$(srcdir)/'`2Dlist.c
22765 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-2Dlist.Tpo $(DEPDIR)/libcfengine_la-2Dlist.Plo
22766 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='2Dlist.c' object='libcfengine_la-2Dlist.lo' libtool=yes @AMDEPBACKSLASH@
22767 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22768 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-2Dlist.lo `test -f '2Dlist.c' || echo '$(srcdir)/'`2Dlist.c
22769 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-2Dlist.lo `test -f '2Dlist.c' || echo '$(srcdir)/'`2Dlist.c
22770
22771 libcfengine_la-globals.lo: globals.c
22772 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-globals.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-globals.Tpo -c -o libcfengine_la-globals.lo `test -f 'globals.c' || echo '$(srcdir)/'`globals.c
22773 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-globals.Tpo $(DEPDIR)/libcfengine_la-globals.Plo
22774 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-globals.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-globals.Tpo -c -o libcfengine_la-globals.lo `test -f 'globals.c' || echo '$(srcdir)/'`globals.c
22775 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-globals.Tpo $(DEPDIR)/libcfengine_la-globals.Plo
22776 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='globals.c' object='libcfengine_la-globals.lo' libtool=yes @AMDEPBACKSLASH@
22777 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22778 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-globals.lo `test -f 'globals.c' || echo '$(srcdir)/'`globals.c
22779 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-globals.lo `test -f 'globals.c' || echo '$(srcdir)/'`globals.c
22780
22781 libcfengine_la-classes.lo: classes.c
22782 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-classes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-classes.Tpo -c -o libcfengine_la-classes.lo `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
22783 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-classes.Tpo $(DEPDIR)/libcfengine_la-classes.Plo
22784 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-classes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-classes.Tpo -c -o libcfengine_la-classes.lo `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
22785 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-classes.Tpo $(DEPDIR)/libcfengine_la-classes.Plo
22786 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='classes.c' object='libcfengine_la-classes.lo' libtool=yes @AMDEPBACKSLASH@
22787 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22788 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-classes.lo `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
22789 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-classes.lo `test -f 'classes.c' || echo '$(srcdir)/'`classes.c
22790
22791 libcfengine_la-misc.lo: misc.c
22792 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-misc.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-misc.Tpo -c -o libcfengine_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
22793 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-misc.Tpo $(DEPDIR)/libcfengine_la-misc.Plo
22794 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-misc.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-misc.Tpo -c -o libcfengine_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
22795 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-misc.Tpo $(DEPDIR)/libcfengine_la-misc.Plo
22796 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='misc.c' object='libcfengine_la-misc.lo' libtool=yes @AMDEPBACKSLASH@
22797 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22798 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
22799 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
22800
22801 libcfengine_la-parse.lo: parse.c
22802 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-parse.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-parse.Tpo -c -o libcfengine_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
22803 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-parse.Tpo $(DEPDIR)/libcfengine_la-parse.Plo
22804 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-parse.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-parse.Tpo -c -o libcfengine_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
22805 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-parse.Tpo $(DEPDIR)/libcfengine_la-parse.Plo
22806 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='parse.c' object='libcfengine_la-parse.lo' libtool=yes @AMDEPBACKSLASH@
22807 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22808 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
22809 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
22810
22811 libcfengine_la-functions.lo: functions.c
22812 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-functions.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-functions.Tpo -c -o libcfengine_la-functions.lo `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
22813 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-functions.Tpo $(DEPDIR)/libcfengine_la-functions.Plo
22814 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-functions.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-functions.Tpo -c -o libcfengine_la-functions.lo `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
22815 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-functions.Tpo $(DEPDIR)/libcfengine_la-functions.Plo
22816 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='functions.c' object='libcfengine_la-functions.lo' libtool=yes @AMDEPBACKSLASH@
22817 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22818 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-functions.lo `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
22819 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-functions.lo `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
22820
22821 libcfengine_la-edittools.lo: edittools.c
22822 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-edittools.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-edittools.Tpo -c -o libcfengine_la-edittools.lo `test -f 'edittools.c' || echo '$(srcdir)/'`edittools.c
22823 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-edittools.Tpo $(DEPDIR)/libcfengine_la-edittools.Plo
22824 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-edittools.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-edittools.Tpo -c -o libcfengine_la-edittools.lo `test -f 'edittools.c' || echo '$(srcdir)/'`edittools.c
22825 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-edittools.Tpo $(DEPDIR)/libcfengine_la-edittools.Plo
22826 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='edittools.c' object='libcfengine_la-edittools.lo' libtool=yes @AMDEPBACKSLASH@
22827 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22828 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-edittools.lo `test -f 'edittools.c' || echo '$(srcdir)/'`edittools.c
22829 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-edittools.lo `test -f 'edittools.c' || echo '$(srcdir)/'`edittools.c
22830
22831 libcfengine_la-patches.lo: patches.c
22832 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-patches.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-patches.Tpo -c -o libcfengine_la-patches.lo `test -f 'patches.c' || echo '$(srcdir)/'`patches.c
22833 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-patches.Tpo $(DEPDIR)/libcfengine_la-patches.Plo
22834 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-patches.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-patches.Tpo -c -o libcfengine_la-patches.lo `test -f 'patches.c' || echo '$(srcdir)/'`patches.c
22835 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-patches.Tpo $(DEPDIR)/libcfengine_la-patches.Plo
22836 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='patches.c' object='libcfengine_la-patches.lo' libtool=yes @AMDEPBACKSLASH@
22837 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22838 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-patches.lo `test -f 'patches.c' || echo '$(srcdir)/'`patches.c
22839 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-patches.lo `test -f 'patches.c' || echo '$(srcdir)/'`patches.c
22840
22841 libcfengine_la-install.lo: install.c
22842 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-install.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-install.Tpo -c -o libcfengine_la-install.lo `test -f 'install.c' || echo '$(srcdir)/'`install.c
22843 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-install.Tpo $(DEPDIR)/libcfengine_la-install.Plo
22844 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-install.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-install.Tpo -c -o libcfengine_la-install.lo `test -f 'install.c' || echo '$(srcdir)/'`install.c
22845 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-install.Tpo $(DEPDIR)/libcfengine_la-install.Plo
22846 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='install.c' object='libcfengine_la-install.lo' libtool=yes @AMDEPBACKSLASH@
22847 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22848 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-install.lo `test -f 'install.c' || echo '$(srcdir)/'`install.c
22849 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-install.lo `test -f 'install.c' || echo '$(srcdir)/'`install.c
22850
22851 libcfengine_la-link.lo: link.c
22852 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-link.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-link.Tpo -c -o libcfengine_la-link.lo `test -f 'link.c' || echo '$(srcdir)/'`link.c
22853 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-link.Tpo $(DEPDIR)/libcfengine_la-link.Plo
22854 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-link.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-link.Tpo -c -o libcfengine_la-link.lo `test -f 'link.c' || echo '$(srcdir)/'`link.c
22855 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-link.Tpo $(DEPDIR)/libcfengine_la-link.Plo
22856 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='link.c' object='libcfengine_la-link.lo' libtool=yes @AMDEPBACKSLASH@
22857 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22858 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-link.lo `test -f 'link.c' || echo '$(srcdir)/'`link.c
22859 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-link.lo `test -f 'link.c' || echo '$(srcdir)/'`link.c
22860
22861 libcfengine_la-tidy.lo: tidy.c
22862 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-tidy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-tidy.Tpo -c -o libcfengine_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
22863 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-tidy.Tpo $(DEPDIR)/libcfengine_la-tidy.Plo
22864 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-tidy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-tidy.Tpo -c -o libcfengine_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
22865 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-tidy.Tpo $(DEPDIR)/libcfengine_la-tidy.Plo
22866 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tidy.c' object='libcfengine_la-tidy.lo' libtool=yes @AMDEPBACKSLASH@
22867 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22868 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
22869 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-tidy.lo `test -f 'tidy.c' || echo '$(srcdir)/'`tidy.c
22870
22871 libcfengine_la-filedir.lo: filedir.c
22872 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filedir.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filedir.Tpo -c -o libcfengine_la-filedir.lo `test -f 'filedir.c' || echo '$(srcdir)/'`filedir.c
22873 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-filedir.Tpo $(DEPDIR)/libcfengine_la-filedir.Plo
22874 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filedir.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filedir.Tpo -c -o libcfengine_la-filedir.lo `test -f 'filedir.c' || echo '$(srcdir)/'`filedir.c
22875 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-filedir.Tpo $(DEPDIR)/libcfengine_la-filedir.Plo
22876 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filedir.c' object='libcfengine_la-filedir.lo' libtool=yes @AMDEPBACKSLASH@
22877 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22878 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filedir.lo `test -f 'filedir.c' || echo '$(srcdir)/'`filedir.c
22879 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filedir.lo `test -f 'filedir.c' || echo '$(srcdir)/'`filedir.c
22880
22881 libcfengine_la-eval.lo: eval.c
22882 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-eval.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-eval.Tpo -c -o libcfengine_la-eval.lo `test -f 'eval.c' || echo '$(srcdir)/'`eval.c
22883 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-eval.Tpo $(DEPDIR)/libcfengine_la-eval.Plo
22884 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-eval.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-eval.Tpo -c -o libcfengine_la-eval.lo `test -f 'eval.c' || echo '$(srcdir)/'`eval.c
22885 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-eval.Tpo $(DEPDIR)/libcfengine_la-eval.Plo
22886 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eval.c' object='libcfengine_la-eval.lo' libtool=yes @AMDEPBACKSLASH@
22887 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22888 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-eval.lo `test -f 'eval.c' || echo '$(srcdir)/'`eval.c
22889 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-eval.lo `test -f 'eval.c' || echo '$(srcdir)/'`eval.c
22890
22891 libcfengine_la-modes.lo: modes.c
22892 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-modes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-modes.Tpo -c -o libcfengine_la-modes.lo `test -f 'modes.c' || echo '$(srcdir)/'`modes.c
22893 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-modes.Tpo $(DEPDIR)/libcfengine_la-modes.Plo
22894 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-modes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-modes.Tpo -c -o libcfengine_la-modes.lo `test -f 'modes.c' || echo '$(srcdir)/'`modes.c
22895 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-modes.Tpo $(DEPDIR)/libcfengine_la-modes.Plo
22896 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='modes.c' object='libcfengine_la-modes.lo' libtool=yes @AMDEPBACKSLASH@
22897 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22898 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-modes.lo `test -f 'modes.c' || echo '$(srcdir)/'`modes.c
22899 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-modes.lo `test -f 'modes.c' || echo '$(srcdir)/'`modes.c
22900
22901 libcfengine_la-sockaddr.lo: sockaddr.c
22902 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-sockaddr.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-sockaddr.Tpo -c -o libcfengine_la-sockaddr.lo `test -f 'sockaddr.c' || echo '$(srcdir)/'`sockaddr.c
22903 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-sockaddr.Tpo $(DEPDIR)/libcfengine_la-sockaddr.Plo
22904 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-sockaddr.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-sockaddr.Tpo -c -o libcfengine_la-sockaddr.lo `test -f 'sockaddr.c' || echo '$(srcdir)/'`sockaddr.c
22905 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-sockaddr.Tpo $(DEPDIR)/libcfengine_la-sockaddr.Plo
22906 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sockaddr.c' object='libcfengine_la-sockaddr.lo' libtool=yes @AMDEPBACKSLASH@
22907 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22908 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-sockaddr.lo `test -f 'sockaddr.c' || echo '$(srcdir)/'`sockaddr.c
22909 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-sockaddr.lo `test -f 'sockaddr.c' || echo '$(srcdir)/'`sockaddr.c
22910
22911 libcfengine_la-chflags.lo: chflags.c
22912 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-chflags.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-chflags.Tpo -c -o libcfengine_la-chflags.lo `test -f 'chflags.c' || echo '$(srcdir)/'`chflags.c
22913 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-chflags.Tpo $(DEPDIR)/libcfengine_la-chflags.Plo
22914 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-chflags.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-chflags.Tpo -c -o libcfengine_la-chflags.lo `test -f 'chflags.c' || echo '$(srcdir)/'`chflags.c
22915 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-chflags.Tpo $(DEPDIR)/libcfengine_la-chflags.Plo
22916 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='chflags.c' object='libcfengine_la-chflags.lo' libtool=yes @AMDEPBACKSLASH@
22917 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22918 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-chflags.lo `test -f 'chflags.c' || echo '$(srcdir)/'`chflags.c
22919 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-chflags.lo `test -f 'chflags.c' || echo '$(srcdir)/'`chflags.c
22920
22921 libcfengine_la-locks.lo: locks.c
22922 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-locks.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-locks.Tpo -c -o libcfengine_la-locks.lo `test -f 'locks.c' || echo '$(srcdir)/'`locks.c
22923 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-locks.Tpo $(DEPDIR)/libcfengine_la-locks.Plo
22924 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-locks.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-locks.Tpo -c -o libcfengine_la-locks.lo `test -f 'locks.c' || echo '$(srcdir)/'`locks.c
22925 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-locks.Tpo $(DEPDIR)/libcfengine_la-locks.Plo
22926 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='locks.c' object='libcfengine_la-locks.lo' libtool=yes @AMDEPBACKSLASH@
22927 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22928 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-locks.lo `test -f 'locks.c' || echo '$(srcdir)/'`locks.c
22929 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-locks.lo `test -f 'locks.c' || echo '$(srcdir)/'`locks.c
22930
22931 libcfengine_la-mount.lo: mount.c
22932 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-mount.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-mount.Tpo -c -o libcfengine_la-mount.lo `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
22933 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-mount.Tpo $(DEPDIR)/libcfengine_la-mount.Plo
22934 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-mount.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-mount.Tpo -c -o libcfengine_la-mount.lo `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
22935 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-mount.Tpo $(DEPDIR)/libcfengine_la-mount.Plo
22936 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mount.c' object='libcfengine_la-mount.lo' libtool=yes @AMDEPBACKSLASH@
22937 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22938 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-mount.lo `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
22939 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-mount.lo `test -f 'mount.c' || echo '$(srcdir)/'`mount.c
22940
22941 libcfengine_la-macro.lo: macro.c
22942 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-macro.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-macro.Tpo -c -o libcfengine_la-macro.lo `test -f 'macro.c' || echo '$(srcdir)/'`macro.c
22943 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-macro.Tpo $(DEPDIR)/libcfengine_la-macro.Plo
22944 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-macro.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-macro.Tpo -c -o libcfengine_la-macro.lo `test -f 'macro.c' || echo '$(srcdir)/'`macro.c
22945 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-macro.Tpo $(DEPDIR)/libcfengine_la-macro.Plo
22946 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='macro.c' object='libcfengine_la-macro.lo' libtool=yes @AMDEPBACKSLASH@
22947 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22948 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-macro.lo `test -f 'macro.c' || echo '$(srcdir)/'`macro.c
22949 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-macro.lo `test -f 'macro.c' || echo '$(srcdir)/'`macro.c
22950
22951 libcfengine_la-filenames.lo: filenames.c
22952 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filenames.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filenames.Tpo -c -o libcfengine_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c
22953 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-filenames.Tpo $(DEPDIR)/libcfengine_la-filenames.Plo
22954 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filenames.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filenames.Tpo -c -o libcfengine_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c
22955 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-filenames.Tpo $(DEPDIR)/libcfengine_la-filenames.Plo
22956 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filenames.c' object='libcfengine_la-filenames.lo' libtool=yes @AMDEPBACKSLASH@
22957 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22958 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c
22959 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c
22960
22961 libcfengine_la-varstring.lo: varstring.c
22962 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-varstring.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-varstring.Tpo -c -o libcfengine_la-varstring.lo `test -f 'varstring.c' || echo '$(srcdir)/'`varstring.c
22963 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-varstring.Tpo $(DEPDIR)/libcfengine_la-varstring.Plo
22964 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-varstring.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-varstring.Tpo -c -o libcfengine_la-varstring.lo `test -f 'varstring.c' || echo '$(srcdir)/'`varstring.c
22965 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-varstring.Tpo $(DEPDIR)/libcfengine_la-varstring.Plo
22966 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='varstring.c' object='libcfengine_la-varstring.lo' libtool=yes @AMDEPBACKSLASH@
22967 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22968 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-varstring.lo `test -f 'varstring.c' || echo '$(srcdir)/'`varstring.c
22969 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-varstring.lo `test -f 'varstring.c' || echo '$(srcdir)/'`varstring.c
22970
22971 libcfengine_la-wildcard.lo: wildcard.c
22972 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-wildcard.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-wildcard.Tpo -c -o libcfengine_la-wildcard.lo `test -f 'wildcard.c' || echo '$(srcdir)/'`wildcard.c
22973 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-wildcard.Tpo $(DEPDIR)/libcfengine_la-wildcard.Plo
22974 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-wildcard.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-wildcard.Tpo -c -o libcfengine_la-wildcard.lo `test -f 'wildcard.c' || echo '$(srcdir)/'`wildcard.c
22975 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-wildcard.Tpo $(DEPDIR)/libcfengine_la-wildcard.Plo
22976 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wildcard.c' object='libcfengine_la-wildcard.lo' libtool=yes @AMDEPBACKSLASH@
22977 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22978 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-wildcard.lo `test -f 'wildcard.c' || echo '$(srcdir)/'`wildcard.c
22979 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-wildcard.lo `test -f 'wildcard.c' || echo '$(srcdir)/'`wildcard.c
22980
22981 libcfengine_la-cfparse.lo: cfparse.c
22982 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-cfparse.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-cfparse.Tpo -c -o libcfengine_la-cfparse.lo `test -f 'cfparse.c' || echo '$(srcdir)/'`cfparse.c
22983 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-cfparse.Tpo $(DEPDIR)/libcfengine_la-cfparse.Plo
22984 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-cfparse.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-cfparse.Tpo -c -o libcfengine_la-cfparse.lo `test -f 'cfparse.c' || echo '$(srcdir)/'`cfparse.c
22985 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-cfparse.Tpo $(DEPDIR)/libcfengine_la-cfparse.Plo
22986 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cfparse.c' object='libcfengine_la-cfparse.lo' libtool=yes @AMDEPBACKSLASH@
22987 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22988 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-cfparse.lo `test -f 'cfparse.c' || echo '$(srcdir)/'`cfparse.c
22989 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-cfparse.lo `test -f 'cfparse.c' || echo '$(srcdir)/'`cfparse.c
22990
22991 libcfengine_la-comparray.lo: comparray.c
22992 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-comparray.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-comparray.Tpo -c -o libcfengine_la-comparray.lo `test -f 'comparray.c' || echo '$(srcdir)/'`comparray.c
22993 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-comparray.Tpo $(DEPDIR)/libcfengine_la-comparray.Plo
22994 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-comparray.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-comparray.Tpo -c -o libcfengine_la-comparray.lo `test -f 'comparray.c' || echo '$(srcdir)/'`comparray.c
22995 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-comparray.Tpo $(DEPDIR)/libcfengine_la-comparray.Plo
22996 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comparray.c' object='libcfengine_la-comparray.lo' libtool=yes @AMDEPBACKSLASH@
22997 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
22998 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-comparray.lo `test -f 'comparray.c' || echo '$(srcdir)/'`comparray.c
22999 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-comparray.lo `test -f 'comparray.c' || echo '$(srcdir)/'`comparray.c
23000
23001 libcfengine_la-read.lo: read.c
23002 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-read.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-read.Tpo -c -o libcfengine_la-read.lo `test -f 'read.c' || echo '$(srcdir)/'`read.c
23003 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-read.Tpo $(DEPDIR)/libcfengine_la-read.Plo
23004 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-read.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-read.Tpo -c -o libcfengine_la-read.lo `test -f 'read.c' || echo '$(srcdir)/'`read.c
23005 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-read.Tpo $(DEPDIR)/libcfengine_la-read.Plo
23006 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='read.c' object='libcfengine_la-read.lo' libtool=yes @AMDEPBACKSLASH@
23007 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23008 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-read.lo `test -f 'read.c' || echo '$(srcdir)/'`read.c
23009 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-read.lo `test -f 'read.c' || echo '$(srcdir)/'`read.c
23010
23011 libcfengine_la-checksums.lo: checksums.c
23012 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-checksums.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-checksums.Tpo -c -o libcfengine_la-checksums.lo `test -f 'checksums.c' || echo '$(srcdir)/'`checksums.c
23013 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-checksums.Tpo $(DEPDIR)/libcfengine_la-checksums.Plo
23014 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-checksums.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-checksums.Tpo -c -o libcfengine_la-checksums.lo `test -f 'checksums.c' || echo '$(srcdir)/'`checksums.c
23015 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-checksums.Tpo $(DEPDIR)/libcfengine_la-checksums.Plo
23016 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='checksums.c' object='libcfengine_la-checksums.lo' libtool=yes @AMDEPBACKSLASH@
23017 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23018 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-checksums.lo `test -f 'checksums.c' || echo '$(srcdir)/'`checksums.c
23019 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-checksums.lo `test -f 'checksums.c' || echo '$(srcdir)/'`checksums.c
23020
23021 libcfengine_la-proto.lo: proto.c
23022 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-proto.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-proto.Tpo -c -o libcfengine_la-proto.lo `test -f 'proto.c' || echo '$(srcdir)/'`proto.c
23023 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-proto.Tpo $(DEPDIR)/libcfengine_la-proto.Plo
23024 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-proto.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-proto.Tpo -c -o libcfengine_la-proto.lo `test -f 'proto.c' || echo '$(srcdir)/'`proto.c
23025 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-proto.Tpo $(DEPDIR)/libcfengine_la-proto.Plo
23026 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proto.c' object='libcfengine_la-proto.lo' libtool=yes @AMDEPBACKSLASH@
23027 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23028 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-proto.lo `test -f 'proto.c' || echo '$(srcdir)/'`proto.c
23029 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-proto.lo `test -f 'proto.c' || echo '$(srcdir)/'`proto.c
23030
23031 libcfengine_la-filters.lo: filters.c
23032 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filters.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filters.Tpo -c -o libcfengine_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c
23033 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-filters.Tpo $(DEPDIR)/libcfengine_la-filters.Plo
23034 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-filters.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-filters.Tpo -c -o libcfengine_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c
23035 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-filters.Tpo $(DEPDIR)/libcfengine_la-filters.Plo
23036 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filters.c' object='libcfengine_la-filters.lo' libtool=yes @AMDEPBACKSLASH@
23037 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23038 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c
23039 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-filters.lo `test -f 'filters.c' || echo '$(srcdir)/'`filters.c
23040
23041 libcfengine_la-copy.lo: copy.c
23042 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-copy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-copy.Tpo -c -o libcfengine_la-copy.lo `test -f 'copy.c' || echo '$(srcdir)/'`copy.c
23043 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-copy.Tpo $(DEPDIR)/libcfengine_la-copy.Plo
23044 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-copy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-copy.Tpo -c -o libcfengine_la-copy.lo `test -f 'copy.c' || echo '$(srcdir)/'`copy.c
23045 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-copy.Tpo $(DEPDIR)/libcfengine_la-copy.Plo
23046 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='copy.c' object='libcfengine_la-copy.lo' libtool=yes @AMDEPBACKSLASH@
23047 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23048 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-copy.lo `test -f 'copy.c' || echo '$(srcdir)/'`copy.c
23049 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-copy.lo `test -f 'copy.c' || echo '$(srcdir)/'`copy.c
23050
23051 libcfengine_la-repository.lo: repository.c
23052 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-repository.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-repository.Tpo -c -o libcfengine_la-repository.lo `test -f 'repository.c' || echo '$(srcdir)/'`repository.c
23053 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-repository.Tpo $(DEPDIR)/libcfengine_la-repository.Plo
23054 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-repository.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-repository.Tpo -c -o libcfengine_la-repository.lo `test -f 'repository.c' || echo '$(srcdir)/'`repository.c
23055 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-repository.Tpo $(DEPDIR)/libcfengine_la-repository.Plo
23056 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='repository.c' object='libcfengine_la-repository.lo' libtool=yes @AMDEPBACKSLASH@
23057 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23058 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-repository.lo `test -f 'repository.c' || echo '$(srcdir)/'`repository.c
23059 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-repository.lo `test -f 'repository.c' || echo '$(srcdir)/'`repository.c
23060
23061 libcfengine_la-rotate.lo: rotate.c
23062 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-rotate.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-rotate.Tpo -c -o libcfengine_la-rotate.lo `test -f 'rotate.c' || echo '$(srcdir)/'`rotate.c
23063 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-rotate.Tpo $(DEPDIR)/libcfengine_la-rotate.Plo
23064 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-rotate.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-rotate.Tpo -c -o libcfengine_la-rotate.lo `test -f 'rotate.c' || echo '$(srcdir)/'`rotate.c
23065 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-rotate.Tpo $(DEPDIR)/libcfengine_la-rotate.Plo
23066 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rotate.c' object='libcfengine_la-rotate.lo' libtool=yes @AMDEPBACKSLASH@
23067 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23068 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-rotate.lo `test -f 'rotate.c' || echo '$(srcdir)/'`rotate.c
23069 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-rotate.lo `test -f 'rotate.c' || echo '$(srcdir)/'`rotate.c
23070
23071 libcfengine_la-errors.lo: errors.c
23072 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-errors.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-errors.Tpo -c -o libcfengine_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
23073 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-errors.Tpo $(DEPDIR)/libcfengine_la-errors.Plo
23074 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-errors.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-errors.Tpo -c -o libcfengine_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
23075 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-errors.Tpo $(DEPDIR)/libcfengine_la-errors.Plo
23076 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='errors.c' object='libcfengine_la-errors.lo' libtool=yes @AMDEPBACKSLASH@
23077 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23078 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
23079 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
23080
23081 libcfengine_la-cflex.lo: cflex.c
23082 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-cflex.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-cflex.Tpo -c -o libcfengine_la-cflex.lo `test -f 'cflex.c' || echo '$(srcdir)/'`cflex.c
23083 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-cflex.Tpo $(DEPDIR)/libcfengine_la-cflex.Plo
23084 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-cflex.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-cflex.Tpo -c -o libcfengine_la-cflex.lo `test -f 'cflex.c' || echo '$(srcdir)/'`cflex.c
23085 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-cflex.Tpo $(DEPDIR)/libcfengine_la-cflex.Plo
23086 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cflex.c' object='libcfengine_la-cflex.lo' libtool=yes @AMDEPBACKSLASH@
23087 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23088 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-cflex.lo `test -f 'cflex.c' || echo '$(srcdir)/'`cflex.c
23089 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-cflex.lo `test -f 'cflex.c' || echo '$(srcdir)/'`cflex.c
23090
23091 libcfengine_la-net.lo: net.c
23092 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-net.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-net.Tpo -c -o libcfengine_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
23093 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-net.Tpo $(DEPDIR)/libcfengine_la-net.Plo
23094 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-net.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-net.Tpo -c -o libcfengine_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
23095 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-net.Tpo $(DEPDIR)/libcfengine_la-net.Plo
23096 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net.c' object='libcfengine_la-net.lo' libtool=yes @AMDEPBACKSLASH@
23097 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23098 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
23099 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
23100
23101 libcfengine_la-df.lo: df.c
23102 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-df.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-df.Tpo -c -o libcfengine_la-df.lo `test -f 'df.c' || echo '$(srcdir)/'`df.c
23103 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-df.Tpo $(DEPDIR)/libcfengine_la-df.Plo
23104 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-df.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-df.Tpo -c -o libcfengine_la-df.lo `test -f 'df.c' || echo '$(srcdir)/'`df.c
23105 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-df.Tpo $(DEPDIR)/libcfengine_la-df.Plo
23106 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='df.c' object='libcfengine_la-df.lo' libtool=yes @AMDEPBACKSLASH@
23107 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23108 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-df.lo `test -f 'df.c' || echo '$(srcdir)/'`df.c
23109 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-df.lo `test -f 'df.c' || echo '$(srcdir)/'`df.c
23110
23111 libcfengine_la-log.lo: log.c
23112 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-log.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-log.Tpo -c -o libcfengine_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
23113 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-log.Tpo $(DEPDIR)/libcfengine_la-log.Plo
23114 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-log.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-log.Tpo -c -o libcfengine_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
23115 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-log.Tpo $(DEPDIR)/libcfengine_la-log.Plo
23116 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='log.c' object='libcfengine_la-log.lo' libtool=yes @AMDEPBACKSLASH@
23117 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23118 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
23119 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-log.lo `test -f 'log.c' || echo '$(srcdir)/'`log.c
23120
23121 libcfengine_la-crypto.lo: crypto.c
23122 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-crypto.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-crypto.Tpo -c -o libcfengine_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
23123 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-crypto.Tpo $(DEPDIR)/libcfengine_la-crypto.Plo
23124 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-crypto.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-crypto.Tpo -c -o libcfengine_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
23125 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-crypto.Tpo $(DEPDIR)/libcfengine_la-crypto.Plo
23126 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='crypto.c' object='libcfengine_la-crypto.lo' libtool=yes @AMDEPBACKSLASH@
23127 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23128 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
23129 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
23130
23131 libcfengine_la-popen.lo: popen.c
23132 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-popen.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-popen.Tpo -c -o libcfengine_la-popen.lo `test -f 'popen.c' || echo '$(srcdir)/'`popen.c
23133 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-popen.Tpo $(DEPDIR)/libcfengine_la-popen.Plo
23134 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-popen.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-popen.Tpo -c -o libcfengine_la-popen.lo `test -f 'popen.c' || echo '$(srcdir)/'`popen.c
23135 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-popen.Tpo $(DEPDIR)/libcfengine_la-popen.Plo
23136 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='popen.c' object='libcfengine_la-popen.lo' libtool=yes @AMDEPBACKSLASH@
23137 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23138 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-popen.lo `test -f 'popen.c' || echo '$(srcdir)/'`popen.c
23139 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-popen.lo `test -f 'popen.c' || echo '$(srcdir)/'`popen.c
23140
23141 libcfengine_la-popen_def.lo: popen_def.c
23142 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-popen_def.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-popen_def.Tpo -c -o libcfengine_la-popen_def.lo `test -f 'popen_def.c' || echo '$(srcdir)/'`popen_def.c
23143 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-popen_def.Tpo $(DEPDIR)/libcfengine_la-popen_def.Plo
23144 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-popen_def.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-popen_def.Tpo -c -o libcfengine_la-popen_def.lo `test -f 'popen_def.c' || echo '$(srcdir)/'`popen_def.c
23145 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-popen_def.Tpo $(DEPDIR)/libcfengine_la-popen_def.Plo
23146 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='popen_def.c' object='libcfengine_la-popen_def.lo' libtool=yes @AMDEPBACKSLASH@
23147 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23148 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-popen_def.lo `test -f 'popen_def.c' || echo '$(srcdir)/'`popen_def.c
23149 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-popen_def.lo `test -f 'popen_def.c' || echo '$(srcdir)/'`popen_def.c
23150
23151 libcfengine_la-sensible.lo: sensible.c
23152 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-sensible.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-sensible.Tpo -c -o libcfengine_la-sensible.lo `test -f 'sensible.c' || echo '$(srcdir)/'`sensible.c
23153 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-sensible.Tpo $(DEPDIR)/libcfengine_la-sensible.Plo
23154 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-sensible.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-sensible.Tpo -c -o libcfengine_la-sensible.lo `test -f 'sensible.c' || echo '$(srcdir)/'`sensible.c
23155 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-sensible.Tpo $(DEPDIR)/libcfengine_la-sensible.Plo
23156 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sensible.c' object='libcfengine_la-sensible.lo' libtool=yes @AMDEPBACKSLASH@
23157 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23158 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-sensible.lo `test -f 'sensible.c' || echo '$(srcdir)/'`sensible.c
23159 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-sensible.lo `test -f 'sensible.c' || echo '$(srcdir)/'`sensible.c
23160
23161 libcfengine_la-acl.lo: acl.c
23162 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-acl.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-acl.Tpo -c -o libcfengine_la-acl.lo `test -f 'acl.c' || echo '$(srcdir)/'`acl.c
23163 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-acl.Tpo $(DEPDIR)/libcfengine_la-acl.Plo
23164 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-acl.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-acl.Tpo -c -o libcfengine_la-acl.lo `test -f 'acl.c' || echo '$(srcdir)/'`acl.c
23165 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-acl.Tpo $(DEPDIR)/libcfengine_la-acl.Plo
23166 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='acl.c' object='libcfengine_la-acl.lo' libtool=yes @AMDEPBACKSLASH@
23167 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23168 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-acl.lo `test -f 'acl.c' || echo '$(srcdir)/'`acl.c
23169 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-acl.lo `test -f 'acl.c' || echo '$(srcdir)/'`acl.c
23170
23171 libcfengine_la-dce_acl.lo: dce_acl.c
23172 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-dce_acl.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-dce_acl.Tpo -c -o libcfengine_la-dce_acl.lo `test -f 'dce_acl.c' || echo '$(srcdir)/'`dce_acl.c
23173 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-dce_acl.Tpo $(DEPDIR)/libcfengine_la-dce_acl.Plo
23174 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-dce_acl.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-dce_acl.Tpo -c -o libcfengine_la-dce_acl.lo `test -f 'dce_acl.c' || echo '$(srcdir)/'`dce_acl.c
23175 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-dce_acl.Tpo $(DEPDIR)/libcfengine_la-dce_acl.Plo
23176 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dce_acl.c' object='libcfengine_la-dce_acl.lo' libtool=yes @AMDEPBACKSLASH@
23177 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23178 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-dce_acl.lo `test -f 'dce_acl.c' || echo '$(srcdir)/'`dce_acl.c
23179 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-dce_acl.lo `test -f 'dce_acl.c' || echo '$(srcdir)/'`dce_acl.c
23180
23181 libcfengine_la-nameinfo.lo: nameinfo.c
23182 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-nameinfo.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-nameinfo.Tpo -c -o libcfengine_la-nameinfo.lo `test -f 'nameinfo.c' || echo '$(srcdir)/'`nameinfo.c
23183 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-nameinfo.Tpo $(DEPDIR)/libcfengine_la-nameinfo.Plo
23184 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-nameinfo.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-nameinfo.Tpo -c -o libcfengine_la-nameinfo.lo `test -f 'nameinfo.c' || echo '$(srcdir)/'`nameinfo.c
23185 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-nameinfo.Tpo $(DEPDIR)/libcfengine_la-nameinfo.Plo
23186 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nameinfo.c' object='libcfengine_la-nameinfo.lo' libtool=yes @AMDEPBACKSLASH@
23187 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23188 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-nameinfo.lo `test -f 'nameinfo.c' || echo '$(srcdir)/'`nameinfo.c
23189 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-nameinfo.lo `test -f 'nameinfo.c' || echo '$(srcdir)/'`nameinfo.c
23190
23191 libcfengine_la-strategies.lo: strategies.c
23192 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-strategies.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-strategies.Tpo -c -o libcfengine_la-strategies.lo `test -f 'strategies.c' || echo '$(srcdir)/'`strategies.c
23193 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-strategies.Tpo $(DEPDIR)/libcfengine_la-strategies.Plo
23194 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-strategies.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-strategies.Tpo -c -o libcfengine_la-strategies.lo `test -f 'strategies.c' || echo '$(srcdir)/'`strategies.c
23195 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-strategies.Tpo $(DEPDIR)/libcfengine_la-strategies.Plo
23196 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='strategies.c' object='libcfengine_la-strategies.lo' libtool=yes @AMDEPBACKSLASH@
23197 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23198 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-strategies.lo `test -f 'strategies.c' || echo '$(srcdir)/'`strategies.c
23199 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-strategies.lo `test -f 'strategies.c' || echo '$(srcdir)/'`strategies.c
23200
23201 libcfengine_la-granules.lo: granules.c
23202 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-granules.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-granules.Tpo -c -o libcfengine_la-granules.lo `test -f 'granules.c' || echo '$(srcdir)/'`granules.c
23203 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-granules.Tpo $(DEPDIR)/libcfengine_la-granules.Plo
23204 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-granules.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-granules.Tpo -c -o libcfengine_la-granules.lo `test -f 'granules.c' || echo '$(srcdir)/'`granules.c
23205 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-granules.Tpo $(DEPDIR)/libcfengine_la-granules.Plo
23206 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='granules.c' object='libcfengine_la-granules.lo' libtool=yes @AMDEPBACKSLASH@
23207 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23208 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-granules.lo `test -f 'granules.c' || echo '$(srcdir)/'`granules.c
23209 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-granules.lo `test -f 'granules.c' || echo '$(srcdir)/'`granules.c
23210
23211 libcfengine_la-methods.lo: methods.c
23212 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-methods.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-methods.Tpo -c -o libcfengine_la-methods.lo `test -f 'methods.c' || echo '$(srcdir)/'`methods.c
23213 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-methods.Tpo $(DEPDIR)/libcfengine_la-methods.Plo
23214 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-methods.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-methods.Tpo -c -o libcfengine_la-methods.lo `test -f 'methods.c' || echo '$(srcdir)/'`methods.c
23215 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-methods.Tpo $(DEPDIR)/libcfengine_la-methods.Plo
23216 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='methods.c' object='libcfengine_la-methods.lo' libtool=yes @AMDEPBACKSLASH@
23217 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23218 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-methods.lo `test -f 'methods.c' || echo '$(srcdir)/'`methods.c
23219 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-methods.lo `test -f 'methods.c' || echo '$(srcdir)/'`methods.c
23220
23221 libcfengine_la-dtypes.lo: dtypes.c
23222 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-dtypes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-dtypes.Tpo -c -o libcfengine_la-dtypes.lo `test -f 'dtypes.c' || echo '$(srcdir)/'`dtypes.c
23223 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-dtypes.Tpo $(DEPDIR)/libcfengine_la-dtypes.Plo
23224 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-dtypes.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-dtypes.Tpo -c -o libcfengine_la-dtypes.lo `test -f 'dtypes.c' || echo '$(srcdir)/'`dtypes.c
23225 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-dtypes.Tpo $(DEPDIR)/libcfengine_la-dtypes.Plo
23226 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dtypes.c' object='libcfengine_la-dtypes.lo' libtool=yes @AMDEPBACKSLASH@
23227 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23228 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-dtypes.lo `test -f 'dtypes.c' || echo '$(srcdir)/'`dtypes.c
23229 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-dtypes.lo `test -f 'dtypes.c' || echo '$(srcdir)/'`dtypes.c
23230
23231 libcfengine_la-state.lo: state.c
23232 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-state.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-state.Tpo -c -o libcfengine_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
23233 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-state.Tpo $(DEPDIR)/libcfengine_la-state.Plo
23234 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-state.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-state.Tpo -c -o libcfengine_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
23235 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-state.Tpo $(DEPDIR)/libcfengine_la-state.Plo
23236 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='state.c' object='libcfengine_la-state.lo' libtool=yes @AMDEPBACKSLASH@
23237 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23238 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
23239 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-state.lo `test -f 'state.c' || echo '$(srcdir)/'`state.c
23240
23241 libcfengine_la-checksum_db.lo: checksum_db.c
23242 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-checksum_db.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-checksum_db.Tpo -c -o libcfengine_la-checksum_db.lo `test -f 'checksum_db.c' || echo '$(srcdir)/'`checksum_db.c
23243 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-checksum_db.Tpo $(DEPDIR)/libcfengine_la-checksum_db.Plo
23244 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-checksum_db.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-checksum_db.Tpo -c -o libcfengine_la-checksum_db.lo `test -f 'checksum_db.c' || echo '$(srcdir)/'`checksum_db.c
23245 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-checksum_db.Tpo $(DEPDIR)/libcfengine_la-checksum_db.Plo
23246 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='checksum_db.c' object='libcfengine_la-checksum_db.lo' libtool=yes @AMDEPBACKSLASH@
23247 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23248 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-checksum_db.lo `test -f 'checksum_db.c' || echo '$(srcdir)/'`checksum_db.c
23249 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-checksum_db.lo `test -f 'checksum_db.c' || echo '$(srcdir)/'`checksum_db.c
23250
23251 libcfengine_la-expand-files.lo: expand-files.c
23252 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-files.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-files.Tpo -c -o libcfengine_la-expand-files.lo `test -f 'expand-files.c' || echo '$(srcdir)/'`expand-files.c
23253 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-expand-files.Tpo $(DEPDIR)/libcfengine_la-expand-files.Plo
23254 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-files.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-files.Tpo -c -o libcfengine_la-expand-files.lo `test -f 'expand-files.c' || echo '$(srcdir)/'`expand-files.c
23255 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-expand-files.Tpo $(DEPDIR)/libcfengine_la-expand-files.Plo
23256 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='expand-files.c' object='libcfengine_la-expand-files.lo' libtool=yes @AMDEPBACKSLASH@
23257 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23258 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-files.lo `test -f 'expand-files.c' || echo '$(srcdir)/'`expand-files.c
23259 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-files.lo `test -f 'expand-files.c' || echo '$(srcdir)/'`expand-files.c
23260
23261 libcfengine_la-expand-tidy.lo: expand-tidy.c
23262 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-tidy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-tidy.Tpo -c -o libcfengine_la-expand-tidy.lo `test -f 'expand-tidy.c' || echo '$(srcdir)/'`expand-tidy.c
23263 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-expand-tidy.Tpo $(DEPDIR)/libcfengine_la-expand-tidy.Plo
23264 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-tidy.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-tidy.Tpo -c -o libcfengine_la-expand-tidy.lo `test -f 'expand-tidy.c' || echo '$(srcdir)/'`expand-tidy.c
23265 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-expand-tidy.Tpo $(DEPDIR)/libcfengine_la-expand-tidy.Plo
23266 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='expand-tidy.c' object='libcfengine_la-expand-tidy.lo' libtool=yes @AMDEPBACKSLASH@
23267 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23268 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-tidy.lo `test -f 'expand-tidy.c' || echo '$(srcdir)/'`expand-tidy.c
23269 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-tidy.lo `test -f 'expand-tidy.c' || echo '$(srcdir)/'`expand-tidy.c
23270
23271 libcfengine_la-expand-image.lo: expand-image.c
23272 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-image.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-image.Tpo -c -o libcfengine_la-expand-image.lo `test -f 'expand-image.c' || echo '$(srcdir)/'`expand-image.c
23273 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-expand-image.Tpo $(DEPDIR)/libcfengine_la-expand-image.Plo
23274 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-image.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-image.Tpo -c -o libcfengine_la-expand-image.lo `test -f 'expand-image.c' || echo '$(srcdir)/'`expand-image.c
23275 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-expand-image.Tpo $(DEPDIR)/libcfengine_la-expand-image.Plo
23276 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='expand-image.c' object='libcfengine_la-expand-image.lo' libtool=yes @AMDEPBACKSLASH@
23277 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23278 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-image.lo `test -f 'expand-image.c' || echo '$(srcdir)/'`expand-image.c
23279 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-image.lo `test -f 'expand-image.c' || echo '$(srcdir)/'`expand-image.c
23280
23281 libcfengine_la-expand-editfiles.lo: expand-editfiles.c
23282 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-editfiles.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-editfiles.Tpo -c -o libcfengine_la-expand-editfiles.lo `test -f 'expand-editfiles.c' || echo '$(srcdir)/'`expand-editfiles.c
23283 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-expand-editfiles.Tpo $(DEPDIR)/libcfengine_la-expand-editfiles.Plo
23284 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-expand-editfiles.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-expand-editfiles.Tpo -c -o libcfengine_la-expand-editfiles.lo `test -f 'expand-editfiles.c' || echo '$(srcdir)/'`expand-editfiles.c
23285 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-expand-editfiles.Tpo $(DEPDIR)/libcfengine_la-expand-editfiles.Plo
23286 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='expand-editfiles.c' object='libcfengine_la-expand-editfiles.lo' libtool=yes @AMDEPBACKSLASH@
23287 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23288 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-editfiles.lo `test -f 'expand-editfiles.c' || echo '$(srcdir)/'`expand-editfiles.c
23289 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-expand-editfiles.lo `test -f 'expand-editfiles.c' || echo '$(srcdir)/'`expand-editfiles.c
23290
23291 libcfengine_la-package.lo: package.c
23292 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-package.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-package.Tpo -c -o libcfengine_la-package.lo `test -f 'package.c' || echo '$(srcdir)/'`package.c
23293 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-package.Tpo $(DEPDIR)/libcfengine_la-package.Plo
23294 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-package.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-package.Tpo -c -o libcfengine_la-package.lo `test -f 'package.c' || echo '$(srcdir)/'`package.c
23295 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-package.Tpo $(DEPDIR)/libcfengine_la-package.Plo
23296 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='package.c' object='libcfengine_la-package.lo' libtool=yes @AMDEPBACKSLASH@
23297 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23298 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-package.lo `test -f 'package.c' || echo '$(srcdir)/'`package.c
23299 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-package.lo `test -f 'package.c' || echo '$(srcdir)/'`package.c
23300
23301 libcfengine_la-scli.lo: scli.c
23302 -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-scli.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-scli.Tpo -c -o libcfengine_la-scli.lo `test -f 'scli.c' || echo '$(srcdir)/'`scli.c
23303 -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcfengine_la-scli.Tpo $(DEPDIR)/libcfengine_la-scli.Plo
23304 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -MT libcfengine_la-scli.lo -MD -MP -MF $(DEPDIR)/libcfengine_la-scli.Tpo -c -o libcfengine_la-scli.lo `test -f 'scli.c' || echo '$(srcdir)/'`scli.c
23305 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcfengine_la-scli.Tpo $(DEPDIR)/libcfengine_la-scli.Plo
23306 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='scli.c' object='libcfengine_la-scli.lo' libtool=yes @AMDEPBACKSLASH@
23307 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23308 -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-scli.lo `test -f 'scli.c' || echo '$(srcdir)/'`scli.c
23309 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfengine_la_CFLAGS) $(CFLAGS) -c -o libcfengine_la-scli.lo `test -f 'scli.c' || echo '$(srcdir)/'`scli.c
23310
23311 .l.c:
23312 $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
23313 @@ -1252,14 +1319,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
23314 unique=`for i in $$list; do \
23315 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
23316 done | \
23317 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
23318 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
23319 END { if (nonempty) { for (i in files) print i; }; }'`; \
23320 mkid -fID $$unique
23321 tags: TAGS
23322
23323 TAGS: $(HEADERS) $(SOURCES) conf.h.in $(TAGS_DEPENDENCIES) \
23324 $(TAGS_FILES) $(LISP)
23325 - tags=; \
23326 + set x; \
23327 here=`pwd`; \
23328 list='$(SOURCES) $(HEADERS) conf.h.in $(LISP) $(TAGS_FILES)'; \
23329 unique=`for i in $$list; do \
23330 @@ -1267,29 +1334,34 @@ TAGS: $(HEADERS) $(SOURCES) conf.h.in $(TAGS_DEPENDENCIES) \
23331 done | \
23332 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
23333 END { if (nonempty) { for (i in files) print i; }; }'`; \
23334 - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
23335 + shift; \
23336 + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
23337 test -n "$$unique" || unique=$$empty_fix; \
23338 - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
23339 - $$tags $$unique; \
23340 + if test $$# -gt 0; then \
23341 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
23342 + "$$@" $$unique; \
23343 + else \
23344 + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
23345 + $$unique; \
23346 + fi; \
23347 fi
23348 ctags: CTAGS
23349 CTAGS: $(HEADERS) $(SOURCES) conf.h.in $(TAGS_DEPENDENCIES) \
23350 $(TAGS_FILES) $(LISP)
23351 - tags=; \
23352 list='$(SOURCES) $(HEADERS) conf.h.in $(LISP) $(TAGS_FILES)'; \
23353 unique=`for i in $$list; do \
23354 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
23355 done | \
23356 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
23357 END { if (nonempty) { for (i in files) print i; }; }'`; \
23358 - test -z "$(CTAGS_ARGS)$$tags$$unique" \
23359 + test -z "$(CTAGS_ARGS)$$unique" \
23360 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
23361 - $$tags $$unique
23362 + $$unique
23363
23364 GTAGS:
23365 here=`$(am__cd) $(top_builddir) && pwd` \
23366 - && cd $(top_srcdir) \
23367 - && gtags -i $(GTAGS_ARGS) $$here
23368 + && $(am__cd) $(top_srcdir) \
23369 + && gtags -i $(GTAGS_ARGS) "$$here"
23370
23371 distclean-tags:
23372 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
23373 @@ -1310,13 +1382,17 @@ distdir: $(DISTFILES)
23374 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
23375 if test -d $$d/$$file; then \
23376 dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
23377 + if test -d "$(distdir)/$$file"; then \
23378 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
23379 + fi; \
23380 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
23381 - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
23382 + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
23383 + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
23384 fi; \
23385 - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
23386 + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
23387 else \
23388 - test -f $(distdir)/$$file \
23389 - || cp -p $$d/$$file $(distdir)/$$file \
23390 + test -f "$(distdir)/$$file" \
23391 + || cp -p $$d/$$file "$(distdir)/$$file" \
23392 || exit 1; \
23393 fi; \
23394 done
23395 @@ -1349,6 +1425,7 @@ clean-generic:
23396
23397 distclean-generic:
23398 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
23399 + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
23400 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
23401
23402 maintainer-clean-generic:
23403 @@ -1375,6 +1452,8 @@ dvi-am:
23404
23405 html: html-am
23406
23407 +html-am:
23408 +
23409 info: info-am
23410
23411 info-am:
23412 @@ -1383,18 +1462,28 @@ install-data-am:
23413
23414 install-dvi: install-dvi-am
23415
23416 +install-dvi-am:
23417 +
23418 install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
23419
23420 install-html: install-html-am
23421
23422 +install-html-am:
23423 +
23424 install-info: install-info-am
23425
23426 +install-info-am:
23427 +
23428 install-man:
23429
23430 install-pdf: install-pdf-am
23431
23432 +install-pdf-am:
23433 +
23434 install-ps: install-ps-am
23435
23436 +install-ps-am:
23437 +
23438 installcheck-am:
23439
23440 maintainer-clean: maintainer-clean-am
23441 @@ -1417,7 +1506,7 @@ ps-am:
23442
23443 uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
23444
23445 -.MAKE: install-am install-strip
23446 +.MAKE: all install-am install-strip
23447
23448 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
23449 clean-libLTLIBRARIES clean-libtool clean-sbinPROGRAMS ctags \
23450 @@ -1434,6 +1523,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
23451 pdf pdf-am ps ps-am tags uninstall uninstall-am \
23452 uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
23453
23454 +
23455 # Tell versions [3.59,3.63) of GNU make to not export all variables.
23456 # Otherwise a system limit (for SysV at least) may be exceeded.
23457 .NOEXPORT:
23458 diff --git a/ylwrap b/ylwrap
23459 index 5ea68e4..84d5634 100755
23460 --- a/ylwrap
23461 +++ b/ylwrap
23462 @@ -1,6 +1,11 @@
23463 #! /bin/sh
23464 # ylwrap - wrapper for lex/yacc invocations.
23465 -# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
23466 +
23467 +scriptversion=2009-04-28.21; # UTC
23468 +
23469 +# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
23470 +# 2007, 2009 Free Software Foundation, Inc.
23471 +#
23472 # Written by Tom Tromey <[email protected]>.
23473 #
23474 # This program is free software; you can redistribute it and/or modify
23475 @@ -14,52 +19,72 @@
23476 # GNU General Public License for more details.
23477 #
23478 # You should have received a copy of the GNU General Public License
23479 -# along with this program; if not, write to the Free Software
23480 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23481 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
23482
23483 # As a special exception to the GNU General Public License, if you
23484 # distribute this file as part of a program that contains a
23485 # configuration script generated by Autoconf, you may include it under
23486 # the same distribution terms that you use for the rest of that program.
23487
23488 -# Usage:
23489 -# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
23490 -# * INPUT is the input file
23491 -# * OUTPUT is file PROG generates
23492 -# * DESIRED is file we actually want
23493 -# * PROGRAM is program to run
23494 -# * ARGS are passed to PROG
23495 -# Any number of OUTPUT,DESIRED pairs may be used.
23496 +# This file is maintained in Automake, please report
23497 +# bugs to <[email protected]> or send patches to
23498 +# <[email protected]>.
23499 +
23500 +case "$1" in
23501 + '')
23502 + echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
23503 + exit 1
23504 + ;;
23505 + --basedir)
23506 + basedir=$2
23507 + shift 2
23508 + ;;
23509 + -h|--h*)
23510 + cat <<\EOF
23511 +Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
23512 +
23513 +Wrapper for lex/yacc invocations, renaming files as desired.
23514 +
23515 + INPUT is the input file
23516 + OUTPUT is one file PROG generates
23517 + DESIRED is the file we actually want instead of OUTPUT
23518 + PROGRAM is program to run
23519 + ARGS are passed to PROG
23520 +
23521 +Any number of OUTPUT,DESIRED pairs may be used.
23522 +
23523 +Report bugs to <[email protected]>.
23524 +EOF
23525 + exit $?
23526 + ;;
23527 + -v|--v*)
23528 + echo "ylwrap $scriptversion"
23529 + exit $?
23530 + ;;
23531 +esac
23532 +
23533
23534 # The input.
23535 input="$1"
23536 shift
23537 case "$input" in
23538 - [\\/]* | ?:[\\/]*)
23539 + [\\/]* | ?:[\\/]*)
23540 # Absolute path; do nothing.
23541 ;;
23542 - *)
23543 + *)
23544 # Relative path. Make it absolute.
23545 input="`pwd`/$input"
23546 ;;
23547 esac
23548
23549 -# The directory holding the input.
23550 -input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
23551 -# Quote $INPUT_DIR so we can use it in a regexp.
23552 -# FIXME: really we should care about more than `.' and `\'.
23553 -input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
23554 -
23555 -echo "got $input_rx"
23556 -
23557 pairlist=
23558 while test "$#" -ne 0; do
23559 - if test "$1" = "--"; then
23560 - shift
23561 - break
23562 - fi
23563 - pairlist="$pairlist $1"
23564 - shift
23565 + if test "$1" = "--"; then
23566 + shift
23567 + break
23568 + fi
23569 + pairlist="$pairlist $1"
23570 + shift
23571 done
23572
23573 # The program to run.
23574 @@ -67,77 +92,131 @@ prog="$1"
23575 shift
23576 # Make any relative path in $prog absolute.
23577 case "$prog" in
23578 - [\\/]* | ?:[\\/]*) ;;
23579 - *[\\/]*) prog="`pwd`/$prog" ;;
23580 + [\\/]* | ?:[\\/]*) ;;
23581 + *[\\/]*) prog="`pwd`/$prog" ;;
23582 esac
23583
23584 # FIXME: add hostname here for parallel makes that run commands on
23585 # other machines. But that might take us over the 14-char limit.
23586 dirname=ylwrap$$
23587 -trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
23588 +trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
23589 mkdir $dirname || exit 1
23590
23591 cd $dirname
23592
23593 -$prog ${1+"$@"} "$input"
23594 -status=$?
23595 -
23596 -if test $status -eq 0; then
23597 - set X $pairlist
23598 - shift
23599 - first=yes
23600 - # Since DOS filename conventions don't allow two dots,
23601 - # the DOS version of Bison writes out y_tab.c instead of y.tab.c
23602 - # and y_tab.h instead of y.tab.h. Test to see if this is the case.
23603 - y_tab_nodot="no"
23604 - if test -f y_tab.c || test -f y_tab.h; then
23605 - y_tab_nodot="yes"
23606 - fi
23607 -
23608 - while test "$#" -ne 0; do
23609 - from="$1"
23610 - # Handle y_tab.c and y_tab.h output by DOS
23611 - if test $y_tab_nodot = "yes"; then
23612 - if test $from = "y.tab.c"; then
23613 - from="y_tab.c"
23614 - else
23615 - if test $from = "y.tab.h"; then
23616 - from="y_tab.h"
23617 - fi
23618 - fi
23619 - fi
23620 - if test -f "$from"; then
23621 - # If $2 is an absolute path name, then just use that,
23622 - # otherwise prepend `../'.
23623 - case "$2" in
23624 - [\\/]* | ?:[\\/]*) target="$2";;
23625 - *) target="../$2";;
23626 - esac
23627 -
23628 - # Edit out `#line' or `#' directives. We don't want the
23629 - # resulting debug information to point at an absolute srcdir;
23630 - # it is better for it to just mention the .y file with no
23631 - # path.
23632 - sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
23633 +case $# in
23634 + 0) "$prog" "$input" ;;
23635 + *) "$prog" "$@" "$input" ;;
23636 +esac
23637 +ret=$?
23638 +
23639 +if test $ret -eq 0; then
23640 + set X $pairlist
23641 + shift
23642 + first=yes
23643 + # Since DOS filename conventions don't allow two dots,
23644 + # the DOS version of Bison writes out y_tab.c instead of y.tab.c
23645 + # and y_tab.h instead of y.tab.h. Test to see if this is the case.
23646 + y_tab_nodot="no"
23647 + if test -f y_tab.c || test -f y_tab.h; then
23648 + y_tab_nodot="yes"
23649 + fi
23650 +
23651 + # The directory holding the input.
23652 + input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
23653 + # Quote $INPUT_DIR so we can use it in a regexp.
23654 + # FIXME: really we should care about more than `.' and `\'.
23655 + input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
23656 +
23657 + while test "$#" -ne 0; do
23658 + from="$1"
23659 + # Handle y_tab.c and y_tab.h output by DOS
23660 + if test $y_tab_nodot = "yes"; then
23661 + if test $from = "y.tab.c"; then
23662 + from="y_tab.c"
23663 else
23664 - # A missing file is only an error for the first file. This
23665 - # is a blatant hack to let us support using "yacc -d". If -d
23666 - # is not specified, we don't want an error when the header
23667 - # file is "missing".
23668 - if test $first = yes; then
23669 - status=1
23670 - fi
23671 + if test $from = "y.tab.h"; then
23672 + from="y_tab.h"
23673 + fi
23674 fi
23675 - shift
23676 - shift
23677 - first=no
23678 - done
23679 + fi
23680 + if test -f "$from"; then
23681 + # If $2 is an absolute path name, then just use that,
23682 + # otherwise prepend `../'.
23683 + case "$2" in
23684 + [\\/]* | ?:[\\/]*) target="$2";;
23685 + *) target="../$2";;
23686 + esac
23687 +
23688 + # We do not want to overwrite a header file if it hasn't
23689 + # changed. This avoid useless recompilations. However the
23690 + # parser itself (the first file) should always be updated,
23691 + # because it is the destination of the .y.c rule in the
23692 + # Makefile. Divert the output of all other files to a temporary
23693 + # file so we can compare them to existing versions.
23694 + if test $first = no; then
23695 + realtarget="$target"
23696 + target="tmp-`echo $target | sed s/.*[\\/]//g`"
23697 + fi
23698 + # Edit out `#line' or `#' directives.
23699 + #
23700 + # We don't want the resulting debug information to point at
23701 + # an absolute srcdir; it is better for it to just mention the
23702 + # .y file with no path.
23703 + #
23704 + # We want to use the real output file name, not yy.lex.c for
23705 + # instance.
23706 + #
23707 + # We want the include guards to be adjusted too.
23708 + FROM=`echo "$from" | sed \
23709 + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
23710 + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
23711 + TARGET=`echo "$2" | sed \
23712 + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
23713 + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
23714 +
23715 + sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
23716 + -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
23717 +
23718 + # Check whether header files must be updated.
23719 + if test $first = no; then
23720 + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
23721 + echo "$2" is unchanged
23722 + rm -f "$target"
23723 + else
23724 + echo updating "$2"
23725 + mv -f "$target" "$realtarget"
23726 + fi
23727 + fi
23728 + else
23729 + # A missing file is only an error for the first file. This
23730 + # is a blatant hack to let us support using "yacc -d". If -d
23731 + # is not specified, we don't want an error when the header
23732 + # file is "missing".
23733 + if test $first = yes; then
23734 + ret=1
23735 + fi
23736 + fi
23737 + shift
23738 + shift
23739 + first=no
23740 + done
23741 else
23742 - status=$?
23743 + ret=$?
23744 fi
23745
23746 # Remove the directory.
23747 cd ..
23748 rm -rf $dirname
23749
23750 -exit $status
23751 +exit $ret
23752 +
23753 +# Local Variables:
23754 +# mode: shell-script
23755 +# sh-indentation: 2
23756 +# eval: (add-hook 'write-file-hooks 'time-stamp)
23757 +# time-stamp-start: "scriptversion="
23758 +# time-stamp-format: "%:y-%02m-%02d.%02H"
23759 +# time-stamp-time-zone: "UTC"
23760 +# time-stamp-end: "; # UTC"
23761 +# End:
23762 --
23763 1.6.5.2
23764