summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorPhil Blundell <philb@brightsign.biz>2019-11-26 11:55:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-04 12:30:59 +0000
commit91153457342c6419953cb0becbe92ee7b3904b46 (patch)
treea41d23d4a10068b9b17845f3fbf0031c95a00d25 /meta/recipes-bsp
parente05e4b5b4ba7fd6be13b3be151e27d3eafc0b5d8 (diff)
downloadpoky-91153457342c6419953cb0becbe92ee7b3904b46.tar.gz
lrzsz: Update autotools infrastructure and make it work with new gettext
Run gettextize and autoreconf and fix up the resulting problem so that it builds more-or-less cleanly and "make dist" works. Some of the existing patches that contained particular point fixes are now rolled into a single big patch. (From OE-Core rev: b045f83519807d645a22f74c590c037a4ebc4fbe) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch19
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch36701
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch21884
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch49
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb4
5 files changed, 36702 insertions, 21955 deletions
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
deleted file mode 100644
index 682cf416e2..0000000000
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Add a description to the AC_DEFINE for LOCALEDIR so that it appears in config.h
2and silences a fatal warning.
3
4Upstream-Status:Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/configure.in b/configure.in
8index c10460c..aa20263 100644
9--- a/configure.in
10+++ b/configure.in
11@@ -258,7 +258,7 @@ AC_SUBST(LIBS)
12
13 AM_GNU_GETTEXT
14
15-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
16+AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME",[locale directory])
17
18 AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile m4/Makefile \
19 man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
new file mode 100644
index 0000000000..fa78599f38
--- /dev/null
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools-update.patch
@@ -0,0 +1,36701 @@
1Update autotools infrastructure (including gettext) to modern versions.
2
3Upstream-Status: Pending
4Signed-off-by: Phil Blundell <pb@pbcl.net>
5
6diff -uprN clean/lrzsz-0.12.20/ABOUT-NLS lrzsz-0.12.20/ABOUT-NLS
7--- clean/lrzsz-0.12.20/ABOUT-NLS 1998-04-26 14:22:30.000000000 +0100
8+++ lrzsz-0.12.20/ABOUT-NLS 2019-11-25 18:21:17.000000000 +0000
9@@ -1,225 +1 @@
10-Notes on the Free Translation Project
11-*************************************
12-
13- Free software is going international! The Free Translation Project
14-is a way to get maintainers of free software, translators, and users all
15-together, so that will gradually become able to speak many languages.
16-A few packages already provide translations for their messages.
17-
18- If you found this `ABOUT-NLS' file inside a distribution, you may
19-assume that the distributed package does use GNU `gettext' internally,
20-itself available at your nearest GNU archive site. But you do *not*
21-need to install GNU `gettext' prior to configuring, installing or using
22-this package with messages translated.
23-
24- Installers will find here some useful hints. These notes also
25-explain how users should proceed for getting the programs to use the
26-available translations. They tell how people wanting to contribute and
27-work at translations should contact the appropriate team.
28-
29- When reporting bugs in the `intl/' directory or bugs which may be
30-related to internationalization, you should tell about the version of
31-`gettext' which is used. The information can be found in the
32-`intl/VERSION' file, in internationalized packages.
33-
34-One advise in advance
35-=====================
36-
37- If you want to exploit the full power of internationalization, you
38-should configure it using
39-
40- ./configure --with-included-gettext
41-
42-to force usage of internationalizing routines provided within this
43-package, despite the existence of internationalizing capabilities in the
44-operating system where this package is being installed. So far, only
45-the `gettext' implementation in the GNU C library version 2 provides as
46-many features (such as locale alias or message inheritance) as the
47-implementation here. It is also not possible to offer this additional
48-functionality on top of a `catgets' implementation. Future versions of
49-GNU `gettext' will very likely convey even more functionality. So it
50-might be a good idea to change to GNU `gettext' as soon as possible.
51-
52- So you need not provide this option if you are using GNU libc 2 or
53-you have installed a recent copy of the GNU gettext package with the
54-included `libintl'.
55-
56-INSTALL Matters
57-===============
58-
59- Some packages are "localizable" when properly installed; the
60-programs they contain can be made to speak your own native language.
61-Most such packages use GNU `gettext'. Other packages have their own
62-ways to internationalization, predating GNU `gettext'.
63-
64- By default, this package will be installed to allow translation of
65-messages. It will automatically detect whether the system provides
66-usable `catgets' (if using this is selected by the installer) or
67-`gettext' functions. If neither is available, the GNU `gettext' own
68-library will be used. This library is wholly contained within this
69-package, usually in the `intl/' subdirectory, so prior installation of
70-the GNU `gettext' package is *not* required. Installers may use
71-special options at configuration time for changing the default
72-behaviour. The commands:
73-
74- ./configure --with-included-gettext
75- ./configure --with-catgets
76- ./configure --disable-nls
77-
78-will respectively bypass any pre-existing `catgets' or `gettext' to use
79-the internationalizing routines provided within this package, enable
80-the use of the `catgets' functions (if found on the locale system), or
81-else, *totally* disable translation of messages.
82-
83- When you already have GNU `gettext' installed on your system and run
84-configure without an option for your new package, `configure' will
85-probably detect the previously built and installed `libintl.a' file and
86-will decide to use this. This might be not what is desirable. You
87-should use the more recent version of the GNU `gettext' library. I.e.
88-if the file `intl/VERSION' shows that the library which comes with this
89-package is more recent, you should use
90-
91- ./configure --with-included-gettext
92-
93-to prevent auto-detection.
94-
95- By default the configuration process will not test for the `catgets'
96-function and therefore they will not be used. The reasons are already
97-given above: the emulation on top of `catgets' cannot provide all the
98-extensions provided by the GNU `gettext' library. If you nevertheless
99-want to use the `catgets' functions use
100-
101- ./configure --with-catgets
102-
103-to enable the test for `catgets' (this causes no harm if `catgets' is
104-not available on your system). If you really select this option we
105-would like to hear about the reasons because we cannot think of any
106-good one ourself.
107-
108- Internationalized packages have usually many `po/LL.po' files, where
109-LL gives an ISO 639 two-letter code identifying the language. Unless
110-translations have been forbidden at `configure' time by using the
111-`--disable-nls' switch, all available translations are installed
112-together with the package. However, the environment variable `LINGUAS'
113-may be set, prior to configuration, to limit the installed set.
114-`LINGUAS' should then contain a space separated list of two-letter
115-codes, stating which languages are allowed.
116-
117-Using This Package
118-==================
119-
120- As a user, if your language has been installed for this package, you
121-only have to set the `LANG' environment variable to the appropriate
122-ISO 639 `LL' two-letter code prior to using the programs in the
123-package. For example, let's suppose that you speak German. At the
124-shell prompt, merely execute `setenv LANG de' (in `csh'),
125-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This
126-can be done from your `.login' or `.profile' file, once and for all.
127-
128- An operating system might already offer message localization for
129-many of its programs, while other programs have been installed locally
130-with the full capabilities of GNU `gettext'. Just using `gettext'
131-extended syntax for `LANG' would break proper localization of already
132-available operating system programs. In this case, users should set
133-both `LANGUAGE' and `LANG' variables in their environment, as programs
134-using GNU `gettext' give preference to `LANGUAGE'. For example, some
135-Swedish users would rather read translations in German than English for
136-when Swedish is not available. This is easily accomplished by setting
137-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
138-
139-Translating Teams
140-=================
141-
142- For the Free Translation Project to be a success, we need interested
143-people who like their own language and write it well, and who are also
144-able to synergize with other translators speaking the same language.
145-Each translation team has its own mailing list, courtesy of Linux
146-International. You may reach your translation team at the address
147-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
148-language. Language codes are *not* the same as the country codes given
149-in ISO 3166. The following translation teams exist, as of August 1997:
150-
151- Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
152- Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
153- `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
154- Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
155- `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
156- Swedish `sv', and Turkish `tr'.
157-
158-For example, you may reach the Chinese translation team by writing to
159-`zh@li.org'.
160-
161- If you'd like to volunteer to *work* at translating messages, you
162-should become a member of the translating team for your own language.
163-The subscribing address is *not* the same as the list itself, it has
164-`-request' appended. For example, speakers of Swedish can send a
165-message to `sv-request@li.org', having this message body:
166-
167- subscribe
168-
169- Keep in mind that team members are expected to participate
170-*actively* in translations, or at solving translational difficulties,
171-rather than merely lurking around. If your team does not exist yet and
172-you want to start one, or if you are unsure about what to do or how to
173-get started, please write to `translation@iro.umontreal.ca' to reach the
174-coordinator for all translator teams.
175-
176- The English team is special. It works at improving and uniformizing
177-the terminology in use. Proven linguistic skill are praised more than
178-programming skill, here.
179-
180-Available Packages
181-==================
182-
183- Languages are not equally supported in all packages. The following
184-matrix shows the current state of internationalization, as of August
185-1997. The matrix shows, in regard of each package, for which languages
186-PO files have been submitted to translation coordination.
187-
188- Ready PO files cs da de en es fi fr it ja ko nl no pl pt sl sv
189- .-------------------------------------------------.
190- bash | [] [] [] | 3
191- bison | [] [] [] | 3
192- clisp | [] [] [] [] | 4
193- cpio | [] [] [] [] [] | 5
194- diffutils | [] [] [] [] [] | 5
195- enscript | [] [] [] [] [] [] | 6
196- fileutils | [] [] [] [] [] [] [] [] [] [] | 10
197- findutils | [] [] [] [] [] [] [] [] | 8
198- flex | [] [] [] [] | 4
199- gcal | [] [] [] [] [] | 5
200- gettext | [] [] [] [] [] [] [] [] [] [] | 11
201- grep | [] [] [] [] [] [] [] [] [] | 9
202- hello | [] [] [] [] [] [] [] [] [] [] | 10
203- id-utils | [] [] [] | 3
204- indent | [] [] [] [] | 4
205- libc | [] [] [] [] [] [] [] | 7
206- m4 | [] [] [] [] [] | 5
207- make | [] [] [] [] [] [] | 6
208- music | [] [] | 2
209- ptx | [] [] [] [] [] [] [] [] | 8
210- recode | [] [] [] [] [] [] [] [] [] | 9
211- sh-utils | [] [] [] [] [] [] [] | 7
212- sharutils | [] [] [] [] [] | 5
213- tar | [] [] [] [] [] [] [] [] [] [] | 10
214- texinfo | [] | 1
215- textutils | [] [] [] [] [] [] [] [] [] | 9
216- wdiff | [] [] [] [] [] [] [] [] | 8
217- `-------------------------------------------------'
218- 16 languages cs da de en es fi fr it ja ko nl no pl pt sl sv
219- 27 packages 3 2 24 1 17 1 26 2 1 11 20 9 19 7 7 17 167
220-
221- Some counters in the preceding matrix are higher than the number of
222-visible blocks let us expect. This is because a few extra PO files are
223-used for implementing regional variants of languages, or language
224-dialects.
225-
226- For a PO file in the matrix above to be effective, the package to
227-which it applies should also have been internationalized and
228-distributed as such by its maintainer. There might be an observable
229-lag between the mere existence a PO file and its wide availability in a
230-distribution.
231-
232- If August 1997 seems to be old, you may fetch a more recent copy of
233-this `ABOUT-NLS' file on most GNU archive sites.
234-
235+<https://www.gnu.org/software/gettext/manual/html_node/Users.html>
236diff -uprN clean/lrzsz-0.12.20/aclocal.m4 lrzsz-0.12.20/aclocal.m4
237--- clean/lrzsz-0.12.20/aclocal.m4 1998-12-30 07:50:12.000000000 +0000
238+++ lrzsz-0.12.20/aclocal.m4 2019-11-26 11:37:44.000000000 +0000
239@@ -1,699 +1,1120 @@
240-dnl aclocal.m4 generated automatically by aclocal 1.3
241+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
242
243-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
244-dnl This Makefile.in is free software; the Free Software Foundation
245-dnl gives unlimited permission to copy and/or distribute it,
246-dnl with or without modifications, as long as this notice is preserved.
247-
248-dnl This program is distributed in the hope that it will be useful,
249-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
250-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
251-dnl PARTICULAR PURPOSE.
252-
253-dnl AC_REPLACE_GNU_GETOPT
254-AC_DEFUN(AC_REPLACE_GNU_GETOPT,
255-[AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1.o getopt.o"])
256-AC_SUBST(LIBOBJS)dnl
257-])
258+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
259
260-dnl
261-dnl taken from taylor uucp
262-AC_DEFUN(LRZSZ_ERRNO_DECL,[
263-AC_MSG_CHECKING(for errno declaration)
264-AC_CACHE_VAL(lrzsz_cv_decl_errno,
265-[AC_TRY_COMPILE([#include <errno.h>], [int i = errno; errno = 1;],
266-lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)])
267-AC_MSG_RESULT($lrzsz_cv_decl_errno)
268-if test $lrzsz_cv_decl_errno = yes; then
269- AC_DEFINE([HAVE_ERRNO_DECLARATION])
270-fi
271-])
272-
273-dnl for ease of use
274-AC_DEFUN([LRZSZ_HEADERS_TERM_IO],[
275-AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)dnl
276-])
277-
278-dnl LRZSZ_TYPE_SPEED_T
279-AC_DEFUN(LRZSZ_TYPE_SPEED_T,[
280-AC_REQUIRE([AC_HEADER_STDC])dnl
281-AC_REQUIRE([LRZSZ_HEADERS_TERM_IO])dnl
282-AC_MSG_CHECKING(for speed_t)
283-AC_CACHE_VAL(ac_cv_type_speed_t,
284-[AC_EGREP_CPP(speed_t, [#include <sys/types.h>
285-#if STDC_HEADERS
286-#include <stdlib.h>
287-#include <stddef.h>
288-#endif
289-#ifdef HAVE_TERMIOS_H
290-#include <termios.h>
291-#else
292-#if defined(HAVE_SYS_TERMIOS_H)
293-#include <sys/termios.h>
294-#else
295-#if defined(HAVE_TERMIO_H)
296-#include <termio.h>
297-#else
298-#if defined(HAVE_SYS_TERMIO_H)
299-#include <sys/termio.h>
300-#else
301-#if defined(HAVE_SGTTY_H)
302-#include <sgtty.h>
303-#else
304-#error neither termio.h nor sgtty.h found. Cannot continue. */
305-#endif
306-#endif
307-#endif
308-#endif
309-#endif
310-], ac_cv_type_speed_t=yes, ac_cv_type_speed_t=no)])dnl
311-AC_MSG_RESULT($ac_cv_type_speed_t)
312-if test $ac_cv_type_speed_t = no; then
313- AC_DEFINE([speed_t],long)
314-fi
315-])
316-
317-AC_DEFUN(lrzsz_HEADER_SYS_SELECT,
318-[AC_CACHE_CHECK([whether sys/time.h and sys/select.h may both be included],
319- lrzsz_cv_header_sys_select,
320-[AC_TRY_COMPILE([#include <sys/types.h>
321-#include <sys/time.h>
322-#include <sys/select.h>],
323-[struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)])
324-if test $lrzsz_cv_header_sys_select = no; then
325- AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT)
326-fi
327-])
328-
329-
330-# Do all the work for Automake. This macro actually does too much --
331-# some checks are only needed if your package does certain things.
332-# But this isn't really a big deal.
333-
334-# serial 1
335-
336-dnl Usage:
337-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
338-
339-AC_DEFUN(AM_INIT_AUTOMAKE,
340-[AC_REQUIRE([AM_PROG_INSTALL])
341-PACKAGE=[$1]
342-AC_SUBST(PACKAGE)
343-VERSION=[$2]
344-AC_SUBST(VERSION)
345-dnl test to see if srcdir already configured
346-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
347- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
348-fi
349-ifelse([$3],,
350-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
351-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
352-AC_REQUIRE([AM_SANITY_CHECK])
353-AC_REQUIRE([AC_ARG_PROGRAM])
354-dnl FIXME This is truly gross.
355-missing_dir=`cd $ac_aux_dir && pwd`
356-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
357-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
358-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
359-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
360-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
361-AC_REQUIRE([AC_PROG_MAKE_SET])])
362-
363-
364-# serial 1
365-
366-AC_DEFUN(AM_PROG_INSTALL,
367-[AC_REQUIRE([AC_PROG_INSTALL])
368-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
369-AC_SUBST(INSTALL_SCRIPT)dnl
370+# This file is free software; the Free Software Foundation
371+# gives unlimited permission to copy and/or distribute it,
372+# with or without modifications, as long as this notice is preserved.
373+
374+# This program is distributed in the hope that it will be useful,
375+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
376+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
377+# PARTICULAR PURPOSE.
378+
379+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
380+m4_ifndef([AC_AUTOCONF_VERSION],
381+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
382+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
383+[m4_warning([this file was generated for autoconf 2.69.
384+You have another version of autoconf. It may work, but is not guaranteed to.
385+If you have problems, you may need to regenerate the build system entirely.
386+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
387+
388+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
389+#
390+# This file is free software; the Free Software Foundation
391+# gives unlimited permission to copy and/or distribute it,
392+# with or without modifications, as long as this notice is preserved.
393+
394+# AM_AUTOMAKE_VERSION(VERSION)
395+# ----------------------------
396+# Automake X.Y traces this macro to ensure aclocal.m4 has been
397+# generated from the m4 files accompanying Automake X.Y.
398+# (This private macro should not be called outside this file.)
399+AC_DEFUN([AM_AUTOMAKE_VERSION],
400+[am__api_version='1.16'
401+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
402+dnl require some minimum version. Point them to the right macro.
403+m4_if([$1], [1.16.1], [],
404+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
405 ])
406
407+# _AM_AUTOCONF_VERSION(VERSION)
408+# -----------------------------
409+# aclocal traces this macro to find the Autoconf version.
410+# This is a private macro too. Using m4_define simplifies
411+# the logic in aclocal, which can simply ignore this definition.
412+m4_define([_AM_AUTOCONF_VERSION], [])
413+
414+# AM_SET_CURRENT_AUTOMAKE_VERSION
415+# -------------------------------
416+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
417+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
418+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
419+[AM_AUTOMAKE_VERSION([1.16.1])dnl
420+m4_ifndef([AC_AUTOCONF_VERSION],
421+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
422+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
423+
424+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
425+
426+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
427+#
428+# This file is free software; the Free Software Foundation
429+# gives unlimited permission to copy and/or distribute it,
430+# with or without modifications, as long as this notice is preserved.
431+
432+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
433+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
434+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
435+#
436+# Of course, Automake must honor this variable whenever it calls a
437+# tool from the auxiliary directory. The problem is that $srcdir (and
438+# therefore $ac_aux_dir as well) can be either absolute or relative,
439+# depending on how configure is run. This is pretty annoying, since
440+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
441+# source directory, any form will work fine, but in subdirectories a
442+# relative path needs to be adjusted first.
443 #
444-# Check to make sure that the build environment is sane.
445+# $ac_aux_dir/missing
446+# fails when called from a subdirectory if $ac_aux_dir is relative
447+# $top_srcdir/$ac_aux_dir/missing
448+# fails if $ac_aux_dir is absolute,
449+# fails when called from a subdirectory in a VPATH build with
450+# a relative $ac_aux_dir
451 #
452+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
453+# are both prefixed by $srcdir. In an in-source build this is usually
454+# harmless because $srcdir is '.', but things will broke when you
455+# start a VPATH build or use an absolute $srcdir.
456+#
457+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
458+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
459+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
460+# and then we would define $MISSING as
461+# MISSING="\${SHELL} $am_aux_dir/missing"
462+# This will work as long as MISSING is not called from configure, because
463+# unfortunately $(top_srcdir) has no meaning in configure.
464+# However there are other variables, like CC, which are often used in
465+# configure, and could therefore not use this "fixed" $ac_aux_dir.
466+#
467+# Another solution, used here, is to always expand $ac_aux_dir to an
468+# absolute PATH. The drawback is that using absolute paths prevent a
469+# configured tree to be moved without reconfiguration.
470+
471+AC_DEFUN([AM_AUX_DIR_EXPAND],
472+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
473+# Expand $ac_aux_dir to an absolute path.
474+am_aux_dir=`cd "$ac_aux_dir" && pwd`
475+])
476
477-AC_DEFUN(AM_SANITY_CHECK,
478-[AC_MSG_CHECKING([whether build environment is sane])
479-# Just in case
480-sleep 1
481-echo timestamp > conftestfile
482-# Do `set' in a subshell so we don't clobber the current shell's
483-# arguments. Must try -L first in case configure is actually a
484-# symlink; some systems play weird games with the mod time of symlinks
485-# (eg FreeBSD returns the mod time of the symlink's containing
486-# directory).
487-if (
488- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
489- if test "[$]*" = "X"; then
490- # -L didn't work.
491- set X `ls -t $srcdir/configure conftestfile`
492- fi
493- if test "[$]*" != "X $srcdir/configure conftestfile" \
494- && test "[$]*" != "X conftestfile $srcdir/configure"; then
495-
496- # If neither matched, then we have a broken ls. This can happen
497- # if, for instance, CONFIG_SHELL is bash and it inherits a
498- # broken ls alias from the environment. This has actually
499- # happened. Such a system could not be considered "sane".
500- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
501-alias in your environment])
502- fi
503-
504- test "[$]2" = conftestfile
505- )
506-then
507- # Ok.
508- :
509+# AM_CONDITIONAL -*- Autoconf -*-
510+
511+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
512+#
513+# This file is free software; the Free Software Foundation
514+# gives unlimited permission to copy and/or distribute it,
515+# with or without modifications, as long as this notice is preserved.
516+
517+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
518+# -------------------------------------
519+# Define a conditional.
520+AC_DEFUN([AM_CONDITIONAL],
521+[AC_PREREQ([2.52])dnl
522+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
523+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
524+AC_SUBST([$1_TRUE])dnl
525+AC_SUBST([$1_FALSE])dnl
526+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
527+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
528+m4_define([_AM_COND_VALUE_$1], [$2])dnl
529+if $2; then
530+ $1_TRUE=
531+ $1_FALSE='#'
532 else
533- AC_MSG_ERROR([newly created file is older than distributed files!
534-Check your system clock])
535+ $1_TRUE='#'
536+ $1_FALSE=
537 fi
538-rm -f conftest*
539-AC_MSG_RESULT(yes)])
540+AC_CONFIG_COMMANDS_PRE(
541+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
542+ AC_MSG_ERROR([[conditional "$1" was never defined.
543+Usually this means the macro was only invoked conditionally.]])
544+fi])])
545
546-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
547-dnl The program must properly implement --version.
548-AC_DEFUN(AM_MISSING_PROG,
549-[AC_MSG_CHECKING(for working $2)
550-# Run test in a subshell; some versions of sh will print an error if
551-# an executable is not found, even if stderr is redirected.
552-# Redirect stdin to placate older versions of autoconf. Sigh.
553-if ($2 --version) < /dev/null > /dev/null 2>&1; then
554- $1=$2
555- AC_MSG_RESULT(found)
556+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
557+#
558+# This file is free software; the Free Software Foundation
559+# gives unlimited permission to copy and/or distribute it,
560+# with or without modifications, as long as this notice is preserved.
561+
562+
563+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
564+# written in clear, in which case automake, when reading aclocal.m4,
565+# will think it sees a *use*, and therefore will trigger all it's
566+# C support machinery. Also note that it means that autoscan, seeing
567+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
568+
569+
570+# _AM_DEPENDENCIES(NAME)
571+# ----------------------
572+# See how the compiler implements dependency checking.
573+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
574+# We try a few techniques and use that to set a single cache variable.
575+#
576+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
577+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
578+# dependency, and given that the user is not expected to run this macro,
579+# just rely on AC_PROG_CC.
580+AC_DEFUN([_AM_DEPENDENCIES],
581+[AC_REQUIRE([AM_SET_DEPDIR])dnl
582+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
583+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
584+AC_REQUIRE([AM_DEP_TRACK])dnl
585+
586+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
587+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
588+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
589+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
590+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
591+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
592+ [depcc="$$1" am_compiler_list=])
593+
594+AC_CACHE_CHECK([dependency style of $depcc],
595+ [am_cv_$1_dependencies_compiler_type],
596+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
597+ # We make a subdir and do the tests there. Otherwise we can end up
598+ # making bogus files that we don't know about and never remove. For
599+ # instance it was reported that on HP-UX the gcc test will end up
600+ # making a dummy file named 'D' -- because '-MD' means "put the output
601+ # in D".
602+ rm -rf conftest.dir
603+ mkdir conftest.dir
604+ # Copy depcomp to subdir because otherwise we won't find it if we're
605+ # using a relative directory.
606+ cp "$am_depcomp" conftest.dir
607+ cd conftest.dir
608+ # We will build objects and dependencies in a subdirectory because
609+ # it helps to detect inapplicable dependency modes. For instance
610+ # both Tru64's cc and ICC support -MD to output dependencies as a
611+ # side effect of compilation, but ICC will put the dependencies in
612+ # the current directory while Tru64 will put them in the object
613+ # directory.
614+ mkdir sub
615+
616+ am_cv_$1_dependencies_compiler_type=none
617+ if test "$am_compiler_list" = ""; then
618+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
619+ fi
620+ am__universal=false
621+ m4_case([$1], [CC],
622+ [case " $depcc " in #(
623+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
624+ esac],
625+ [CXX],
626+ [case " $depcc " in #(
627+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
628+ esac])
629+
630+ for depmode in $am_compiler_list; do
631+ # Setup a source with many dependencies, because some compilers
632+ # like to wrap large dependency lists on column 80 (with \), and
633+ # we should not choose a depcomp mode which is confused by this.
634+ #
635+ # We need to recreate these files for each test, as the compiler may
636+ # overwrite some of them when testing with obscure command lines.
637+ # This happens at least with the AIX C compiler.
638+ : > sub/conftest.c
639+ for i in 1 2 3 4 5 6; do
640+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
641+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
642+ # Solaris 10 /bin/sh.
643+ echo '/* dummy */' > sub/conftst$i.h
644+ done
645+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
646+
647+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
648+ # mode. It turns out that the SunPro C++ compiler does not properly
649+ # handle '-M -o', and we need to detect this. Also, some Intel
650+ # versions had trouble with output in subdirs.
651+ am__obj=sub/conftest.${OBJEXT-o}
652+ am__minus_obj="-o $am__obj"
653+ case $depmode in
654+ gcc)
655+ # This depmode causes a compiler race in universal mode.
656+ test "$am__universal" = false || continue
657+ ;;
658+ nosideeffect)
659+ # After this tag, mechanisms are not by side-effect, so they'll
660+ # only be used when explicitly requested.
661+ if test "x$enable_dependency_tracking" = xyes; then
662+ continue
663+ else
664+ break
665+ fi
666+ ;;
667+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
668+ # This compiler won't grok '-c -o', but also, the minuso test has
669+ # not run yet. These depmodes are late enough in the game, and
670+ # so weak that their functioning should not be impacted.
671+ am__obj=conftest.${OBJEXT-o}
672+ am__minus_obj=
673+ ;;
674+ none) break ;;
675+ esac
676+ if depmode=$depmode \
677+ source=sub/conftest.c object=$am__obj \
678+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
679+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
680+ >/dev/null 2>conftest.err &&
681+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
682+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
683+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
684+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
685+ # icc doesn't choke on unknown options, it will just issue warnings
686+ # or remarks (even with -Werror). So we grep stderr for any message
687+ # that says an option was ignored or not supported.
688+ # When given -MP, icc 7.0 and 7.1 complain thusly:
689+ # icc: Command line warning: ignoring option '-M'; no argument required
690+ # The diagnosis changed in icc 8.0:
691+ # icc: Command line remark: option '-MP' not supported
692+ if (grep 'ignoring option' conftest.err ||
693+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
694+ am_cv_$1_dependencies_compiler_type=$depmode
695+ break
696+ fi
697+ fi
698+ done
699+
700+ cd ..
701+ rm -rf conftest.dir
702 else
703- $1="$3/missing $2"
704- AC_MSG_RESULT(missing)
705+ am_cv_$1_dependencies_compiler_type=none
706 fi
707-AC_SUBST($1)])
708+])
709+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
710+AM_CONDITIONAL([am__fastdep$1], [
711+ test "x$enable_dependency_tracking" != xno \
712+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
713+])
714+
715
716-# Like AC_CONFIG_HEADER, but automatically create stamp file.
717+# AM_SET_DEPDIR
718+# -------------
719+# Choose a directory name for dependency files.
720+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
721+AC_DEFUN([AM_SET_DEPDIR],
722+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
723+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
724+])
725
726-AC_DEFUN(AM_CONFIG_HEADER,
727-[AC_PREREQ([2.12])
728-AC_CONFIG_HEADER([$1])
729-dnl When config.status generates a header, we must update the stamp-h file.
730-dnl This file resides in the same directory as the config header
731-dnl that is generated. We must strip everything past the first ":",
732-dnl and everything past the last "/".
733-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
734-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
735-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
736-<<am_indx=1
737-for am_file in <<$1>>; do
738- case " <<$>>CONFIG_HEADERS " in
739- *" <<$>>am_file "*<<)>>
740- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
741- ;;
742+
743+# AM_DEP_TRACK
744+# ------------
745+AC_DEFUN([AM_DEP_TRACK],
746+[AC_ARG_ENABLE([dependency-tracking], [dnl
747+AS_HELP_STRING(
748+ [--enable-dependency-tracking],
749+ [do not reject slow dependency extractors])
750+AS_HELP_STRING(
751+ [--disable-dependency-tracking],
752+ [speeds up one-time build])])
753+if test "x$enable_dependency_tracking" != xno; then
754+ am_depcomp="$ac_aux_dir/depcomp"
755+ AMDEPBACKSLASH='\'
756+ am__nodep='_no'
757+fi
758+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
759+AC_SUBST([AMDEPBACKSLASH])dnl
760+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
761+AC_SUBST([am__nodep])dnl
762+_AM_SUBST_NOTMAKE([am__nodep])dnl
763+])
764+
765+# Generate code to set up dependency tracking. -*- Autoconf -*-
766+
767+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
768+#
769+# This file is free software; the Free Software Foundation
770+# gives unlimited permission to copy and/or distribute it,
771+# with or without modifications, as long as this notice is preserved.
772+
773+# _AM_OUTPUT_DEPENDENCY_COMMANDS
774+# ------------------------------
775+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
776+[{
777+ # Older Autoconf quotes --file arguments for eval, but not when files
778+ # are listed without --file. Let's play safe and only enable the eval
779+ # if we detect the quoting.
780+ # TODO: see whether this extra hack can be removed once we start
781+ # requiring Autoconf 2.70 or later.
782+ AS_CASE([$CONFIG_FILES],
783+ [*\'*], [eval set x "$CONFIG_FILES"],
784+ [*], [set x $CONFIG_FILES])
785+ shift
786+ # Used to flag and report bootstrapping failures.
787+ am_rc=0
788+ for am_mf
789+ do
790+ # Strip MF so we end up with the name of the file.
791+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
792+ # Check whether this is an Automake generated Makefile which includes
793+ # dependency-tracking related rules and includes.
794+ # Grep'ing the whole file directly is not great: AIX grep has a line
795+ # limit of 2048, but all sed's we know have understand at least 4000.
796+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
797+ || continue
798+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
799+ am_filepart=`AS_BASENAME(["$am_mf"])`
800+ AM_RUN_LOG([cd "$am_dirpart" \
801+ && sed -e '/# am--include-marker/d' "$am_filepart" \
802+ | $MAKE -f - am--depfiles]) || am_rc=$?
803+ done
804+ if test $am_rc -ne 0; then
805+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
806+ for automatic dependency tracking. Try re-running configure with the
807+ '--disable-dependency-tracking' option to at least be able to build
808+ the package (albeit without support for automatic dependency tracking).])
809+ fi
810+ AS_UNSET([am_dirpart])
811+ AS_UNSET([am_filepart])
812+ AS_UNSET([am_mf])
813+ AS_UNSET([am_rc])
814+ rm -f conftest-deps.mk
815+}
816+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
817+
818+
819+# AM_OUTPUT_DEPENDENCY_COMMANDS
820+# -----------------------------
821+# This macro should only be invoked once -- use via AC_REQUIRE.
822+#
823+# This code is only required when automatic dependency tracking is enabled.
824+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
825+# order to bootstrap the dependency handling code.
826+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
827+[AC_CONFIG_COMMANDS([depfiles],
828+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
829+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
830+
831+# Do all the work for Automake. -*- Autoconf -*-
832+
833+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
834+#
835+# This file is free software; the Free Software Foundation
836+# gives unlimited permission to copy and/or distribute it,
837+# with or without modifications, as long as this notice is preserved.
838+
839+# This macro actually does too much. Some checks are only needed if
840+# your package does certain things. But this isn't really a big deal.
841+
842+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
843+m4_define([AC_PROG_CC],
844+m4_defn([AC_PROG_CC])
845+[_AM_PROG_CC_C_O
846+])
847+
848+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
849+# AM_INIT_AUTOMAKE([OPTIONS])
850+# -----------------------------------------------
851+# The call with PACKAGE and VERSION arguments is the old style
852+# call (pre autoconf-2.50), which is being phased out. PACKAGE
853+# and VERSION should now be passed to AC_INIT and removed from
854+# the call to AM_INIT_AUTOMAKE.
855+# We support both call styles for the transition. After
856+# the next Automake release, Autoconf can make the AC_INIT
857+# arguments mandatory, and then we can depend on a new Autoconf
858+# release and drop the old call support.
859+AC_DEFUN([AM_INIT_AUTOMAKE],
860+[AC_PREREQ([2.65])dnl
861+dnl Autoconf wants to disallow AM_ names. We explicitly allow
862+dnl the ones we care about.
863+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
864+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
865+AC_REQUIRE([AC_PROG_INSTALL])dnl
866+if test "`cd $srcdir && pwd`" != "`pwd`"; then
867+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
868+ # is not polluted with repeated "-I."
869+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
870+ # test to see if srcdir already configured
871+ if test -f $srcdir/config.status; then
872+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
873+ fi
874+fi
875+
876+# test whether we have cygpath
877+if test -z "$CYGPATH_W"; then
878+ if (cygpath --version) >/dev/null 2>/dev/null; then
879+ CYGPATH_W='cygpath -w'
880+ else
881+ CYGPATH_W=echo
882+ fi
883+fi
884+AC_SUBST([CYGPATH_W])
885+
886+# Define the identity of the package.
887+dnl Distinguish between old-style and new-style calls.
888+m4_ifval([$2],
889+[AC_DIAGNOSE([obsolete],
890+ [$0: two- and three-arguments forms are deprecated.])
891+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
892+ AC_SUBST([PACKAGE], [$1])dnl
893+ AC_SUBST([VERSION], [$2])],
894+[_AM_SET_OPTIONS([$1])dnl
895+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
896+m4_if(
897+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
898+ [ok:ok],,
899+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
900+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
901+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
902+
903+_AM_IF_OPTION([no-define],,
904+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
905+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
906+
907+# Some tools Automake needs.
908+AC_REQUIRE([AM_SANITY_CHECK])dnl
909+AC_REQUIRE([AC_ARG_PROGRAM])dnl
910+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
911+AM_MISSING_PROG([AUTOCONF], [autoconf])
912+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
913+AM_MISSING_PROG([AUTOHEADER], [autoheader])
914+AM_MISSING_PROG([MAKEINFO], [makeinfo])
915+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
916+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
917+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
918+# For better backward compatibility. To be removed once Automake 1.9.x
919+# dies out for good. For more background, see:
920+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
921+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
922+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
923+# We need awk for the "check" target (and possibly the TAP driver). The
924+# system "awk" is bad on some platforms.
925+AC_REQUIRE([AC_PROG_AWK])dnl
926+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
927+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
928+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
929+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
930+ [_AM_PROG_TAR([v7])])])
931+_AM_IF_OPTION([no-dependencies],,
932+[AC_PROVIDE_IFELSE([AC_PROG_CC],
933+ [_AM_DEPENDENCIES([CC])],
934+ [m4_define([AC_PROG_CC],
935+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
936+AC_PROVIDE_IFELSE([AC_PROG_CXX],
937+ [_AM_DEPENDENCIES([CXX])],
938+ [m4_define([AC_PROG_CXX],
939+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
940+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
941+ [_AM_DEPENDENCIES([OBJC])],
942+ [m4_define([AC_PROG_OBJC],
943+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
944+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
945+ [_AM_DEPENDENCIES([OBJCXX])],
946+ [m4_define([AC_PROG_OBJCXX],
947+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
948+])
949+AC_REQUIRE([AM_SILENT_RULES])dnl
950+dnl The testsuite driver may need to know about EXEEXT, so add the
951+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
952+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
953+AC_CONFIG_COMMANDS_PRE(dnl
954+[m4_provide_if([_AM_COMPILER_EXEEXT],
955+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
956+
957+# POSIX will say in a future version that running "rm -f" with no argument
958+# is OK; and we want to be able to make that assumption in our Makefile
959+# recipes. So use an aggressive probe to check that the usage we want is
960+# actually supported "in the wild" to an acceptable degree.
961+# See automake bug#10828.
962+# To make any issue more visible, cause the running configure to be aborted
963+# by default if the 'rm' program in use doesn't match our expectations; the
964+# user can still override this though.
965+if rm -f && rm -fr && rm -rf; then : OK; else
966+ cat >&2 <<'END'
967+Oops!
968+
969+Your 'rm' program seems unable to run without file operands specified
970+on the command line, even when the '-f' option is present. This is contrary
971+to the behaviour of most rm programs out there, and not conforming with
972+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
973+
974+Please tell bug-automake@gnu.org about your system, including the value
975+of your $PATH and any error possibly output before this message. This
976+can help us improve future automake versions.
977+
978+END
979+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
980+ echo 'Configuration will proceed anyway, since you have set the' >&2
981+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
982+ echo >&2
983+ else
984+ cat >&2 <<'END'
985+Aborting the configuration process, to ensure you take notice of the issue.
986+
987+You can download and install GNU coreutils to get an 'rm' implementation
988+that behaves properly: <https://www.gnu.org/software/coreutils/>.
989+
990+If you want to complete the configuration process using your problematic
991+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
992+to "yes", and re-run configure.
993+
994+END
995+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
996+ fi
997+fi
998+dnl The trailing newline in this macro's definition is deliberate, for
999+dnl backward compatibility and to allow trailing 'dnl'-style comments
1000+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
1001+])
1002+
1003+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1004+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1005+dnl mangled by Autoconf and run in a shell conditional statement.
1006+m4_define([_AC_COMPILER_EXEEXT],
1007+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
1008+
1009+# When config.status generates a header, we must update the stamp-h file.
1010+# This file resides in the same directory as the config header
1011+# that is generated. The stamp files are numbered to have different names.
1012+
1013+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
1014+# loop where config.status creates the headers, so we can generate
1015+# our stamp files there.
1016+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
1017+[# Compute $1's index in $config_headers.
1018+_am_arg=$1
1019+_am_stamp_count=1
1020+for _am_header in $config_headers :; do
1021+ case $_am_header in
1022+ $_am_arg | $_am_arg:* )
1023+ break ;;
1024+ * )
1025+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
1026 esac
1027- am_indx=`expr "<<$>>am_indx" + 1`
1028-done<<>>dnl>>)
1029-changequote([,]))])
1030+done
1031+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1032
1033+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1034+#
1035+# This file is free software; the Free Software Foundation
1036+# gives unlimited permission to copy and/or distribute it,
1037+# with or without modifications, as long as this notice is preserved.
1038+
1039+# AM_PROG_INSTALL_SH
1040+# ------------------
1041+# Define $install_sh.
1042+AC_DEFUN([AM_PROG_INSTALL_SH],
1043+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1044+if test x"${install_sh+set}" != xset; then
1045+ case $am_aux_dir in
1046+ *\ * | *\ *)
1047+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
1048+ *)
1049+ install_sh="\${SHELL} $am_aux_dir/install-sh"
1050+ esac
1051+fi
1052+AC_SUBST([install_sh])])
1053
1054-# serial 1
1055-
1056-AC_DEFUN(AM_C_PROTOTYPES,
1057-[AC_REQUIRE([AM_PROG_CC_STDC])
1058-AC_REQUIRE([AC_PROG_CPP])
1059-AC_MSG_CHECKING([for function prototypes])
1060-if test "$am_cv_prog_cc_stdc" != no; then
1061- AC_MSG_RESULT(yes)
1062- AC_DEFINE(PROTOTYPES)
1063- U= ANSI2KNR=
1064+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
1065+#
1066+# This file is free software; the Free Software Foundation
1067+# gives unlimited permission to copy and/or distribute it,
1068+# with or without modifications, as long as this notice is preserved.
1069+
1070+# Check whether the underlying file-system supports filenames
1071+# with a leading dot. For instance MS-DOS doesn't.
1072+AC_DEFUN([AM_SET_LEADING_DOT],
1073+[rm -rf .tst 2>/dev/null
1074+mkdir .tst 2>/dev/null
1075+if test -d .tst; then
1076+ am__leading_dot=.
1077 else
1078- AC_MSG_RESULT(no)
1079- U=_ ANSI2KNR=./ansi2knr
1080- # Ensure some checks needed by ansi2knr itself.
1081- AC_HEADER_STDC
1082- AC_CHECK_HEADERS(string.h)
1083-fi
1084-AC_SUBST(U)dnl
1085-AC_SUBST(ANSI2KNR)dnl
1086-])
1087-
1088-
1089-# serial 1
1090-
1091-# @defmac AC_PROG_CC_STDC
1092-# @maindex PROG_CC_STDC
1093-# @ovindex CC
1094-# If the C compiler in not in ANSI C mode by default, try to add an option
1095-# to output variable @code{CC} to make it so. This macro tries various
1096-# options that select ANSI C on some system or another. It considers the
1097-# compiler to be in ANSI C mode if it handles function prototypes correctly.
1098-#
1099-# If you use this macro, you should check after calling it whether the C
1100-# compiler has been set to accept ANSI C; if not, the shell variable
1101-# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
1102-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
1103-# program @code{ansi2knr}, which comes with Ghostscript.
1104-# @end defmac
1105-
1106-AC_DEFUN(AM_PROG_CC_STDC,
1107-[AC_REQUIRE([AC_PROG_CC])
1108-AC_BEFORE([$0], [AC_C_INLINE])
1109-AC_BEFORE([$0], [AC_C_CONST])
1110-dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
1111-dnl a magic option to avoid problems with ANSI preprocessor commands
1112-dnl like #elif.
1113-dnl FIXME: can't do this because then AC_AIX won't work due to a
1114-dnl circular dependency.
1115-dnl AC_BEFORE([$0], [AC_PROG_CPP])
1116-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
1117-AC_CACHE_VAL(am_cv_prog_cc_stdc,
1118-[am_cv_prog_cc_stdc=no
1119-ac_save_CC="$CC"
1120-# Don't try gcc -ansi; that turns off useful extensions and
1121-# breaks some systems' header files.
1122-# AIX -qlanglvl=ansi
1123-# Ultrix and OSF/1 -std1
1124-# HP-UX -Aa -D_HPUX_SOURCE
1125-# SVR4 -Xc -D__EXTENSIONS__
1126-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
1127-do
1128- CC="$ac_save_CC $ac_arg"
1129- AC_TRY_COMPILE(
1130-[#include <stdarg.h>
1131-#include <stdio.h>
1132-#include <sys/types.h>
1133-#include <sys/stat.h>
1134-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
1135-struct buf { int x; };
1136-FILE * (*rcsopen) (struct buf *, struct stat *, int);
1137-static char *e (p, i)
1138- char **p;
1139- int i;
1140-{
1141- return p[i];
1142-}
1143-static char *f (char * (*g) (char **, int), char **p, ...)
1144-{
1145- char *s;
1146- va_list v;
1147- va_start (v,p);
1148- s = g (p, va_arg (v,int));
1149- va_end (v);
1150- return s;
1151-}
1152-int test (int i, double x);
1153-struct s1 {int (*f) (int a);};
1154-struct s2 {int (*f) (double a);};
1155-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
1156-int argc;
1157-char **argv;
1158-], [
1159-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
1160-],
1161-[am_cv_prog_cc_stdc="$ac_arg"; break])
1162+ am__leading_dot=_
1163+fi
1164+rmdir .tst 2>/dev/null
1165+AC_SUBST([am__leading_dot])])
1166+
1167+# Check to see how 'make' treats includes. -*- Autoconf -*-
1168+
1169+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1170+#
1171+# This file is free software; the Free Software Foundation
1172+# gives unlimited permission to copy and/or distribute it,
1173+# with or without modifications, as long as this notice is preserved.
1174+
1175+# AM_MAKE_INCLUDE()
1176+# -----------------
1177+# Check whether make has an 'include' directive that can support all
1178+# the idioms we need for our automatic dependency tracking code.
1179+AC_DEFUN([AM_MAKE_INCLUDE],
1180+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
1181+cat > confinc.mk << 'END'
1182+am__doit:
1183+ @echo this is the am__doit target >confinc.out
1184+.PHONY: am__doit
1185+END
1186+am__include="#"
1187+am__quote=
1188+# BSD make does it like this.
1189+echo '.include "confinc.mk" # ignored' > confmf.BSD
1190+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
1191+echo 'include confinc.mk # ignored' > confmf.GNU
1192+_am_result=no
1193+for s in GNU BSD; do
1194+ AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
1195+ AS_CASE([$?:`cat confinc.out 2>/dev/null`],
1196+ ['0:this is the am__doit target'],
1197+ [AS_CASE([$s],
1198+ [BSD], [am__include='.include' am__quote='"'],
1199+ [am__include='include' am__quote=''])])
1200+ if test "$am__include" != "#"; then
1201+ _am_result="yes ($s style)"
1202+ break
1203+ fi
1204 done
1205-CC="$ac_save_CC"
1206-])
1207-if test -z "$am_cv_prog_cc_stdc"; then
1208- AC_MSG_RESULT([none needed])
1209+rm -f confinc.* confmf.*
1210+AC_MSG_RESULT([${_am_result}])
1211+AC_SUBST([am__include])])
1212+AC_SUBST([am__quote])])
1213+
1214+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1215+
1216+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
1217+#
1218+# This file is free software; the Free Software Foundation
1219+# gives unlimited permission to copy and/or distribute it,
1220+# with or without modifications, as long as this notice is preserved.
1221+
1222+# AM_MISSING_PROG(NAME, PROGRAM)
1223+# ------------------------------
1224+AC_DEFUN([AM_MISSING_PROG],
1225+[AC_REQUIRE([AM_MISSING_HAS_RUN])
1226+$1=${$1-"${am_missing_run}$2"}
1227+AC_SUBST($1)])
1228+
1229+# AM_MISSING_HAS_RUN
1230+# ------------------
1231+# Define MISSING if not defined so far and test if it is modern enough.
1232+# If it is, set am_missing_run to use it, otherwise, to nothing.
1233+AC_DEFUN([AM_MISSING_HAS_RUN],
1234+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1235+AC_REQUIRE_AUX_FILE([missing])dnl
1236+if test x"${MISSING+set}" != xset; then
1237+ case $am_aux_dir in
1238+ *\ * | *\ *)
1239+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1240+ *)
1241+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
1242+ esac
1243+fi
1244+# Use eval to expand $SHELL
1245+if eval "$MISSING --is-lightweight"; then
1246+ am_missing_run="$MISSING "
1247 else
1248- AC_MSG_RESULT($am_cv_prog_cc_stdc)
1249+ am_missing_run=
1250+ AC_MSG_WARN(['missing' script is too old or missing])
1251 fi
1252-case "x$am_cv_prog_cc_stdc" in
1253- x|xno) ;;
1254- *) CC="$CC $am_cv_prog_cc_stdc" ;;
1255-esac
1256 ])
1257
1258-# Macro to add for using GNU gettext.
1259-# Ulrich Drepper <drepper@cygnus.com>, 1995.
1260+# -*- Autoconf -*-
1261+# Obsolete and "removed" macros, that must however still report explicit
1262+# error messages when used, to smooth transition.
1263 #
1264-# This file file be copied and used freely without restrictions. It can
1265-# be used in projects which are not available under the GNU Public License
1266-# but which still want to provide support for the GNU gettext functionality.
1267-# Please note that the actual code is *not* freely available.
1268-
1269-# serial 3
1270-
1271-AC_DEFUN(AM_WITH_NLS,
1272- [AC_MSG_CHECKING([whether NLS is requested])
1273- dnl Default is enabled NLS
1274- AC_ARG_ENABLE(nls,
1275- [ --disable-nls do not use Native Language Support],
1276- USE_NLS=$enableval, USE_NLS=yes)
1277- AC_MSG_RESULT($USE_NLS)
1278- AC_SUBST(USE_NLS)
1279-
1280- USE_INCLUDED_LIBINTL=no
1281-
1282- dnl If we use NLS figure out what method
1283- if test "$USE_NLS" = "yes"; then
1284- AC_DEFINE(ENABLE_NLS)
1285- AC_MSG_CHECKING([whether included gettext is requested])
1286- AC_ARG_WITH(included-gettext,
1287- [ --with-included-gettext use the GNU gettext library included here],
1288- nls_cv_force_use_gnu_gettext=$withval,
1289- nls_cv_force_use_gnu_gettext=no)
1290- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
1291-
1292- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
1293- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
1294- dnl User does not insist on using GNU NLS library. Figure out what
1295- dnl to use. If gettext or catgets are available (in this order) we
1296- dnl use this. Else we have to fall back to GNU NLS library.
1297- dnl catgets is only used if permitted by option --with-catgets.
1298- nls_cv_header_intl=
1299- nls_cv_header_libgt=
1300- CATOBJEXT=NONE
1301-
1302- AC_CHECK_HEADER(libintl.h,
1303- [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
1304- [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
1305- gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
1306-
1307- if test "$gt_cv_func_gettext_libc" != "yes"; then
1308- AC_CHECK_LIB(intl, bindtextdomain,
1309- [AC_CACHE_CHECK([for gettext in libintl],
1310- gt_cv_func_gettext_libintl,
1311- [AC_TRY_LINK([], [return (int) gettext ("")],
1312- gt_cv_func_gettext_libintl=yes,
1313- gt_cv_func_gettext_libintl=no)])])
1314- fi
1315-
1316- if test "$gt_cv_func_gettext_libc" = "yes" \
1317- || test "$gt_cv_func_gettext_libintl" = "yes"; then
1318- AC_DEFINE(HAVE_GETTEXT)
1319- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1320- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1321- if test "$MSGFMT" != "no"; then
1322- AC_CHECK_FUNCS(dcgettext)
1323- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1324- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1325- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1326- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1327- return _nl_msg_cat_cntr],
1328- [CATOBJEXT=.gmo
1329- DATADIRNAME=share],
1330- [CATOBJEXT=.mo
1331- DATADIRNAME=lib])
1332- INSTOBJEXT=.mo
1333- fi
1334- fi
1335- ])
1336-
1337- if test "$CATOBJEXT" = "NONE"; then
1338- AC_MSG_CHECKING([whether catgets can be used])
1339- AC_ARG_WITH(catgets,
1340- [ --with-catgets use catgets functions if available],
1341- nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
1342- AC_MSG_RESULT($nls_cv_use_catgets)
1343-
1344- if test "$nls_cv_use_catgets" = "yes"; then
1345- dnl No gettext in C library. Try catgets next.
1346- AC_CHECK_LIB(i, main)
1347- AC_CHECK_FUNC(catgets,
1348- [AC_DEFINE(HAVE_CATGETS)
1349- INTLOBJS="\$(CATOBJS)"
1350- AC_PATH_PROG(GENCAT, gencat, no)dnl
1351- if test "$GENCAT" != "no"; then
1352- AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
1353- if test "$GMSGFMT" = "no"; then
1354- AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
1355- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
1356- fi
1357- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1358- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1359- USE_INCLUDED_LIBINTL=yes
1360- CATOBJEXT=.cat
1361- INSTOBJEXT=.cat
1362- DATADIRNAME=lib
1363- INTLDEPS='$(top_builddir)/intl/libintl.a'
1364- INTLLIBS=$INTLDEPS
1365- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
1366- nls_cv_header_intl=intl/libintl.h
1367- nls_cv_header_libgt=intl/libgettext.h
1368- fi])
1369- fi
1370- fi
1371-
1372- if test "$CATOBJEXT" = "NONE"; then
1373- dnl Neither gettext nor catgets in included in the C library.
1374- dnl Fall back on GNU gettext library.
1375- nls_cv_use_gnu_gettext=yes
1376- fi
1377- fi
1378+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
1379+#
1380+# This file is free software; the Free Software Foundation
1381+# gives unlimited permission to copy and/or distribute it,
1382+# with or without modifications, as long as this notice is preserved.
1383+
1384+AC_DEFUN([AM_CONFIG_HEADER],
1385+[AC_DIAGNOSE([obsolete],
1386+['$0': this macro is obsolete.
1387+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
1388+AC_CONFIG_HEADERS($@)])
1389+
1390+AC_DEFUN([AM_PROG_CC_STDC],
1391+[AC_PROG_CC
1392+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
1393+AC_DIAGNOSE([obsolete],
1394+['$0': this macro is obsolete.
1395+You should simply use the 'AC][_PROG_CC' macro instead.
1396+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
1397+but upon 'ac_cv_prog_cc_stdc'.])])
1398+
1399+AC_DEFUN([AM_C_PROTOTYPES],
1400+ [AC_FATAL([automatic de-ANSI-fication support has been removed])])
1401+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
1402
1403- if test "$nls_cv_use_gnu_gettext" = "yes"; then
1404- dnl Mark actions used to generate GNU NLS library.
1405- INTLOBJS="\$(GETTOBJS)"
1406- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1407- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
1408- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1409- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1410- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1411- AC_SUBST(MSGFMT)
1412- USE_INCLUDED_LIBINTL=yes
1413- CATOBJEXT=.gmo
1414- INSTOBJEXT=.mo
1415- DATADIRNAME=share
1416- INTLDEPS='$(top_builddir)/intl/libintl.a'
1417- INTLLIBS=$INTLDEPS
1418- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
1419- nls_cv_header_intl=intl/libintl.h
1420- nls_cv_header_libgt=intl/libgettext.h
1421- fi
1422+# Helper functions for option handling. -*- Autoconf -*-
1423
1424- dnl Test whether we really found GNU xgettext.
1425- if test "$XGETTEXT" != ":"; then
1426- dnl If it is no GNU xgettext we define it as : so that the
1427- dnl Makefiles still can work.
1428- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1429- : ;
1430- else
1431- AC_MSG_RESULT(
1432- [found xgettext programs is not GNU xgettext; ignore it])
1433- XGETTEXT=":"
1434- fi
1435- fi
1436+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1437+#
1438+# This file is free software; the Free Software Foundation
1439+# gives unlimited permission to copy and/or distribute it,
1440+# with or without modifications, as long as this notice is preserved.
1441+
1442+# _AM_MANGLE_OPTION(NAME)
1443+# -----------------------
1444+AC_DEFUN([_AM_MANGLE_OPTION],
1445+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1446+
1447+# _AM_SET_OPTION(NAME)
1448+# --------------------
1449+# Set option NAME. Presently that only means defining a flag for this option.
1450+AC_DEFUN([_AM_SET_OPTION],
1451+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
1452+
1453+# _AM_SET_OPTIONS(OPTIONS)
1454+# ------------------------
1455+# OPTIONS is a space-separated list of Automake options.
1456+AC_DEFUN([_AM_SET_OPTIONS],
1457+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1458+
1459+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1460+# -------------------------------------------
1461+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
1462+AC_DEFUN([_AM_IF_OPTION],
1463+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1464
1465- # We need to process the po/ directory.
1466- POSUB=po
1467+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
1468+#
1469+# This file is free software; the Free Software Foundation
1470+# gives unlimited permission to copy and/or distribute it,
1471+# with or without modifications, as long as this notice is preserved.
1472+
1473+# _AM_PROG_CC_C_O
1474+# ---------------
1475+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
1476+# to automatically call this.
1477+AC_DEFUN([_AM_PROG_CC_C_O],
1478+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1479+AC_REQUIRE_AUX_FILE([compile])dnl
1480+AC_LANG_PUSH([C])dnl
1481+AC_CACHE_CHECK(
1482+ [whether $CC understands -c and -o together],
1483+ [am_cv_prog_cc_c_o],
1484+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
1485+ # Make sure it works both with $CC and with simple cc.
1486+ # Following AC_PROG_CC_C_O, we do the test twice because some
1487+ # compilers refuse to overwrite an existing .o file with -o,
1488+ # though they will create one.
1489+ am_cv_prog_cc_c_o=yes
1490+ for am_i in 1 2; do
1491+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
1492+ && test -f conftest2.$ac_objext; then
1493+ : OK
1494 else
1495- DATADIRNAME=share
1496- nls_cv_header_intl=intl/libintl.h
1497- nls_cv_header_libgt=intl/libgettext.h
1498+ am_cv_prog_cc_c_o=no
1499+ break
1500 fi
1501+ done
1502+ rm -f core conftest*
1503+ unset am_i])
1504+if test "$am_cv_prog_cc_c_o" != yes; then
1505+ # Losing compiler, so override with the script.
1506+ # FIXME: It is wrong to rewrite CC.
1507+ # But if we don't then we get into trouble of one sort or another.
1508+ # A longer-term fix would be to have automake use am__CC in this case,
1509+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1510+ CC="$am_aux_dir/compile $CC"
1511+fi
1512+AC_LANG_POP([C])])
1513
1514- # If this is used in GNU gettext we have to set USE_NLS to `yes'
1515- # because some of the sources are only built for this goal.
1516- if test "$PACKAGE" = gettext; then
1517- USE_NLS=yes
1518- USE_INCLUDED_LIBINTL=yes
1519- fi
1520+# For backward compatibility.
1521+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1522
1523- dnl These rules are solely for the distribution goal. While doing this
1524- dnl we only have to keep exactly one list of the available catalogs
1525- dnl in configure.in.
1526- for lang in $ALL_LINGUAS; do
1527- GMOFILES="$GMOFILES $lang.gmo"
1528- POFILES="$POFILES $lang.po"
1529- done
1530+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1531+#
1532+# This file is free software; the Free Software Foundation
1533+# gives unlimited permission to copy and/or distribute it,
1534+# with or without modifications, as long as this notice is preserved.
1535+
1536+# AM_RUN_LOG(COMMAND)
1537+# -------------------
1538+# Run COMMAND, save the exit status in ac_status, and log it.
1539+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
1540+AC_DEFUN([AM_RUN_LOG],
1541+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
1542+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
1543+ ac_status=$?
1544+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1545+ (exit $ac_status); }])
1546
1547- dnl Make all variables we use known to autoconf.
1548- AC_SUBST(USE_INCLUDED_LIBINTL)
1549- AC_SUBST(CATALOGS)
1550- AC_SUBST(CATOBJEXT)
1551- AC_SUBST(DATADIRNAME)
1552- AC_SUBST(GMOFILES)
1553- AC_SUBST(INSTOBJEXT)
1554- AC_SUBST(INTLDEPS)
1555- AC_SUBST(INTLLIBS)
1556- AC_SUBST(INTLOBJS)
1557- AC_SUBST(POFILES)
1558- AC_SUBST(POSUB)
1559- ])
1560-
1561-AC_DEFUN(AM_GNU_GETTEXT,
1562- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1563- AC_REQUIRE([AC_PROG_CC])dnl
1564- AC_REQUIRE([AC_PROG_RANLIB])dnl
1565- AC_REQUIRE([AC_ISC_POSIX])dnl
1566- AC_REQUIRE([AC_HEADER_STDC])dnl
1567- AC_REQUIRE([AC_C_CONST])dnl
1568- AC_REQUIRE([AC_C_INLINE])dnl
1569- AC_REQUIRE([AC_TYPE_OFF_T])dnl
1570- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
1571- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
1572- AC_REQUIRE([AC_FUNC_MMAP])dnl
1573-
1574- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
1575-unistd.h values.h sys/param.h])
1576- AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
1577-__argz_count __argz_stringify __argz_next])
1578-
1579- if test "${ac_cv_func_stpcpy+set}" != "set"; then
1580- AC_CHECK_FUNCS(stpcpy)
1581- fi
1582- if test "${ac_cv_func_stpcpy}" = "yes"; then
1583- AC_DEFINE(HAVE_STPCPY)
1584- fi
1585-
1586- AM_LC_MESSAGES
1587- AM_WITH_NLS
1588-
1589- if test "x$CATOBJEXT" != "x"; then
1590- if test "x$ALL_LINGUAS" = "x"; then
1591- LINGUAS=
1592- else
1593- AC_MSG_CHECKING(for catalogs to be installed)
1594- NEW_LINGUAS=
1595- for lang in ${LINGUAS=$ALL_LINGUAS}; do
1596- case "$ALL_LINGUAS" in
1597- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
1598- esac
1599- done
1600- LINGUAS=$NEW_LINGUAS
1601- AC_MSG_RESULT($LINGUAS)
1602- fi
1603-
1604- dnl Construct list of names of catalog files to be constructed.
1605- if test -n "$LINGUAS"; then
1606- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1607- fi
1608- fi
1609-
1610- dnl The reference to <locale.h> in the installed <libintl.h> file
1611- dnl must be resolved because we cannot expect the users of this
1612- dnl to define HAVE_LOCALE_H.
1613- if test $ac_cv_header_locale_h = yes; then
1614- INCLUDE_LOCALE_H="#include <locale.h>"
1615- else
1616- INCLUDE_LOCALE_H="\
1617-/* The system does not provide the header <locale.h>. Take care yourself. */"
1618- fi
1619- AC_SUBST(INCLUDE_LOCALE_H)
1620-
1621- dnl Determine which catalog format we have (if any is needed)
1622- dnl For now we know about two different formats:
1623- dnl Linux libc-5 and the normal X/Open format
1624- test -d intl || mkdir intl
1625- if test "$CATOBJEXT" = ".cat"; then
1626- AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
1627-
1628- dnl Transform the SED scripts while copying because some dumb SEDs
1629- dnl cannot handle comments.
1630- sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
1631- fi
1632- dnl po2tbl.sed is always needed.
1633- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
1634- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
1635-
1636- dnl In the intl/Makefile.in we have a special dependency which makes
1637- dnl only sense for gettext. We comment this out for non-gettext
1638- dnl packages.
1639- if test "$PACKAGE" = "gettext"; then
1640- GT_NO="#NO#"
1641- GT_YES=
1642- else
1643- GT_NO=
1644- GT_YES="#YES#"
1645- fi
1646- AC_SUBST(GT_NO)
1647- AC_SUBST(GT_YES)
1648-
1649- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1650- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1651- dnl Try to locate is.
1652- MKINSTALLDIRS=
1653- if test -n "$ac_aux_dir"; then
1654- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1655- fi
1656- if test -z "$MKINSTALLDIRS"; then
1657- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1658- fi
1659- AC_SUBST(MKINSTALLDIRS)
1660-
1661- dnl *** For now the libtool support in intl/Makefile is not for real.
1662- l=
1663- AC_SUBST(l)
1664-
1665- dnl Generate list of files to be processed by xgettext which will
1666- dnl be included in po/Makefile.
1667- test -d po || mkdir po
1668- if test "x$srcdir" != "x."; then
1669- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1670- posrcprefix="$srcdir/"
1671- else
1672- posrcprefix="../$srcdir/"
1673- fi
1674- else
1675- posrcprefix="../"
1676- fi
1677- rm -f po/POTFILES
1678- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1679- < $srcdir/po/POTFILES.in > po/POTFILES
1680- ])
1681-
1682-# Search path for a program which passes the given test.
1683-# Ulrich Drepper <drepper@cygnus.com>, 1996.
1684-#
1685-# This file file be copied and used freely without restrictions. It can
1686-# be used in projects which are not available under the GNU Public License
1687-# but which still want to provide support for the GNU gettext functionality.
1688-# Please note that the actual code is *not* freely available.
1689-
1690-# serial 1
1691-
1692-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
1693-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
1694-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
1695-[# Extract the first word of "$2", so it can be a program name with args.
1696-set dummy $2; ac_word=[$]2
1697-AC_MSG_CHECKING([for $ac_word])
1698-AC_CACHE_VAL(ac_cv_path_$1,
1699-[case "[$]$1" in
1700- /*)
1701- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
1702- ;;
1703- *)
1704- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
1705- for ac_dir in ifelse([$5], , $PATH, [$5]); do
1706- test -z "$ac_dir" && ac_dir=.
1707- if test -f $ac_dir/$ac_word; then
1708- if [$3]; then
1709- ac_cv_path_$1="$ac_dir/$ac_word"
1710- break
1711- fi
1712- fi
1713- done
1714- IFS="$ac_save_ifs"
1715-dnl If no 4th arg is given, leave the cache variable unset,
1716-dnl so AC_PATH_PROGS will keep looking.
1717-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
1718-])dnl
1719- ;;
1720-esac])dnl
1721-$1="$ac_cv_path_$1"
1722-if test -n "[$]$1"; then
1723- AC_MSG_RESULT([$]$1)
1724+# Check to make sure that the build environment is sane. -*- Autoconf -*-
1725+
1726+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
1727+#
1728+# This file is free software; the Free Software Foundation
1729+# gives unlimited permission to copy and/or distribute it,
1730+# with or without modifications, as long as this notice is preserved.
1731+
1732+# AM_SANITY_CHECK
1733+# ---------------
1734+AC_DEFUN([AM_SANITY_CHECK],
1735+[AC_MSG_CHECKING([whether build environment is sane])
1736+# Reject unsafe characters in $srcdir or the absolute working directory
1737+# name. Accept space and tab only in the latter.
1738+am_lf='
1739+'
1740+case `pwd` in
1741+ *[[\\\"\#\$\&\'\`$am_lf]]*)
1742+ AC_MSG_ERROR([unsafe absolute working directory name]);;
1743+esac
1744+case $srcdir in
1745+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1746+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
1747+esac
1748+
1749+AC_MSG_RESULT([yes])
1750+])
1751+
1752+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
1753+#
1754+# This file is free software; the Free Software Foundation
1755+# gives unlimited permission to copy and/or distribute it,
1756+# with or without modifications, as long as this notice is preserved.
1757+
1758+# AM_SILENT_RULES([DEFAULT])
1759+# --------------------------
1760+# Enable less verbose build rules; with the default set to DEFAULT
1761+# ("yes" being less verbose, "no" or empty being verbose).
1762+AC_DEFUN([AM_SILENT_RULES],
1763+[AC_ARG_ENABLE([silent-rules], [dnl
1764+AS_HELP_STRING(
1765+ [--enable-silent-rules],
1766+ [less verbose build output (undo: "make V=1")])
1767+AS_HELP_STRING(
1768+ [--disable-silent-rules],
1769+ [verbose build output (undo: "make V=0")])dnl
1770+])
1771+case $enable_silent_rules in @%:@ (((
1772+ yes) AM_DEFAULT_VERBOSITY=0;;
1773+ no) AM_DEFAULT_VERBOSITY=1;;
1774+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1775+esac
1776+dnl
1777+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1778+dnl do not support nested variable expansions.
1779+dnl See automake bug#9928 and bug#10237.
1780+am_make=${MAKE-make}
1781+AC_CACHE_CHECK([whether $am_make supports nested variables],
1782+ [am_cv_make_support_nested_variables],
1783+ [if AS_ECHO([['TRUE=$(BAR$(V))
1784+BAR0=false
1785+BAR1=true
1786+V=1
1787+am__doit:
1788+ @$(TRUE)
1789+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
1790+ am_cv_make_support_nested_variables=yes
1791+else
1792+ am_cv_make_support_nested_variables=no
1793+fi])
1794+if test $am_cv_make_support_nested_variables = yes; then
1795+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
1796+ AM_V='$(V)'
1797+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1798 else
1799- AC_MSG_RESULT(no)
1800+ AM_V=$AM_DEFAULT_VERBOSITY
1801+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
1802 fi
1803-AC_SUBST($1)dnl
1804+AC_SUBST([AM_V])dnl
1805+AM_SUBST_NOTMAKE([AM_V])dnl
1806+AC_SUBST([AM_DEFAULT_V])dnl
1807+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
1808+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
1809+AM_BACKSLASH='\'
1810+AC_SUBST([AM_BACKSLASH])dnl
1811+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1812 ])
1813
1814-# Check whether LC_MESSAGES is available in <locale.h>.
1815-# Ulrich Drepper <drepper@cygnus.com>, 1995.
1816+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
1817+#
1818+# This file is free software; the Free Software Foundation
1819+# gives unlimited permission to copy and/or distribute it,
1820+# with or without modifications, as long as this notice is preserved.
1821+
1822+# AM_PROG_INSTALL_STRIP
1823+# ---------------------
1824+# One issue with vendor 'install' (even GNU) is that you can't
1825+# specify the program used to strip binaries. This is especially
1826+# annoying in cross-compiling environments, where the build's strip
1827+# is unlikely to handle the host's binaries.
1828+# Fortunately install-sh will honor a STRIPPROG variable, so we
1829+# always use install-sh in "make install-strip", and initialize
1830+# STRIPPROG with the value of the STRIP variable (set by the user).
1831+AC_DEFUN([AM_PROG_INSTALL_STRIP],
1832+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1833+# Installed binaries are usually stripped using 'strip' when the user
1834+# run "make install-strip". However 'strip' might not be the right
1835+# tool to use in cross-compilation environments, therefore Automake
1836+# will honor the 'STRIP' environment variable to overrule this program.
1837+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1838+if test "$cross_compiling" != no; then
1839+ AC_CHECK_TOOL([STRIP], [strip], :)
1840+fi
1841+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1842+AC_SUBST([INSTALL_STRIP_PROGRAM])])
1843+
1844+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
1845 #
1846-# This file file be copied and used freely without restrictions. It can
1847-# be used in projects which are not available under the GNU Public License
1848-# but which still want to provide support for the GNU gettext functionality.
1849-# Please note that the actual code is *not* freely available.
1850+# This file is free software; the Free Software Foundation
1851+# gives unlimited permission to copy and/or distribute it,
1852+# with or without modifications, as long as this notice is preserved.
1853+
1854+# _AM_SUBST_NOTMAKE(VARIABLE)
1855+# ---------------------------
1856+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
1857+# This macro is traced by Automake.
1858+AC_DEFUN([_AM_SUBST_NOTMAKE])
1859+
1860+# AM_SUBST_NOTMAKE(VARIABLE)
1861+# --------------------------
1862+# Public sister of _AM_SUBST_NOTMAKE.
1863+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
1864
1865-# serial 1
1866+# Check how to create a tarball. -*- Autoconf -*-
1867
1868-AC_DEFUN(AM_LC_MESSAGES,
1869- [if test $ac_cv_header_locale_h = yes; then
1870- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
1871- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
1872- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
1873- if test $am_cv_val_LC_MESSAGES = yes; then
1874- AC_DEFINE(HAVE_LC_MESSAGES)
1875+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
1876+#
1877+# This file is free software; the Free Software Foundation
1878+# gives unlimited permission to copy and/or distribute it,
1879+# with or without modifications, as long as this notice is preserved.
1880+
1881+# _AM_PROG_TAR(FORMAT)
1882+# --------------------
1883+# Check how to create a tarball in format FORMAT.
1884+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1885+#
1886+# Substitute a variable $(am__tar) that is a command
1887+# writing to stdout a FORMAT-tarball containing the directory
1888+# $tardir.
1889+# tardir=directory && $(am__tar) > result.tar
1890+#
1891+# Substitute a variable $(am__untar) that extract such
1892+# a tarball read from stdin.
1893+# $(am__untar) < result.tar
1894+#
1895+AC_DEFUN([_AM_PROG_TAR],
1896+[# Always define AMTAR for backward compatibility. Yes, it's still used
1897+# in the wild :-( We should find a proper way to deprecate it ...
1898+AC_SUBST([AMTAR], ['$${TAR-tar}'])
1899+
1900+# We'll loop over all known methods to create a tar archive until one works.
1901+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1902+
1903+m4_if([$1], [v7],
1904+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1905+
1906+ [m4_case([$1],
1907+ [ustar],
1908+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1909+ # There is notably a 21 bits limit for the UID and the GID. In fact,
1910+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1911+ # and bug#13588).
1912+ am_max_uid=2097151 # 2^21 - 1
1913+ am_max_gid=$am_max_uid
1914+ # The $UID and $GID variables are not portable, so we need to resort
1915+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
1916+ # below are definitely unexpected, so allow the users to see them
1917+ # (that is, avoid stderr redirection).
1918+ am_uid=`id -u || echo unknown`
1919+ am_gid=`id -g || echo unknown`
1920+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1921+ if test $am_uid -le $am_max_uid; then
1922+ AC_MSG_RESULT([yes])
1923+ else
1924+ AC_MSG_RESULT([no])
1925+ _am_tools=none
1926+ fi
1927+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1928+ if test $am_gid -le $am_max_gid; then
1929+ AC_MSG_RESULT([yes])
1930+ else
1931+ AC_MSG_RESULT([no])
1932+ _am_tools=none
1933+ fi],
1934+
1935+ [pax],
1936+ [],
1937+
1938+ [m4_fatal([Unknown tar format])])
1939+
1940+ AC_MSG_CHECKING([how to create a $1 tar archive])
1941+
1942+ # Go ahead even if we have the value already cached. We do so because we
1943+ # need to set the values for the 'am__tar' and 'am__untar' variables.
1944+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1945+
1946+ for _am_tool in $_am_tools; do
1947+ case $_am_tool in
1948+ gnutar)
1949+ for _am_tar in tar gnutar gtar; do
1950+ AM_RUN_LOG([$_am_tar --version]) && break
1951+ done
1952+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1953+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1954+ am__untar="$_am_tar -xf -"
1955+ ;;
1956+ plaintar)
1957+ # Must skip GNU tar: if it does not support --format= it doesn't create
1958+ # ustar tarball either.
1959+ (tar --version) >/dev/null 2>&1 && continue
1960+ am__tar='tar chf - "$$tardir"'
1961+ am__tar_='tar chf - "$tardir"'
1962+ am__untar='tar xf -'
1963+ ;;
1964+ pax)
1965+ am__tar='pax -L -x $1 -w "$$tardir"'
1966+ am__tar_='pax -L -x $1 -w "$tardir"'
1967+ am__untar='pax -r'
1968+ ;;
1969+ cpio)
1970+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1971+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1972+ am__untar='cpio -i -H $1 -d'
1973+ ;;
1974+ none)
1975+ am__tar=false
1976+ am__tar_=false
1977+ am__untar=false
1978+ ;;
1979+ esac
1980+
1981+ # If the value was cached, stop now. We just wanted to have am__tar
1982+ # and am__untar set.
1983+ test -n "${am_cv_prog_tar_$1}" && break
1984+
1985+ # tar/untar a dummy directory, and stop if the command works.
1986+ rm -rf conftest.dir
1987+ mkdir conftest.dir
1988+ echo GrepMe > conftest.dir/file
1989+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1990+ rm -rf conftest.dir
1991+ if test -s conftest.tar; then
1992+ AM_RUN_LOG([$am__untar <conftest.tar])
1993+ AM_RUN_LOG([cat conftest.dir/file])
1994+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1995 fi
1996- fi])
1997+ done
1998+ rm -rf conftest.dir
1999+
2000+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
2001+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
2002
2003+AC_SUBST([am__tar])
2004+AC_SUBST([am__untar])
2005+]) # _AM_PROG_TAR
2006+
2007+m4_include([m4/gettext.m4])
2008+m4_include([m4/host-cpu-c-abi.m4])
2009+m4_include([m4/iconv.m4])
2010+m4_include([m4/intlmacosx.m4])
2011+m4_include([m4/lib-ld.m4])
2012+m4_include([m4/lib-link.m4])
2013+m4_include([m4/lib-prefix.m4])
2014+m4_include([m4/nls.m4])
2015+m4_include([m4/po.m4])
2016+m4_include([m4/progtest.m4])
2017+m4_include([acinclude.m4])
2018diff -uprN clean/lrzsz-0.12.20/ChangeLog lrzsz-0.12.20/ChangeLog
2019--- clean/lrzsz-0.12.20/ChangeLog 1998-12-29 22:49:56.000000000 +0000
2020+++ lrzsz-0.12.20/ChangeLog 2019-11-25 18:11:54.000000000 +0000
2021@@ -1,3 +1,9 @@
2022+2019-11-25 gettextize <bug-gnu-gettext@gnu.org>
2023+
2024+ * Makefile.am (SUBDIRS): Remove intl.
2025+ (ACLOCAL_AMFLAGS): New variable.
2026+ (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
2027+
2028 1998-12-29 Uwe Ohse <uwe@ohse.de>
2029
2030 * src/lrz.c: removed stpcpy call.
2031diff -uprN clean/lrzsz-0.12.20/compile lrzsz-0.12.20/compile
2032--- clean/lrzsz-0.12.20/compile 1970-01-01 01:00:00.000000000 +0100
2033+++ lrzsz-0.12.20/compile 2019-09-30 10:52:39.000000000 +0100
2034@@ -0,0 +1,348 @@
2035+#! /bin/sh
2036+# Wrapper for compilers which do not understand '-c -o'.
2037+
2038+scriptversion=2016-01-11.22; # UTC
2039+
2040+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
2041+# Written by Tom Tromey <tromey@cygnus.com>.
2042+#
2043+# This program is free software; you can redistribute it and/or modify
2044+# it under the terms of the GNU General Public License as published by
2045+# the Free Software Foundation; either version 2, or (at your option)
2046+# any later version.
2047+#
2048+# This program is distributed in the hope that it will be useful,
2049+# but WITHOUT ANY WARRANTY; without even the implied warranty of
2050+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2051+# GNU General Public License for more details.
2052+#
2053+# You should have received a copy of the GNU General Public License
2054+# along with this program. If not, see <http://www.gnu.org/licenses/>.
2055+
2056+# As a special exception to the GNU General Public License, if you
2057+# distribute this file as part of a program that contains a
2058+# configuration script generated by Autoconf, you may include it under
2059+# the same distribution terms that you use for the rest of that program.
2060+
2061+# This file is maintained in Automake, please report
2062+# bugs to <bug-automake@gnu.org> or send patches to
2063+# <automake-patches@gnu.org>.
2064+
2065+nl='
2066+'
2067+
2068+# We need space, tab and new line, in precisely that order. Quoting is
2069+# there to prevent tools from complaining about whitespace usage.
2070+IFS=" "" $nl"
2071+
2072+file_conv=
2073+
2074+# func_file_conv build_file lazy
2075+# Convert a $build file to $host form and store it in $file
2076+# Currently only supports Windows hosts. If the determined conversion
2077+# type is listed in (the comma separated) LAZY, no conversion will
2078+# take place.
2079+func_file_conv ()
2080+{
2081+ file=$1
2082+ case $file in
2083+ / | /[!/]*) # absolute file, and not a UNC file
2084+ if test -z "$file_conv"; then
2085+ # lazily determine how to convert abs files
2086+ case `uname -s` in
2087+ MINGW*)
2088+ file_conv=mingw
2089+ ;;
2090+ CYGWIN*)
2091+ file_conv=cygwin
2092+ ;;
2093+ *)
2094+ file_conv=wine
2095+ ;;
2096+ esac
2097+ fi
2098+ case $file_conv/,$2, in
2099+ *,$file_conv,*)
2100+ ;;
2101+ mingw/*)
2102+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
2103+ ;;
2104+ cygwin/*)
2105+ file=`cygpath -m "$file" || echo "$file"`
2106+ ;;
2107+ wine/*)
2108+ file=`winepath -w "$file" || echo "$file"`
2109+ ;;
2110+ esac
2111+ ;;
2112+ esac
2113+}
2114+
2115+# func_cl_dashL linkdir
2116+# Make cl look for libraries in LINKDIR
2117+func_cl_dashL ()
2118+{
2119+ func_file_conv "$1"
2120+ if test -z "$lib_path"; then
2121+ lib_path=$file
2122+ else
2123+ lib_path="$lib_path;$file"
2124+ fi
2125+ linker_opts="$linker_opts -LIBPATH:$file"
2126+}
2127+
2128+# func_cl_dashl library
2129+# Do a library search-path lookup for cl
2130+func_cl_dashl ()
2131+{
2132+ lib=$1
2133+ found=no
2134+ save_IFS=$IFS
2135+ IFS=';'
2136+ for dir in $lib_path $LIB
2137+ do
2138+ IFS=$save_IFS
2139+ if $shared && test -f "$dir/$lib.dll.lib"; then
2140+ found=yes
2141+ lib=$dir/$lib.dll.lib
2142+ break
2143+ fi
2144+ if test -f "$dir/$lib.lib"; then
2145+ found=yes
2146+ lib=$dir/$lib.lib
2147+ break
2148+ fi
2149+ if test -f "$dir/lib$lib.a"; then
2150+ found=yes
2151+ lib=$dir/lib$lib.a
2152+ break
2153+ fi
2154+ done
2155+ IFS=$save_IFS
2156+
2157+ if test "$found" != yes; then
2158+ lib=$lib.lib
2159+ fi
2160+}
2161+
2162+# func_cl_wrapper cl arg...
2163+# Adjust compile command to suit cl
2164+func_cl_wrapper ()
2165+{
2166+ # Assume a capable shell
2167+ lib_path=
2168+ shared=:
2169+ linker_opts=
2170+ for arg
2171+ do
2172+ if test -n "$eat"; then
2173+ eat=
2174+ else
2175+ case $1 in
2176+ -o)
2177+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
2178+ eat=1
2179+ case $2 in
2180+ *.o | *.[oO][bB][jJ])
2181+ func_file_conv "$2"
2182+ set x "$@" -Fo"$file"
2183+ shift
2184+ ;;
2185+ *)
2186+ func_file_conv "$2"
2187+ set x "$@" -Fe"$file"
2188+ shift
2189+ ;;
2190+ esac
2191+ ;;
2192+ -I)
2193+ eat=1
2194+ func_file_conv "$2" mingw
2195+ set x "$@" -I"$file"
2196+ shift
2197+ ;;
2198+ -I*)
2199+ func_file_conv "${1#-I}" mingw
2200+ set x "$@" -I"$file"
2201+ shift
2202+ ;;
2203+ -l)
2204+ eat=1
2205+ func_cl_dashl "$2"
2206+ set x "$@" "$lib"
2207+ shift
2208+ ;;
2209+ -l*)
2210+ func_cl_dashl "${1#-l}"
2211+ set x "$@" "$lib"
2212+ shift
2213+ ;;
2214+ -L)
2215+ eat=1
2216+ func_cl_dashL "$2"
2217+ ;;
2218+ -L*)
2219+ func_cl_dashL "${1#-L}"
2220+ ;;
2221+ -static)
2222+ shared=false
2223+ ;;
2224+ -Wl,*)
2225+ arg=${1#-Wl,}
2226+ save_ifs="$IFS"; IFS=','
2227+ for flag in $arg; do
2228+ IFS="$save_ifs"
2229+ linker_opts="$linker_opts $flag"
2230+ done
2231+ IFS="$save_ifs"
2232+ ;;
2233+ -Xlinker)
2234+ eat=1
2235+ linker_opts="$linker_opts $2"
2236+ ;;
2237+ -*)
2238+ set x "$@" "$1"
2239+ shift
2240+ ;;
2241+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
2242+ func_file_conv "$1"
2243+ set x "$@" -Tp"$file"
2244+ shift
2245+ ;;
2246+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
2247+ func_file_conv "$1" mingw
2248+ set x "$@" "$file"
2249+ shift
2250+ ;;
2251+ *)
2252+ set x "$@" "$1"
2253+ shift
2254+ ;;
2255+ esac
2256+ fi
2257+ shift
2258+ done
2259+ if test -n "$linker_opts"; then
2260+ linker_opts="-link$linker_opts"
2261+ fi
2262+ exec "$@" $linker_opts
2263+ exit 1
2264+}
2265+
2266+eat=
2267+
2268+case $1 in
2269+ '')
2270+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
2271+ exit 1;
2272+ ;;
2273+ -h | --h*)
2274+ cat <<\EOF
2275+Usage: compile [--help] [--version] PROGRAM [ARGS]
2276+
2277+Wrapper for compilers which do not understand '-c -o'.
2278+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
2279+arguments, and rename the output as expected.
2280+
2281+If you are trying to build a whole package this is not the
2282+right script to run: please start by reading the file 'INSTALL'.
2283+
2284+Report bugs to <bug-automake@gnu.org>.
2285+EOF
2286+ exit $?
2287+ ;;
2288+ -v | --v*)
2289+ echo "compile $scriptversion"
2290+ exit $?
2291+ ;;
2292+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
2293+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
2294+ func_cl_wrapper "$@" # Doesn't return...
2295+ ;;
2296+esac
2297+
2298+ofile=
2299+cfile=
2300+
2301+for arg
2302+do
2303+ if test -n "$eat"; then
2304+ eat=
2305+ else
2306+ case $1 in
2307+ -o)
2308+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
2309+ # So we strip '-o arg' only if arg is an object.
2310+ eat=1
2311+ case $2 in
2312+ *.o | *.obj)
2313+ ofile=$2
2314+ ;;
2315+ *)
2316+ set x "$@" -o "$2"
2317+ shift
2318+ ;;
2319+ esac
2320+ ;;
2321+ *.c)
2322+ cfile=$1
2323+ set x "$@" "$1"
2324+ shift
2325+ ;;
2326+ *)
2327+ set x "$@" "$1"
2328+ shift
2329+ ;;
2330+ esac
2331+ fi
2332+ shift
2333+done
2334+
2335+if test -z "$ofile" || test -z "$cfile"; then
2336+ # If no '-o' option was seen then we might have been invoked from a
2337+ # pattern rule where we don't need one. That is ok -- this is a
2338+ # normal compilation that the losing compiler can handle. If no
2339+ # '.c' file was seen then we are probably linking. That is also
2340+ # ok.
2341+ exec "$@"
2342+fi
2343+
2344+# Name of file we expect compiler to create.
2345+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
2346+
2347+# Create the lock directory.
2348+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
2349+# that we are using for the .o file. Also, base the name on the expected
2350+# object file name, since that is what matters with a parallel build.
2351+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
2352+while true; do
2353+ if mkdir "$lockdir" >/dev/null 2>&1; then
2354+ break
2355+ fi
2356+ sleep 1
2357+done
2358+# FIXME: race condition here if user kills between mkdir and trap.
2359+trap "rmdir '$lockdir'; exit 1" 1 2 15
2360+
2361+# Run the compile.
2362+"$@"
2363+ret=$?
2364+
2365+if test -f "$cofile"; then
2366+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
2367+elif test -f "${cofile}bj"; then
2368+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
2369+fi
2370+
2371+rmdir "$lockdir"
2372+exit $ret
2373+
2374+# Local Variables:
2375+# mode: shell-script
2376+# sh-indentation: 2
2377+# eval: (add-hook 'write-file-hooks 'time-stamp)
2378+# time-stamp-start: "scriptversion="
2379+# time-stamp-format: "%:y-%02m-%02d.%02H"
2380+# time-stamp-time-zone: "UTC0"
2381+# time-stamp-end: "; # UTC"
2382+# End:
2383diff -uprN clean/lrzsz-0.12.20/config.guess lrzsz-0.12.20/config.guess
2384--- clean/lrzsz-0.12.20/config.guess 1998-04-26 14:20:59.000000000 +0100
2385+++ lrzsz-0.12.20/config.guess 2019-11-26 11:37:46.000000000 +0000
2386@@ -1,10 +1,12 @@
2387 #! /bin/sh
2388 # Attempt to guess a canonical system name.
2389-# Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
2390-#
2391+# Copyright 1992-2019 Free Software Foundation, Inc.
2392+
2393+timestamp='2019-04-28'
2394+
2395 # This file is free software; you can redistribute it and/or modify it
2396 # under the terms of the GNU General Public License as published by
2397-# the Free Software Foundation; either version 2 of the License, or
2398+# the Free Software Foundation; either version 3 of the License, or
2399 # (at your option) any later version.
2400 #
2401 # This program is distributed in the hope that it will be useful, but
2402@@ -13,82 +15,403 @@
2403 # General Public License for more details.
2404 #
2405 # You should have received a copy of the GNU General Public License
2406-# along with this program; if not, write to the Free Software
2407-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2408+# along with this program; if not, see <https://www.gnu.org/licenses/>.
2409 #
2410 # As a special exception to the GNU General Public License, if you
2411 # distribute this file as part of a program that contains a
2412 # configuration script generated by Autoconf, you may include it under
2413-# the same distribution terms that you use for the rest of that program.
2414-
2415-# Written by Per Bothner <bothner@cygnus.com>.
2416-# The master version of this file is at the FSF in /home/gd/gnu/lib.
2417+# the same distribution terms that you use for the rest of that
2418+# program. This Exception is an additional permission under section 7
2419+# of the GNU General Public License, version 3 ("GPLv3").
2420 #
2421-# This script attempts to guess a canonical system name similar to
2422-# config.sub. If it succeeds, it prints the system name on stdout, and
2423-# exits with 0. Otherwise, it exits with 1.
2424+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
2425 #
2426-# The plan is that this can be called by configure scripts if you
2427-# don't specify an explicit system type (host/target name).
2428-#
2429-# Only a few systems have been added to this list; please add others
2430-# (but try to keep the structure clean).
2431+# You can get the latest version of this script from:
2432+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
2433 #
2434+# Please send patches to <config-patches@gnu.org>.
2435+
2436+
2437+me=`echo "$0" | sed -e 's,.*/,,'`
2438+
2439+usage="\
2440+Usage: $0 [OPTION]
2441+
2442+Output the configuration name of the system \`$me' is run on.
2443+
2444+Options:
2445+ -h, --help print this help, then exit
2446+ -t, --time-stamp print date of last modification, then exit
2447+ -v, --version print version number, then exit
2448+
2449+Report bugs and patches to <config-patches@gnu.org>."
2450+
2451+version="\
2452+GNU config.guess ($timestamp)
2453+
2454+Originally written by Per Bothner.
2455+Copyright 1992-2019 Free Software Foundation, Inc.
2456+
2457+This is free software; see the source for copying conditions. There is NO
2458+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
2459+
2460+help="
2461+Try \`$me --help' for more information."
2462+
2463+# Parse command line
2464+while test $# -gt 0 ; do
2465+ case $1 in
2466+ --time-stamp | --time* | -t )
2467+ echo "$timestamp" ; exit ;;
2468+ --version | -v )
2469+ echo "$version" ; exit ;;
2470+ --help | --h* | -h )
2471+ echo "$usage"; exit ;;
2472+ -- ) # Stop option processing
2473+ shift; break ;;
2474+ - ) # Use stdin as input.
2475+ break ;;
2476+ -* )
2477+ echo "$me: invalid option $1$help" >&2
2478+ exit 1 ;;
2479+ * )
2480+ break ;;
2481+ esac
2482+done
2483+
2484+if test $# != 0; then
2485+ echo "$me: too many arguments$help" >&2
2486+ exit 1
2487+fi
2488+
2489+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
2490+# compiler to aid in system detection is discouraged as it requires
2491+# temporary files to be created and, as you can see below, it is a
2492+# headache to deal with in a portable fashion.
2493+
2494+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
2495+# use `HOST_CC' if defined, but it is deprecated.
2496+
2497+# Portable tmp directory creation inspired by the Autoconf team.
2498+
2499+tmp=
2500+# shellcheck disable=SC2172
2501+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
2502+
2503+set_cc_for_build() {
2504+ : "${TMPDIR=/tmp}"
2505+ # shellcheck disable=SC2039
2506+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
2507+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
2508+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
2509+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
2510+ dummy=$tmp/dummy
2511+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
2512+ ,,) echo "int x;" > "$dummy.c"
2513+ for driver in cc gcc c89 c99 ; do
2514+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
2515+ CC_FOR_BUILD="$driver"
2516+ break
2517+ fi
2518+ done
2519+ if test x"$CC_FOR_BUILD" = x ; then
2520+ CC_FOR_BUILD=no_compiler_found
2521+ fi
2522+ ;;
2523+ ,,*) CC_FOR_BUILD=$CC ;;
2524+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
2525+ esac
2526+}
2527
2528 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
2529-# (ghazi@noc.rutgers.edu 8/24/94.)
2530-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
2531+# (ghazi@noc.rutgers.edu 1994-08-24)
2532+if test -f /.attbin/uname ; then
2533 PATH=$PATH:/.attbin ; export PATH
2534 fi
2535
2536 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
2537 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
2538-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
2539+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
2540 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
2541
2542-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
2543+case "$UNAME_SYSTEM" in
2544+Linux|GNU|GNU/*)
2545+ # If the system lacks a compiler, then just pick glibc.
2546+ # We could probably try harder.
2547+ LIBC=gnu
2548+
2549+ set_cc_for_build
2550+ cat <<-EOF > "$dummy.c"
2551+ #include <features.h>
2552+ #if defined(__UCLIBC__)
2553+ LIBC=uclibc
2554+ #elif defined(__dietlibc__)
2555+ LIBC=dietlibc
2556+ #else
2557+ LIBC=gnu
2558+ #endif
2559+ EOF
2560+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
2561+
2562+ # If ldd exists, use it to detect musl libc.
2563+ if command -v ldd >/dev/null && \
2564+ ldd --version 2>&1 | grep -q ^musl
2565+ then
2566+ LIBC=musl
2567+ fi
2568+ ;;
2569+esac
2570
2571 # Note: order is significant - the case branches are not exclusive.
2572
2573-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2574+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
2575+ *:NetBSD:*:*)
2576+ # NetBSD (nbsd) targets should (where applicable) match one or
2577+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
2578+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
2579+ # switched to ELF, *-*-netbsd* would select the old
2580+ # object file format. This provides both forward
2581+ # compatibility and a consistent mechanism for selecting the
2582+ # object file format.
2583+ #
2584+ # Note: NetBSD doesn't particularly care about the vendor
2585+ # portion of the name. We always set it to "unknown".
2586+ sysctl="sysctl -n hw.machine_arch"
2587+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
2588+ "/sbin/$sysctl" 2>/dev/null || \
2589+ "/usr/sbin/$sysctl" 2>/dev/null || \
2590+ echo unknown)`
2591+ case "$UNAME_MACHINE_ARCH" in
2592+ armeb) machine=armeb-unknown ;;
2593+ arm*) machine=arm-unknown ;;
2594+ sh3el) machine=shl-unknown ;;
2595+ sh3eb) machine=sh-unknown ;;
2596+ sh5el) machine=sh5le-unknown ;;
2597+ earmv*)
2598+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
2599+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
2600+ machine="${arch}${endian}"-unknown
2601+ ;;
2602+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
2603+ esac
2604+ # The Operating System including object format, if it has switched
2605+ # to ELF recently (or will in the future) and ABI.
2606+ case "$UNAME_MACHINE_ARCH" in
2607+ earm*)
2608+ os=netbsdelf
2609+ ;;
2610+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
2611+ set_cc_for_build
2612+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
2613+ | grep -q __ELF__
2614+ then
2615+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
2616+ # Return netbsd for either. FIX?
2617+ os=netbsd
2618+ else
2619+ os=netbsdelf
2620+ fi
2621+ ;;
2622+ *)
2623+ os=netbsd
2624+ ;;
2625+ esac
2626+ # Determine ABI tags.
2627+ case "$UNAME_MACHINE_ARCH" in
2628+ earm*)
2629+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
2630+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
2631+ ;;
2632+ esac
2633+ # The OS release
2634+ # Debian GNU/NetBSD machines have a different userland, and
2635+ # thus, need a distinct triplet. However, they do not need
2636+ # kernel version information, so it can be replaced with a
2637+ # suitable tag, in the style of linux-gnu.
2638+ case "$UNAME_VERSION" in
2639+ Debian*)
2640+ release='-gnu'
2641+ ;;
2642+ *)
2643+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
2644+ ;;
2645+ esac
2646+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
2647+ # contains redundant information, the shorter form:
2648+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
2649+ echo "$machine-${os}${release}${abi-}"
2650+ exit ;;
2651+ *:Bitrig:*:*)
2652+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
2653+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
2654+ exit ;;
2655+ *:OpenBSD:*:*)
2656+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
2657+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
2658+ exit ;;
2659+ *:LibertyBSD:*:*)
2660+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
2661+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
2662+ exit ;;
2663+ *:MidnightBSD:*:*)
2664+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
2665+ exit ;;
2666+ *:ekkoBSD:*:*)
2667+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
2668+ exit ;;
2669+ *:SolidBSD:*:*)
2670+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
2671+ exit ;;
2672+ macppc:MirBSD:*:*)
2673+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
2674+ exit ;;
2675+ *:MirBSD:*:*)
2676+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
2677+ exit ;;
2678+ *:Sortix:*:*)
2679+ echo "$UNAME_MACHINE"-unknown-sortix
2680+ exit ;;
2681+ *:Redox:*:*)
2682+ echo "$UNAME_MACHINE"-unknown-redox
2683+ exit ;;
2684+ mips:OSF1:*.*)
2685+ echo mips-dec-osf1
2686+ exit ;;
2687 alpha:OSF1:*:*)
2688+ case $UNAME_RELEASE in
2689+ *4.0)
2690+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
2691+ ;;
2692+ *5.*)
2693+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
2694+ ;;
2695+ esac
2696+ # According to Compaq, /usr/sbin/psrinfo has been available on
2697+ # OSF/1 and Tru64 systems produced since 1995. I hope that
2698+ # covers most systems running today. This code pipes the CPU
2699+ # types through head -n 1, so we only detect the type of CPU 0.
2700+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
2701+ case "$ALPHA_CPU_TYPE" in
2702+ "EV4 (21064)")
2703+ UNAME_MACHINE=alpha ;;
2704+ "EV4.5 (21064)")
2705+ UNAME_MACHINE=alpha ;;
2706+ "LCA4 (21066/21068)")
2707+ UNAME_MACHINE=alpha ;;
2708+ "EV5 (21164)")
2709+ UNAME_MACHINE=alphaev5 ;;
2710+ "EV5.6 (21164A)")
2711+ UNAME_MACHINE=alphaev56 ;;
2712+ "EV5.6 (21164PC)")
2713+ UNAME_MACHINE=alphapca56 ;;
2714+ "EV5.7 (21164PC)")
2715+ UNAME_MACHINE=alphapca57 ;;
2716+ "EV6 (21264)")
2717+ UNAME_MACHINE=alphaev6 ;;
2718+ "EV6.7 (21264A)")
2719+ UNAME_MACHINE=alphaev67 ;;
2720+ "EV6.8CB (21264C)")
2721+ UNAME_MACHINE=alphaev68 ;;
2722+ "EV6.8AL (21264B)")
2723+ UNAME_MACHINE=alphaev68 ;;
2724+ "EV6.8CX (21264D)")
2725+ UNAME_MACHINE=alphaev68 ;;
2726+ "EV6.9A (21264/EV69A)")
2727+ UNAME_MACHINE=alphaev69 ;;
2728+ "EV7 (21364)")
2729+ UNAME_MACHINE=alphaev7 ;;
2730+ "EV7.9 (21364A)")
2731+ UNAME_MACHINE=alphaev79 ;;
2732+ esac
2733+ # A Pn.n version is a patched version.
2734 # A Vn.n version is a released version.
2735 # A Tn.n version is a released field test version.
2736 # A Xn.n version is an unreleased experimental baselevel.
2737 # 1.2 uses "1.2" for uname -r.
2738- echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
2739- exit 0 ;;
2740- 21064:Windows_NT:50:3)
2741- echo alpha-dec-winnt3.5
2742- exit 0 ;;
2743+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
2744+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
2745+ exitcode=$?
2746+ trap '' 0
2747+ exit $exitcode ;;
2748 Amiga*:UNIX_System_V:4.0:*)
2749- echo m68k-cbm-sysv4
2750- exit 0;;
2751- amiga:NetBSD:*:*)
2752- echo m68k-cbm-netbsd${UNAME_RELEASE}
2753- exit 0 ;;
2754+ echo m68k-unknown-sysv4
2755+ exit ;;
2756+ *:[Aa]miga[Oo][Ss]:*:*)
2757+ echo "$UNAME_MACHINE"-unknown-amigaos
2758+ exit ;;
2759+ *:[Mm]orph[Oo][Ss]:*:*)
2760+ echo "$UNAME_MACHINE"-unknown-morphos
2761+ exit ;;
2762+ *:OS/390:*:*)
2763+ echo i370-ibm-openedition
2764+ exit ;;
2765+ *:z/VM:*:*)
2766+ echo s390-ibm-zvmoe
2767+ exit ;;
2768+ *:OS400:*:*)
2769+ echo powerpc-ibm-os400
2770+ exit ;;
2771 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
2772- echo arm-acorn-riscix${UNAME_RELEASE}
2773- exit 0;;
2774- Pyramid*:OSx*:*:*)
2775+ echo arm-acorn-riscix"$UNAME_RELEASE"
2776+ exit ;;
2777+ arm*:riscos:*:*|arm*:RISCOS:*:*)
2778+ echo arm-unknown-riscos
2779+ exit ;;
2780+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
2781+ echo hppa1.1-hitachi-hiuxmpp
2782+ exit ;;
2783+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
2784+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
2785 if test "`(/bin/universe) 2>/dev/null`" = att ; then
2786 echo pyramid-pyramid-sysv3
2787 else
2788 echo pyramid-pyramid-bsd
2789 fi
2790- exit 0 ;;
2791- sun4*:SunOS:5.*:*)
2792- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2793- exit 0 ;;
2794- i86pc:SunOS:5.*:*)
2795- echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2796- exit 0 ;;
2797+ exit ;;
2798+ NILE*:*:*:dcosx)
2799+ echo pyramid-pyramid-svr4
2800+ exit ;;
2801+ DRS?6000:unix:4.0:6*)
2802+ echo sparc-icl-nx6
2803+ exit ;;
2804+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
2805+ case `/usr/bin/uname -p` in
2806+ sparc) echo sparc-icl-nx7; exit ;;
2807+ esac ;;
2808+ s390x:SunOS:*:*)
2809+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
2810+ exit ;;
2811+ sun4H:SunOS:5.*:*)
2812+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
2813+ exit ;;
2814+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
2815+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
2816+ exit ;;
2817+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
2818+ echo i386-pc-auroraux"$UNAME_RELEASE"
2819+ exit ;;
2820+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
2821+ set_cc_for_build
2822+ SUN_ARCH=i386
2823+ # If there is a compiler, see if it is configured for 64-bit objects.
2824+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
2825+ # This test works for both compilers.
2826+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
2827+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
2828+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
2829+ grep IS_64BIT_ARCH >/dev/null
2830+ then
2831+ SUN_ARCH=x86_64
2832+ fi
2833+ fi
2834+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
2835+ exit ;;
2836 sun4*:SunOS:6*:*)
2837 # According to config.sub, this is the proper way to canonicalize
2838 # SunOS6. Hard to guess exactly what SunOS6 will be like, but
2839 # it's likely to be more like Solaris than SunOS4.
2840- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2841- exit 0 ;;
2842+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
2843+ exit ;;
2844 sun4*:SunOS:*:*)
2845 case "`/usr/bin/arch -k`" in
2846 Series*|S4*)
2847@@ -96,82 +419,170 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
2848 ;;
2849 esac
2850 # Japanese Language versions have a version number like `4.1.3-JL'.
2851- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
2852- exit 0 ;;
2853+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
2854+ exit ;;
2855 sun3*:SunOS:*:*)
2856- echo m68k-sun-sunos${UNAME_RELEASE}
2857- exit 0 ;;
2858- atari*:NetBSD:*:*)
2859- echo m68k-atari-netbsd${UNAME_RELEASE}
2860- exit 0 ;;
2861- sun3*:NetBSD:*:*)
2862- echo m68k-sun-netbsd${UNAME_RELEASE}
2863- exit 0 ;;
2864- mac68k:NetBSD:*:*)
2865- echo m68k-apple-netbsd${UNAME_RELEASE}
2866- exit 0 ;;
2867+ echo m68k-sun-sunos"$UNAME_RELEASE"
2868+ exit ;;
2869+ sun*:*:4.2BSD:*)
2870+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
2871+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
2872+ case "`/bin/arch`" in
2873+ sun3)
2874+ echo m68k-sun-sunos"$UNAME_RELEASE"
2875+ ;;
2876+ sun4)
2877+ echo sparc-sun-sunos"$UNAME_RELEASE"
2878+ ;;
2879+ esac
2880+ exit ;;
2881+ aushp:SunOS:*:*)
2882+ echo sparc-auspex-sunos"$UNAME_RELEASE"
2883+ exit ;;
2884+ # The situation for MiNT is a little confusing. The machine name
2885+ # can be virtually everything (everything which is not
2886+ # "atarist" or "atariste" at least should have a processor
2887+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
2888+ # to the lowercase version "mint" (or "freemint"). Finally
2889+ # the system name "TOS" denotes a system which is actually not
2890+ # MiNT. But MiNT is downward compatible to TOS, so this should
2891+ # be no problem.
2892+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
2893+ echo m68k-atari-mint"$UNAME_RELEASE"
2894+ exit ;;
2895+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
2896+ echo m68k-atari-mint"$UNAME_RELEASE"
2897+ exit ;;
2898+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
2899+ echo m68k-atari-mint"$UNAME_RELEASE"
2900+ exit ;;
2901+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
2902+ echo m68k-milan-mint"$UNAME_RELEASE"
2903+ exit ;;
2904+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
2905+ echo m68k-hades-mint"$UNAME_RELEASE"
2906+ exit ;;
2907+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
2908+ echo m68k-unknown-mint"$UNAME_RELEASE"
2909+ exit ;;
2910+ m68k:machten:*:*)
2911+ echo m68k-apple-machten"$UNAME_RELEASE"
2912+ exit ;;
2913+ powerpc:machten:*:*)
2914+ echo powerpc-apple-machten"$UNAME_RELEASE"
2915+ exit ;;
2916+ RISC*:Mach:*:*)
2917+ echo mips-dec-mach_bsd4.3
2918+ exit ;;
2919 RISC*:ULTRIX:*:*)
2920- echo mips-dec-ultrix${UNAME_RELEASE}
2921- exit 0 ;;
2922+ echo mips-dec-ultrix"$UNAME_RELEASE"
2923+ exit ;;
2924 VAX*:ULTRIX*:*:*)
2925- echo vax-dec-ultrix${UNAME_RELEASE}
2926- exit 0 ;;
2927- mips:*:4*:UMIPS)
2928- echo mips-mips-riscos4sysv
2929- exit 0 ;;
2930- mips:*:5*:RISCos)
2931- echo mips-mips-riscos${UNAME_RELEASE}
2932- exit 0 ;;
2933+ echo vax-dec-ultrix"$UNAME_RELEASE"
2934+ exit ;;
2935+ 2020:CLIX:*:* | 2430:CLIX:*:*)
2936+ echo clipper-intergraph-clix"$UNAME_RELEASE"
2937+ exit ;;
2938+ mips:*:*:UMIPS | mips:*:*:RISCos)
2939+ set_cc_for_build
2940+ sed 's/^ //' << EOF > "$dummy.c"
2941+#ifdef __cplusplus
2942+#include <stdio.h> /* for printf() prototype */
2943+ int main (int argc, char *argv[]) {
2944+#else
2945+ int main (argc, argv) int argc; char *argv[]; {
2946+#endif
2947+ #if defined (host_mips) && defined (MIPSEB)
2948+ #if defined (SYSTYPE_SYSV)
2949+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
2950+ #endif
2951+ #if defined (SYSTYPE_SVR4)
2952+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
2953+ #endif
2954+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
2955+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
2956+ #endif
2957+ #endif
2958+ exit (-1);
2959+ }
2960+EOF
2961+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
2962+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
2963+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
2964+ { echo "$SYSTEM_NAME"; exit; }
2965+ echo mips-mips-riscos"$UNAME_RELEASE"
2966+ exit ;;
2967+ Motorola:PowerMAX_OS:*:*)
2968+ echo powerpc-motorola-powermax
2969+ exit ;;
2970+ Motorola:*:4.3:PL8-*)
2971+ echo powerpc-harris-powermax
2972+ exit ;;
2973+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
2974+ echo powerpc-harris-powermax
2975+ exit ;;
2976 Night_Hawk:Power_UNIX:*:*)
2977 echo powerpc-harris-powerunix
2978- exit 0 ;;
2979+ exit ;;
2980 m88k:CX/UX:7*:*)
2981 echo m88k-harris-cxux7
2982- exit 0 ;;
2983+ exit ;;
2984 m88k:*:4*:R4*)
2985 echo m88k-motorola-sysv4
2986- exit 0 ;;
2987+ exit ;;
2988 m88k:*:3*:R3*)
2989 echo m88k-motorola-sysv3
2990- exit 0 ;;
2991+ exit ;;
2992 AViiON:dgux:*:*)
2993- # DG/UX returns AViiON for all architectures
2994- UNAME_PROCESSOR=`/usr/bin/uname -p`
2995- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
2996- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
2997- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
2998- echo m88k-dg-dgux${UNAME_RELEASE}
2999- else
3000- echo m88k-dg-dguxbcs${UNAME_RELEASE}
3001- fi
3002- else echo i586-dg-dgux${UNAME_RELEASE}
3003- fi
3004- exit 0 ;;
3005+ # DG/UX returns AViiON for all architectures
3006+ UNAME_PROCESSOR=`/usr/bin/uname -p`
3007+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
3008+ then
3009+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
3010+ [ "$TARGET_BINARY_INTERFACE"x = x ]
3011+ then
3012+ echo m88k-dg-dgux"$UNAME_RELEASE"
3013+ else
3014+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
3015+ fi
3016+ else
3017+ echo i586-dg-dgux"$UNAME_RELEASE"
3018+ fi
3019+ exit ;;
3020 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
3021 echo m88k-dolphin-sysv3
3022- exit 0 ;;
3023+ exit ;;
3024 M88*:*:R3*:*)
3025 # Delta 88k system running SVR3
3026 echo m88k-motorola-sysv3
3027- exit 0 ;;
3028+ exit ;;
3029 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
3030 echo m88k-tektronix-sysv3
3031- exit 0 ;;
3032+ exit ;;
3033 Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
3034 echo m68k-tektronix-bsd
3035- exit 0 ;;
3036+ exit ;;
3037 *:IRIX*:*:*)
3038- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
3039- exit 0 ;;
3040- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
3041- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
3042- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
3043- i[34]86:AIX:*:*)
3044+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
3045+ exit ;;
3046+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
3047+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
3048+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
3049+ i*86:AIX:*:*)
3050 echo i386-ibm-aix
3051- exit 0 ;;
3052+ exit ;;
3053+ ia64:AIX:*:*)
3054+ if [ -x /usr/bin/oslevel ] ; then
3055+ IBM_REV=`/usr/bin/oslevel`
3056+ else
3057+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
3058+ fi
3059+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
3060+ exit ;;
3061 *:AIX:2:3)
3062 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
3063- sed 's/^ //' << EOF >dummy.c
3064+ set_cc_for_build
3065+ sed 's/^ //' << EOF > "$dummy.c"
3066 #include <sys/systemcfg.h>
3067
3068 main()
3069@@ -182,61 +593,143 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
3070 exit(0);
3071 }
3072 EOF
3073- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
3074- rm -f dummy.c dummy
3075- echo rs6000-ibm-aix3.2.5
3076+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
3077+ then
3078+ echo "$SYSTEM_NAME"
3079+ else
3080+ echo rs6000-ibm-aix3.2.5
3081+ fi
3082 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
3083 echo rs6000-ibm-aix3.2.4
3084 else
3085 echo rs6000-ibm-aix3.2
3086 fi
3087- exit 0 ;;
3088- *:AIX:*:4)
3089- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
3090+ exit ;;
3091+ *:AIX:*:[4567])
3092+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
3093+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
3094 IBM_ARCH=rs6000
3095 else
3096 IBM_ARCH=powerpc
3097 fi
3098- if [ -x /usr/bin/oslevel ] ; then
3099- IBM_REV=`/usr/bin/oslevel`
3100+ if [ -x /usr/bin/lslpp ] ; then
3101+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
3102+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
3103 else
3104- IBM_REV=4.${UNAME_RELEASE}
3105+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
3106 fi
3107- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
3108- exit 0 ;;
3109+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
3110+ exit ;;
3111 *:AIX:*:*)
3112 echo rs6000-ibm-aix
3113- exit 0 ;;
3114- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
3115+ exit ;;
3116+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
3117 echo romp-ibm-bsd4.4
3118- exit 0 ;;
3119- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
3120- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
3121- exit 0 ;; # report: romp-ibm BSD 4.3
3122+ exit ;;
3123+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
3124+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
3125+ exit ;; # report: romp-ibm BSD 4.3
3126 *:BOSX:*:*)
3127 echo rs6000-bull-bosx
3128- exit 0 ;;
3129+ exit ;;
3130 DPX/2?00:B.O.S.:*:*)
3131 echo m68k-bull-sysv3
3132- exit 0 ;;
3133+ exit ;;
3134 9000/[34]??:4.3bsd:1.*:*)
3135 echo m68k-hp-bsd
3136- exit 0 ;;
3137+ exit ;;
3138 hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
3139 echo m68k-hp-bsd4.4
3140- exit 0 ;;
3141- 9000/[3478]??:HP-UX:*:*)
3142- case "${UNAME_MACHINE}" in
3143- 9000/31? ) HP_ARCH=m68000 ;;
3144- 9000/[34]?? ) HP_ARCH=m68k ;;
3145- 9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
3146- 9000/8?? ) HP_ARCH=hppa1.0 ;;
3147- esac
3148- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
3149- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
3150- exit 0 ;;
3151+ exit ;;
3152+ 9000/[34678]??:HP-UX:*:*)
3153+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
3154+ case "$UNAME_MACHINE" in
3155+ 9000/31?) HP_ARCH=m68000 ;;
3156+ 9000/[34]??) HP_ARCH=m68k ;;
3157+ 9000/[678][0-9][0-9])
3158+ if [ -x /usr/bin/getconf ]; then
3159+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
3160+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
3161+ case "$sc_cpu_version" in
3162+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
3163+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
3164+ 532) # CPU_PA_RISC2_0
3165+ case "$sc_kernel_bits" in
3166+ 32) HP_ARCH=hppa2.0n ;;
3167+ 64) HP_ARCH=hppa2.0w ;;
3168+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
3169+ esac ;;
3170+ esac
3171+ fi
3172+ if [ "$HP_ARCH" = "" ]; then
3173+ set_cc_for_build
3174+ sed 's/^ //' << EOF > "$dummy.c"
3175+
3176+ #define _HPUX_SOURCE
3177+ #include <stdlib.h>
3178+ #include <unistd.h>
3179+
3180+ int main ()
3181+ {
3182+ #if defined(_SC_KERNEL_BITS)
3183+ long bits = sysconf(_SC_KERNEL_BITS);
3184+ #endif
3185+ long cpu = sysconf (_SC_CPU_VERSION);
3186+
3187+ switch (cpu)
3188+ {
3189+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
3190+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
3191+ case CPU_PA_RISC2_0:
3192+ #if defined(_SC_KERNEL_BITS)
3193+ switch (bits)
3194+ {
3195+ case 64: puts ("hppa2.0w"); break;
3196+ case 32: puts ("hppa2.0n"); break;
3197+ default: puts ("hppa2.0"); break;
3198+ } break;
3199+ #else /* !defined(_SC_KERNEL_BITS) */
3200+ puts ("hppa2.0"); break;
3201+ #endif
3202+ default: puts ("hppa1.0"); break;
3203+ }
3204+ exit (0);
3205+ }
3206+EOF
3207+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
3208+ test -z "$HP_ARCH" && HP_ARCH=hppa
3209+ fi ;;
3210+ esac
3211+ if [ "$HP_ARCH" = hppa2.0w ]
3212+ then
3213+ set_cc_for_build
3214+
3215+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
3216+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
3217+ # generating 64-bit code. GNU and HP use different nomenclature:
3218+ #
3219+ # $ CC_FOR_BUILD=cc ./config.guess
3220+ # => hppa2.0w-hp-hpux11.23
3221+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
3222+ # => hppa64-hp-hpux11.23
3223+
3224+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
3225+ grep -q __LP64__
3226+ then
3227+ HP_ARCH=hppa2.0w
3228+ else
3229+ HP_ARCH=hppa64
3230+ fi
3231+ fi
3232+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
3233+ exit ;;
3234+ ia64:HP-UX:*:*)
3235+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
3236+ echo ia64-hp-hpux"$HPUX_REV"
3237+ exit ;;
3238 3050*:HI-UX:*:*)
3239- sed 's/^ //' << EOF >dummy.c
3240+ set_cc_for_build
3241+ sed 's/^ //' << EOF > "$dummy.c"
3242 #include <unistd.h>
3243 int
3244 main ()
3245@@ -261,213 +754,727 @@ EOF
3246 exit (0);
3247 }
3248 EOF
3249- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
3250- rm -f dummy.c dummy
3251+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
3252+ { echo "$SYSTEM_NAME"; exit; }
3253 echo unknown-hitachi-hiuxwe2
3254- exit 0 ;;
3255- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
3256+ exit ;;
3257+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
3258 echo hppa1.1-hp-bsd
3259- exit 0 ;;
3260+ exit ;;
3261 9000/8??:4.3bsd:*:*)
3262 echo hppa1.0-hp-bsd
3263- exit 0 ;;
3264- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
3265+ exit ;;
3266+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
3267+ echo hppa1.0-hp-mpeix
3268+ exit ;;
3269+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
3270 echo hppa1.1-hp-osf
3271- exit 0 ;;
3272+ exit ;;
3273 hp8??:OSF1:*:*)
3274 echo hppa1.0-hp-osf
3275- exit 0 ;;
3276+ exit ;;
3277+ i*86:OSF1:*:*)
3278+ if [ -x /usr/sbin/sysversion ] ; then
3279+ echo "$UNAME_MACHINE"-unknown-osf1mk
3280+ else
3281+ echo "$UNAME_MACHINE"-unknown-osf1
3282+ fi
3283+ exit ;;
3284 parisc*:Lites*:*:*)
3285 echo hppa1.1-hp-lites
3286- exit 0 ;;
3287+ exit ;;
3288 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
3289 echo c1-convex-bsd
3290- exit 0 ;;
3291+ exit ;;
3292 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
3293 if getsysinfo -f scalar_acc
3294 then echo c32-convex-bsd
3295 else echo c2-convex-bsd
3296 fi
3297- exit 0 ;;
3298+ exit ;;
3299 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
3300 echo c34-convex-bsd
3301- exit 0 ;;
3302+ exit ;;
3303 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
3304 echo c38-convex-bsd
3305- exit 0 ;;
3306+ exit ;;
3307 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
3308 echo c4-convex-bsd
3309- exit 0 ;;
3310- CRAY*X-MP:*:*:*)
3311- echo xmp-cray-unicos
3312- exit 0 ;;
3313+ exit ;;
3314 CRAY*Y-MP:*:*:*)
3315- echo ymp-cray-unicos${UNAME_RELEASE}
3316- exit 0 ;;
3317- CRAY*C90:*:*:*)
3318- echo c90-cray-unicos${UNAME_RELEASE}
3319- exit 0 ;;
3320- CRAY-2:*:*:*)
3321- echo cray2-cray-unicos
3322- exit 0 ;;
3323- hp3[0-9][05]:NetBSD:*:*)
3324- echo m68k-hp-netbsd${UNAME_RELEASE}
3325- exit 0 ;;
3326- i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
3327- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
3328- exit 0 ;;
3329+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3330+ exit ;;
3331+ CRAY*[A-Z]90:*:*:*)
3332+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
3333+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
3334+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
3335+ -e 's/\.[^.]*$/.X/'
3336+ exit ;;
3337+ CRAY*TS:*:*:*)
3338+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3339+ exit ;;
3340+ CRAY*T3E:*:*:*)
3341+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3342+ exit ;;
3343+ CRAY*SV1:*:*:*)
3344+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3345+ exit ;;
3346+ *:UNICOS/mp:*:*)
3347+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
3348+ exit ;;
3349+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
3350+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
3351+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
3352+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
3353+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3354+ exit ;;
3355+ 5000:UNIX_System_V:4.*:*)
3356+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
3357+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
3358+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
3359+ exit ;;
3360+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
3361+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
3362+ exit ;;
3363+ sparc*:BSD/OS:*:*)
3364+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
3365+ exit ;;
3366+ *:BSD/OS:*:*)
3367+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
3368+ exit ;;
3369+ arm:FreeBSD:*:*)
3370+ UNAME_PROCESSOR=`uname -p`
3371+ set_cc_for_build
3372+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
3373+ | grep -q __ARM_PCS_VFP
3374+ then
3375+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
3376+ else
3377+ echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
3378+ fi
3379+ exit ;;
3380 *:FreeBSD:*:*)
3381- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
3382- exit 0 ;;
3383- *:NetBSD:*:*)
3384- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
3385- exit 0 ;;
3386+ UNAME_PROCESSOR=`/usr/bin/uname -p`
3387+ case "$UNAME_PROCESSOR" in
3388+ amd64)
3389+ UNAME_PROCESSOR=x86_64 ;;
3390+ i386)
3391+ UNAME_PROCESSOR=i586 ;;
3392+ esac
3393+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
3394+ exit ;;
3395 i*:CYGWIN*:*)
3396- echo i386-unknown-cygwin32
3397- exit 0 ;;
3398- p*:CYGWIN*:*)
3399- echo powerpcle-unknown-cygwin32
3400- exit 0 ;;
3401+ echo "$UNAME_MACHINE"-pc-cygwin
3402+ exit ;;
3403+ *:MINGW64*:*)
3404+ echo "$UNAME_MACHINE"-pc-mingw64
3405+ exit ;;
3406+ *:MINGW*:*)
3407+ echo "$UNAME_MACHINE"-pc-mingw32
3408+ exit ;;
3409+ *:MSYS*:*)
3410+ echo "$UNAME_MACHINE"-pc-msys
3411+ exit ;;
3412+ i*:PW*:*)
3413+ echo "$UNAME_MACHINE"-pc-pw32
3414+ exit ;;
3415+ *:Interix*:*)
3416+ case "$UNAME_MACHINE" in
3417+ x86)
3418+ echo i586-pc-interix"$UNAME_RELEASE"
3419+ exit ;;
3420+ authenticamd | genuineintel | EM64T)
3421+ echo x86_64-unknown-interix"$UNAME_RELEASE"
3422+ exit ;;
3423+ IA64)
3424+ echo ia64-unknown-interix"$UNAME_RELEASE"
3425+ exit ;;
3426+ esac ;;
3427+ i*:UWIN*:*)
3428+ echo "$UNAME_MACHINE"-pc-uwin
3429+ exit ;;
3430+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
3431+ echo x86_64-pc-cygwin
3432+ exit ;;
3433 prep*:SunOS:5.*:*)
3434- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
3435- exit 0 ;;
3436+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
3437+ exit ;;
3438 *:GNU:*:*)
3439- echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
3440- exit 0 ;;
3441- *:Linux:*:*)
3442- # The BFD linker knows what the default object file format is, so
3443- # first see if it will tell us.
3444- ld_help_string=`ld --help 2>&1`
3445- if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
3446- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
3447- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
3448- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
3449- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
3450- echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
3451- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
3452- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
3453- elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
3454- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
3455- elif test "${UNAME_MACHINE}" = "alpha" ; then
3456- echo alpha-unknown-linux ; exit 0
3457- else
3458- # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
3459- # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout.
3460- test ! -d /usr/lib/ldscripts/. \
3461- && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
3462- # Determine whether the default compiler is a.out or elf
3463- cat >dummy.c <<EOF
3464-main(argc, argv)
3465-int argc;
3466-char *argv[];
3467-{
3468-#ifdef __ELF__
3469- printf ("%s-unknown-linux\n", argv[1]);
3470-#else
3471- printf ("%s-unknown-linuxaout\n", argv[1]);
3472-#endif
3473- return 0;
3474-}
3475+ # the GNU system
3476+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
3477+ exit ;;
3478+ *:GNU/*:*:*)
3479+ # other systems with GNU libc and userland
3480+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
3481+ exit ;;
3482+ *:Minix:*:*)
3483+ echo "$UNAME_MACHINE"-unknown-minix
3484+ exit ;;
3485+ aarch64:Linux:*:*)
3486+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3487+ exit ;;
3488+ aarch64_be:Linux:*:*)
3489+ UNAME_MACHINE=aarch64_be
3490+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3491+ exit ;;
3492+ alpha:Linux:*:*)
3493+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3494+ EV5) UNAME_MACHINE=alphaev5 ;;
3495+ EV56) UNAME_MACHINE=alphaev56 ;;
3496+ PCA56) UNAME_MACHINE=alphapca56 ;;
3497+ PCA57) UNAME_MACHINE=alphapca56 ;;
3498+ EV6) UNAME_MACHINE=alphaev6 ;;
3499+ EV67) UNAME_MACHINE=alphaev67 ;;
3500+ EV68*) UNAME_MACHINE=alphaev68 ;;
3501+ esac
3502+ objdump --private-headers /bin/sh | grep -q ld.so.1
3503+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
3504+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3505+ exit ;;
3506+ arc:Linux:*:* | arceb:Linux:*:*)
3507+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3508+ exit ;;
3509+ arm*:Linux:*:*)
3510+ set_cc_for_build
3511+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
3512+ | grep -q __ARM_EABI__
3513+ then
3514+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3515+ else
3516+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
3517+ | grep -q __ARM_PCS_VFP
3518+ then
3519+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
3520+ else
3521+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
3522+ fi
3523+ fi
3524+ exit ;;
3525+ avr32*:Linux:*:*)
3526+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3527+ exit ;;
3528+ cris:Linux:*:*)
3529+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
3530+ exit ;;
3531+ crisv32:Linux:*:*)
3532+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
3533+ exit ;;
3534+ e2k:Linux:*:*)
3535+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3536+ exit ;;
3537+ frv:Linux:*:*)
3538+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3539+ exit ;;
3540+ hexagon:Linux:*:*)
3541+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3542+ exit ;;
3543+ i*86:Linux:*:*)
3544+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
3545+ exit ;;
3546+ ia64:Linux:*:*)
3547+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3548+ exit ;;
3549+ k1om:Linux:*:*)
3550+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3551+ exit ;;
3552+ m32r*:Linux:*:*)
3553+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3554+ exit ;;
3555+ m68*:Linux:*:*)
3556+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3557+ exit ;;
3558+ mips:Linux:*:* | mips64:Linux:*:*)
3559+ set_cc_for_build
3560+ IS_GLIBC=0
3561+ test x"${LIBC}" = xgnu && IS_GLIBC=1
3562+ sed 's/^ //' << EOF > "$dummy.c"
3563+ #undef CPU
3564+ #undef mips
3565+ #undef mipsel
3566+ #undef mips64
3567+ #undef mips64el
3568+ #if ${IS_GLIBC} && defined(_ABI64)
3569+ LIBCABI=gnuabi64
3570+ #else
3571+ #if ${IS_GLIBC} && defined(_ABIN32)
3572+ LIBCABI=gnuabin32
3573+ #else
3574+ LIBCABI=${LIBC}
3575+ #endif
3576+ #endif
3577+
3578+ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
3579+ CPU=mipsisa64r6
3580+ #else
3581+ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
3582+ CPU=mipsisa32r6
3583+ #else
3584+ #if defined(__mips64)
3585+ CPU=mips64
3586+ #else
3587+ CPU=mips
3588+ #endif
3589+ #endif
3590+ #endif
3591+
3592+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3593+ MIPS_ENDIAN=el
3594+ #else
3595+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3596+ MIPS_ENDIAN=
3597+ #else
3598+ MIPS_ENDIAN=
3599+ #endif
3600+ #endif
3601 EOF
3602- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
3603- rm -f dummy.c dummy
3604- fi ;;
3605-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
3606-# are messed up and put the nodename in both sysname and nodename.
3607- i[34]86:DYNIX/ptx:4*:*)
3608+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
3609+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
3610+ ;;
3611+ mips64el:Linux:*:*)
3612+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3613+ exit ;;
3614+ openrisc*:Linux:*:*)
3615+ echo or1k-unknown-linux-"$LIBC"
3616+ exit ;;
3617+ or32:Linux:*:* | or1k*:Linux:*:*)
3618+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3619+ exit ;;
3620+ padre:Linux:*:*)
3621+ echo sparc-unknown-linux-"$LIBC"
3622+ exit ;;
3623+ parisc64:Linux:*:* | hppa64:Linux:*:*)
3624+ echo hppa64-unknown-linux-"$LIBC"
3625+ exit ;;
3626+ parisc:Linux:*:* | hppa:Linux:*:*)
3627+ # Look for CPU level
3628+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
3629+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
3630+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
3631+ *) echo hppa-unknown-linux-"$LIBC" ;;
3632+ esac
3633+ exit ;;
3634+ ppc64:Linux:*:*)
3635+ echo powerpc64-unknown-linux-"$LIBC"
3636+ exit ;;
3637+ ppc:Linux:*:*)
3638+ echo powerpc-unknown-linux-"$LIBC"
3639+ exit ;;
3640+ ppc64le:Linux:*:*)
3641+ echo powerpc64le-unknown-linux-"$LIBC"
3642+ exit ;;
3643+ ppcle:Linux:*:*)
3644+ echo powerpcle-unknown-linux-"$LIBC"
3645+ exit ;;
3646+ riscv32:Linux:*:* | riscv64:Linux:*:*)
3647+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3648+ exit ;;
3649+ s390:Linux:*:* | s390x:Linux:*:*)
3650+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
3651+ exit ;;
3652+ sh64*:Linux:*:*)
3653+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3654+ exit ;;
3655+ sh*:Linux:*:*)
3656+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3657+ exit ;;
3658+ sparc:Linux:*:* | sparc64:Linux:*:*)
3659+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3660+ exit ;;
3661+ tile*:Linux:*:*)
3662+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3663+ exit ;;
3664+ vax:Linux:*:*)
3665+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
3666+ exit ;;
3667+ x86_64:Linux:*:*)
3668+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
3669+ exit ;;
3670+ xtensa*:Linux:*:*)
3671+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
3672+ exit ;;
3673+ i*86:DYNIX/ptx:4*:*)
3674+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
3675+ # earlier versions are messed up and put the nodename in both
3676+ # sysname and nodename.
3677 echo i386-sequent-sysv4
3678- exit 0 ;;
3679- i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
3680+ exit ;;
3681+ i*86:UNIX_SV:4.2MP:2.*)
3682+ # Unixware is an offshoot of SVR4, but it has its own version
3683+ # number series starting with 2...
3684+ # I am not positive that other SVR4 systems won't match this,
3685+ # I just have to hope. -- rms.
3686+ # Use sysv4.2uw... so that sysv4* matches it.
3687+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
3688+ exit ;;
3689+ i*86:OS/2:*:*)
3690+ # If we were able to find `uname', then EMX Unix compatibility
3691+ # is probably installed.
3692+ echo "$UNAME_MACHINE"-pc-os2-emx
3693+ exit ;;
3694+ i*86:XTS-300:*:STOP)
3695+ echo "$UNAME_MACHINE"-unknown-stop
3696+ exit ;;
3697+ i*86:atheos:*:*)
3698+ echo "$UNAME_MACHINE"-unknown-atheos
3699+ exit ;;
3700+ i*86:syllable:*:*)
3701+ echo "$UNAME_MACHINE"-pc-syllable
3702+ exit ;;
3703+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
3704+ echo i386-unknown-lynxos"$UNAME_RELEASE"
3705+ exit ;;
3706+ i*86:*DOS:*:*)
3707+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
3708+ exit ;;
3709+ i*86:*:4.*:*)
3710+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
3711 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
3712- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
3713+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
3714 else
3715- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
3716+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
3717 fi
3718- exit 0 ;;
3719- i[34]86:*:3.2:*)
3720+ exit ;;
3721+ i*86:*:5:[678]*)
3722+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
3723+ case `/bin/uname -X | grep "^Machine"` in
3724+ *486*) UNAME_MACHINE=i486 ;;
3725+ *Pentium) UNAME_MACHINE=i586 ;;
3726+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
3727+ esac
3728+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
3729+ exit ;;
3730+ i*86:*:3.2:*)
3731 if test -f /usr/options/cb.name; then
3732 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
3733- echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
3734+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
3735 elif /bin/uname -X 2>/dev/null >/dev/null ; then
3736- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
3737- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
3738- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
3739+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
3740+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
3741+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
3742 && UNAME_MACHINE=i586
3743- echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
3744+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
3745+ && UNAME_MACHINE=i686
3746+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
3747+ && UNAME_MACHINE=i686
3748+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
3749 else
3750- echo ${UNAME_MACHINE}-unknown-sysv32
3751+ echo "$UNAME_MACHINE"-pc-sysv32
3752 fi
3753- exit 0 ;;
3754+ exit ;;
3755+ pc:*:*:*)
3756+ # Left here for compatibility:
3757+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
3758+ # the processor, so we play safe by assuming i586.
3759+ # Note: whatever this is, it MUST be the same as what config.sub
3760+ # prints for the "djgpp" host, or else GDB configure will decide that
3761+ # this is a cross-build.
3762+ echo i586-pc-msdosdjgpp
3763+ exit ;;
3764 Intel:Mach:3*:*)
3765- echo i386-unknown-mach3
3766- exit 0 ;;
3767+ echo i386-pc-mach3
3768+ exit ;;
3769 paragon:*:*:*)
3770 echo i860-intel-osf1
3771- exit 0 ;;
3772+ exit ;;
3773 i860:*:4.*:*) # i860-SVR4
3774 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
3775- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
3776+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
3777 else # Add other i860-SVR4 vendors below as they are discovered.
3778- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
3779+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
3780 fi
3781- exit 0 ;;
3782+ exit ;;
3783 mini*:CTIX:SYS*5:*)
3784 # "miniframe"
3785 echo m68010-convergent-sysv
3786- exit 0 ;;
3787- M680[234]0:*:R3V[567]*:*)
3788- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
3789- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
3790- uname -p 2>/dev/null | grep 86 >/dev/null \
3791- && echo i486-ncr-sysv4.3 && exit 0 ;;
3792+ exit ;;
3793+ mc68k:UNIX:SYSTEM5:3.51m)
3794+ echo m68k-convergent-sysv
3795+ exit ;;
3796+ M680?0:D-NIX:5.3:*)
3797+ echo m68k-diab-dnix
3798+ exit ;;
3799+ M68*:*:R3V[5678]*:*)
3800+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
3801+ 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)
3802+ OS_REL=''
3803+ test -r /etc/.relid \
3804+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
3805+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3806+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
3807+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3808+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3809 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
3810- uname -p 2>/dev/null | grep 86 >/dev/null \
3811- && echo i486-ncr-sysv4 && exit 0 ;;
3812- m680[234]0:LynxOS:2.[23]*:*)
3813- echo m68k-lynx-lynxos${UNAME_RELEASE}
3814- exit 0 ;;
3815+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3816+ && { echo i486-ncr-sysv4; exit; } ;;
3817+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
3818+ OS_REL='.3'
3819+ test -r /etc/.relid \
3820+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
3821+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3822+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
3823+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3824+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
3825+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
3826+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
3827+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
3828+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
3829+ exit ;;
3830 mc68030:UNIX_System_V:4.*:*)
3831 echo m68k-atari-sysv4
3832- exit 0 ;;
3833- i[34]86:LynxOS:2.[23]*:*)
3834- echo i386-lynx-lynxos${UNAME_RELEASE}
3835- exit 0 ;;
3836- TSUNAMI:LynxOS:2.[23]*:*)
3837- echo sparc-lynx-lynxos${UNAME_RELEASE}
3838- exit 0 ;;
3839- rs6000:LynxOS:2.[23]*:*)
3840- echo rs6000-lynx-lynxos${UNAME_RELEASE}
3841- exit 0 ;;
3842+ exit ;;
3843+ TSUNAMI:LynxOS:2.*:*)
3844+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
3845+ exit ;;
3846+ rs6000:LynxOS:2.*:*)
3847+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
3848+ exit ;;
3849+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
3850+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
3851+ exit ;;
3852+ SM[BE]S:UNIX_SV:*:*)
3853+ echo mips-dde-sysv"$UNAME_RELEASE"
3854+ exit ;;
3855+ RM*:ReliantUNIX-*:*:*)
3856+ echo mips-sni-sysv4
3857+ exit ;;
3858 RM*:SINIX-*:*:*)
3859 echo mips-sni-sysv4
3860- exit 0 ;;
3861+ exit ;;
3862 *:SINIX-*:*:*)
3863 if uname -p 2>/dev/null >/dev/null ; then
3864 UNAME_MACHINE=`(uname -p) 2>/dev/null`
3865- echo ${UNAME_MACHINE}-sni-sysv4
3866+ echo "$UNAME_MACHINE"-sni-sysv4
3867 else
3868 echo ns32k-sni-sysv
3869 fi
3870- exit 0 ;;
3871+ exit ;;
3872+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
3873+ # says <Richard.M.Bartel@ccMail.Census.GOV>
3874+ echo i586-unisys-sysv4
3875+ exit ;;
3876+ *:UNIX_System_V:4*:FTX*)
3877+ # From Gerald Hewes <hewes@openmarket.com>.
3878+ # How about differentiating between stratus architectures? -djm
3879+ echo hppa1.1-stratus-sysv4
3880+ exit ;;
3881+ *:*:*:FTX*)
3882+ # From seanf@swdc.stratus.com.
3883+ echo i860-stratus-sysv4
3884+ exit ;;
3885+ i*86:VOS:*:*)
3886+ # From Paul.Green@stratus.com.
3887+ echo "$UNAME_MACHINE"-stratus-vos
3888+ exit ;;
3889+ *:VOS:*:*)
3890+ # From Paul.Green@stratus.com.
3891+ echo hppa1.1-stratus-vos
3892+ exit ;;
3893 mc68*:A/UX:*:*)
3894- echo m68k-apple-aux${UNAME_RELEASE}
3895- exit 0 ;;
3896- R3000:*System_V*:*:*)
3897+ echo m68k-apple-aux"$UNAME_RELEASE"
3898+ exit ;;
3899+ news*:NEWS-OS:6*:*)
3900+ echo mips-sony-newsos6
3901+ exit ;;
3902+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
3903 if [ -d /usr/nec ]; then
3904- echo mips-nec-sysv${UNAME_RELEASE}
3905+ echo mips-nec-sysv"$UNAME_RELEASE"
3906 else
3907- echo mips-unknown-sysv${UNAME_RELEASE}
3908+ echo mips-unknown-sysv"$UNAME_RELEASE"
3909+ fi
3910+ exit ;;
3911+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
3912+ echo powerpc-be-beos
3913+ exit ;;
3914+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
3915+ echo powerpc-apple-beos
3916+ exit ;;
3917+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
3918+ echo i586-pc-beos
3919+ exit ;;
3920+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
3921+ echo i586-pc-haiku
3922+ exit ;;
3923+ x86_64:Haiku:*:*)
3924+ echo x86_64-unknown-haiku
3925+ exit ;;
3926+ SX-4:SUPER-UX:*:*)
3927+ echo sx4-nec-superux"$UNAME_RELEASE"
3928+ exit ;;
3929+ SX-5:SUPER-UX:*:*)
3930+ echo sx5-nec-superux"$UNAME_RELEASE"
3931+ exit ;;
3932+ SX-6:SUPER-UX:*:*)
3933+ echo sx6-nec-superux"$UNAME_RELEASE"
3934+ exit ;;
3935+ SX-7:SUPER-UX:*:*)
3936+ echo sx7-nec-superux"$UNAME_RELEASE"
3937+ exit ;;
3938+ SX-8:SUPER-UX:*:*)
3939+ echo sx8-nec-superux"$UNAME_RELEASE"
3940+ exit ;;
3941+ SX-8R:SUPER-UX:*:*)
3942+ echo sx8r-nec-superux"$UNAME_RELEASE"
3943+ exit ;;
3944+ SX-ACE:SUPER-UX:*:*)
3945+ echo sxace-nec-superux"$UNAME_RELEASE"
3946+ exit ;;
3947+ Power*:Rhapsody:*:*)
3948+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
3949+ exit ;;
3950+ *:Rhapsody:*:*)
3951+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
3952+ exit ;;
3953+ *:Darwin:*:*)
3954+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
3955+ set_cc_for_build
3956+ if test "$UNAME_PROCESSOR" = unknown ; then
3957+ UNAME_PROCESSOR=powerpc
3958 fi
3959- exit 0 ;;
3960+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
3961+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
3962+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
3963+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
3964+ grep IS_64BIT_ARCH >/dev/null
3965+ then
3966+ case $UNAME_PROCESSOR in
3967+ i386) UNAME_PROCESSOR=x86_64 ;;
3968+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
3969+ esac
3970+ fi
3971+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
3972+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
3973+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
3974+ grep IS_PPC >/dev/null
3975+ then
3976+ UNAME_PROCESSOR=powerpc
3977+ fi
3978+ fi
3979+ elif test "$UNAME_PROCESSOR" = i386 ; then
3980+ # Avoid executing cc on OS X 10.9, as it ships with a stub
3981+ # that puts up a graphical alert prompting to install
3982+ # developer tools. Any system running Mac OS X 10.7 or
3983+ # later (Darwin 11 and later) is required to have a 64-bit
3984+ # processor. This is not true of the ARM version of Darwin
3985+ # that Apple uses in portable devices.
3986+ UNAME_PROCESSOR=x86_64
3987+ fi
3988+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
3989+ exit ;;
3990+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
3991+ UNAME_PROCESSOR=`uname -p`
3992+ if test "$UNAME_PROCESSOR" = x86; then
3993+ UNAME_PROCESSOR=i386
3994+ UNAME_MACHINE=pc
3995+ fi
3996+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
3997+ exit ;;
3998+ *:QNX:*:4*)
3999+ echo i386-pc-qnx
4000+ exit ;;
4001+ NEO-*:NONSTOP_KERNEL:*:*)
4002+ echo neo-tandem-nsk"$UNAME_RELEASE"
4003+ exit ;;
4004+ NSE-*:NONSTOP_KERNEL:*:*)
4005+ echo nse-tandem-nsk"$UNAME_RELEASE"
4006+ exit ;;
4007+ NSR-*:NONSTOP_KERNEL:*:*)
4008+ echo nsr-tandem-nsk"$UNAME_RELEASE"
4009+ exit ;;
4010+ NSV-*:NONSTOP_KERNEL:*:*)
4011+ echo nsv-tandem-nsk"$UNAME_RELEASE"
4012+ exit ;;
4013+ NSX-*:NONSTOP_KERNEL:*:*)
4014+ echo nsx-tandem-nsk"$UNAME_RELEASE"
4015+ exit ;;
4016+ *:NonStop-UX:*:*)
4017+ echo mips-compaq-nonstopux
4018+ exit ;;
4019+ BS2000:POSIX*:*:*)
4020+ echo bs2000-siemens-sysv
4021+ exit ;;
4022+ DS/*:UNIX_System_V:*:*)
4023+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
4024+ exit ;;
4025+ *:Plan9:*:*)
4026+ # "uname -m" is not consistent, so use $cputype instead. 386
4027+ # is converted to i386 for consistency with other x86
4028+ # operating systems.
4029+ # shellcheck disable=SC2154
4030+ if test "$cputype" = 386; then
4031+ UNAME_MACHINE=i386
4032+ else
4033+ UNAME_MACHINE="$cputype"
4034+ fi
4035+ echo "$UNAME_MACHINE"-unknown-plan9
4036+ exit ;;
4037+ *:TOPS-10:*:*)
4038+ echo pdp10-unknown-tops10
4039+ exit ;;
4040+ *:TENEX:*:*)
4041+ echo pdp10-unknown-tenex
4042+ exit ;;
4043+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
4044+ echo pdp10-dec-tops20
4045+ exit ;;
4046+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
4047+ echo pdp10-xkl-tops20
4048+ exit ;;
4049+ *:TOPS-20:*:*)
4050+ echo pdp10-unknown-tops20
4051+ exit ;;
4052+ *:ITS:*:*)
4053+ echo pdp10-unknown-its
4054+ exit ;;
4055+ SEI:*:*:SEIUX)
4056+ echo mips-sei-seiux"$UNAME_RELEASE"
4057+ exit ;;
4058+ *:DragonFly:*:*)
4059+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
4060+ exit ;;
4061+ *:*VMS:*:*)
4062+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
4063+ case "$UNAME_MACHINE" in
4064+ A*) echo alpha-dec-vms ; exit ;;
4065+ I*) echo ia64-dec-vms ; exit ;;
4066+ V*) echo vax-dec-vms ; exit ;;
4067+ esac ;;
4068+ *:XENIX:*:SysV)
4069+ echo i386-pc-xenix
4070+ exit ;;
4071+ i*86:skyos:*:*)
4072+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
4073+ exit ;;
4074+ i*86:rdos:*:*)
4075+ echo "$UNAME_MACHINE"-pc-rdos
4076+ exit ;;
4077+ i*86:AROS:*:*)
4078+ echo "$UNAME_MACHINE"-pc-aros
4079+ exit ;;
4080+ x86_64:VMkernel:*:*)
4081+ echo "$UNAME_MACHINE"-unknown-esx
4082+ exit ;;
4083+ amd64:Isilon\ OneFS:*:*)
4084+ echo x86_64-unknown-onefs
4085+ exit ;;
4086+ *:Unleashed:*:*)
4087+ echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
4088+ exit ;;
4089 esac
4090
4091-#echo '(No uname command or uname output not recognized.)' 1>&2
4092-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
4093-
4094-cat >dummy.c <<EOF
4095+# No uname command or uname output not recognized.
4096+set_cc_for_build
4097+cat > "$dummy.c" <<EOF
4098 #ifdef _SEQUENT_
4099-# include <sys/types.h>
4100-# include <sys/utsname.h>
4101+#include <sys/types.h>
4102+#include <sys/utsname.h>
4103+#endif
4104+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
4105+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
4106+#include <signal.h>
4107+#if defined(_SIZE_T_) || defined(SIGLOST)
4108+#include <sys/utsname.h>
4109+#endif
4110+#endif
4111 #endif
4112 main ()
4113 {
4114@@ -480,20 +1487,12 @@ main ()
4115 #include <sys/param.h>
4116 printf ("m68k-sony-newsos%s\n",
4117 #ifdef NEWSOS4
4118- "4"
4119+ "4"
4120 #else
4121- ""
4122-#endif
4123- ); exit (0);
4124+ ""
4125 #endif
4126+ ); exit (0);
4127 #endif
4128-
4129-#if defined (__arm) && defined (__acorn) && defined (__unix)
4130- printf ("arm-acorn-riscix"); exit (0);
4131-#endif
4132-
4133-#if defined (hp300) && !defined (hpux)
4134- printf ("m68k-hp-bsd\n"); exit (0);
4135 #endif
4136
4137 #if defined (NeXT)
4138@@ -502,7 +1501,10 @@ main ()
4139 #endif
4140 int version;
4141 version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
4142- printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
4143+ if (version < 4)
4144+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
4145+ else
4146+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
4147 exit (0);
4148 #endif
4149
4150@@ -519,7 +1521,7 @@ main ()
4151 #endif
4152
4153 #if defined (__386BSD__)
4154- printf ("i386-unknown-bsd\n"); exit (0);
4155+ printf ("i386-pc-bsd\n"); exit (0);
4156 #endif
4157
4158 #if defined (sequent)
4159@@ -532,27 +1534,55 @@ main ()
4160 #endif
4161
4162 #if defined (_SEQUENT_)
4163- struct utsname un;
4164-
4165- uname(&un);
4166-
4167- if (strncmp(un.version, "V2", 2) == 0) {
4168- printf ("i386-sequent-ptx2\n"); exit (0);
4169- }
4170- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
4171- printf ("i386-sequent-ptx1\n"); exit (0);
4172- }
4173- printf ("i386-sequent-ptx\n"); exit (0);
4174+ struct utsname un;
4175
4176+ uname(&un);
4177+ if (strncmp(un.version, "V2", 2) == 0) {
4178+ printf ("i386-sequent-ptx2\n"); exit (0);
4179+ }
4180+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
4181+ printf ("i386-sequent-ptx1\n"); exit (0);
4182+ }
4183+ printf ("i386-sequent-ptx\n"); exit (0);
4184 #endif
4185
4186 #if defined (vax)
4187 #if !defined (ultrix)
4188+#include <sys/param.h>
4189+#if defined (BSD)
4190+#if BSD == 43
4191+ printf ("vax-dec-bsd4.3\n"); exit (0);
4192+#else
4193+#if BSD == 199006
4194+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
4195+#else
4196+ printf ("vax-dec-bsd\n"); exit (0);
4197+#endif
4198+#endif
4199+#else
4200 printf ("vax-dec-bsd\n"); exit (0);
4201+#endif
4202+#else
4203+#if defined(_SIZE_T_) || defined(SIGLOST)
4204+ struct utsname un;
4205+ uname (&un);
4206+ printf ("vax-dec-ultrix%s\n", un.release); exit (0);
4207 #else
4208 printf ("vax-dec-ultrix\n"); exit (0);
4209 #endif
4210 #endif
4211+#endif
4212+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
4213+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
4214+#if defined(_SIZE_T_) || defined(SIGLOST)
4215+ struct utsname *un;
4216+ uname (&un);
4217+ printf ("mips-dec-ultrix%s\n", un.release); exit (0);
4218+#else
4219+ printf ("mips-dec-ultrix\n"); exit (0);
4220+#endif
4221+#endif
4222+#endif
4223
4224 #if defined (alliant) && defined (i860)
4225 printf ("i860-alliant-bsd\n"); exit (0);
4226@@ -562,39 +1592,67 @@ main ()
4227 }
4228 EOF
4229
4230-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
4231-rm -f dummy.c dummy
4232+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
4233+ { echo "$SYSTEM_NAME"; exit; }
4234
4235 # Apollos put the system type in the environment.
4236+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
4237
4238-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
4239+echo "$0: unable to guess system type" >&2
4240
4241-# Convex versions that predate uname can use getsysinfo(1)
4242+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
4243+ mips:Linux | mips64:Linux)
4244+ # If we got here on MIPS GNU/Linux, output extra information.
4245+ cat >&2 <<EOF
4246
4247-if [ -x /usr/convex/getsysinfo ]
4248-then
4249- case `getsysinfo -f cpu_type` in
4250- c1*)
4251- echo c1-convex-bsd
4252- exit 0 ;;
4253- c2*)
4254- if getsysinfo -f scalar_acc
4255- then echo c32-convex-bsd
4256- else echo c2-convex-bsd
4257- fi
4258- exit 0 ;;
4259- c34*)
4260- echo c34-convex-bsd
4261- exit 0 ;;
4262- c38*)
4263- echo c38-convex-bsd
4264- exit 0 ;;
4265- c4*)
4266- echo c4-convex-bsd
4267- exit 0 ;;
4268- esac
4269-fi
4270+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
4271+the system type. Please install a C compiler and try again.
4272+EOF
4273+ ;;
4274+esac
4275
4276-#echo '(Unable to guess system type)' 1>&2
4277+cat >&2 <<EOF
4278+
4279+This script (version $timestamp), has failed to recognize the
4280+operating system you are using. If your script is old, overwrite *all*
4281+copies of config.guess and config.sub with the latest versions from:
4282+
4283+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
4284+and
4285+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
4286+
4287+If $0 has already been updated, send the following data and any
4288+information you think might be pertinent to config-patches@gnu.org to
4289+provide the necessary information to handle your system.
4290+
4291+config.guess timestamp = $timestamp
4292+
4293+uname -m = `(uname -m) 2>/dev/null || echo unknown`
4294+uname -r = `(uname -r) 2>/dev/null || echo unknown`
4295+uname -s = `(uname -s) 2>/dev/null || echo unknown`
4296+uname -v = `(uname -v) 2>/dev/null || echo unknown`
4297+
4298+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
4299+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
4300+
4301+hostinfo = `(hostinfo) 2>/dev/null`
4302+/bin/universe = `(/bin/universe) 2>/dev/null`
4303+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
4304+/bin/arch = `(/bin/arch) 2>/dev/null`
4305+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
4306+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
4307+
4308+UNAME_MACHINE = "$UNAME_MACHINE"
4309+UNAME_RELEASE = "$UNAME_RELEASE"
4310+UNAME_SYSTEM = "$UNAME_SYSTEM"
4311+UNAME_VERSION = "$UNAME_VERSION"
4312+EOF
4313
4314 exit 1
4315+
4316+# Local variables:
4317+# eval: (add-hook 'before-save-hook 'time-stamp)
4318+# time-stamp-start: "timestamp='"
4319+# time-stamp-format: "%:y-%02m-%02d"
4320+# time-stamp-end: "'"
4321+# End:
4322diff -uprN clean/lrzsz-0.12.20/config.h.in lrzsz-0.12.20/config.h.in
4323--- clean/lrzsz-0.12.20/config.h.in 1998-12-30 00:37:27.000000000 +0000
4324+++ lrzsz-0.12.20/config.h.in 2019-11-26 11:37:45.000000000 +0000
4325@@ -1,82 +1,4 @@
4326-/* config.h.in. Generated automatically from configure.in by autoheader. */
4327-
4328-/* Define if on AIX 3.
4329- System headers sometimes define this.
4330- We just want to avoid a redefinition error message. */
4331-#ifndef _ALL_SOURCE
4332-#undef _ALL_SOURCE
4333-#endif
4334-
4335-/* Define if using alloca.c. */
4336-#undef C_ALLOCA
4337-
4338-/* Define to empty if the keyword does not work. */
4339-#undef const
4340-
4341-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
4342- This function is required for alloca.c support on those systems. */
4343-#undef CRAY_STACKSEG_END
4344-
4345-/* Define if you have alloca, as a function or macro. */
4346-#undef HAVE_ALLOCA
4347-
4348-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
4349-#undef HAVE_ALLOCA_H
4350-
4351-/* Define if you have a working `mmap' system call. */
4352-#undef HAVE_MMAP
4353-
4354-/* Define if your struct stat has st_rdev. */
4355-#undef HAVE_ST_RDEV
4356-
4357-/* Define as __inline if that's what the C compiler calls it. */
4358-#undef inline
4359-
4360-/* Define if on MINIX. */
4361-#undef _MINIX
4362-
4363-/* Define to `int' if <sys/types.h> doesn't define. */
4364-#undef mode_t
4365-
4366-/* Define to `long' if <sys/types.h> doesn't define. */
4367-#undef off_t
4368-
4369-/* Define if the system does not provide POSIX.1 features except
4370- with this defined. */
4371-#undef _POSIX_1_SOURCE
4372-
4373-/* Define if you need to in order for stat and other things to work. */
4374-#undef _POSIX_SOURCE
4375-
4376-/* Define as the return type of signal handlers (int or void). */
4377-#undef RETSIGTYPE
4378-
4379-/* Define if the setvbuf function takes the buffering type as its second
4380- argument and the buffer pointer as the third, as on System V
4381- before release 3. */
4382-#undef SETVBUF_REVERSED
4383-
4384-/* Define to `unsigned' if <sys/types.h> doesn't define. */
4385-#undef size_t
4386-
4387-/* If using the C implementation of alloca, define if you know the
4388- direction of stack growth for your system; otherwise it will be
4389- automatically deduced at run-time.
4390- STACK_DIRECTION > 0 => grows toward higher addresses
4391- STACK_DIRECTION < 0 => grows toward lower addresses
4392- STACK_DIRECTION = 0 => direction of growth unknown
4393- */
4394-#undef STACK_DIRECTION
4395-
4396-/* Define if you have the ANSI C header files. */
4397-#undef STDC_HEADERS
4398-
4399-/* Define if you can safely include both <sys/time.h> and <time.h>. */
4400-#undef TIME_WITH_SYS_TIME
4401-
4402-/* Define if your <sys/time.h> declares struct tm. */
4403-#undef TM_IN_SYS_TIME
4404-
4405+/* config.h.in. Generated from configure.in by autoheader. */
4406 /* define this if you have a reliable ftime function */
4407 #undef HAVE_FTIME
4408
4409@@ -150,188 +72,303 @@
4410 /* define this if you headers conflict */
4411 #undef SYS_TIME_WITHOUT_SYS_SELECT
4412
4413-/* Define if you have the __argz_count function. */
4414-#undef HAVE___ARGZ_COUNT
4415+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
4416+ systems. This function is required for `alloca.c' support on those systems.
4417+ */
4418+#undef CRAY_STACKSEG_END
4419
4420-/* Define if you have the __argz_next function. */
4421-#undef HAVE___ARGZ_NEXT
4422+/* Define to 1 if using `alloca.c'. */
4423+#undef C_ALLOCA
4424
4425-/* Define if you have the __argz_stringify function. */
4426-#undef HAVE___ARGZ_STRINGIFY
4427+/* Define to 1 if translation of program messages to the user's native
4428+ language is requested. */
4429+#undef ENABLE_NLS
4430
4431-/* Define if you have the dcgettext function. */
4432+/* Define to 1 if you have `alloca', as a function or macro. */
4433+#undef HAVE_ALLOCA
4434+
4435+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
4436+ */
4437+#undef HAVE_ALLOCA_H
4438+
4439+/* Define to 1 if you have the <arpa/inet.h> header file. */
4440+#undef HAVE_ARPA_INET_H
4441+
4442+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
4443+ CoreFoundation framework. */
4444+#undef HAVE_CFLOCALECOPYCURRENT
4445+
4446+/* Define to 1 if you have the Mac OS X function
4447+ CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
4448+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
4449+
4450+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
4451+ the CoreFoundation framework. */
4452+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
4453+
4454+/* Define if the GNU dcgettext() function is already present or preinstalled.
4455+ */
4456 #undef HAVE_DCGETTEXT
4457
4458-/* Define if you have the getcwd function. */
4459-#undef HAVE_GETCWD
4460+/* Define to 1 if you have the <fcntl.h> header file. */
4461+#undef HAVE_FCNTL_H
4462
4463-/* Define if you have the getpagesize function. */
4464+/* Define to 1 if you have the `getpagesize' function. */
4465 #undef HAVE_GETPAGESIZE
4466
4467-/* Define if you have the gettimeofday function. */
4468+/* Define if the GNU gettext() function is already present or preinstalled. */
4469+#undef HAVE_GETTEXT
4470+
4471+/* Define to 1 if you have the `gettimeofday' function. */
4472 #undef HAVE_GETTIMEOFDAY
4473
4474-/* Define if you have the memcpy function. */
4475+/* Define if you have the iconv() function and it works. */
4476+#undef HAVE_ICONV
4477+
4478+/* Define to 1 if you have the <inttypes.h> header file. */
4479+#undef HAVE_INTTYPES_H
4480+
4481+/* Define to 1 if you have the `be' library (-lbe). */
4482+#undef HAVE_LIBBE
4483+
4484+/* Define to 1 if you have the `nsl' library (-lnsl). */
4485+#undef HAVE_LIBNSL
4486+
4487+/* Define to 1 if you have the `socket' library (-lsocket). */
4488+#undef HAVE_LIBSOCKET
4489+
4490+/* Define to 1 if you have the <limits.h> header file. */
4491+#undef HAVE_LIMITS_H
4492+
4493+/* Define to 1 if you have the `memcpy' function. */
4494 #undef HAVE_MEMCPY
4495
4496-/* Define if you have the mkdir function. */
4497+/* Define to 1 if you have the <memory.h> header file. */
4498+#undef HAVE_MEMORY_H
4499+
4500+/* Define to 1 if you have the `mkdir' function. */
4501 #undef HAVE_MKDIR
4502
4503-/* Define if you have the mktime function. */
4504+/* Define to 1 if you have the `mktime' function. */
4505 #undef HAVE_MKTIME
4506
4507-/* Define if you have the munmap function. */
4508-#undef HAVE_MUNMAP
4509-
4510-/* Define if you have the putenv function. */
4511-#undef HAVE_PUTENV
4512+/* Define to 1 if you have a working `mmap' system call. */
4513+#undef HAVE_MMAP
4514
4515-/* Define if you have the rdchk function. */
4516+/* Define to 1 if you have the `rdchk' function. */
4517 #undef HAVE_RDCHK
4518
4519-/* Define if you have the select function. */
4520+/* Define to 1 if you have the `select' function. */
4521 #undef HAVE_SELECT
4522
4523-/* Define if you have the setenv function. */
4524-#undef HAVE_SETENV
4525-
4526-/* Define if you have the setlocale function. */
4527-#undef HAVE_SETLOCALE
4528-
4529-/* Define if you have the settimeofday function. */
4530+/* Define to 1 if you have the `settimeofday' function. */
4531 #undef HAVE_SETTIMEOFDAY
4532
4533-/* Define if you have the siginterrupt function. */
4534+/* Define to 1 if you have the <sgtty.h> header file. */
4535+#undef HAVE_SGTTY_H
4536+
4537+/* Define to 1 if you have the `siginterrupt' function. */
4538 #undef HAVE_SIGINTERRUPT
4539
4540-/* Define if you have the stpcpy function. */
4541-#undef HAVE_STPCPY
4542+/* Define to 1 if you have the <stdint.h> header file. */
4543+#undef HAVE_STDINT_H
4544
4545-/* Define if you have the strcasecmp function. */
4546-#undef HAVE_STRCASECMP
4547+/* Define to 1 if you have the <stdlib.h> header file. */
4548+#undef HAVE_STDLIB_H
4549+
4550+/* Define to 1 if you have the `stpcpy' function. */
4551+#undef HAVE_STPCPY
4552
4553-/* Define if you have the strchr function. */
4554+/* Define to 1 if you have the `strchr' function. */
4555 #undef HAVE_STRCHR
4556
4557-/* Define if you have the strdup function. */
4558+/* Define to 1 if you have the `strdup' function. */
4559 #undef HAVE_STRDUP
4560
4561-/* Define if you have the strerror function. */
4562+/* Define to 1 if you have the `strerror' function. */
4563 #undef HAVE_STRERROR
4564
4565-/* Define if you have the strftime function. */
4566+/* Define to 1 if you have the `strftime' function. */
4567 #undef HAVE_STRFTIME
4568
4569-/* Define if you have the strpbrk function. */
4570+/* Define to 1 if you have the <strings.h> header file. */
4571+#undef HAVE_STRINGS_H
4572+
4573+/* Define to 1 if you have the <string.h> header file. */
4574+#undef HAVE_STRING_H
4575+
4576+/* Define to 1 if you have the `strpbrk' function. */
4577 #undef HAVE_STRPBRK
4578
4579-/* Define if you have the strstr function. */
4580+/* Define to 1 if you have the `strstr' function. */
4581 #undef HAVE_STRSTR
4582
4583-/* Define if you have the strtol function. */
4584+/* Define to 1 if you have the `strtol' function. */
4585 #undef HAVE_STRTOL
4586
4587-/* Define if you have the strtoul function. */
4588+/* Define to 1 if you have the `strtoul' function. */
4589 #undef HAVE_STRTOUL
4590
4591-/* Define if you have the syslog function. */
4592+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
4593+#undef HAVE_STRUCT_STAT_ST_RDEV
4594+
4595+/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
4596+ `HAVE_STRUCT_STAT_ST_RDEV' instead. */
4597+#undef HAVE_ST_RDEV
4598+
4599+/* Define to 1 if you have the `syslog' function. */
4600 #undef HAVE_SYSLOG
4601
4602-/* Define if you have the times function. */
4603-#undef HAVE_TIMES
4604+/* Define to 1 if you have the <syslog.h> header file. */
4605+#undef HAVE_SYSLOG_H
4606
4607-/* Define if you have the utime function. */
4608-#undef HAVE_UTIME
4609+/* Define to 1 if you have the <sys/ioctl.h> header file. */
4610+#undef HAVE_SYS_IOCTL_H
4611
4612-/* Define if you have the vasprintf function. */
4613-#undef HAVE_VASPRINTF
4614+/* Define to 1 if you have the <sys/mman.h> header file. */
4615+#undef HAVE_SYS_MMAN_H
4616
4617-/* Define if you have the vprintf function. */
4618-#undef HAVE_VPRINTF
4619+/* Define to 1 if you have the <sys/param.h> header file. */
4620+#undef HAVE_SYS_PARAM_H
4621
4622-/* Define if you have the <argz.h> header file. */
4623-#undef HAVE_ARGZ_H
4624+/* Define to 1 if you have the <sys/select.h> header file. */
4625+#undef HAVE_SYS_SELECT_H
4626
4627-/* Define if you have the <arpa/inet.h> header file. */
4628-#undef HAVE_ARPA_INET_H
4629+/* Define to 1 if you have the <sys/stat.h> header file. */
4630+#undef HAVE_SYS_STAT_H
4631
4632-/* Define if you have the <fcntl.h> header file. */
4633-#undef HAVE_FCNTL_H
4634+/* Define to 1 if you have the <sys/syslog.h> header file. */
4635+#undef HAVE_SYS_SYSLOG_H
4636
4637-/* Define if you have the <limits.h> header file. */
4638-#undef HAVE_LIMITS_H
4639+/* Define to 1 if you have the <sys/termios.h> header file. */
4640+#undef HAVE_SYS_TERMIOS_H
4641
4642-/* Define if you have the <locale.h> header file. */
4643-#undef HAVE_LOCALE_H
4644+/* Define to 1 if you have the <sys/termio.h> header file. */
4645+#undef HAVE_SYS_TERMIO_H
4646
4647-/* Define if you have the <malloc.h> header file. */
4648-#undef HAVE_MALLOC_H
4649+/* Define to 1 if you have the <sys/times.h> header file. */
4650+#undef HAVE_SYS_TIMES_H
4651
4652-/* Define if you have the <nl_types.h> header file. */
4653-#undef HAVE_NL_TYPES_H
4654+/* Define to 1 if you have the <sys/time.h> header file. */
4655+#undef HAVE_SYS_TIME_H
4656
4657-/* Define if you have the <sgtty.h> header file. */
4658-#undef HAVE_SGTTY_H
4659+/* Define to 1 if you have the <sys/types.h> header file. */
4660+#undef HAVE_SYS_TYPES_H
4661
4662-/* Define if you have the <string.h> header file. */
4663-#undef HAVE_STRING_H
4664+/* Define to 1 if you have the <termios.h> header file. */
4665+#undef HAVE_TERMIOS_H
4666
4667-/* Define if you have the <strings.h> header file. */
4668-#undef HAVE_STRINGS_H
4669+/* Define to 1 if you have the <termio.h> header file. */
4670+#undef HAVE_TERMIO_H
4671
4672-/* Define if you have the <sys/ioctl.h> header file. */
4673-#undef HAVE_SYS_IOCTL_H
4674+/* Define to 1 if you have the `times' function. */
4675+#undef HAVE_TIMES
4676
4677-/* Define if you have the <sys/mman.h> header file. */
4678-#undef HAVE_SYS_MMAN_H
4679+/* Define to 1 if you have the <unistd.h> header file. */
4680+#undef HAVE_UNISTD_H
4681
4682-/* Define if you have the <sys/param.h> header file. */
4683-#undef HAVE_SYS_PARAM_H
4684+/* Define to 1 if you have the `utime' function. */
4685+#undef HAVE_UTIME
4686
4687-/* Define if you have the <sys/select.h> header file. */
4688-#undef HAVE_SYS_SELECT_H
4689+/* Define to 1 if you have the <utime.h> header file. */
4690+#undef HAVE_UTIME_H
4691
4692-/* Define if you have the <sys/syslog.h> header file. */
4693-#undef HAVE_SYS_SYSLOG_H
4694+/* Define to 1 if you have the `vasprintf' function. */
4695+#undef HAVE_VASPRINTF
4696
4697-/* Define if you have the <sys/termio.h> header file. */
4698-#undef HAVE_SYS_TERMIO_H
4699+/* Define to 1 if you have the `vprintf' function. */
4700+#undef HAVE_VPRINTF
4701
4702-/* Define if you have the <sys/termios.h> header file. */
4703-#undef HAVE_SYS_TERMIOS_H
4704+/* Name of package */
4705+#undef PACKAGE
4706
4707-/* Define if you have the <sys/time.h> header file. */
4708-#undef HAVE_SYS_TIME_H
4709+/* Define to the address where bug reports for this package should be sent. */
4710+#undef PACKAGE_BUGREPORT
4711
4712-/* Define if you have the <sys/times.h> header file. */
4713-#undef HAVE_SYS_TIMES_H
4714+/* Define to the full name of this package. */
4715+#undef PACKAGE_NAME
4716
4717-/* Define if you have the <syslog.h> header file. */
4718-#undef HAVE_SYSLOG_H
4719+/* Define to the full name and version of this package. */
4720+#undef PACKAGE_STRING
4721
4722-/* Define if you have the <termio.h> header file. */
4723-#undef HAVE_TERMIO_H
4724+/* Define to the one symbol short name of this package. */
4725+#undef PACKAGE_TARNAME
4726
4727-/* Define if you have the <termios.h> header file. */
4728-#undef HAVE_TERMIOS_H
4729+/* Define to the home page for this package. */
4730+#undef PACKAGE_URL
4731
4732-/* Define if you have the <unistd.h> header file. */
4733-#undef HAVE_UNISTD_H
4734+/* Define to the version of this package. */
4735+#undef PACKAGE_VERSION
4736
4737-/* Define if you have the <utime.h> header file. */
4738-#undef HAVE_UTIME_H
4739+/* Define as the return type of signal handlers (`int' or `void'). */
4740+#undef RETSIGTYPE
4741
4742-/* Define if you have the <values.h> header file. */
4743-#undef HAVE_VALUES_H
4744+/* If using the C implementation of alloca, define if you know the
4745+ direction of stack growth for your system; otherwise it will be
4746+ automatically deduced at runtime.
4747+ STACK_DIRECTION > 0 => grows toward higher addresses
4748+ STACK_DIRECTION < 0 => grows toward lower addresses
4749+ STACK_DIRECTION = 0 => direction of growth unknown */
4750+#undef STACK_DIRECTION
4751
4752-/* Define if you have the be library (-lbe). */
4753-#undef HAVE_LIBBE
4754+/* Define to 1 if you have the ANSI C header files. */
4755+#undef STDC_HEADERS
4756
4757-/* Define if you have the i library (-li). */
4758-#undef HAVE_LIBI
4759+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
4760+#undef TIME_WITH_SYS_TIME
4761
4762-/* Define if you have the nsl library (-lnsl). */
4763-#undef HAVE_LIBNSL
4764+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
4765+#undef TM_IN_SYS_TIME
4766
4767-/* Define if you have the socket library (-lsocket). */
4768-#undef HAVE_LIBSOCKET
4769+/* Enable extensions on AIX 3, Interix. */
4770+#ifndef _ALL_SOURCE
4771+# undef _ALL_SOURCE
4772+#endif
4773+/* Enable GNU extensions on systems that have them. */
4774+#ifndef _GNU_SOURCE
4775+# undef _GNU_SOURCE
4776+#endif
4777+/* Enable threading extensions on Solaris. */
4778+#ifndef _POSIX_PTHREAD_SEMANTICS
4779+# undef _POSIX_PTHREAD_SEMANTICS
4780+#endif
4781+/* Enable extensions on HP NonStop. */
4782+#ifndef _TANDEM_SOURCE
4783+# undef _TANDEM_SOURCE
4784+#endif
4785+/* Enable general extensions on Solaris. */
4786+#ifndef __EXTENSIONS__
4787+# undef __EXTENSIONS__
4788+#endif
4789+
4790+
4791+/* Version number of package */
4792+#undef VERSION
4793+
4794+/* Define to 1 if on MINIX. */
4795+#undef _MINIX
4796+
4797+/* Define to 2 if the system does not provide POSIX.1 features except with
4798+ this defined. */
4799+#undef _POSIX_1_SOURCE
4800+
4801+/* Define to 1 if you need to in order for `stat' and other things to work. */
4802+#undef _POSIX_SOURCE
4803+
4804+/* Define to empty if `const' does not conform to ANSI C. */
4805+#undef const
4806+
4807+/* Define to `__inline__' or `__inline' if that's what the C compiler
4808+ calls it, or to nothing if 'inline' is not supported under any name. */
4809+#ifndef __cplusplus
4810+#undef inline
4811+#endif
4812+
4813+/* Define to `int' if <sys/types.h> does not define. */
4814+#undef mode_t
4815+
4816+/* Define to `long int' if <sys/types.h> does not define. */
4817+#undef off_t
4818+
4819+/* Define to `unsigned int' if <sys/types.h> does not define. */
4820+#undef size_t
4821diff -uprN clean/lrzsz-0.12.20/config.rpath lrzsz-0.12.20/config.rpath
4822--- clean/lrzsz-0.12.20/config.rpath 1970-01-01 01:00:00.000000000 +0100
4823+++ lrzsz-0.12.20/config.rpath 2019-11-25 18:21:17.000000000 +0000
4824@@ -0,0 +1,684 @@
4825+#! /bin/sh
4826+# Output a system dependent set of variables, describing how to set the
4827+# run time search path of shared libraries in an executable.
4828+#
4829+# Copyright 1996-2019 Free Software Foundation, Inc.
4830+# Taken from GNU libtool, 2001
4831+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
4832+#
4833+# This file is free software; the Free Software Foundation gives
4834+# unlimited permission to copy and/or distribute it, with or without
4835+# modifications, as long as this notice is preserved.
4836+#
4837+# The first argument passed to this file is the canonical host specification,
4838+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
4839+# or
4840+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
4841+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
4842+# should be set by the caller.
4843+#
4844+# The set of defined variables is at the end of this script.
4845+
4846+# Known limitations:
4847+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
4848+# than 256 bytes, otherwise the compiler driver will dump core. The only
4849+# known workaround is to choose shorter directory names for the build
4850+# directory and/or the installation directory.
4851+
4852+# All known linkers require a '.a' archive for static linking (except MSVC,
4853+# which needs '.lib').
4854+libext=a
4855+shrext=.so
4856+
4857+host="$1"
4858+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4859+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4860+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4861+
4862+# Code taken from libtool.m4's _LT_CC_BASENAME.
4863+
4864+for cc_temp in $CC""; do
4865+ case $cc_temp in
4866+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
4867+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
4868+ \-*) ;;
4869+ *) break;;
4870+ esac
4871+done
4872+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
4873+
4874+# Code taken from libtool.m4's _LT_COMPILER_PIC.
4875+
4876+wl=
4877+if test "$GCC" = yes; then
4878+ wl='-Wl,'
4879+else
4880+ case "$host_os" in
4881+ aix*)
4882+ wl='-Wl,'
4883+ ;;
4884+ mingw* | cygwin* | pw32* | os2* | cegcc*)
4885+ ;;
4886+ hpux9* | hpux10* | hpux11*)
4887+ wl='-Wl,'
4888+ ;;
4889+ irix5* | irix6* | nonstopux*)
4890+ wl='-Wl,'
4891+ ;;
4892+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
4893+ case $cc_basename in
4894+ ecc*)
4895+ wl='-Wl,'
4896+ ;;
4897+ icc* | ifort*)
4898+ wl='-Wl,'
4899+ ;;
4900+ lf95*)
4901+ wl='-Wl,'
4902+ ;;
4903+ nagfor*)
4904+ wl='-Wl,-Wl,,'
4905+ ;;
4906+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
4907+ wl='-Wl,'
4908+ ;;
4909+ ccc*)
4910+ wl='-Wl,'
4911+ ;;
4912+ xl* | bgxl* | bgf* | mpixl*)
4913+ wl='-Wl,'
4914+ ;;
4915+ como)
4916+ wl='-lopt='
4917+ ;;
4918+ *)
4919+ case `$CC -V 2>&1 | sed 5q` in
4920+ *Sun\ F* | *Sun*Fortran*)
4921+ wl=
4922+ ;;
4923+ *Sun\ C*)
4924+ wl='-Wl,'
4925+ ;;
4926+ esac
4927+ ;;
4928+ esac
4929+ ;;
4930+ newsos6)
4931+ ;;
4932+ *nto* | *qnx*)
4933+ ;;
4934+ osf3* | osf4* | osf5*)
4935+ wl='-Wl,'
4936+ ;;
4937+ rdos*)
4938+ ;;
4939+ solaris*)
4940+ case $cc_basename in
4941+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
4942+ wl='-Qoption ld '
4943+ ;;
4944+ *)
4945+ wl='-Wl,'
4946+ ;;
4947+ esac
4948+ ;;
4949+ sunos4*)
4950+ wl='-Qoption ld '
4951+ ;;
4952+ sysv4 | sysv4.2uw2* | sysv4.3*)
4953+ wl='-Wl,'
4954+ ;;
4955+ sysv4*MP*)
4956+ ;;
4957+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
4958+ wl='-Wl,'
4959+ ;;
4960+ unicos*)
4961+ wl='-Wl,'
4962+ ;;
4963+ uts4*)
4964+ ;;
4965+ esac
4966+fi
4967+
4968+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
4969+
4970+hardcode_libdir_flag_spec=
4971+hardcode_libdir_separator=
4972+hardcode_direct=no
4973+hardcode_minus_L=no
4974+
4975+case "$host_os" in
4976+ cygwin* | mingw* | pw32* | cegcc*)
4977+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
4978+ # When not using gcc, we currently assume that we are using
4979+ # Microsoft Visual C++.
4980+ if test "$GCC" != yes; then
4981+ with_gnu_ld=no
4982+ fi
4983+ ;;
4984+ interix*)
4985+ # we just hope/assume this is gcc and not c89 (= MSVC++)
4986+ with_gnu_ld=yes
4987+ ;;
4988+ openbsd*)
4989+ with_gnu_ld=no
4990+ ;;
4991+esac
4992+
4993+ld_shlibs=yes
4994+if test "$with_gnu_ld" = yes; then
4995+ # Set some defaults for GNU ld with shared library support. These
4996+ # are reset later if shared libraries are not supported. Putting them
4997+ # here allows them to be overridden if necessary.
4998+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
4999+ # option of GNU ld is called -rpath, not --rpath.
5000+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5001+ case "$host_os" in
5002+ aix[3-9]*)
5003+ # On AIX/PPC, the GNU linker is very broken
5004+ if test "$host_cpu" != ia64; then
5005+ ld_shlibs=no
5006+ fi
5007+ ;;
5008+ amigaos*)
5009+ case "$host_cpu" in
5010+ powerpc)
5011+ ;;
5012+ m68k)
5013+ hardcode_libdir_flag_spec='-L$libdir'
5014+ hardcode_minus_L=yes
5015+ ;;
5016+ esac
5017+ ;;
5018+ beos*)
5019+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5020+ :
5021+ else
5022+ ld_shlibs=no
5023+ fi
5024+ ;;
5025+ cygwin* | mingw* | pw32* | cegcc*)
5026+ # hardcode_libdir_flag_spec is actually meaningless, as there is
5027+ # no search path for DLLs.
5028+ hardcode_libdir_flag_spec='-L$libdir'
5029+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
5030+ :
5031+ else
5032+ ld_shlibs=no
5033+ fi
5034+ ;;
5035+ haiku*)
5036+ ;;
5037+ interix[3-9]*)
5038+ hardcode_direct=no
5039+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5040+ ;;
5041+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
5042+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5043+ :
5044+ else
5045+ ld_shlibs=no
5046+ fi
5047+ ;;
5048+ netbsd*)
5049+ ;;
5050+ solaris*)
5051+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
5052+ ld_shlibs=no
5053+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5054+ :
5055+ else
5056+ ld_shlibs=no
5057+ fi
5058+ ;;
5059+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
5060+ case `$LD -v 2>&1` in
5061+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
5062+ ld_shlibs=no
5063+ ;;
5064+ *)
5065+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5066+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
5067+ else
5068+ ld_shlibs=no
5069+ fi
5070+ ;;
5071+ esac
5072+ ;;
5073+ sunos4*)
5074+ hardcode_direct=yes
5075+ ;;
5076+ *)
5077+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5078+ :
5079+ else
5080+ ld_shlibs=no
5081+ fi
5082+ ;;
5083+ esac
5084+ if test "$ld_shlibs" = no; then
5085+ hardcode_libdir_flag_spec=
5086+ fi
5087+else
5088+ case "$host_os" in
5089+ aix3*)
5090+ # Note: this linker hardcodes the directories in LIBPATH if there
5091+ # are no directories specified by -L.
5092+ hardcode_minus_L=yes
5093+ if test "$GCC" = yes; then
5094+ # Neither direct hardcoding nor static linking is supported with a
5095+ # broken collect2.
5096+ hardcode_direct=unsupported
5097+ fi
5098+ ;;
5099+ aix[4-9]*)
5100+ if test "$host_cpu" = ia64; then
5101+ # On IA64, the linker does run time linking by default, so we don't
5102+ # have to do anything special.
5103+ aix_use_runtimelinking=no
5104+ else
5105+ aix_use_runtimelinking=no
5106+ # Test if we are trying to use run time linking or normal
5107+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
5108+ # need to do runtime linking.
5109+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
5110+ for ld_flag in $LDFLAGS; do
5111+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
5112+ aix_use_runtimelinking=yes
5113+ break
5114+ fi
5115+ done
5116+ ;;
5117+ esac
5118+ fi
5119+ hardcode_direct=yes
5120+ hardcode_libdir_separator=':'
5121+ if test "$GCC" = yes; then
5122+ case $host_os in aix4.[012]|aix4.[012].*)
5123+ collect2name=`${CC} -print-prog-name=collect2`
5124+ if test -f "$collect2name" && \
5125+ strings "$collect2name" | grep resolve_lib_name >/dev/null
5126+ then
5127+ # We have reworked collect2
5128+ :
5129+ else
5130+ # We have old collect2
5131+ hardcode_direct=unsupported
5132+ hardcode_minus_L=yes
5133+ hardcode_libdir_flag_spec='-L$libdir'
5134+ hardcode_libdir_separator=
5135+ fi
5136+ ;;
5137+ esac
5138+ fi
5139+ # Begin _LT_AC_SYS_LIBPATH_AIX.
5140+ echo 'int main () { return 0; }' > conftest.c
5141+ ${CC} ${LDFLAGS} conftest.c -o conftest
5142+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
5143+}'`
5144+ if test -z "$aix_libpath"; then
5145+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
5146+}'`
5147+ fi
5148+ if test -z "$aix_libpath"; then
5149+ aix_libpath="/usr/lib:/lib"
5150+ fi
5151+ rm -f conftest.c conftest
5152+ # End _LT_AC_SYS_LIBPATH_AIX.
5153+ if test "$aix_use_runtimelinking" = yes; then
5154+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5155+ else
5156+ if test "$host_cpu" = ia64; then
5157+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
5158+ else
5159+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
5160+ fi
5161+ fi
5162+ ;;
5163+ amigaos*)
5164+ case "$host_cpu" in
5165+ powerpc)
5166+ ;;
5167+ m68k)
5168+ hardcode_libdir_flag_spec='-L$libdir'
5169+ hardcode_minus_L=yes
5170+ ;;
5171+ esac
5172+ ;;
5173+ bsdi[45]*)
5174+ ;;
5175+ cygwin* | mingw* | pw32* | cegcc*)
5176+ # When not using gcc, we currently assume that we are using
5177+ # Microsoft Visual C++.
5178+ # hardcode_libdir_flag_spec is actually meaningless, as there is
5179+ # no search path for DLLs.
5180+ hardcode_libdir_flag_spec=' '
5181+ libext=lib
5182+ ;;
5183+ darwin* | rhapsody*)
5184+ hardcode_direct=no
5185+ if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
5186+ :
5187+ else
5188+ ld_shlibs=no
5189+ fi
5190+ ;;
5191+ dgux*)
5192+ hardcode_libdir_flag_spec='-L$libdir'
5193+ ;;
5194+ freebsd2.[01]*)
5195+ hardcode_direct=yes
5196+ hardcode_minus_L=yes
5197+ ;;
5198+ freebsd* | dragonfly*)
5199+ hardcode_libdir_flag_spec='-R$libdir'
5200+ hardcode_direct=yes
5201+ ;;
5202+ hpux9*)
5203+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5204+ hardcode_libdir_separator=:
5205+ hardcode_direct=yes
5206+ # hardcode_minus_L: Not really in the search PATH,
5207+ # but as the default location of the library.
5208+ hardcode_minus_L=yes
5209+ ;;
5210+ hpux10*)
5211+ if test "$with_gnu_ld" = no; then
5212+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5213+ hardcode_libdir_separator=:
5214+ hardcode_direct=yes
5215+ # hardcode_minus_L: Not really in the search PATH,
5216+ # but as the default location of the library.
5217+ hardcode_minus_L=yes
5218+ fi
5219+ ;;
5220+ hpux11*)
5221+ if test "$with_gnu_ld" = no; then
5222+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
5223+ hardcode_libdir_separator=:
5224+ case $host_cpu in
5225+ hppa*64*|ia64*)
5226+ hardcode_direct=no
5227+ ;;
5228+ *)
5229+ hardcode_direct=yes
5230+ # hardcode_minus_L: Not really in the search PATH,
5231+ # but as the default location of the library.
5232+ hardcode_minus_L=yes
5233+ ;;
5234+ esac
5235+ fi
5236+ ;;
5237+ irix5* | irix6* | nonstopux*)
5238+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5239+ hardcode_libdir_separator=:
5240+ ;;
5241+ netbsd*)
5242+ hardcode_libdir_flag_spec='-R$libdir'
5243+ hardcode_direct=yes
5244+ ;;
5245+ newsos6)
5246+ hardcode_direct=yes
5247+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5248+ hardcode_libdir_separator=:
5249+ ;;
5250+ *nto* | *qnx*)
5251+ ;;
5252+ openbsd*)
5253+ if test -f /usr/libexec/ld.so; then
5254+ hardcode_direct=yes
5255+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5256+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5257+ else
5258+ case "$host_os" in
5259+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
5260+ hardcode_libdir_flag_spec='-R$libdir'
5261+ ;;
5262+ *)
5263+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
5264+ ;;
5265+ esac
5266+ fi
5267+ else
5268+ ld_shlibs=no
5269+ fi
5270+ ;;
5271+ os2*)
5272+ hardcode_libdir_flag_spec='-L$libdir'
5273+ hardcode_minus_L=yes
5274+ ;;
5275+ osf3*)
5276+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5277+ hardcode_libdir_separator=:
5278+ ;;
5279+ osf4* | osf5*)
5280+ if test "$GCC" = yes; then
5281+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
5282+ else
5283+ # Both cc and cxx compiler support -rpath directly
5284+ hardcode_libdir_flag_spec='-rpath $libdir'
5285+ fi
5286+ hardcode_libdir_separator=:
5287+ ;;
5288+ solaris*)
5289+ hardcode_libdir_flag_spec='-R$libdir'
5290+ ;;
5291+ sunos4*)
5292+ hardcode_libdir_flag_spec='-L$libdir'
5293+ hardcode_direct=yes
5294+ hardcode_minus_L=yes
5295+ ;;
5296+ sysv4)
5297+ case $host_vendor in
5298+ sni)
5299+ hardcode_direct=yes # is this really true???
5300+ ;;
5301+ siemens)
5302+ hardcode_direct=no
5303+ ;;
5304+ motorola)
5305+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
5306+ ;;
5307+ esac
5308+ ;;
5309+ sysv4.3*)
5310+ ;;
5311+ sysv4*MP*)
5312+ if test -d /usr/nec; then
5313+ ld_shlibs=yes
5314+ fi
5315+ ;;
5316+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
5317+ ;;
5318+ sysv5* | sco3.2v5* | sco5v6*)
5319+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
5320+ hardcode_libdir_separator=':'
5321+ ;;
5322+ uts4*)
5323+ hardcode_libdir_flag_spec='-L$libdir'
5324+ ;;
5325+ *)
5326+ ld_shlibs=no
5327+ ;;
5328+ esac
5329+fi
5330+
5331+# Check dynamic linker characteristics
5332+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
5333+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
5334+# only about the one the linker finds when passed -lNAME. This is the last
5335+# element of library_names_spec in libtool.m4, or possibly two of them if the
5336+# linker has special search rules.
5337+library_names_spec= # the last element of library_names_spec in libtool.m4
5338+libname_spec='lib$name'
5339+case "$host_os" in
5340+ aix3*)
5341+ library_names_spec='$libname.a'
5342+ ;;
5343+ aix[4-9]*)
5344+ library_names_spec='$libname$shrext'
5345+ ;;
5346+ amigaos*)
5347+ case "$host_cpu" in
5348+ powerpc*)
5349+ library_names_spec='$libname$shrext' ;;
5350+ m68k)
5351+ library_names_spec='$libname.a' ;;
5352+ esac
5353+ ;;
5354+ beos*)
5355+ library_names_spec='$libname$shrext'
5356+ ;;
5357+ bsdi[45]*)
5358+ library_names_spec='$libname$shrext'
5359+ ;;
5360+ cygwin* | mingw* | pw32* | cegcc*)
5361+ shrext=.dll
5362+ library_names_spec='$libname.dll.a $libname.lib'
5363+ ;;
5364+ darwin* | rhapsody*)
5365+ shrext=.dylib
5366+ library_names_spec='$libname$shrext'
5367+ ;;
5368+ dgux*)
5369+ library_names_spec='$libname$shrext'
5370+ ;;
5371+ freebsd[23].*)
5372+ library_names_spec='$libname$shrext$versuffix'
5373+ ;;
5374+ freebsd* | dragonfly*)
5375+ library_names_spec='$libname$shrext'
5376+ ;;
5377+ gnu*)
5378+ library_names_spec='$libname$shrext'
5379+ ;;
5380+ haiku*)
5381+ library_names_spec='$libname$shrext'
5382+ ;;
5383+ hpux9* | hpux10* | hpux11*)
5384+ case $host_cpu in
5385+ ia64*)
5386+ shrext=.so
5387+ ;;
5388+ hppa*64*)
5389+ shrext=.sl
5390+ ;;
5391+ *)
5392+ shrext=.sl
5393+ ;;
5394+ esac
5395+ library_names_spec='$libname$shrext'
5396+ ;;
5397+ interix[3-9]*)
5398+ library_names_spec='$libname$shrext'
5399+ ;;
5400+ irix5* | irix6* | nonstopux*)
5401+ library_names_spec='$libname$shrext'
5402+ case "$host_os" in
5403+ irix5* | nonstopux*)
5404+ libsuff= shlibsuff=
5405+ ;;
5406+ *)
5407+ case $LD in
5408+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
5409+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
5410+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
5411+ *) libsuff= shlibsuff= ;;
5412+ esac
5413+ ;;
5414+ esac
5415+ ;;
5416+ linux*oldld* | linux*aout* | linux*coff*)
5417+ ;;
5418+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5419+ library_names_spec='$libname$shrext'
5420+ ;;
5421+ knetbsd*-gnu)
5422+ library_names_spec='$libname$shrext'
5423+ ;;
5424+ netbsd*)
5425+ library_names_spec='$libname$shrext'
5426+ ;;
5427+ newsos6)
5428+ library_names_spec='$libname$shrext'
5429+ ;;
5430+ *nto* | *qnx*)
5431+ library_names_spec='$libname$shrext'
5432+ ;;
5433+ openbsd*)
5434+ library_names_spec='$libname$shrext$versuffix'
5435+ ;;
5436+ os2*)
5437+ libname_spec='$name'
5438+ shrext=.dll
5439+ library_names_spec='$libname.a'
5440+ ;;
5441+ osf3* | osf4* | osf5*)
5442+ library_names_spec='$libname$shrext'
5443+ ;;
5444+ rdos*)
5445+ ;;
5446+ solaris*)
5447+ library_names_spec='$libname$shrext'
5448+ ;;
5449+ sunos4*)
5450+ library_names_spec='$libname$shrext$versuffix'
5451+ ;;
5452+ sysv4 | sysv4.3*)
5453+ library_names_spec='$libname$shrext'
5454+ ;;
5455+ sysv4*MP*)
5456+ library_names_spec='$libname$shrext'
5457+ ;;
5458+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
5459+ library_names_spec='$libname$shrext'
5460+ ;;
5461+ tpf*)
5462+ library_names_spec='$libname$shrext'
5463+ ;;
5464+ uts4*)
5465+ library_names_spec='$libname$shrext'
5466+ ;;
5467+esac
5468+
5469+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
5470+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
5471+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
5472+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5473+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5474+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
5475+
5476+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
5477+
5478+# How to pass a linker flag through the compiler.
5479+wl="$escaped_wl"
5480+
5481+# Static library suffix (normally "a").
5482+libext="$libext"
5483+
5484+# Shared library suffix (normally "so").
5485+shlibext="$shlibext"
5486+
5487+# Format of library name prefix.
5488+libname_spec="$escaped_libname_spec"
5489+
5490+# Library names that the linker finds when passed -lNAME.
5491+library_names_spec="$escaped_library_names_spec"
5492+
5493+# Flag to hardcode \$libdir into a binary during linking.
5494+# This must work even if \$libdir does not exist.
5495+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
5496+
5497+# Whether we need a single -rpath flag with a separated argument.
5498+hardcode_libdir_separator="$hardcode_libdir_separator"
5499+
5500+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
5501+# resulting binary.
5502+hardcode_direct="$hardcode_direct"
5503+
5504+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
5505+# resulting binary.
5506+hardcode_minus_L="$hardcode_minus_L"
5507+
5508+EOF
5509diff -uprN clean/lrzsz-0.12.20/config.sub lrzsz-0.12.20/config.sub
5510--- clean/lrzsz-0.12.20/config.sub 1998-04-26 14:20:59.000000000 +0100
5511+++ lrzsz-0.12.20/config.sub 2019-11-26 11:37:46.000000000 +0000
5512@@ -1,35 +1,40 @@
5513 #! /bin/sh
5514-# Configuration validation subroutine script, version 1.1.
5515-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
5516-# This file is (in principle) common to ALL GNU software.
5517-# The presence of a machine in this file suggests that SOME GNU software
5518-# can handle that machine. It does not imply ALL GNU software can.
5519-#
5520-# This file is free software; you can redistribute it and/or modify
5521-# it under the terms of the GNU General Public License as published by
5522-# the Free Software Foundation; either version 2 of the License, or
5523+# Configuration validation subroutine script.
5524+# Copyright 1992-2019 Free Software Foundation, Inc.
5525+
5526+timestamp='2019-01-05'
5527+
5528+# This file is free software; you can redistribute it and/or modify it
5529+# under the terms of the GNU General Public License as published by
5530+# the Free Software Foundation; either version 3 of the License, or
5531 # (at your option) any later version.
5532 #
5533-# This program is distributed in the hope that it will be useful,
5534-# but WITHOUT ANY WARRANTY; without even the implied warranty of
5535-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5536-# GNU General Public License for more details.
5537+# This program is distributed in the hope that it will be useful, but
5538+# WITHOUT ANY WARRANTY; without even the implied warranty of
5539+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5540+# General Public License for more details.
5541 #
5542 # You should have received a copy of the GNU General Public License
5543-# along with this program; if not, write to the Free Software
5544-# Foundation, Inc., 59 Temple Place - Suite 330,
5545-# Boston, MA 02111-1307, USA.
5546-
5547+# along with this program; if not, see <https://www.gnu.org/licenses/>.
5548+#
5549 # As a special exception to the GNU General Public License, if you
5550 # distribute this file as part of a program that contains a
5551 # configuration script generated by Autoconf, you may include it under
5552-# the same distribution terms that you use for the rest of that program.
5553+# the same distribution terms that you use for the rest of that
5554+# program. This Exception is an additional permission under section 7
5555+# of the GNU General Public License, version 3 ("GPLv3").
5556+
5557
5558+# Please send patches to <config-patches@gnu.org>.
5559+#
5560 # Configuration subroutine to validate and canonicalize a configuration type.
5561 # Supply the specified configuration type as an argument.
5562 # If it is invalid, we print an error message on stderr and exit with code 1.
5563 # Otherwise, we print the canonical config type on stdout and succeed.
5564
5565+# You can get the latest version of this script from:
5566+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
5567+
5568 # This file is supposed to be the same for all GNU packages
5569 # and recognize all the CPU types, system types and aliases
5570 # that are meaningful with *any* GNU software.
5571@@ -41,570 +46,1231 @@
5572 # The goal of this file is to map all the various variations of a given
5573 # machine specification into a single specification in the form:
5574 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
5575+# or in some cases, the newer four-part form:
5576+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
5577 # It is wrong to echo any other type of specification.
5578
5579-if [ x$1 = x ]
5580-then
5581- echo Configuration name missing. 1>&2
5582- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
5583- echo "or $0 ALIAS" 1>&2
5584- echo where ALIAS is a recognized configuration type. 1>&2
5585- exit 1
5586-fi
5587+me=`echo "$0" | sed -e 's,.*/,,'`
5588
5589-# First pass through any local machine types.
5590-case $1 in
5591- *local*)
5592- echo $1
5593- exit 0
5594- ;;
5595- *)
5596- ;;
5597+usage="\
5598+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
5599+
5600+Canonicalize a configuration name.
5601+
5602+Options:
5603+ -h, --help print this help, then exit
5604+ -t, --time-stamp print date of last modification, then exit
5605+ -v, --version print version number, then exit
5606+
5607+Report bugs and patches to <config-patches@gnu.org>."
5608+
5609+version="\
5610+GNU config.sub ($timestamp)
5611+
5612+Copyright 1992-2019 Free Software Foundation, Inc.
5613+
5614+This is free software; see the source for copying conditions. There is NO
5615+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
5616+
5617+help="
5618+Try \`$me --help' for more information."
5619+
5620+# Parse command line
5621+while test $# -gt 0 ; do
5622+ case $1 in
5623+ --time-stamp | --time* | -t )
5624+ echo "$timestamp" ; exit ;;
5625+ --version | -v )
5626+ echo "$version" ; exit ;;
5627+ --help | --h* | -h )
5628+ echo "$usage"; exit ;;
5629+ -- ) # Stop option processing
5630+ shift; break ;;
5631+ - ) # Use stdin as input.
5632+ break ;;
5633+ -* )
5634+ echo "$me: invalid option $1$help" >&2
5635+ exit 1 ;;
5636+
5637+ *local*)
5638+ # First pass through any local machine types.
5639+ echo "$1"
5640+ exit ;;
5641+
5642+ * )
5643+ break ;;
5644+ esac
5645+done
5646+
5647+case $# in
5648+ 0) echo "$me: missing argument$help" >&2
5649+ exit 1;;
5650+ 1) ;;
5651+ *) echo "$me: too many arguments$help" >&2
5652+ exit 1;;
5653 esac
5654
5655-# Separate what the user gave into CPU-COMPANY and OS (if any).
5656-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
5657-if [ $basic_machine != $1 ]
5658-then os=`echo $1 | sed 's/.*-/-/'`
5659-else os=; fi
5660-
5661-### Let's recognize common machines as not being operating systems so
5662-### that things like config.sub decstation-3100 work. We also
5663-### recognize some manufacturers as not being operating systems, so we
5664-### can provide default operating systems below.
5665-case $os in
5666- -sun*os*)
5667- # Prevent following clause from handling this invalid input.
5668- ;;
5669- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
5670- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
5671- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
5672- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
5673- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
5674- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
5675- os=
5676- basic_machine=$1
5677- ;;
5678- -hiux*)
5679- os=-hiuxwe2
5680- ;;
5681- -sco4)
5682- os=-sco3.2v4
5683- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5684- ;;
5685- -sco3.2.[4-9]*)
5686- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
5687- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5688- ;;
5689- -sco3.2v[4-9]*)
5690- # Don't forget version if it is 3.2v4 or newer.
5691- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5692- ;;
5693- -sco*)
5694- os=-sco3.2v2
5695- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5696- ;;
5697- -isc)
5698- os=-isc2.2
5699- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5700- ;;
5701- -clix*)
5702- basic_machine=clipper-intergraph
5703+# Split fields of configuration type
5704+# shellcheck disable=SC2162
5705+IFS="-" read field1 field2 field3 field4 <<EOF
5706+$1
5707+EOF
5708+
5709+# Separate into logical components for further validation
5710+case $1 in
5711+ *-*-*-*-*)
5712+ echo Invalid configuration \`"$1"\': more than four components >&2
5713+ exit 1
5714 ;;
5715- -isc*)
5716- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
5717+ *-*-*-*)
5718+ basic_machine=$field1-$field2
5719+ os=$field3-$field4
5720 ;;
5721- -lynx*)
5722- os=-lynxos
5723+ *-*-*)
5724+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
5725+ # parts
5726+ maybe_os=$field2-$field3
5727+ case $maybe_os in
5728+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
5729+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
5730+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
5731+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
5732+ | storm-chaos* | os2-emx* | rtmk-nova*)
5733+ basic_machine=$field1
5734+ os=$maybe_os
5735+ ;;
5736+ android-linux)
5737+ basic_machine=$field1-unknown
5738+ os=linux-android
5739+ ;;
5740+ *)
5741+ basic_machine=$field1-$field2
5742+ os=$field3
5743+ ;;
5744+ esac
5745 ;;
5746- -ptx*)
5747- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
5748+ *-*)
5749+ # A lone config we happen to match not fitting any pattern
5750+ case $field1-$field2 in
5751+ decstation-3100)
5752+ basic_machine=mips-dec
5753+ os=
5754+ ;;
5755+ *-*)
5756+ # Second component is usually, but not always the OS
5757+ case $field2 in
5758+ # Prevent following clause from handling this valid os
5759+ sun*os*)
5760+ basic_machine=$field1
5761+ os=$field2
5762+ ;;
5763+ # Manufacturers
5764+ dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
5765+ | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
5766+ | unicom* | ibm* | next | hp | isi* | apollo | altos* \
5767+ | convergent* | ncr* | news | 32* | 3600* | 3100* \
5768+ | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
5769+ | ultra | tti* | harris | dolphin | highlevel | gould \
5770+ | cbm | ns | masscomp | apple | axis | knuth | cray \
5771+ | microblaze* | sim | cisco \
5772+ | oki | wec | wrs | winbond)
5773+ basic_machine=$field1-$field2
5774+ os=
5775+ ;;
5776+ *)
5777+ basic_machine=$field1
5778+ os=$field2
5779+ ;;
5780+ esac
5781+ ;;
5782+ esac
5783 ;;
5784- -windowsnt*)
5785- os=`echo $os | sed -e 's/windowsnt/winnt/'`
5786+ *)
5787+ # Convert single-component short-hands not valid as part of
5788+ # multi-component configurations.
5789+ case $field1 in
5790+ 386bsd)
5791+ basic_machine=i386-pc
5792+ os=bsd
5793+ ;;
5794+ a29khif)
5795+ basic_machine=a29k-amd
5796+ os=udi
5797+ ;;
5798+ adobe68k)
5799+ basic_machine=m68010-adobe
5800+ os=scout
5801+ ;;
5802+ alliant)
5803+ basic_machine=fx80-alliant
5804+ os=
5805+ ;;
5806+ altos | altos3068)
5807+ basic_machine=m68k-altos
5808+ os=
5809+ ;;
5810+ am29k)
5811+ basic_machine=a29k-none
5812+ os=bsd
5813+ ;;
5814+ amdahl)
5815+ basic_machine=580-amdahl
5816+ os=sysv
5817+ ;;
5818+ amiga)
5819+ basic_machine=m68k-unknown
5820+ os=
5821+ ;;
5822+ amigaos | amigados)
5823+ basic_machine=m68k-unknown
5824+ os=amigaos
5825+ ;;
5826+ amigaunix | amix)
5827+ basic_machine=m68k-unknown
5828+ os=sysv4
5829+ ;;
5830+ apollo68)
5831+ basic_machine=m68k-apollo
5832+ os=sysv
5833+ ;;
5834+ apollo68bsd)
5835+ basic_machine=m68k-apollo
5836+ os=bsd
5837+ ;;
5838+ aros)
5839+ basic_machine=i386-pc
5840+ os=aros
5841+ ;;
5842+ aux)
5843+ basic_machine=m68k-apple
5844+ os=aux
5845+ ;;
5846+ balance)
5847+ basic_machine=ns32k-sequent
5848+ os=dynix
5849+ ;;
5850+ blackfin)
5851+ basic_machine=bfin-unknown
5852+ os=linux
5853+ ;;
5854+ cegcc)
5855+ basic_machine=arm-unknown
5856+ os=cegcc
5857+ ;;
5858+ convex-c1)
5859+ basic_machine=c1-convex
5860+ os=bsd
5861+ ;;
5862+ convex-c2)
5863+ basic_machine=c2-convex
5864+ os=bsd
5865+ ;;
5866+ convex-c32)
5867+ basic_machine=c32-convex
5868+ os=bsd
5869+ ;;
5870+ convex-c34)
5871+ basic_machine=c34-convex
5872+ os=bsd
5873+ ;;
5874+ convex-c38)
5875+ basic_machine=c38-convex
5876+ os=bsd
5877+ ;;
5878+ cray)
5879+ basic_machine=j90-cray
5880+ os=unicos
5881+ ;;
5882+ crds | unos)
5883+ basic_machine=m68k-crds
5884+ os=
5885+ ;;
5886+ da30)
5887+ basic_machine=m68k-da30
5888+ os=
5889+ ;;
5890+ decstation | pmax | pmin | dec3100 | decstatn)
5891+ basic_machine=mips-dec
5892+ os=
5893+ ;;
5894+ delta88)
5895+ basic_machine=m88k-motorola
5896+ os=sysv3
5897+ ;;
5898+ dicos)
5899+ basic_machine=i686-pc
5900+ os=dicos
5901+ ;;
5902+ djgpp)
5903+ basic_machine=i586-pc
5904+ os=msdosdjgpp
5905+ ;;
5906+ ebmon29k)
5907+ basic_machine=a29k-amd
5908+ os=ebmon
5909+ ;;
5910+ es1800 | OSE68k | ose68k | ose | OSE)
5911+ basic_machine=m68k-ericsson
5912+ os=ose
5913+ ;;
5914+ gmicro)
5915+ basic_machine=tron-gmicro
5916+ os=sysv
5917+ ;;
5918+ go32)
5919+ basic_machine=i386-pc
5920+ os=go32
5921+ ;;
5922+ h8300hms)
5923+ basic_machine=h8300-hitachi
5924+ os=hms
5925+ ;;
5926+ h8300xray)
5927+ basic_machine=h8300-hitachi
5928+ os=xray
5929+ ;;
5930+ h8500hms)
5931+ basic_machine=h8500-hitachi
5932+ os=hms
5933+ ;;
5934+ harris)
5935+ basic_machine=m88k-harris
5936+ os=sysv3
5937+ ;;
5938+ hp300)
5939+ basic_machine=m68k-hp
5940+ ;;
5941+ hp300bsd)
5942+ basic_machine=m68k-hp
5943+ os=bsd
5944+ ;;
5945+ hp300hpux)
5946+ basic_machine=m68k-hp
5947+ os=hpux
5948+ ;;
5949+ hppaosf)
5950+ basic_machine=hppa1.1-hp
5951+ os=osf
5952+ ;;
5953+ hppro)
5954+ basic_machine=hppa1.1-hp
5955+ os=proelf
5956+ ;;
5957+ i386mach)
5958+ basic_machine=i386-mach
5959+ os=mach
5960+ ;;
5961+ vsta)
5962+ basic_machine=i386-pc
5963+ os=vsta
5964+ ;;
5965+ isi68 | isi)
5966+ basic_machine=m68k-isi
5967+ os=sysv
5968+ ;;
5969+ m68knommu)
5970+ basic_machine=m68k-unknown
5971+ os=linux
5972+ ;;
5973+ magnum | m3230)
5974+ basic_machine=mips-mips
5975+ os=sysv
5976+ ;;
5977+ merlin)
5978+ basic_machine=ns32k-utek
5979+ os=sysv
5980+ ;;
5981+ mingw64)
5982+ basic_machine=x86_64-pc
5983+ os=mingw64
5984+ ;;
5985+ mingw32)
5986+ basic_machine=i686-pc
5987+ os=mingw32
5988+ ;;
5989+ mingw32ce)
5990+ basic_machine=arm-unknown
5991+ os=mingw32ce
5992+ ;;
5993+ monitor)
5994+ basic_machine=m68k-rom68k
5995+ os=coff
5996+ ;;
5997+ morphos)
5998+ basic_machine=powerpc-unknown
5999+ os=morphos
6000+ ;;
6001+ moxiebox)
6002+ basic_machine=moxie-unknown
6003+ os=moxiebox
6004+ ;;
6005+ msdos)
6006+ basic_machine=i386-pc
6007+ os=msdos
6008+ ;;
6009+ msys)
6010+ basic_machine=i686-pc
6011+ os=msys
6012+ ;;
6013+ mvs)
6014+ basic_machine=i370-ibm
6015+ os=mvs
6016+ ;;
6017+ nacl)
6018+ basic_machine=le32-unknown
6019+ os=nacl
6020+ ;;
6021+ ncr3000)
6022+ basic_machine=i486-ncr
6023+ os=sysv4
6024+ ;;
6025+ netbsd386)
6026+ basic_machine=i386-pc
6027+ os=netbsd
6028+ ;;
6029+ netwinder)
6030+ basic_machine=armv4l-rebel
6031+ os=linux
6032+ ;;
6033+ news | news700 | news800 | news900)
6034+ basic_machine=m68k-sony
6035+ os=newsos
6036+ ;;
6037+ news1000)
6038+ basic_machine=m68030-sony
6039+ os=newsos
6040+ ;;
6041+ necv70)
6042+ basic_machine=v70-nec
6043+ os=sysv
6044+ ;;
6045+ nh3000)
6046+ basic_machine=m68k-harris
6047+ os=cxux
6048+ ;;
6049+ nh[45]000)
6050+ basic_machine=m88k-harris
6051+ os=cxux
6052+ ;;
6053+ nindy960)
6054+ basic_machine=i960-intel
6055+ os=nindy
6056+ ;;
6057+ mon960)
6058+ basic_machine=i960-intel
6059+ os=mon960
6060+ ;;
6061+ nonstopux)
6062+ basic_machine=mips-compaq
6063+ os=nonstopux
6064+ ;;
6065+ os400)
6066+ basic_machine=powerpc-ibm
6067+ os=os400
6068+ ;;
6069+ OSE68000 | ose68000)
6070+ basic_machine=m68000-ericsson
6071+ os=ose
6072+ ;;
6073+ os68k)
6074+ basic_machine=m68k-none
6075+ os=os68k
6076+ ;;
6077+ paragon)
6078+ basic_machine=i860-intel
6079+ os=osf
6080+ ;;
6081+ parisc)
6082+ basic_machine=hppa-unknown
6083+ os=linux
6084+ ;;
6085+ pw32)
6086+ basic_machine=i586-unknown
6087+ os=pw32
6088+ ;;
6089+ rdos | rdos64)
6090+ basic_machine=x86_64-pc
6091+ os=rdos
6092+ ;;
6093+ rdos32)
6094+ basic_machine=i386-pc
6095+ os=rdos
6096+ ;;
6097+ rom68k)
6098+ basic_machine=m68k-rom68k
6099+ os=coff
6100+ ;;
6101+ sa29200)
6102+ basic_machine=a29k-amd
6103+ os=udi
6104+ ;;
6105+ sei)
6106+ basic_machine=mips-sei
6107+ os=seiux
6108+ ;;
6109+ sequent)
6110+ basic_machine=i386-sequent
6111+ os=
6112+ ;;
6113+ sps7)
6114+ basic_machine=m68k-bull
6115+ os=sysv2
6116+ ;;
6117+ st2000)
6118+ basic_machine=m68k-tandem
6119+ os=
6120+ ;;
6121+ stratus)
6122+ basic_machine=i860-stratus
6123+ os=sysv4
6124+ ;;
6125+ sun2)
6126+ basic_machine=m68000-sun
6127+ os=
6128+ ;;
6129+ sun2os3)
6130+ basic_machine=m68000-sun
6131+ os=sunos3
6132+ ;;
6133+ sun2os4)
6134+ basic_machine=m68000-sun
6135+ os=sunos4
6136+ ;;
6137+ sun3)
6138+ basic_machine=m68k-sun
6139+ os=
6140+ ;;
6141+ sun3os3)
6142+ basic_machine=m68k-sun
6143+ os=sunos3
6144+ ;;
6145+ sun3os4)
6146+ basic_machine=m68k-sun
6147+ os=sunos4
6148+ ;;
6149+ sun4)
6150+ basic_machine=sparc-sun
6151+ os=
6152+ ;;
6153+ sun4os3)
6154+ basic_machine=sparc-sun
6155+ os=sunos3
6156+ ;;
6157+ sun4os4)
6158+ basic_machine=sparc-sun
6159+ os=sunos4
6160+ ;;
6161+ sun4sol2)
6162+ basic_machine=sparc-sun
6163+ os=solaris2
6164+ ;;
6165+ sun386 | sun386i | roadrunner)
6166+ basic_machine=i386-sun
6167+ os=
6168+ ;;
6169+ sv1)
6170+ basic_machine=sv1-cray
6171+ os=unicos
6172+ ;;
6173+ symmetry)
6174+ basic_machine=i386-sequent
6175+ os=dynix
6176+ ;;
6177+ t3e)
6178+ basic_machine=alphaev5-cray
6179+ os=unicos
6180+ ;;
6181+ t90)
6182+ basic_machine=t90-cray
6183+ os=unicos
6184+ ;;
6185+ toad1)
6186+ basic_machine=pdp10-xkl
6187+ os=tops20
6188+ ;;
6189+ tpf)
6190+ basic_machine=s390x-ibm
6191+ os=tpf
6192+ ;;
6193+ udi29k)
6194+ basic_machine=a29k-amd
6195+ os=udi
6196+ ;;
6197+ ultra3)
6198+ basic_machine=a29k-nyu
6199+ os=sym1
6200+ ;;
6201+ v810 | necv810)
6202+ basic_machine=v810-nec
6203+ os=none
6204+ ;;
6205+ vaxv)
6206+ basic_machine=vax-dec
6207+ os=sysv
6208+ ;;
6209+ vms)
6210+ basic_machine=vax-dec
6211+ os=vms
6212+ ;;
6213+ vxworks960)
6214+ basic_machine=i960-wrs
6215+ os=vxworks
6216+ ;;
6217+ vxworks68)
6218+ basic_machine=m68k-wrs
6219+ os=vxworks
6220+ ;;
6221+ vxworks29k)
6222+ basic_machine=a29k-wrs
6223+ os=vxworks
6224+ ;;
6225+ xbox)
6226+ basic_machine=i686-pc
6227+ os=mingw32
6228+ ;;
6229+ ymp)
6230+ basic_machine=ymp-cray
6231+ os=unicos
6232+ ;;
6233+ *)
6234+ basic_machine=$1
6235+ os=
6236+ ;;
6237+ esac
6238 ;;
6239 esac
6240
6241-# Decode aliases for certain CPU-COMPANY combinations.
6242+# Decode 1-component or ad-hoc basic machines
6243 case $basic_machine in
6244- # Recognize the basic CPU types without company name.
6245- # Some are omitted here because they have special meanings below.
6246- tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
6247- | arme[lb] | pyramid \
6248- | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
6249- | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
6250- | powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
6251- | pdp11 | mips64el | mips64orion | mips64orionel \
6252- | sparc)
6253- basic_machine=$basic_machine-unknown
6254+ # Here we handle the default manufacturer of certain CPU types. It is in
6255+ # some cases the only manufacturer, in others, it is the most popular.
6256+ w89k)
6257+ cpu=hppa1.1
6258+ vendor=winbond
6259+ ;;
6260+ op50n)
6261+ cpu=hppa1.1
6262+ vendor=oki
6263+ ;;
6264+ op60c)
6265+ cpu=hppa1.1
6266+ vendor=oki
6267+ ;;
6268+ ibm*)
6269+ cpu=i370
6270+ vendor=ibm
6271 ;;
6272- # Object if more than one company name word.
6273- *-*-*)
6274- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
6275- exit 1
6276+ orion105)
6277+ cpu=clipper
6278+ vendor=highlevel
6279 ;;
6280- # Recognize the basic CPU types with company name.
6281- vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
6282- | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
6283- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
6284- | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
6285- | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
6286- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
6287- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
6288- | mips64el-* | mips64orion-* | mips64orionel-*)
6289+ mac | mpw | mac-mpw)
6290+ cpu=m68k
6291+ vendor=apple
6292+ ;;
6293+ pmac | pmac-mpw)
6294+ cpu=powerpc
6295+ vendor=apple
6296 ;;
6297+
6298 # Recognize the various machine names and aliases which stand
6299 # for a CPU type and a company and sometimes even an OS.
6300 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
6301- basic_machine=m68000-att
6302+ cpu=m68000
6303+ vendor=att
6304 ;;
6305 3b*)
6306- basic_machine=we32k-att
6307- ;;
6308- alliant | fx80)
6309- basic_machine=fx80-alliant
6310- ;;
6311- altos | altos3068)
6312- basic_machine=m68k-altos
6313- ;;
6314- am29k)
6315- basic_machine=a29k-none
6316- os=-bsd
6317- ;;
6318- amdahl)
6319- basic_machine=580-amdahl
6320- os=-sysv
6321- ;;
6322- amiga | amiga-*)
6323- basic_machine=m68k-cbm
6324- ;;
6325- amigados)
6326- basic_machine=m68k-cbm
6327- os=-amigados
6328- ;;
6329- amigaunix | amix)
6330- basic_machine=m68k-cbm
6331- os=-sysv4
6332- ;;
6333- apollo68)
6334- basic_machine=m68k-apollo
6335- os=-sysv
6336- ;;
6337- balance)
6338- basic_machine=ns32k-sequent
6339- os=-dynix
6340+ cpu=we32k
6341+ vendor=att
6342 ;;
6343- convex-c1)
6344- basic_machine=c1-convex
6345- os=-bsd
6346- ;;
6347- convex-c2)
6348- basic_machine=c2-convex
6349- os=-bsd
6350- ;;
6351- convex-c32)
6352- basic_machine=c32-convex
6353- os=-bsd
6354- ;;
6355- convex-c34)
6356- basic_machine=c34-convex
6357- os=-bsd
6358- ;;
6359- convex-c38)
6360- basic_machine=c38-convex
6361- os=-bsd
6362- ;;
6363- cray | ymp)
6364- basic_machine=ymp-cray
6365- os=-unicos
6366- ;;
6367- cray2)
6368- basic_machine=cray2-cray
6369- os=-unicos
6370- ;;
6371- crds | unos)
6372- basic_machine=m68k-crds
6373- ;;
6374- da30 | da30-*)
6375- basic_machine=m68k-da30
6376- ;;
6377- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
6378- basic_machine=mips-dec
6379+ bluegene*)
6380+ cpu=powerpc
6381+ vendor=ibm
6382+ os=cnk
6383+ ;;
6384+ decsystem10* | dec10*)
6385+ cpu=pdp10
6386+ vendor=dec
6387+ os=tops10
6388+ ;;
6389+ decsystem20* | dec20*)
6390+ cpu=pdp10
6391+ vendor=dec
6392+ os=tops20
6393 ;;
6394 delta | 3300 | motorola-3300 | motorola-delta \
6395 | 3300-motorola | delta-motorola)
6396- basic_machine=m68k-motorola
6397+ cpu=m68k
6398+ vendor=motorola
6399 ;;
6400- delta88)
6401- basic_machine=m88k-motorola
6402- os=-sysv3
6403- ;;
6404- dpx20 | dpx20-*)
6405- basic_machine=rs6000-bull
6406- os=-bosx
6407- ;;
6408- dpx2* | dpx2*-bull)
6409- basic_machine=m68k-bull
6410- os=-sysv3
6411- ;;
6412- ebmon29k)
6413- basic_machine=a29k-amd
6414- os=-ebmon
6415- ;;
6416- elxsi)
6417- basic_machine=elxsi-elxsi
6418- os=-bsd
6419+ dpx2*)
6420+ cpu=m68k
6421+ vendor=bull
6422+ os=sysv3
6423 ;;
6424 encore | umax | mmax)
6425- basic_machine=ns32k-encore
6426+ cpu=ns32k
6427+ vendor=encore
6428+ ;;
6429+ elxsi)
6430+ cpu=elxsi
6431+ vendor=elxsi
6432+ os=${os:-bsd}
6433 ;;
6434 fx2800)
6435- basic_machine=i860-alliant
6436+ cpu=i860
6437+ vendor=alliant
6438 ;;
6439 genix)
6440- basic_machine=ns32k-ns
6441- ;;
6442- gmicro)
6443- basic_machine=tron-gmicro
6444- os=-sysv
6445+ cpu=ns32k
6446+ vendor=ns
6447 ;;
6448 h3050r* | hiux*)
6449- basic_machine=hppa1.1-hitachi
6450- os=-hiuxwe2
6451- ;;
6452- h8300hms)
6453- basic_machine=h8300-hitachi
6454- os=-hms
6455- ;;
6456- harris)
6457- basic_machine=m88k-harris
6458- os=-sysv3
6459- ;;
6460- hp300-*)
6461- basic_machine=m68k-hp
6462- ;;
6463- hp300bsd)
6464- basic_machine=m68k-hp
6465- os=-bsd
6466- ;;
6467- hp300hpux)
6468- basic_machine=m68k-hp
6469- os=-hpux
6470+ cpu=hppa1.1
6471+ vendor=hitachi
6472+ os=hiuxwe2
6473+ ;;
6474+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
6475+ cpu=hppa1.0
6476+ vendor=hp
6477 ;;
6478 hp9k2[0-9][0-9] | hp9k31[0-9])
6479- basic_machine=m68000-hp
6480+ cpu=m68000
6481+ vendor=hp
6482 ;;
6483 hp9k3[2-9][0-9])
6484- basic_machine=m68k-hp
6485+ cpu=m68k
6486+ vendor=hp
6487 ;;
6488- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
6489- basic_machine=hppa1.1-hp
6490+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
6491+ cpu=hppa1.0
6492+ vendor=hp
6493+ ;;
6494+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
6495+ cpu=hppa1.1
6496+ vendor=hp
6497+ ;;
6498+ hp9k78[0-9] | hp78[0-9])
6499+ # FIXME: really hppa2.0-hp
6500+ cpu=hppa1.1
6501+ vendor=hp
6502+ ;;
6503+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
6504+ # FIXME: really hppa2.0-hp
6505+ cpu=hppa1.1
6506+ vendor=hp
6507+ ;;
6508+ hp9k8[0-9][13679] | hp8[0-9][13679])
6509+ cpu=hppa1.1
6510+ vendor=hp
6511 ;;
6512 hp9k8[0-9][0-9] | hp8[0-9][0-9])
6513- basic_machine=hppa1.0-hp
6514+ cpu=hppa1.0
6515+ vendor=hp
6516 ;;
6517- i370-ibm* | ibm*)
6518- basic_machine=i370-ibm
6519- os=-mvs
6520- ;;
6521-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
6522- i[345]86v32)
6523- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
6524- os=-sysv32
6525- ;;
6526- i[345]86v4*)
6527- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
6528- os=-sysv4
6529- ;;
6530- i[345]86v)
6531- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
6532- os=-sysv
6533- ;;
6534- i[345]86sol2)
6535- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
6536- os=-solaris2
6537+ i*86v32)
6538+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
6539+ vendor=pc
6540+ os=sysv32
6541+ ;;
6542+ i*86v4*)
6543+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
6544+ vendor=pc
6545+ os=sysv4
6546+ ;;
6547+ i*86v)
6548+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
6549+ vendor=pc
6550+ os=sysv
6551+ ;;
6552+ i*86sol2)
6553+ cpu=`echo "$1" | sed -e 's/86.*/86/'`
6554+ vendor=pc
6555+ os=solaris2
6556+ ;;
6557+ j90 | j90-cray)
6558+ cpu=j90
6559+ vendor=cray
6560+ os=${os:-unicos}
6561 ;;
6562 iris | iris4d)
6563- basic_machine=mips-sgi
6564+ cpu=mips
6565+ vendor=sgi
6566 case $os in
6567- -irix*)
6568+ irix*)
6569 ;;
6570 *)
6571- os=-irix4
6572+ os=irix4
6573 ;;
6574 esac
6575 ;;
6576- isi68 | isi)
6577- basic_machine=m68k-isi
6578- os=-sysv
6579- ;;
6580- m88k-omron*)
6581- basic_machine=m88k-omron
6582- ;;
6583- magnum | m3230)
6584- basic_machine=mips-mips
6585- os=-sysv
6586- ;;
6587- merlin)
6588- basic_machine=ns32k-utek
6589- os=-sysv
6590- ;;
6591 miniframe)
6592- basic_machine=m68000-convergent
6593- ;;
6594- mips3*-*)
6595- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
6596- ;;
6597- mips3*)
6598- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
6599+ cpu=m68000
6600+ vendor=convergent
6601 ;;
6602- ncr3000)
6603- basic_machine=i486-ncr
6604- os=-sysv4
6605- ;;
6606- news | news700 | news800 | news900)
6607- basic_machine=m68k-sony
6608- os=-newsos
6609- ;;
6610- news1000)
6611- basic_machine=m68030-sony
6612- os=-newsos
6613+ *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
6614+ cpu=m68k
6615+ vendor=atari
6616+ os=mint
6617 ;;
6618 news-3600 | risc-news)
6619- basic_machine=mips-sony
6620- os=-newsos
6621- ;;
6622- next | m*-next )
6623- basic_machine=m68k-next
6624+ cpu=mips
6625+ vendor=sony
6626+ os=newsos
6627+ ;;
6628+ next | m*-next)
6629+ cpu=m68k
6630+ vendor=next
6631 case $os in
6632- -nextstep* )
6633+ openstep*)
6634+ ;;
6635+ nextstep*)
6636 ;;
6637- -ns2*)
6638- os=-nextstep2
6639+ ns2*)
6640+ os=nextstep2
6641 ;;
6642 *)
6643- os=-nextstep3
6644+ os=nextstep3
6645 ;;
6646 esac
6647 ;;
6648- nh3000)
6649- basic_machine=m68k-harris
6650- os=-cxux
6651- ;;
6652- nh[45]000)
6653- basic_machine=m88k-harris
6654- os=-cxux
6655- ;;
6656- nindy960)
6657- basic_machine=i960-intel
6658- os=-nindy
6659- ;;
6660 np1)
6661- basic_machine=np1-gould
6662+ cpu=np1
6663+ vendor=gould
6664 ;;
6665- pa-hitachi)
6666- basic_machine=hppa1.1-hitachi
6667- os=-hiuxwe2
6668+ op50n-* | op60c-*)
6669+ cpu=hppa1.1
6670+ vendor=oki
6671+ os=proelf
6672 ;;
6673- paragon)
6674- basic_machine=i860-intel
6675- os=-osf
6676+ pa-hitachi)
6677+ cpu=hppa1.1
6678+ vendor=hitachi
6679+ os=hiuxwe2
6680 ;;
6681 pbd)
6682- basic_machine=sparc-tti
6683+ cpu=sparc
6684+ vendor=tti
6685 ;;
6686 pbb)
6687- basic_machine=m68k-tti
6688- ;;
6689- pc532 | pc532-*)
6690- basic_machine=ns32k-pc532
6691+ cpu=m68k
6692+ vendor=tti
6693 ;;
6694- pentium | p5 | p6)
6695- # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
6696- basic_machine=i586-intel
6697- ;;
6698- pentium-* | p5-* | p6-*)
6699- # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
6700- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
6701- ;;
6702- k5)
6703- # We don't have specific support for AMD's K5 yet, so just call it a Pentium
6704- basic_machine=i586-amd
6705- ;;
6706- nexen)
6707- # We don't have specific support for Nexgen yet, so just call it a Pentium
6708- basic_machine=i586-nexgen
6709+ pc532)
6710+ cpu=ns32k
6711+ vendor=pc532
6712 ;;
6713 pn)
6714- basic_machine=pn-gould
6715- ;;
6716- power) basic_machine=rs6000-ibm
6717+ cpu=pn
6718+ vendor=gould
6719 ;;
6720- ppc) basic_machine=powerpc-unknown
6721- ;;
6722- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
6723- ;;
6724- ppcle | powerpclittle | ppc-le | powerpc-little)
6725- basic_machine=powerpcle-unknown
6726- ;;
6727- ppcle-* | powerpclittle-*)
6728- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
6729+ power)
6730+ cpu=power
6731+ vendor=ibm
6732 ;;
6733 ps2)
6734- basic_machine=i386-ibm
6735+ cpu=i386
6736+ vendor=ibm
6737 ;;
6738 rm[46]00)
6739- basic_machine=mips-siemens
6740+ cpu=mips
6741+ vendor=siemens
6742 ;;
6743 rtpc | rtpc-*)
6744- basic_machine=romp-ibm
6745+ cpu=romp
6746+ vendor=ibm
6747 ;;
6748- sequent)
6749- basic_machine=i386-sequent
6750+ sde)
6751+ cpu=mipsisa32
6752+ vendor=sde
6753+ os=${os:-elf}
6754+ ;;
6755+ simso-wrs)
6756+ cpu=sparclite
6757+ vendor=wrs
6758+ os=vxworks
6759 ;;
6760- sh)
6761- basic_machine=sh-hitachi
6762- os=-hms
6763+ tower | tower-32)
6764+ cpu=m68k
6765+ vendor=ncr
6766 ;;
6767- sps7)
6768- basic_machine=m68k-bull
6769- os=-sysv2
6770+ vpp*|vx|vx-*)
6771+ cpu=f301
6772+ vendor=fujitsu
6773+ ;;
6774+ w65)
6775+ cpu=w65
6776+ vendor=wdc
6777+ ;;
6778+ w89k-*)
6779+ cpu=hppa1.1
6780+ vendor=winbond
6781+ os=proelf
6782 ;;
6783- spur)
6784- basic_machine=spur-unknown
6785+ none)
6786+ cpu=none
6787+ vendor=none
6788 ;;
6789- sun2)
6790- basic_machine=m68000-sun
6791+ leon|leon[3-9])
6792+ cpu=sparc
6793+ vendor=$basic_machine
6794+ ;;
6795+ leon-*|leon[3-9]-*)
6796+ cpu=sparc
6797+ vendor=`echo "$basic_machine" | sed 's/-.*//'`
6798 ;;
6799- sun2os3)
6800- basic_machine=m68000-sun
6801- os=-sunos3
6802+
6803+ *-*)
6804+ # shellcheck disable=SC2162
6805+ IFS="-" read cpu vendor <<EOF
6806+$basic_machine
6807+EOF
6808+ ;;
6809+ # We use `pc' rather than `unknown'
6810+ # because (1) that's what they normally are, and
6811+ # (2) the word "unknown" tends to confuse beginning users.
6812+ i*86 | x86_64)
6813+ cpu=$basic_machine
6814+ vendor=pc
6815+ ;;
6816+ # These rules are duplicated from below for sake of the special case above;
6817+ # i.e. things that normalized to x86 arches should also default to "pc"
6818+ pc98)
6819+ cpu=i386
6820+ vendor=pc
6821+ ;;
6822+ x64 | amd64)
6823+ cpu=x86_64
6824+ vendor=pc
6825 ;;
6826- sun2os4)
6827- basic_machine=m68000-sun
6828- os=-sunos4
6829+ # Recognize the basic CPU types without company name.
6830+ *)
6831+ cpu=$basic_machine
6832+ vendor=unknown
6833+ ;;
6834+esac
6835+
6836+unset -v basic_machine
6837+
6838+# Decode basic machines in the full and proper CPU-Company form.
6839+case $cpu-$vendor in
6840+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
6841+ # some cases the only manufacturer, in others, it is the most popular.
6842+ craynv-unknown)
6843+ vendor=cray
6844+ os=${os:-unicosmp}
6845 ;;
6846- sun3os3)
6847- basic_machine=m68k-sun
6848- os=-sunos3
6849+ c90-unknown | c90-cray)
6850+ vendor=cray
6851+ os=${os:-unicos}
6852 ;;
6853- sun3os4)
6854- basic_machine=m68k-sun
6855- os=-sunos4
6856+ fx80-unknown)
6857+ vendor=alliant
6858 ;;
6859- sun4os3)
6860- basic_machine=sparc-sun
6861- os=-sunos3
6862+ romp-unknown)
6863+ vendor=ibm
6864 ;;
6865- sun4os4)
6866- basic_machine=sparc-sun
6867- os=-sunos4
6868+ mmix-unknown)
6869+ vendor=knuth
6870 ;;
6871- sun4sol2)
6872- basic_machine=sparc-sun
6873- os=-solaris2
6874+ microblaze-unknown | microblazeel-unknown)
6875+ vendor=xilinx
6876 ;;
6877- sun3 | sun3-*)
6878- basic_machine=m68k-sun
6879+ rs6000-unknown)
6880+ vendor=ibm
6881 ;;
6882- sun4)
6883- basic_machine=sparc-sun
6884+ vax-unknown)
6885+ vendor=dec
6886 ;;
6887- sun386 | sun386i | roadrunner)
6888- basic_machine=i386-sun
6889+ pdp11-unknown)
6890+ vendor=dec
6891 ;;
6892- symmetry)
6893- basic_machine=i386-sequent
6894- os=-dynix
6895+ we32k-unknown)
6896+ vendor=att
6897 ;;
6898- tower | tower-32)
6899- basic_machine=m68k-ncr
6900+ cydra-unknown)
6901+ vendor=cydrome
6902 ;;
6903- udi29k)
6904- basic_machine=a29k-amd
6905- os=-udi
6906- ;;
6907- ultra3)
6908- basic_machine=a29k-nyu
6909- os=-sym1
6910- ;;
6911- vaxv)
6912- basic_machine=vax-dec
6913- os=-sysv
6914- ;;
6915- vms)
6916- basic_machine=vax-dec
6917- os=-vms
6918- ;;
6919- vxworks960)
6920- basic_machine=i960-wrs
6921- os=-vxworks
6922- ;;
6923- vxworks68)
6924- basic_machine=m68k-wrs
6925- os=-vxworks
6926- ;;
6927- vxworks29k)
6928- basic_machine=a29k-wrs
6929- os=-vxworks
6930- ;;
6931- xmp)
6932- basic_machine=xmp-cray
6933- os=-unicos
6934+ i370-ibm*)
6935+ vendor=ibm
6936 ;;
6937- xps | xps100)
6938- basic_machine=xps100-honeywell
6939+ orion-unknown)
6940+ vendor=highlevel
6941 ;;
6942- none)
6943- basic_machine=none-none
6944- os=-none
6945+ xps-unknown | xps100-unknown)
6946+ cpu=xps100
6947+ vendor=honeywell
6948+ ;;
6949+
6950+ # Here we normalize CPU types with a missing or matching vendor
6951+ dpx20-unknown | dpx20-bull)
6952+ cpu=rs6000
6953+ vendor=bull
6954+ os=${os:-bosx}
6955 ;;
6956
6957-# Here we handle the default manufacturer of certain CPU types. It is in
6958-# some cases the only manufacturer, in others, it is the most popular.
6959- mips)
6960- basic_machine=mips-mips
6961+ # Here we normalize CPU types irrespective of the vendor
6962+ amd64-*)
6963+ cpu=x86_64
6964+ ;;
6965+ blackfin-*)
6966+ cpu=bfin
6967+ os=linux
6968+ ;;
6969+ c54x-*)
6970+ cpu=tic54x
6971+ ;;
6972+ c55x-*)
6973+ cpu=tic55x
6974+ ;;
6975+ c6x-*)
6976+ cpu=tic6x
6977+ ;;
6978+ e500v[12]-*)
6979+ cpu=powerpc
6980+ os=$os"spe"
6981 ;;
6982- romp)
6983- basic_machine=romp-ibm
6984+ mips3*-*)
6985+ cpu=mips64
6986 ;;
6987- rs6000)
6988- basic_machine=rs6000-ibm
6989+ ms1-*)
6990+ cpu=mt
6991 ;;
6992- vax)
6993- basic_machine=vax-dec
6994+ m68knommu-*)
6995+ cpu=m68k
6996+ os=linux
6997 ;;
6998- pdp11)
6999- basic_machine=pdp11-dec
7000+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
7001+ cpu=s12z
7002 ;;
7003- we32k)
7004- basic_machine=we32k-att
7005+ openrisc-*)
7006+ cpu=or32
7007 ;;
7008- sparc)
7009- basic_machine=sparc-sun
7010+ parisc-*)
7011+ cpu=hppa
7012+ os=linux
7013 ;;
7014- cydra)
7015- basic_machine=cydra-cydrome
7016+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
7017+ cpu=i586
7018 ;;
7019- orion)
7020- basic_machine=orion-highlevel
7021+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
7022+ cpu=i686
7023 ;;
7024- orion105)
7025- basic_machine=clipper-highlevel
7026+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
7027+ cpu=i686
7028+ ;;
7029+ pentium4-*)
7030+ cpu=i786
7031+ ;;
7032+ pc98-*)
7033+ cpu=i386
7034+ ;;
7035+ ppc-* | ppcbe-*)
7036+ cpu=powerpc
7037+ ;;
7038+ ppcle-* | powerpclittle-*)
7039+ cpu=powerpcle
7040+ ;;
7041+ ppc64-*)
7042+ cpu=powerpc64
7043+ ;;
7044+ ppc64le-* | powerpc64little-*)
7045+ cpu=powerpc64le
7046+ ;;
7047+ sb1-*)
7048+ cpu=mipsisa64sb1
7049+ ;;
7050+ sb1el-*)
7051+ cpu=mipsisa64sb1el
7052 ;;
7053+ sh5e[lb]-*)
7054+ cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
7055+ ;;
7056+ spur-*)
7057+ cpu=spur
7058+ ;;
7059+ strongarm-* | thumb-*)
7060+ cpu=arm
7061+ ;;
7062+ tx39-*)
7063+ cpu=mipstx39
7064+ ;;
7065+ tx39el-*)
7066+ cpu=mipstx39el
7067+ ;;
7068+ x64-*)
7069+ cpu=x86_64
7070+ ;;
7071+ xscale-* | xscalee[bl]-*)
7072+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
7073+ ;;
7074+
7075+ # Recognize the canonical CPU Types that limit and/or modify the
7076+ # company names they are paired with.
7077+ cr16-*)
7078+ os=${os:-elf}
7079+ ;;
7080+ crisv32-* | etraxfs*-*)
7081+ cpu=crisv32
7082+ vendor=axis
7083+ ;;
7084+ cris-* | etrax*-*)
7085+ cpu=cris
7086+ vendor=axis
7087+ ;;
7088+ crx-*)
7089+ os=${os:-elf}
7090+ ;;
7091+ neo-tandem)
7092+ cpu=neo
7093+ vendor=tandem
7094+ ;;
7095+ nse-tandem)
7096+ cpu=nse
7097+ vendor=tandem
7098+ ;;
7099+ nsr-tandem)
7100+ cpu=nsr
7101+ vendor=tandem
7102+ ;;
7103+ nsv-tandem)
7104+ cpu=nsv
7105+ vendor=tandem
7106+ ;;
7107+ nsx-tandem)
7108+ cpu=nsx
7109+ vendor=tandem
7110+ ;;
7111+ s390-*)
7112+ cpu=s390
7113+ vendor=ibm
7114+ ;;
7115+ s390x-*)
7116+ cpu=s390x
7117+ vendor=ibm
7118+ ;;
7119+ tile*-*)
7120+ os=${os:-linux-gnu}
7121+ ;;
7122+
7123 *)
7124- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
7125- exit 1
7126+ # Recognize the canonical CPU types that are allowed with any
7127+ # company name.
7128+ case $cpu in
7129+ 1750a | 580 \
7130+ | a29k \
7131+ | aarch64 | aarch64_be \
7132+ | abacus \
7133+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
7134+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
7135+ | alphapca5[67] | alpha64pca5[67] \
7136+ | am33_2.0 \
7137+ | amdgcn \
7138+ | arc | arceb \
7139+ | arm | arm[lb]e | arme[lb] | armv* \
7140+ | avr | avr32 \
7141+ | asmjs \
7142+ | ba \
7143+ | be32 | be64 \
7144+ | bfin | bs2000 \
7145+ | c[123]* | c30 | [cjt]90 | c4x \
7146+ | c8051 | clipper | craynv | csky | cydra \
7147+ | d10v | d30v | dlx | dsp16xx \
7148+ | e2k | elxsi | epiphany \
7149+ | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
7150+ | h8300 | h8500 \
7151+ | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
7152+ | hexagon \
7153+ | i370 | i*86 | i860 | i960 | ia16 | ia64 \
7154+ | ip2k | iq2000 \
7155+ | k1om \
7156+ | le32 | le64 \
7157+ | lm32 \
7158+ | m32c | m32r | m32rle \
7159+ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
7160+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
7161+ | m88110 | m88k | maxq | mb | mcore | mep | metag \
7162+ | microblaze | microblazeel \
7163+ | mips | mipsbe | mipseb | mipsel | mipsle \
7164+ | mips16 \
7165+ | mips64 | mips64eb | mips64el \
7166+ | mips64octeon | mips64octeonel \
7167+ | mips64orion | mips64orionel \
7168+ | mips64r5900 | mips64r5900el \
7169+ | mips64vr | mips64vrel \
7170+ | mips64vr4100 | mips64vr4100el \
7171+ | mips64vr4300 | mips64vr4300el \
7172+ | mips64vr5000 | mips64vr5000el \
7173+ | mips64vr5900 | mips64vr5900el \
7174+ | mipsisa32 | mipsisa32el \
7175+ | mipsisa32r2 | mipsisa32r2el \
7176+ | mipsisa32r6 | mipsisa32r6el \
7177+ | mipsisa64 | mipsisa64el \
7178+ | mipsisa64r2 | mipsisa64r2el \
7179+ | mipsisa64r6 | mipsisa64r6el \
7180+ | mipsisa64sb1 | mipsisa64sb1el \
7181+ | mipsisa64sr71k | mipsisa64sr71kel \
7182+ | mipsr5900 | mipsr5900el \
7183+ | mipstx39 | mipstx39el \
7184+ | mmix \
7185+ | mn10200 | mn10300 \
7186+ | moxie \
7187+ | mt \
7188+ | msp430 \
7189+ | nds32 | nds32le | nds32be \
7190+ | nfp \
7191+ | nios | nios2 | nios2eb | nios2el \
7192+ | none | np1 | ns16k | ns32k | nvptx \
7193+ | open8 \
7194+ | or1k* \
7195+ | or32 \
7196+ | orion \
7197+ | picochip \
7198+ | pdp10 | pdp11 | pj | pjl | pn | power \
7199+ | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
7200+ | pru \
7201+ | pyramid \
7202+ | riscv | riscv32 | riscv64 \
7203+ | rl78 | romp | rs6000 | rx \
7204+ | score \
7205+ | sh | shl \
7206+ | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
7207+ | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
7208+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
7209+ | sparclite \
7210+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
7211+ | spu \
7212+ | tahoe \
7213+ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
7214+ | tron \
7215+ | ubicom32 \
7216+ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
7217+ | vax \
7218+ | visium \
7219+ | w65 \
7220+ | wasm32 | wasm64 \
7221+ | we32k \
7222+ | x86 | x86_64 | xc16x | xgate | xps100 \
7223+ | xstormy16 | xtensa* \
7224+ | ymp \
7225+ | z8k | z80)
7226+ ;;
7227+
7228+ *)
7229+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
7230+ exit 1
7231+ ;;
7232+ esac
7233 ;;
7234 esac
7235
7236 # Here we canonicalize certain aliases for manufacturers.
7237-case $basic_machine in
7238- *-digital*)
7239- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
7240+case $vendor in
7241+ digital*)
7242+ vendor=dec
7243 ;;
7244- *-commodore*)
7245- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
7246+ commodore*)
7247+ vendor=cbm
7248 ;;
7249 *)
7250 ;;
7251@@ -612,96 +1278,246 @@ esac
7252
7253 # Decode manufacturer-specific aliases for certain operating systems.
7254
7255-if [ x"$os" != x"" ]
7256+if [ x$os != x ]
7257 then
7258 case $os in
7259- # -solaris* is a basic system type, with this one exception.
7260- -solaris1 | -solaris1.*)
7261+ # First match some system type aliases that might get confused
7262+ # with valid system types.
7263+ # solaris* is a basic system type, with this one exception.
7264+ auroraux)
7265+ os=auroraux
7266+ ;;
7267+ bluegene*)
7268+ os=cnk
7269+ ;;
7270+ solaris1 | solaris1.*)
7271 os=`echo $os | sed -e 's|solaris1|sunos4|'`
7272 ;;
7273- -solaris)
7274- os=-solaris2
7275+ solaris)
7276+ os=solaris2
7277+ ;;
7278+ unixware*)
7279+ os=sysv4.2uw
7280+ ;;
7281+ gnu/linux*)
7282+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
7283+ ;;
7284+ # es1800 is here to avoid being matched by es* (a different OS)
7285+ es1800*)
7286+ os=ose
7287+ ;;
7288+ # Some version numbers need modification
7289+ chorusos*)
7290+ os=chorusos
7291+ ;;
7292+ isc)
7293+ os=isc2.2
7294+ ;;
7295+ sco6)
7296+ os=sco5v6
7297+ ;;
7298+ sco5)
7299+ os=sco3.2v5
7300+ ;;
7301+ sco4)
7302+ os=sco3.2v4
7303+ ;;
7304+ sco3.2.[4-9]*)
7305+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
7306+ ;;
7307+ sco3.2v[4-9]* | sco5v6*)
7308+ # Don't forget version if it is 3.2v4 or newer.
7309+ ;;
7310+ scout)
7311+ # Don't match below
7312 ;;
7313- -unixware* | svr4*)
7314- os=-sysv4
7315+ sco*)
7316+ os=sco3.2v2
7317 ;;
7318- -gnu/linux*)
7319- os=`echo $os | sed -e 's|gnu/linux|linux|'`
7320+ psos*)
7321+ os=psos
7322 ;;
7323- # First accept the basic system types.
7324+ # Now accept the basic system types.
7325 # The portable systems comes first.
7326- # Each alternative MUST END IN A *, to match a version number.
7327- # -sysv* is not here because it comes later, after sysvr4.
7328- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
7329- | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
7330- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
7331- | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
7332- | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
7333- | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
7334- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
7335- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
7336- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
7337- | -udi* | -eabi* | -lites* )
7338+ # Each alternative MUST end in a * to match a version number.
7339+ # sysv* is not here because it comes later, after sysvr4.
7340+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
7341+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
7342+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
7343+ | sym* | kopensolaris* | plan9* \
7344+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
7345+ | aos* | aros* | cloudabi* | sortix* \
7346+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
7347+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
7348+ | knetbsd* | mirbsd* | netbsd* \
7349+ | bitrig* | openbsd* | solidbsd* | libertybsd* \
7350+ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
7351+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
7352+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
7353+ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
7354+ | chorusrdb* | cegcc* | glidix* \
7355+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
7356+ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
7357+ | linux-newlib* | linux-musl* | linux-uclibc* \
7358+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
7359+ | interix* | uwin* | mks* | rhapsody* | darwin* \
7360+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
7361+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
7362+ | os2* | vos* | palmos* | uclinux* | nucleus* \
7363+ | morphos* | superux* | rtmk* | windiss* \
7364+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
7365+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
7366+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
7367+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
7368 # Remember, each alternative MUST END IN *, to match a version number.
7369 ;;
7370- -sunos5*)
7371- os=`echo $os | sed -e 's|sunos5|solaris2|'`
7372+ qnx*)
7373+ case $cpu in
7374+ x86 | i*86)
7375+ ;;
7376+ *)
7377+ os=nto-$os
7378+ ;;
7379+ esac
7380+ ;;
7381+ hiux*)
7382+ os=hiuxwe2
7383+ ;;
7384+ nto-qnx*)
7385+ ;;
7386+ nto*)
7387+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
7388+ ;;
7389+ sim | xray | os68k* | v88r* \
7390+ | windows* | osx | abug | netware* | os9* \
7391+ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
7392+ ;;
7393+ linux-dietlibc)
7394+ os=linux-dietlibc
7395+ ;;
7396+ linux*)
7397+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
7398+ ;;
7399+ lynx*178)
7400+ os=lynxos178
7401+ ;;
7402+ lynx*5)
7403+ os=lynxos5
7404+ ;;
7405+ lynx*)
7406+ os=lynxos
7407+ ;;
7408+ mac*)
7409+ os=`echo "$os" | sed -e 's|mac|macos|'`
7410+ ;;
7411+ opened*)
7412+ os=openedition
7413+ ;;
7414+ os400*)
7415+ os=os400
7416+ ;;
7417+ sunos5*)
7418+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
7419+ ;;
7420+ sunos6*)
7421+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
7422+ ;;
7423+ wince*)
7424+ os=wince
7425+ ;;
7426+ utek*)
7427+ os=bsd
7428+ ;;
7429+ dynix*)
7430+ os=bsd
7431+ ;;
7432+ acis*)
7433+ os=aos
7434 ;;
7435- -sunos6*)
7436- os=`echo $os | sed -e 's|sunos6|solaris3|'`
7437+ atheos*)
7438+ os=atheos
7439 ;;
7440- -osfrose*)
7441- os=-osfrose
7442+ syllable*)
7443+ os=syllable
7444 ;;
7445- -osf*)
7446- os=-osf
7447+ 386bsd)
7448+ os=bsd
7449 ;;
7450- -utek*)
7451- os=-bsd
7452+ ctix* | uts*)
7453+ os=sysv
7454 ;;
7455- -dynix*)
7456- os=-bsd
7457+ nova*)
7458+ os=rtmk-nova
7459 ;;
7460- -acis*)
7461- os=-aos
7462+ ns2)
7463+ os=nextstep2
7464 ;;
7465- -ctix* | -uts*)
7466- os=-sysv
7467+ nsk*)
7468+ os=nsk
7469 ;;
7470 # Preserve the version number of sinix5.
7471- -sinix5.*)
7472+ sinix5.*)
7473 os=`echo $os | sed -e 's|sinix|sysv|'`
7474 ;;
7475- -sinix*)
7476- os=-sysv4
7477+ sinix*)
7478+ os=sysv4
7479 ;;
7480- -triton*)
7481- os=-sysv3
7482+ tpf*)
7483+ os=tpf
7484 ;;
7485- -oss*)
7486- os=-sysv3
7487+ triton*)
7488+ os=sysv3
7489 ;;
7490- -svr4)
7491- os=-sysv4
7492+ oss*)
7493+ os=sysv3
7494 ;;
7495- -svr3)
7496- os=-sysv3
7497+ svr4*)
7498+ os=sysv4
7499 ;;
7500- -sysvr4)
7501- os=-sysv4
7502+ svr3)
7503+ os=sysv3
7504 ;;
7505- # This must come after -sysvr4.
7506- -sysv*)
7507+ sysvr4)
7508+ os=sysv4
7509 ;;
7510- -xenix)
7511- os=-xenix
7512+ # This must come after sysvr4.
7513+ sysv*)
7514 ;;
7515- -none)
7516+ ose*)
7517+ os=ose
7518+ ;;
7519+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
7520+ os=mint
7521+ ;;
7522+ zvmoe)
7523+ os=zvmoe
7524+ ;;
7525+ dicos*)
7526+ os=dicos
7527+ ;;
7528+ pikeos*)
7529+ # Until real need of OS specific support for
7530+ # particular features comes up, bare metal
7531+ # configurations are quite functional.
7532+ case $cpu in
7533+ arm*)
7534+ os=eabi
7535+ ;;
7536+ *)
7537+ os=elf
7538+ ;;
7539+ esac
7540+ ;;
7541+ nacl*)
7542+ ;;
7543+ ios)
7544+ ;;
7545+ none)
7546+ ;;
7547+ *-eabi)
7548 ;;
7549 *)
7550- # Get rid of the `-' at the beginning of $os.
7551- os=`echo $os | sed 's/[^-]*-//'`
7552- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
7553+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
7554 exit 1
7555 ;;
7556 esac
7557@@ -717,151 +1533,266 @@ else
7558 # will signal an error saying that MANUFACTURER isn't an operating
7559 # system, and we'll never get to this point.
7560
7561-case $basic_machine in
7562+case $cpu-$vendor in
7563+ score-*)
7564+ os=elf
7565+ ;;
7566+ spu-*)
7567+ os=elf
7568+ ;;
7569 *-acorn)
7570- os=-riscix1.2
7571+ os=riscix1.2
7572+ ;;
7573+ arm*-rebel)
7574+ os=linux
7575 ;;
7576 arm*-semi)
7577- os=-aout
7578+ os=aout
7579+ ;;
7580+ c4x-* | tic4x-*)
7581+ os=coff
7582+ ;;
7583+ c8051-*)
7584+ os=elf
7585+ ;;
7586+ clipper-intergraph)
7587+ os=clix
7588+ ;;
7589+ hexagon-*)
7590+ os=elf
7591 ;;
7592- pdp11-*)
7593- os=-none
7594+ tic54x-*)
7595+ os=coff
7596+ ;;
7597+ tic55x-*)
7598+ os=coff
7599+ ;;
7600+ tic6x-*)
7601+ os=coff
7602+ ;;
7603+ # This must come before the *-dec entry.
7604+ pdp10-*)
7605+ os=tops20
7606+ ;;
7607+ pdp11-*)
7608+ os=none
7609 ;;
7610 *-dec | vax-*)
7611- os=-ultrix4.2
7612+ os=ultrix4.2
7613 ;;
7614 m68*-apollo)
7615- os=-domain
7616+ os=domain
7617 ;;
7618 i386-sun)
7619- os=-sunos4.0.2
7620+ os=sunos4.0.2
7621 ;;
7622 m68000-sun)
7623- os=-sunos3
7624- # This also exists in the configure program, but was not the
7625- # default.
7626- # os=-sunos4
7627+ os=sunos3
7628+ ;;
7629+ m68*-cisco)
7630+ os=aout
7631+ ;;
7632+ mep-*)
7633+ os=elf
7634+ ;;
7635+ mips*-cisco)
7636+ os=elf
7637+ ;;
7638+ mips*-*)
7639+ os=elf
7640+ ;;
7641+ or32-*)
7642+ os=coff
7643 ;;
7644 *-tti) # must be before sparc entry or we get the wrong os.
7645- os=-sysv3
7646+ os=sysv3
7647 ;;
7648 sparc-* | *-sun)
7649- os=-sunos4.1.1
7650+ os=sunos4.1.1
7651+ ;;
7652+ pru-*)
7653+ os=elf
7654+ ;;
7655+ *-be)
7656+ os=beos
7657 ;;
7658 *-ibm)
7659- os=-aix
7660+ os=aix
7661+ ;;
7662+ *-knuth)
7663+ os=mmixware
7664+ ;;
7665+ *-wec)
7666+ os=proelf
7667+ ;;
7668+ *-winbond)
7669+ os=proelf
7670+ ;;
7671+ *-oki)
7672+ os=proelf
7673 ;;
7674 *-hp)
7675- os=-hpux
7676+ os=hpux
7677 ;;
7678 *-hitachi)
7679- os=-hiux
7680+ os=hiux
7681 ;;
7682 i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
7683- os=-sysv
7684+ os=sysv
7685 ;;
7686 *-cbm)
7687- os=-amigados
7688+ os=amigaos
7689 ;;
7690 *-dg)
7691- os=-dgux
7692+ os=dgux
7693 ;;
7694 *-dolphin)
7695- os=-sysv3
7696+ os=sysv3
7697 ;;
7698 m68k-ccur)
7699- os=-rtu
7700+ os=rtu
7701 ;;
7702 m88k-omron*)
7703- os=-luna
7704+ os=luna
7705+ ;;
7706+ *-next)
7707+ os=nextstep
7708 ;;
7709 *-sequent)
7710- os=-ptx
7711+ os=ptx
7712 ;;
7713 *-crds)
7714- os=-unos
7715+ os=unos
7716 ;;
7717 *-ns)
7718- os=-genix
7719+ os=genix
7720 ;;
7721 i370-*)
7722- os=-mvs
7723- ;;
7724- *-next)
7725- os=-nextstep3
7726+ os=mvs
7727 ;;
7728- *-gould)
7729- os=-sysv
7730+ *-gould)
7731+ os=sysv
7732 ;;
7733- *-highlevel)
7734- os=-bsd
7735+ *-highlevel)
7736+ os=bsd
7737 ;;
7738 *-encore)
7739- os=-bsd
7740+ os=bsd
7741 ;;
7742- *-sgi)
7743- os=-irix
7744+ *-sgi)
7745+ os=irix
7746 ;;
7747- *-siemens)
7748- os=-sysv4
7749+ *-siemens)
7750+ os=sysv4
7751 ;;
7752 *-masscomp)
7753- os=-rtu
7754+ os=rtu
7755+ ;;
7756+ f30[01]-fujitsu | f700-fujitsu)
7757+ os=uxpv
7758+ ;;
7759+ *-rom68k)
7760+ os=coff
7761+ ;;
7762+ *-*bug)
7763+ os=coff
7764+ ;;
7765+ *-apple)
7766+ os=macos
7767+ ;;
7768+ *-atari*)
7769+ os=mint
7770+ ;;
7771+ *-wrs)
7772+ os=vxworks
7773 ;;
7774 *)
7775- os=-none
7776+ os=none
7777 ;;
7778 esac
7779 fi
7780
7781 # Here we handle the case where we know the os, and the CPU type, but not the
7782 # manufacturer. We pick the logical manufacturer.
7783-vendor=unknown
7784-case $basic_machine in
7785- *-unknown)
7786+case $vendor in
7787+ unknown)
7788 case $os in
7789- -riscix*)
7790+ riscix*)
7791 vendor=acorn
7792 ;;
7793- -sunos*)
7794+ sunos*)
7795 vendor=sun
7796 ;;
7797- -lynxos*)
7798- vendor=lynx
7799- ;;
7800- -aix*)
7801+ cnk*|-aix*)
7802 vendor=ibm
7803 ;;
7804- -hpux*)
7805+ beos*)
7806+ vendor=be
7807+ ;;
7808+ hpux*)
7809+ vendor=hp
7810+ ;;
7811+ mpeix*)
7812 vendor=hp
7813 ;;
7814- -hiux*)
7815+ hiux*)
7816 vendor=hitachi
7817 ;;
7818- -unos*)
7819+ unos*)
7820 vendor=crds
7821 ;;
7822- -dgux*)
7823+ dgux*)
7824 vendor=dg
7825 ;;
7826- -luna*)
7827+ luna*)
7828 vendor=omron
7829 ;;
7830- -genix*)
7831+ genix*)
7832 vendor=ns
7833 ;;
7834- -mvs*)
7835+ clix*)
7836+ vendor=intergraph
7837+ ;;
7838+ mvs* | opened*)
7839 vendor=ibm
7840 ;;
7841- -ptx*)
7842+ os400*)
7843+ vendor=ibm
7844+ ;;
7845+ ptx*)
7846 vendor=sequent
7847 ;;
7848- -vxworks*)
7849+ tpf*)
7850+ vendor=ibm
7851+ ;;
7852+ vxsim* | vxworks* | windiss*)
7853 vendor=wrs
7854 ;;
7855+ aux*)
7856+ vendor=apple
7857+ ;;
7858+ hms*)
7859+ vendor=hitachi
7860+ ;;
7861+ mpw* | macos*)
7862+ vendor=apple
7863+ ;;
7864+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
7865+ vendor=atari
7866+ ;;
7867+ vos*)
7868+ vendor=stratus
7869+ ;;
7870 esac
7871- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
7872 ;;
7873 esac
7874
7875-echo $basic_machine$os
7876+echo "$cpu-$vendor-$os"
7877+exit
7878+
7879+# Local variables:
7880+# eval: (add-hook 'before-save-hook 'time-stamp)
7881+# time-stamp-start: "timestamp='"
7882+# time-stamp-format: "%:y-%02m-%02d"
7883+# time-stamp-end: "'"
7884+# End:
7885diff -uprN clean/lrzsz-0.12.20/configure lrzsz-0.12.20/configure
7886--- clean/lrzsz-0.12.20/configure 1998-12-30 07:50:18.000000000 +0000
7887+++ lrzsz-0.12.20/configure 2019-11-26 11:37:45.000000000 +0000
7888@@ -1,40 +1,749 @@
7889 #! /bin/sh
7890-
7891 # Guess values for system-dependent variables and create Makefiles.
7892-# Generated automatically using autoconf version 2.12
7893-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
7894+# Generated by GNU Autoconf 2.69.
7895+#
7896+#
7897+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
7898+#
7899 #
7900 # This configure script is free software; the Free Software Foundation
7901 # gives unlimited permission to copy, distribute and modify it.
7902+## -------------------- ##
7903+## M4sh Initialization. ##
7904+## -------------------- ##
7905+
7906+# Be more Bourne compatible
7907+DUALCASE=1; export DUALCASE # for MKS sh
7908+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
7909+ emulate sh
7910+ NULLCMD=:
7911+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
7912+ # is contrary to our usage. Disable this feature.
7913+ alias -g '${1+"$@"}'='"$@"'
7914+ setopt NO_GLOB_SUBST
7915+else
7916+ case `(set -o) 2>/dev/null` in #(
7917+ *posix*) :
7918+ set -o posix ;; #(
7919+ *) :
7920+ ;;
7921+esac
7922+fi
7923+
7924+
7925+as_nl='
7926+'
7927+export as_nl
7928+as_echo='printf %s\n'
7929+as_echo_n='printf %s'
7930+
7931+# The user is always right.
7932+if test "${PATH_SEPARATOR+set}" != set; then
7933+ PATH_SEPARATOR=:
7934+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
7935+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
7936+ PATH_SEPARATOR=';'
7937+ }
7938+fi
7939+
7940+
7941+# IFS
7942+# We need space, tab and new line, in precisely that order. Quoting is
7943+# there to prevent editors from complaining about space-tab.
7944+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
7945+# splitting by setting IFS to empty value.)
7946+IFS=" "" $as_nl"
7947+
7948+# Find who we are. Look in the path if we contain no directory separator.
7949+as_myself=
7950+case $0 in #((
7951+ *[\\/]* ) as_myself=$0 ;;
7952+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7953+for as_dir in $PATH
7954+do
7955+ IFS=$as_save_IFS
7956+ test -z "$as_dir" && as_dir=.
7957+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
7958+ done
7959+IFS=$as_save_IFS
7960+
7961+ ;;
7962+esac
7963+# We did not find ourselves, most probably we were run as `sh COMMAND'
7964+# in which case we are not to be found in the path.
7965+if test "x$as_myself" = x; then
7966+ as_myself=$0
7967+fi
7968+if test ! -f "$as_myself"; then
7969+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
7970+ exit 1
7971+fi
7972+
7973+# Unset variables that we do not need and which cause bugs (e.g. in
7974+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
7975+# suppresses any "Segmentation fault" message there. '((' could
7976+# trigger a bug in pdksh 5.2.14.
7977+for as_var in BASH_ENV ENV MAIL MAILPATH
7978+do eval test x\${$as_var+set} = xset \
7979+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
7980+done
7981+PS1='$ '
7982+PS2='> '
7983+PS4='+ '
7984+
7985+# NLS nuisances.
7986+LC_ALL=C
7987+export LC_ALL
7988+LANGUAGE=C
7989+export LANGUAGE
7990+
7991+# CDPATH.
7992+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
7993+
7994+# Use a proper internal environment variable to ensure we don't fall
7995+ # into an infinite loop, continuously re-executing ourselves.
7996+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
7997+ _as_can_reexec=no; export _as_can_reexec;
7998+ # We cannot yet assume a decent shell, so we have to provide a
7999+# neutralization value for shells without unset; and this also
8000+# works around shells that cannot unset nonexistent variables.
8001+# Preserve -v and -x to the replacement shell.
8002+BASH_ENV=/dev/null
8003+ENV=/dev/null
8004+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
8005+case $- in # ((((
8006+ *v*x* | *x*v* ) as_opts=-vx ;;
8007+ *v* ) as_opts=-v ;;
8008+ *x* ) as_opts=-x ;;
8009+ * ) as_opts= ;;
8010+esac
8011+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
8012+# Admittedly, this is quite paranoid, since all the known shells bail
8013+# out after a failed `exec'.
8014+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
8015+as_fn_exit 255
8016+ fi
8017+ # We don't want this to propagate to other subprocesses.
8018+ { _as_can_reexec=; unset _as_can_reexec;}
8019+if test "x$CONFIG_SHELL" = x; then
8020+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
8021+ emulate sh
8022+ NULLCMD=:
8023+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
8024+ # is contrary to our usage. Disable this feature.
8025+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
8026+ setopt NO_GLOB_SUBST
8027+else
8028+ case \`(set -o) 2>/dev/null\` in #(
8029+ *posix*) :
8030+ set -o posix ;; #(
8031+ *) :
8032+ ;;
8033+esac
8034+fi
8035+"
8036+ as_required="as_fn_return () { (exit \$1); }
8037+as_fn_success () { as_fn_return 0; }
8038+as_fn_failure () { as_fn_return 1; }
8039+as_fn_ret_success () { return 0; }
8040+as_fn_ret_failure () { return 1; }
8041+
8042+exitcode=0
8043+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
8044+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
8045+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
8046+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
8047+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
8048+
8049+else
8050+ exitcode=1; echo positional parameters were not saved.
8051+fi
8052+test x\$exitcode = x0 || exit 1
8053+test -x / || exit 1"
8054+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
8055+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
8056+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
8057+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
8058+test \$(( 1 + 1 )) = 2 || exit 1"
8059+ if (eval "$as_required") 2>/dev/null; then :
8060+ as_have_required=yes
8061+else
8062+ as_have_required=no
8063+fi
8064+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
8065+
8066+else
8067+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8068+as_found=false
8069+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
8070+do
8071+ IFS=$as_save_IFS
8072+ test -z "$as_dir" && as_dir=.
8073+ as_found=:
8074+ case $as_dir in #(
8075+ /*)
8076+ for as_base in bash sh ksh sh5; do
8077+ # Try only shells that exist, to save several forks.
8078+ as_shell=$as_dir/$as_base
8079+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
8080+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
8081+ CONFIG_SHELL=$as_shell as_have_required=yes
8082+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
8083+ break 2
8084+fi
8085+fi
8086+ done;;
8087+ esac
8088+ as_found=false
8089+done
8090+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
8091+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
8092+ CONFIG_SHELL=$SHELL as_have_required=yes
8093+fi; }
8094+IFS=$as_save_IFS
8095+
8096+
8097+ if test "x$CONFIG_SHELL" != x; then :
8098+ export CONFIG_SHELL
8099+ # We cannot yet assume a decent shell, so we have to provide a
8100+# neutralization value for shells without unset; and this also
8101+# works around shells that cannot unset nonexistent variables.
8102+# Preserve -v and -x to the replacement shell.
8103+BASH_ENV=/dev/null
8104+ENV=/dev/null
8105+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
8106+case $- in # ((((
8107+ *v*x* | *x*v* ) as_opts=-vx ;;
8108+ *v* ) as_opts=-v ;;
8109+ *x* ) as_opts=-x ;;
8110+ * ) as_opts= ;;
8111+esac
8112+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
8113+# Admittedly, this is quite paranoid, since all the known shells bail
8114+# out after a failed `exec'.
8115+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
8116+exit 255
8117+fi
8118+
8119+ if test x$as_have_required = xno; then :
8120+ $as_echo "$0: This script requires a shell more modern than all"
8121+ $as_echo "$0: the shells that I found on your system."
8122+ if test x${ZSH_VERSION+set} = xset ; then
8123+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
8124+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
8125+ else
8126+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
8127+$0: including any error possibly output before this
8128+$0: message. Then install a modern shell, or manually run
8129+$0: the script under such a shell if you do have one."
8130+ fi
8131+ exit 1
8132+fi
8133+fi
8134+fi
8135+SHELL=${CONFIG_SHELL-/bin/sh}
8136+export SHELL
8137+# Unset more variables known to interfere with behavior of common tools.
8138+CLICOLOR_FORCE= GREP_OPTIONS=
8139+unset CLICOLOR_FORCE GREP_OPTIONS
8140+
8141+## --------------------- ##
8142+## M4sh Shell Functions. ##
8143+## --------------------- ##
8144+# as_fn_unset VAR
8145+# ---------------
8146+# Portably unset VAR.
8147+as_fn_unset ()
8148+{
8149+ { eval $1=; unset $1;}
8150+}
8151+as_unset=as_fn_unset
8152
8153-# Defaults:
8154-ac_help=
8155+# as_fn_set_status STATUS
8156+# -----------------------
8157+# Set $? to STATUS, without forking.
8158+as_fn_set_status ()
8159+{
8160+ return $1
8161+} # as_fn_set_status
8162+
8163+# as_fn_exit STATUS
8164+# -----------------
8165+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
8166+as_fn_exit ()
8167+{
8168+ set +e
8169+ as_fn_set_status $1
8170+ exit $1
8171+} # as_fn_exit
8172+
8173+# as_fn_mkdir_p
8174+# -------------
8175+# Create "$as_dir" as a directory, including parents if necessary.
8176+as_fn_mkdir_p ()
8177+{
8178+
8179+ case $as_dir in #(
8180+ -*) as_dir=./$as_dir;;
8181+ esac
8182+ test -d "$as_dir" || eval $as_mkdir_p || {
8183+ as_dirs=
8184+ while :; do
8185+ case $as_dir in #(
8186+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
8187+ *) as_qdir=$as_dir;;
8188+ esac
8189+ as_dirs="'$as_qdir' $as_dirs"
8190+ as_dir=`$as_dirname -- "$as_dir" ||
8191+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
8192+ X"$as_dir" : 'X\(//\)[^/]' \| \
8193+ X"$as_dir" : 'X\(//\)$' \| \
8194+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
8195+$as_echo X"$as_dir" |
8196+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
8197+ s//\1/
8198+ q
8199+ }
8200+ /^X\(\/\/\)[^/].*/{
8201+ s//\1/
8202+ q
8203+ }
8204+ /^X\(\/\/\)$/{
8205+ s//\1/
8206+ q
8207+ }
8208+ /^X\(\/\).*/{
8209+ s//\1/
8210+ q
8211+ }
8212+ s/.*/./; q'`
8213+ test -d "$as_dir" && break
8214+ done
8215+ test -z "$as_dirs" || eval "mkdir $as_dirs"
8216+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
8217+
8218+
8219+} # as_fn_mkdir_p
8220+
8221+# as_fn_executable_p FILE
8222+# -----------------------
8223+# Test if FILE is an executable regular file.
8224+as_fn_executable_p ()
8225+{
8226+ test -f "$1" && test -x "$1"
8227+} # as_fn_executable_p
8228+# as_fn_append VAR VALUE
8229+# ----------------------
8230+# Append the text in VALUE to the end of the definition contained in VAR. Take
8231+# advantage of any shell optimizations that allow amortized linear growth over
8232+# repeated appends, instead of the typical quadratic growth present in naive
8233+# implementations.
8234+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
8235+ eval 'as_fn_append ()
8236+ {
8237+ eval $1+=\$2
8238+ }'
8239+else
8240+ as_fn_append ()
8241+ {
8242+ eval $1=\$$1\$2
8243+ }
8244+fi # as_fn_append
8245+
8246+# as_fn_arith ARG...
8247+# ------------------
8248+# Perform arithmetic evaluation on the ARGs, and store the result in the
8249+# global $as_val. Take advantage of shells that can avoid forks. The arguments
8250+# must be portable across $(()) and expr.
8251+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
8252+ eval 'as_fn_arith ()
8253+ {
8254+ as_val=$(( $* ))
8255+ }'
8256+else
8257+ as_fn_arith ()
8258+ {
8259+ as_val=`expr "$@" || test $? -eq 1`
8260+ }
8261+fi # as_fn_arith
8262+
8263+
8264+# as_fn_error STATUS ERROR [LINENO LOG_FD]
8265+# ----------------------------------------
8266+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
8267+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
8268+# script with STATUS, using 1 if that was 0.
8269+as_fn_error ()
8270+{
8271+ as_status=$1; test $as_status -eq 0 && as_status=1
8272+ if test "$4"; then
8273+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
8274+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
8275+ fi
8276+ $as_echo "$as_me: error: $2" >&2
8277+ as_fn_exit $as_status
8278+} # as_fn_error
8279+
8280+if expr a : '\(a\)' >/dev/null 2>&1 &&
8281+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
8282+ as_expr=expr
8283+else
8284+ as_expr=false
8285+fi
8286+
8287+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
8288+ as_basename=basename
8289+else
8290+ as_basename=false
8291+fi
8292+
8293+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
8294+ as_dirname=dirname
8295+else
8296+ as_dirname=false
8297+fi
8298+
8299+as_me=`$as_basename -- "$0" ||
8300+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
8301+ X"$0" : 'X\(//\)$' \| \
8302+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
8303+$as_echo X/"$0" |
8304+ sed '/^.*\/\([^/][^/]*\)\/*$/{
8305+ s//\1/
8306+ q
8307+ }
8308+ /^X\/\(\/\/\)$/{
8309+ s//\1/
8310+ q
8311+ }
8312+ /^X\/\(\/\).*/{
8313+ s//\1/
8314+ q
8315+ }
8316+ s/.*/./; q'`
8317+
8318+# Avoid depending upon Character Ranges.
8319+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
8320+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
8321+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
8322+as_cr_digits='0123456789'
8323+as_cr_alnum=$as_cr_Letters$as_cr_digits
8324+
8325+
8326+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
8327+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
8328+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
8329+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
8330+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
8331+ sed -n '
8332+ p
8333+ /[$]LINENO/=
8334+ ' <$as_myself |
8335+ sed '
8336+ s/[$]LINENO.*/&-/
8337+ t lineno
8338+ b
8339+ :lineno
8340+ N
8341+ :loop
8342+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
8343+ t loop
8344+ s/-\n.*//
8345+ ' >$as_me.lineno &&
8346+ chmod +x "$as_me.lineno" ||
8347+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
8348+
8349+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
8350+ # already done that, so ensure we don't try to do so again and fall
8351+ # in an infinite loop. This has already happened in practice.
8352+ _as_can_reexec=no; export _as_can_reexec
8353+ # Don't try to exec as it changes $[0], causing all sort of problems
8354+ # (the dirname of $[0] is not the place where we might find the
8355+ # original and so on. Autoconf is especially sensitive to this).
8356+ . "./$as_me.lineno"
8357+ # Exit status is that of the last command.
8358+ exit
8359+}
8360+
8361+ECHO_C= ECHO_N= ECHO_T=
8362+case `echo -n x` in #(((((
8363+-n*)
8364+ case `echo 'xy\c'` in
8365+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
8366+ xy) ECHO_C='\c';;
8367+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
8368+ ECHO_T=' ';;
8369+ esac;;
8370+*)
8371+ ECHO_N='-n';;
8372+esac
8373+
8374+rm -f conf$$ conf$$.exe conf$$.file
8375+if test -d conf$$.dir; then
8376+ rm -f conf$$.dir/conf$$.file
8377+else
8378+ rm -f conf$$.dir
8379+ mkdir conf$$.dir 2>/dev/null
8380+fi
8381+if (echo >conf$$.file) 2>/dev/null; then
8382+ if ln -s conf$$.file conf$$ 2>/dev/null; then
8383+ as_ln_s='ln -s'
8384+ # ... but there are two gotchas:
8385+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
8386+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
8387+ # In both cases, we have to default to `cp -pR'.
8388+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
8389+ as_ln_s='cp -pR'
8390+ elif ln conf$$.file conf$$ 2>/dev/null; then
8391+ as_ln_s=ln
8392+ else
8393+ as_ln_s='cp -pR'
8394+ fi
8395+else
8396+ as_ln_s='cp -pR'
8397+fi
8398+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
8399+rmdir conf$$.dir 2>/dev/null
8400+
8401+if mkdir -p . 2>/dev/null; then
8402+ as_mkdir_p='mkdir -p "$as_dir"'
8403+else
8404+ test -d ./-p && rmdir ./-p
8405+ as_mkdir_p=false
8406+fi
8407+
8408+as_test_x='test -x'
8409+as_executable_p=as_fn_executable_p
8410+
8411+# Sed expression to map a string onto a valid CPP name.
8412+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
8413+
8414+# Sed expression to map a string onto a valid variable name.
8415+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
8416+
8417+
8418+test -n "$DJDIR" || exec 7<&0 </dev/null
8419+exec 6>&1
8420+
8421+# Name of the host.
8422+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
8423+# so uname gets run too.
8424+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
8425+
8426+#
8427+# Initializations.
8428+#
8429 ac_default_prefix=/usr/local
8430-# Any additions from configure.in:
8431-ac_help="$ac_help
8432---disable-timesync exclude support for timesync protocol"
8433-ac_help="$ac_help
8434---enable-pubdir=/path include support for a public writeable directory"
8435-ac_help="$ac_help
8436---disable-mkdir disable support for creating directories (lrz)"
8437-ac_help="$ac_help
8438---enable-syslog=FACILITY,{force,default,optional} include syslogsupport"
8439-ac_help="$ac_help
8440- --disable-nls do not use Native Language Support"
8441-ac_help="$ac_help
8442- --with-included-gettext use the GNU gettext library included here"
8443-ac_help="$ac_help
8444- --with-catgets use catgets functions if available"
8445+ac_clean_files=
8446+ac_config_libobj_dir=.
8447+LIBOBJS=
8448+cross_compiling=no
8449+subdirs=
8450+MFLAGS=
8451+MAKEFLAGS=
8452+
8453+# Identity of this package.
8454+PACKAGE_NAME=
8455+PACKAGE_TARNAME=
8456+PACKAGE_VERSION=
8457+PACKAGE_STRING=
8458+PACKAGE_BUGREPORT=
8459+PACKAGE_URL=
8460+
8461+ac_unique_file="src/crctab.c"
8462+# Factoring default headers for most tests.
8463+ac_includes_default="\
8464+#include <stdio.h>
8465+#ifdef HAVE_SYS_TYPES_H
8466+# include <sys/types.h>
8467+#endif
8468+#ifdef HAVE_SYS_STAT_H
8469+# include <sys/stat.h>
8470+#endif
8471+#ifdef STDC_HEADERS
8472+# include <stdlib.h>
8473+# include <stddef.h>
8474+#else
8475+# ifdef HAVE_STDLIB_H
8476+# include <stdlib.h>
8477+# endif
8478+#endif
8479+#ifdef HAVE_STRING_H
8480+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
8481+# include <memory.h>
8482+# endif
8483+# include <string.h>
8484+#endif
8485+#ifdef HAVE_STRINGS_H
8486+# include <strings.h>
8487+#endif
8488+#ifdef HAVE_INTTYPES_H
8489+# include <inttypes.h>
8490+#endif
8491+#ifdef HAVE_STDINT_H
8492+# include <stdint.h>
8493+#endif
8494+#ifdef HAVE_UNISTD_H
8495+# include <unistd.h>
8496+#endif"
8497+
8498+ac_header_list=
8499+gt_needs=
8500+ac_subst_vars='am__EXEEXT_FALSE
8501+am__EXEEXT_TRUE
8502+LTLIBOBJS
8503+POSUB
8504+LTLIBINTL
8505+LIBINTL
8506+INTLLIBS
8507+LTLIBICONV
8508+LIBICONV
8509+INTL_MACOSX_LIBS
8510+host_os
8511+host_vendor
8512+host_cpu
8513+host
8514+build_os
8515+build_vendor
8516+build_cpu
8517+build
8518+XGETTEXT_EXTRA_OPTIONS
8519+MSGMERGE_FOR_MSGFMT_OPTION
8520+MSGMERGE
8521+XGETTEXT_015
8522+XGETTEXT
8523+GMSGFMT_015
8524+GMSGFMT
8525+MSGFMT
8526+GETTEXT_MACRO_VERSION
8527+USE_NLS
8528+SED
8529+LIBOBJS
8530+LIBOBJS
8531+ALLOCA
8532+RANLIB
8533+EGREP
8534+GREP
8535+CPP
8536+am__fastdepCC_FALSE
8537+am__fastdepCC_TRUE
8538+CCDEPMODE
8539+am__nodep
8540+AMDEPBACKSLASH
8541+AMDEP_FALSE
8542+AMDEP_TRUE
8543+am__include
8544+DEPDIR
8545+OBJEXT
8546+EXEEXT
8547+ac_ct_CC
8548+CPPFLAGS
8549+LDFLAGS
8550+CFLAGS
8551+CC
8552+ENABLE_TIMESYNC
8553+AM_BACKSLASH
8554+AM_DEFAULT_VERBOSITY
8555+AM_DEFAULT_V
8556+AM_V
8557+am__untar
8558+am__tar
8559+AMTAR
8560+am__leading_dot
8561+SET_MAKE
8562+AWK
8563+mkdir_p
8564+MKDIR_P
8565+INSTALL_STRIP_PROGRAM
8566+STRIP
8567+install_sh
8568+MAKEINFO
8569+AUTOHEADER
8570+AUTOMAKE
8571+AUTOCONF
8572+ACLOCAL
8573+VERSION
8574+PACKAGE
8575+CYGPATH_W
8576+am__isrc
8577+INSTALL_DATA
8578+INSTALL_SCRIPT
8579+INSTALL_PROGRAM
8580+target_alias
8581+host_alias
8582+build_alias
8583+LIBS
8584+ECHO_T
8585+ECHO_N
8586+ECHO_C
8587+DEFS
8588+mandir
8589+localedir
8590+libdir
8591+psdir
8592+pdfdir
8593+dvidir
8594+htmldir
8595+infodir
8596+docdir
8597+oldincludedir
8598+includedir
8599+localstatedir
8600+sharedstatedir
8601+sysconfdir
8602+datadir
8603+datarootdir
8604+libexecdir
8605+sbindir
8606+bindir
8607+program_transform_name
8608+prefix
8609+exec_prefix
8610+PACKAGE_URL
8611+PACKAGE_BUGREPORT
8612+PACKAGE_STRING
8613+PACKAGE_VERSION
8614+PACKAGE_TARNAME
8615+PACKAGE_NAME
8616+PATH_SEPARATOR
8617+SHELL
8618+am__quote'
8619+ac_subst_files=''
8620+ac_user_opts='
8621+enable_option_checking
8622+enable_silent_rules
8623+enable_timesync
8624+enable_pubdir
8625+enable_mkdir
8626+enable_syslog
8627+enable_dependency_tracking
8628+enable_nls
8629+with_gnu_ld
8630+enable_rpath
8631+with_libiconv_prefix
8632+with_libintl_prefix
8633+'
8634+ ac_precious_vars='build_alias
8635+host_alias
8636+target_alias
8637+CC
8638+CFLAGS
8639+LDFLAGS
8640+LIBS
8641+CPPFLAGS
8642+CPP'
8643+
8644
8645 # Initialize some variables set by options.
8646+ac_init_help=
8647+ac_init_version=false
8648+ac_unrecognized_opts=
8649+ac_unrecognized_sep=
8650 # The variables have the same names as the options, with
8651 # dashes changed to underlines.
8652-build=NONE
8653-cache_file=./config.cache
8654+cache_file=/dev/null
8655 exec_prefix=NONE
8656-host=NONE
8657 no_create=
8658-nonopt=NONE
8659 no_recursion=
8660 prefix=NONE
8661 program_prefix=NONE
8662@@ -43,93 +752,132 @@ program_transform_name=s,x,x,
8663 silent=
8664 site=
8665 srcdir=
8666-target=NONE
8667 verbose=
8668 x_includes=NONE
8669 x_libraries=NONE
8670+
8671+# Installation directory options.
8672+# These are left unexpanded so users can "make install exec_prefix=/foo"
8673+# and all the variables that are supposed to be based on exec_prefix
8674+# by default will actually change.
8675+# Use braces instead of parens because sh, perl, etc. also accept them.
8676+# (The list follows the same order as the GNU Coding Standards.)
8677 bindir='${exec_prefix}/bin'
8678 sbindir='${exec_prefix}/sbin'
8679 libexecdir='${exec_prefix}/libexec'
8680-datadir='${prefix}/share'
8681+datarootdir='${prefix}/share'
8682+datadir='${datarootdir}'
8683 sysconfdir='${prefix}/etc'
8684 sharedstatedir='${prefix}/com'
8685 localstatedir='${prefix}/var'
8686-libdir='${exec_prefix}/lib'
8687 includedir='${prefix}/include'
8688 oldincludedir='/usr/include'
8689-infodir='${prefix}/info'
8690-mandir='${prefix}/man'
8691-
8692-# Initialize some other variables.
8693-subdirs=
8694-MFLAGS= MAKEFLAGS=
8695-# Maximum number of lines to put in a shell here document.
8696-ac_max_here_lines=12
8697+docdir='${datarootdir}/doc/${PACKAGE}'
8698+infodir='${datarootdir}/info'
8699+htmldir='${docdir}'
8700+dvidir='${docdir}'
8701+pdfdir='${docdir}'
8702+psdir='${docdir}'
8703+libdir='${exec_prefix}/lib'
8704+localedir='${datarootdir}/locale'
8705+mandir='${datarootdir}/man'
8706
8707 ac_prev=
8708+ac_dashdash=
8709 for ac_option
8710 do
8711-
8712 # If the previous option needs an argument, assign it.
8713 if test -n "$ac_prev"; then
8714- eval "$ac_prev=\$ac_option"
8715+ eval $ac_prev=\$ac_option
8716 ac_prev=
8717 continue
8718 fi
8719
8720- case "$ac_option" in
8721- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
8722- *) ac_optarg= ;;
8723+ case $ac_option in
8724+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
8725+ *=) ac_optarg= ;;
8726+ *) ac_optarg=yes ;;
8727 esac
8728
8729 # Accept the important Cygnus configure options, so we can diagnose typos.
8730
8731- case "$ac_option" in
8732+ case $ac_dashdash$ac_option in
8733+ --)
8734+ ac_dashdash=yes ;;
8735
8736 -bindir | --bindir | --bindi | --bind | --bin | --bi)
8737 ac_prev=bindir ;;
8738 -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
8739- bindir="$ac_optarg" ;;
8740+ bindir=$ac_optarg ;;
8741
8742 -build | --build | --buil | --bui | --bu)
8743- ac_prev=build ;;
8744+ ac_prev=build_alias ;;
8745 -build=* | --build=* | --buil=* | --bui=* | --bu=*)
8746- build="$ac_optarg" ;;
8747+ build_alias=$ac_optarg ;;
8748
8749 -cache-file | --cache-file | --cache-fil | --cache-fi \
8750 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
8751 ac_prev=cache_file ;;
8752 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
8753 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
8754- cache_file="$ac_optarg" ;;
8755+ cache_file=$ac_optarg ;;
8756+
8757+ --config-cache | -C)
8758+ cache_file=config.cache ;;
8759
8760- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
8761+ -datadir | --datadir | --datadi | --datad)
8762 ac_prev=datadir ;;
8763- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
8764- | --da=*)
8765- datadir="$ac_optarg" ;;
8766+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
8767+ datadir=$ac_optarg ;;
8768+
8769+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
8770+ | --dataroo | --dataro | --datar)
8771+ ac_prev=datarootdir ;;
8772+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
8773+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
8774+ datarootdir=$ac_optarg ;;
8775
8776 -disable-* | --disable-*)
8777- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
8778+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
8779 # Reject names that are not valid shell variable names.
8780- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
8781- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
8782- fi
8783- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
8784- eval "enable_${ac_feature}=no" ;;
8785+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8786+ as_fn_error $? "invalid feature name: $ac_useropt"
8787+ ac_useropt_orig=$ac_useropt
8788+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8789+ case $ac_user_opts in
8790+ *"
8791+"enable_$ac_useropt"
8792+"*) ;;
8793+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
8794+ ac_unrecognized_sep=', ';;
8795+ esac
8796+ eval enable_$ac_useropt=no ;;
8797+
8798+ -docdir | --docdir | --docdi | --doc | --do)
8799+ ac_prev=docdir ;;
8800+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
8801+ docdir=$ac_optarg ;;
8802+
8803+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
8804+ ac_prev=dvidir ;;
8805+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
8806+ dvidir=$ac_optarg ;;
8807
8808 -enable-* | --enable-*)
8809- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
8810+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
8811 # Reject names that are not valid shell variable names.
8812- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
8813- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
8814- fi
8815- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
8816- case "$ac_option" in
8817- *=*) ;;
8818- *) ac_optarg=yes ;;
8819+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
8820+ as_fn_error $? "invalid feature name: $ac_useropt"
8821+ ac_useropt_orig=$ac_useropt
8822+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
8823+ case $ac_user_opts in
8824+ *"
8825+"enable_$ac_useropt"
8826+"*) ;;
8827+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
8828+ ac_unrecognized_sep=', ';;
8829 esac
8830- eval "enable_${ac_feature}='$ac_optarg'" ;;
8831+ eval enable_$ac_useropt=\$ac_optarg ;;
8832
8833 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
8834 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
8835@@ -138,116 +886,77 @@ do
8836 -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
8837 | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
8838 | --exec=* | --exe=* | --ex=*)
8839- exec_prefix="$ac_optarg" ;;
8840+ exec_prefix=$ac_optarg ;;
8841
8842 -gas | --gas | --ga | --g)
8843 # Obsolete; use --with-gas.
8844 with_gas=yes ;;
8845
8846- -help | --help | --hel | --he)
8847- # Omit some internal or obsolete options to make the list less imposing.
8848- # This message is too long to be a string in the A/UX 3.1 sh.
8849- cat << EOF
8850-Usage: configure [options] [host]
8851-Options: [defaults in brackets after descriptions]
8852-Configuration:
8853- --cache-file=FILE cache test results in FILE
8854- --help print this message
8855- --no-create do not create output files
8856- --quiet, --silent do not print \`checking...' messages
8857- --version print the version of autoconf that created configure
8858-Directory and file names:
8859- --prefix=PREFIX install architecture-independent files in PREFIX
8860- [$ac_default_prefix]
8861- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
8862- [same as prefix]
8863- --bindir=DIR user executables in DIR [EPREFIX/bin]
8864- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
8865- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
8866- --datadir=DIR read-only architecture-independent data in DIR
8867- [PREFIX/share]
8868- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
8869- --sharedstatedir=DIR modifiable architecture-independent data in DIR
8870- [PREFIX/com]
8871- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
8872- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
8873- --includedir=DIR C header files in DIR [PREFIX/include]
8874- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
8875- --infodir=DIR info documentation in DIR [PREFIX/info]
8876- --mandir=DIR man documentation in DIR [PREFIX/man]
8877- --srcdir=DIR find the sources in DIR [configure dir or ..]
8878- --program-prefix=PREFIX prepend PREFIX to installed program names
8879- --program-suffix=SUFFIX append SUFFIX to installed program names
8880- --program-transform-name=PROGRAM
8881- run sed PROGRAM on installed program names
8882-EOF
8883- cat << EOF
8884-Host type:
8885- --build=BUILD configure for building on BUILD [BUILD=HOST]
8886- --host=HOST configure for HOST [guessed]
8887- --target=TARGET configure for TARGET [TARGET=HOST]
8888-Features and packages:
8889- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
8890- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
8891- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
8892- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
8893- --x-includes=DIR X include files are in DIR
8894- --x-libraries=DIR X library files are in DIR
8895-EOF
8896- if test -n "$ac_help"; then
8897- echo "--enable and --with options recognized:$ac_help"
8898- fi
8899- exit 0 ;;
8900+ -help | --help | --hel | --he | -h)
8901+ ac_init_help=long ;;
8902+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
8903+ ac_init_help=recursive ;;
8904+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
8905+ ac_init_help=short ;;
8906
8907 -host | --host | --hos | --ho)
8908- ac_prev=host ;;
8909+ ac_prev=host_alias ;;
8910 -host=* | --host=* | --hos=* | --ho=*)
8911- host="$ac_optarg" ;;
8912+ host_alias=$ac_optarg ;;
8913+
8914+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
8915+ ac_prev=htmldir ;;
8916+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
8917+ | --ht=*)
8918+ htmldir=$ac_optarg ;;
8919
8920 -includedir | --includedir | --includedi | --included | --include \
8921 | --includ | --inclu | --incl | --inc)
8922 ac_prev=includedir ;;
8923 -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
8924 | --includ=* | --inclu=* | --incl=* | --inc=*)
8925- includedir="$ac_optarg" ;;
8926+ includedir=$ac_optarg ;;
8927
8928 -infodir | --infodir | --infodi | --infod | --info | --inf)
8929 ac_prev=infodir ;;
8930 -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
8931- infodir="$ac_optarg" ;;
8932+ infodir=$ac_optarg ;;
8933
8934 -libdir | --libdir | --libdi | --libd)
8935 ac_prev=libdir ;;
8936 -libdir=* | --libdir=* | --libdi=* | --libd=*)
8937- libdir="$ac_optarg" ;;
8938+ libdir=$ac_optarg ;;
8939
8940 -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
8941 | --libexe | --libex | --libe)
8942 ac_prev=libexecdir ;;
8943 -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
8944 | --libexe=* | --libex=* | --libe=*)
8945- libexecdir="$ac_optarg" ;;
8946+ libexecdir=$ac_optarg ;;
8947+
8948+ -localedir | --localedir | --localedi | --localed | --locale)
8949+ ac_prev=localedir ;;
8950+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
8951+ localedir=$ac_optarg ;;
8952
8953 -localstatedir | --localstatedir | --localstatedi | --localstated \
8954- | --localstate | --localstat | --localsta | --localst \
8955- | --locals | --local | --loca | --loc | --lo)
8956+ | --localstate | --localstat | --localsta | --localst | --locals)
8957 ac_prev=localstatedir ;;
8958 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
8959- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
8960- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
8961- localstatedir="$ac_optarg" ;;
8962+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
8963+ localstatedir=$ac_optarg ;;
8964
8965 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
8966 ac_prev=mandir ;;
8967 -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
8968- mandir="$ac_optarg" ;;
8969+ mandir=$ac_optarg ;;
8970
8971 -nfp | --nfp | --nf)
8972 # Obsolete; use --without-fp.
8973 with_fp=no ;;
8974
8975 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
8976- | --no-cr | --no-c)
8977+ | --no-cr | --no-c | -n)
8978 no_create=yes ;;
8979
8980 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
8981@@ -261,26 +970,26 @@ EOF
8982 -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
8983 | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
8984 | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
8985- oldincludedir="$ac_optarg" ;;
8986+ oldincludedir=$ac_optarg ;;
8987
8988 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
8989 ac_prev=prefix ;;
8990 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
8991- prefix="$ac_optarg" ;;
8992+ prefix=$ac_optarg ;;
8993
8994 -program-prefix | --program-prefix | --program-prefi | --program-pref \
8995 | --program-pre | --program-pr | --program-p)
8996 ac_prev=program_prefix ;;
8997 -program-prefix=* | --program-prefix=* | --program-prefi=* \
8998 | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
8999- program_prefix="$ac_optarg" ;;
9000+ program_prefix=$ac_optarg ;;
9001
9002 -program-suffix | --program-suffix | --program-suffi | --program-suff \
9003 | --program-suf | --program-su | --program-s)
9004 ac_prev=program_suffix ;;
9005 -program-suffix=* | --program-suffix=* | --program-suffi=* \
9006 | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
9007- program_suffix="$ac_optarg" ;;
9008+ program_suffix=$ac_optarg ;;
9009
9010 -program-transform-name | --program-transform-name \
9011 | --program-transform-nam | --program-transform-na \
9012@@ -297,7 +1006,17 @@ EOF
9013 | --program-transfo=* | --program-transf=* \
9014 | --program-trans=* | --program-tran=* \
9015 | --progr-tra=* | --program-tr=* | --program-t=*)
9016- program_transform_name="$ac_optarg" ;;
9017+ program_transform_name=$ac_optarg ;;
9018+
9019+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
9020+ ac_prev=pdfdir ;;
9021+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
9022+ pdfdir=$ac_optarg ;;
9023+
9024+ -psdir | --psdir | --psdi | --psd | --ps)
9025+ ac_prev=psdir ;;
9026+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
9027+ psdir=$ac_optarg ;;
9028
9029 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
9030 | -silent | --silent | --silen | --sile | --sil)
9031@@ -307,7 +1026,7 @@ EOF
9032 ac_prev=sbindir ;;
9033 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
9034 | --sbi=* | --sb=*)
9035- sbindir="$ac_optarg" ;;
9036+ sbindir=$ac_optarg ;;
9037
9038 -sharedstatedir | --sharedstatedir | --sharedstatedi \
9039 | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
9040@@ -318,58 +1037,67 @@ EOF
9041 | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
9042 | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
9043 | --sha=* | --sh=*)
9044- sharedstatedir="$ac_optarg" ;;
9045+ sharedstatedir=$ac_optarg ;;
9046
9047 -site | --site | --sit)
9048 ac_prev=site ;;
9049 -site=* | --site=* | --sit=*)
9050- site="$ac_optarg" ;;
9051+ site=$ac_optarg ;;
9052
9053 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
9054 ac_prev=srcdir ;;
9055 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
9056- srcdir="$ac_optarg" ;;
9057+ srcdir=$ac_optarg ;;
9058
9059 -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
9060 | --syscon | --sysco | --sysc | --sys | --sy)
9061 ac_prev=sysconfdir ;;
9062 -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
9063 | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
9064- sysconfdir="$ac_optarg" ;;
9065+ sysconfdir=$ac_optarg ;;
9066
9067 -target | --target | --targe | --targ | --tar | --ta | --t)
9068- ac_prev=target ;;
9069+ ac_prev=target_alias ;;
9070 -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
9071- target="$ac_optarg" ;;
9072+ target_alias=$ac_optarg ;;
9073
9074 -v | -verbose | --verbose | --verbos | --verbo | --verb)
9075 verbose=yes ;;
9076
9077- -version | --version | --versio | --versi | --vers)
9078- echo "configure generated by autoconf version 2.12"
9079- exit 0 ;;
9080+ -version | --version | --versio | --versi | --vers | -V)
9081+ ac_init_version=: ;;
9082
9083 -with-* | --with-*)
9084- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
9085+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
9086 # Reject names that are not valid shell variable names.
9087- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
9088- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
9089- fi
9090- ac_package=`echo $ac_package| sed 's/-/_/g'`
9091- case "$ac_option" in
9092- *=*) ;;
9093- *) ac_optarg=yes ;;
9094+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
9095+ as_fn_error $? "invalid package name: $ac_useropt"
9096+ ac_useropt_orig=$ac_useropt
9097+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
9098+ case $ac_user_opts in
9099+ *"
9100+"with_$ac_useropt"
9101+"*) ;;
9102+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
9103+ ac_unrecognized_sep=', ';;
9104 esac
9105- eval "with_${ac_package}='$ac_optarg'" ;;
9106+ eval with_$ac_useropt=\$ac_optarg ;;
9107
9108 -without-* | --without-*)
9109- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
9110+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
9111 # Reject names that are not valid shell variable names.
9112- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
9113- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
9114- fi
9115- ac_package=`echo $ac_package| sed 's/-/_/g'`
9116- eval "with_${ac_package}=no" ;;
9117+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
9118+ as_fn_error $? "invalid package name: $ac_useropt"
9119+ ac_useropt_orig=$ac_useropt
9120+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
9121+ case $ac_user_opts in
9122+ *"
9123+"with_$ac_useropt"
9124+"*) ;;
9125+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
9126+ ac_unrecognized_sep=', ';;
9127+ esac
9128+ eval with_$ac_useropt=no ;;
9129
9130 --x)
9131 # Obsolete; use --with-x.
9132@@ -380,176 +1108,1195 @@ EOF
9133 ac_prev=x_includes ;;
9134 -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
9135 | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
9136- x_includes="$ac_optarg" ;;
9137+ x_includes=$ac_optarg ;;
9138
9139 -x-libraries | --x-libraries | --x-librarie | --x-librari \
9140 | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
9141 ac_prev=x_libraries ;;
9142 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
9143 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
9144- x_libraries="$ac_optarg" ;;
9145+ x_libraries=$ac_optarg ;;
9146
9147- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
9148+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
9149+Try \`$0 --help' for more information"
9150 ;;
9151
9152+ *=*)
9153+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
9154+ # Reject names that are not valid shell variable names.
9155+ case $ac_envvar in #(
9156+ '' | [0-9]* | *[!_$as_cr_alnum]* )
9157+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
9158+ esac
9159+ eval $ac_envvar=\$ac_optarg
9160+ export $ac_envvar ;;
9161+
9162 *)
9163- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
9164- echo "configure: warning: $ac_option: invalid host type" 1>&2
9165- fi
9166- if test "x$nonopt" != xNONE; then
9167- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
9168- fi
9169- nonopt="$ac_option"
9170+ # FIXME: should be removed in autoconf 3.0.
9171+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
9172+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
9173+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
9174+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
9175 ;;
9176
9177 esac
9178 done
9179
9180 if test -n "$ac_prev"; then
9181- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
9182+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
9183+ as_fn_error $? "missing argument to $ac_option"
9184 fi
9185
9186-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
9187-
9188-# File descriptor usage:
9189-# 0 standard input
9190-# 1 file creation
9191-# 2 errors and warnings
9192-# 3 some systems may open it to /dev/tty
9193-# 4 used on the Kubota Titan
9194-# 6 checking for... messages and results
9195-# 5 compiler messages saved in config.log
9196-if test "$silent" = yes; then
9197- exec 6>/dev/null
9198-else
9199- exec 6>&1
9200+if test -n "$ac_unrecognized_opts"; then
9201+ case $enable_option_checking in
9202+ no) ;;
9203+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
9204+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
9205+ esac
9206 fi
9207-exec 5>./config.log
9208
9209-echo "\
9210-This file contains any messages produced by compilers while
9211-running configure, to aid debugging if configure makes a mistake.
9212-" 1>&5
9213-
9214-# Strip out --no-create and --no-recursion so they do not pile up.
9215-# Also quote any args containing shell metacharacters.
9216-ac_configure_args=
9217-for ac_arg
9218+# Check all directory arguments for consistency.
9219+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
9220+ datadir sysconfdir sharedstatedir localstatedir includedir \
9221+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
9222+ libdir localedir mandir
9223 do
9224- case "$ac_arg" in
9225- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
9226- | --no-cr | --no-c) ;;
9227- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
9228- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
9229- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
9230- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
9231- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
9232+ eval ac_val=\$$ac_var
9233+ # Remove trailing slashes.
9234+ case $ac_val in
9235+ */ )
9236+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
9237+ eval $ac_var=\$ac_val;;
9238+ esac
9239+ # Be sure to have absolute directory names.
9240+ case $ac_val in
9241+ [\\/$]* | ?:[\\/]* ) continue;;
9242+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
9243 esac
9244+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
9245 done
9246
9247-# NLS nuisances.
9248-# Only set these to C if already set. These must not be set unconditionally
9249-# because not all systems understand e.g. LANG=C (notably SCO).
9250-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
9251-# Non-C LC_CTYPE values break the ctype check.
9252-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
9253-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
9254-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
9255-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
9256+# There might be people who depend on the old broken behavior: `$host'
9257+# used to hold the argument of --host etc.
9258+# FIXME: To remove some day.
9259+build=$build_alias
9260+host=$host_alias
9261+target=$target_alias
9262+
9263+# FIXME: To remove some day.
9264+if test "x$host_alias" != x; then
9265+ if test "x$build_alias" = x; then
9266+ cross_compiling=maybe
9267+ elif test "x$build_alias" != "x$host_alias"; then
9268+ cross_compiling=yes
9269+ fi
9270+fi
9271+
9272+ac_tool_prefix=
9273+test -n "$host_alias" && ac_tool_prefix=$host_alias-
9274+
9275+test "$silent" = yes && exec 6>/dev/null
9276+
9277+
9278+ac_pwd=`pwd` && test -n "$ac_pwd" &&
9279+ac_ls_di=`ls -di .` &&
9280+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
9281+ as_fn_error $? "working directory cannot be determined"
9282+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
9283+ as_fn_error $? "pwd does not report name of working directory"
9284
9285-# confdefs.h avoids OS command line length limits that DEFS can exceed.
9286-rm -rf conftest* confdefs.h
9287-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
9288-echo > confdefs.h
9289-
9290-# A filename unique to this package, relative to the directory that
9291-# configure is in, which we can look for to find out if srcdir is correct.
9292-ac_unique_file=src/crctab.c
9293
9294 # Find the source files, if location was not specified.
9295 if test -z "$srcdir"; then
9296 ac_srcdir_defaulted=yes
9297- # Try the directory containing this script, then its parent.
9298- ac_prog=$0
9299- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
9300- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
9301+ # Try the directory containing this script, then the parent directory.
9302+ ac_confdir=`$as_dirname -- "$as_myself" ||
9303+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
9304+ X"$as_myself" : 'X\(//\)[^/]' \| \
9305+ X"$as_myself" : 'X\(//\)$' \| \
9306+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
9307+$as_echo X"$as_myself" |
9308+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
9309+ s//\1/
9310+ q
9311+ }
9312+ /^X\(\/\/\)[^/].*/{
9313+ s//\1/
9314+ q
9315+ }
9316+ /^X\(\/\/\)$/{
9317+ s//\1/
9318+ q
9319+ }
9320+ /^X\(\/\).*/{
9321+ s//\1/
9322+ q
9323+ }
9324+ s/.*/./; q'`
9325 srcdir=$ac_confdir
9326- if test ! -r $srcdir/$ac_unique_file; then
9327+ if test ! -r "$srcdir/$ac_unique_file"; then
9328 srcdir=..
9329 fi
9330 else
9331 ac_srcdir_defaulted=no
9332 fi
9333-if test ! -r $srcdir/$ac_unique_file; then
9334- if test "$ac_srcdir_defaulted" = yes; then
9335- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
9336- else
9337- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
9338- fi
9339+if test ! -r "$srcdir/$ac_unique_file"; then
9340+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
9341+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
9342+fi
9343+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
9344+ac_abs_confdir=`(
9345+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
9346+ pwd)`
9347+# When building in place, set srcdir=.
9348+if test "$ac_abs_confdir" = "$ac_pwd"; then
9349+ srcdir=.
9350+fi
9351+# Remove unnecessary trailing slashes from srcdir.
9352+# Double slashes in file names in object file debugging info
9353+# mess up M-x gdb in Emacs.
9354+case $srcdir in
9355+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
9356+esac
9357+for ac_var in $ac_precious_vars; do
9358+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
9359+ eval ac_env_${ac_var}_value=\$${ac_var}
9360+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
9361+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
9362+done
9363+
9364+#
9365+# Report the --help message.
9366+#
9367+if test "$ac_init_help" = "long"; then
9368+ # Omit some internal or obsolete options to make the list less imposing.
9369+ # This message is too long to be a string in the A/UX 3.1 sh.
9370+ cat <<_ACEOF
9371+\`configure' configures this package to adapt to many kinds of systems.
9372+
9373+Usage: $0 [OPTION]... [VAR=VALUE]...
9374+
9375+To assign environment variables (e.g., CC, CFLAGS...), specify them as
9376+VAR=VALUE. See below for descriptions of some of the useful variables.
9377+
9378+Defaults for the options are specified in brackets.
9379+
9380+Configuration:
9381+ -h, --help display this help and exit
9382+ --help=short display options specific to this package
9383+ --help=recursive display the short help of all the included packages
9384+ -V, --version display version information and exit
9385+ -q, --quiet, --silent do not print \`checking ...' messages
9386+ --cache-file=FILE cache test results in FILE [disabled]
9387+ -C, --config-cache alias for \`--cache-file=config.cache'
9388+ -n, --no-create do not create output files
9389+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
9390+
9391+Installation directories:
9392+ --prefix=PREFIX install architecture-independent files in PREFIX
9393+ [$ac_default_prefix]
9394+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
9395+ [PREFIX]
9396+
9397+By default, \`make install' will install all the files in
9398+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
9399+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
9400+for instance \`--prefix=\$HOME'.
9401+
9402+For better control, use the options below.
9403+
9404+Fine tuning of the installation directories:
9405+ --bindir=DIR user executables [EPREFIX/bin]
9406+ --sbindir=DIR system admin executables [EPREFIX/sbin]
9407+ --libexecdir=DIR program executables [EPREFIX/libexec]
9408+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
9409+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
9410+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
9411+ --libdir=DIR object code libraries [EPREFIX/lib]
9412+ --includedir=DIR C header files [PREFIX/include]
9413+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
9414+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
9415+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
9416+ --infodir=DIR info documentation [DATAROOTDIR/info]
9417+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
9418+ --mandir=DIR man documentation [DATAROOTDIR/man]
9419+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
9420+ --htmldir=DIR html documentation [DOCDIR]
9421+ --dvidir=DIR dvi documentation [DOCDIR]
9422+ --pdfdir=DIR pdf documentation [DOCDIR]
9423+ --psdir=DIR ps documentation [DOCDIR]
9424+_ACEOF
9425+
9426+ cat <<\_ACEOF
9427+
9428+Program names:
9429+ --program-prefix=PREFIX prepend PREFIX to installed program names
9430+ --program-suffix=SUFFIX append SUFFIX to installed program names
9431+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
9432+
9433+System types:
9434+ --build=BUILD configure for building on BUILD [guessed]
9435+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
9436+_ACEOF
9437 fi
9438-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
9439
9440-# Prefer explicitly selected file to automatically selected ones.
9441-if test -z "$CONFIG_SITE"; then
9442- if test "x$prefix" != xNONE; then
9443- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
9444- else
9445- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
9446+if test -n "$ac_init_help"; then
9447+
9448+ cat <<\_ACEOF
9449+
9450+Optional Features:
9451+ --disable-option-checking ignore unrecognized --enable/--with options
9452+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
9453+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
9454+ --enable-silent-rules less verbose build output (undo: "make V=1")
9455+ --disable-silent-rules verbose build output (undo: "make V=0")
9456+--disable-timesync exclude support for timesync protocol
9457+--enable-pubdir=/path include support for a public writeable directory
9458+--disable-mkdir disable support for creating directories (lrz)
9459+--enable-syslog=FACILITY,{force,default,optional} include syslogsupport
9460+ --enable-dependency-tracking
9461+ do not reject slow dependency extractors
9462+ --disable-dependency-tracking
9463+ speeds up one-time build
9464+ --disable-nls do not use Native Language Support
9465+ --disable-rpath do not hardcode runtime library paths
9466+
9467+Optional Packages:
9468+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
9469+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
9470+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
9471+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
9472+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
9473+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
9474+ --without-libintl-prefix don't search for libintl in includedir and libdir
9475+
9476+Some influential environment variables:
9477+ CC C compiler command
9478+ CFLAGS C compiler flags
9479+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
9480+ nonstandard directory <lib dir>
9481+ LIBS libraries to pass to the linker, e.g. -l<library>
9482+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
9483+ you have headers in a nonstandard directory <include dir>
9484+ CPP C preprocessor
9485+
9486+Use these variables to override the choices made by `configure' or to help
9487+it to find libraries and programs with nonstandard names/locations.
9488+
9489+Report bugs to the package provider.
9490+_ACEOF
9491+ac_status=$?
9492+fi
9493+
9494+if test "$ac_init_help" = "recursive"; then
9495+ # If there are subdirs, report their specific --help.
9496+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
9497+ test -d "$ac_dir" ||
9498+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
9499+ continue
9500+ ac_builddir=.
9501+
9502+case "$ac_dir" in
9503+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
9504+*)
9505+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
9506+ # A ".." for each directory in $ac_dir_suffix.
9507+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
9508+ case $ac_top_builddir_sub in
9509+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
9510+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
9511+ esac ;;
9512+esac
9513+ac_abs_top_builddir=$ac_pwd
9514+ac_abs_builddir=$ac_pwd$ac_dir_suffix
9515+# for backward compatibility:
9516+ac_top_builddir=$ac_top_build_prefix
9517+
9518+case $srcdir in
9519+ .) # We are building in place.
9520+ ac_srcdir=.
9521+ ac_top_srcdir=$ac_top_builddir_sub
9522+ ac_abs_top_srcdir=$ac_pwd ;;
9523+ [\\/]* | ?:[\\/]* ) # Absolute name.
9524+ ac_srcdir=$srcdir$ac_dir_suffix;
9525+ ac_top_srcdir=$srcdir
9526+ ac_abs_top_srcdir=$srcdir ;;
9527+ *) # Relative name.
9528+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
9529+ ac_top_srcdir=$ac_top_build_prefix$srcdir
9530+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
9531+esac
9532+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
9533+
9534+ cd "$ac_dir" || { ac_status=$?; continue; }
9535+ # Check for guested configure.
9536+ if test -f "$ac_srcdir/configure.gnu"; then
9537+ echo &&
9538+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
9539+ elif test -f "$ac_srcdir/configure"; then
9540+ echo &&
9541+ $SHELL "$ac_srcdir/configure" --help=recursive
9542+ else
9543+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
9544+ fi || ac_status=$?
9545+ cd "$ac_pwd" || { ac_status=$?; break; }
9546+ done
9547+fi
9548+
9549+test -n "$ac_init_help" && exit $ac_status
9550+if $ac_init_version; then
9551+ cat <<\_ACEOF
9552+configure
9553+generated by GNU Autoconf 2.69
9554+
9555+Copyright (C) 2012 Free Software Foundation, Inc.
9556+This configure script is free software; the Free Software Foundation
9557+gives unlimited permission to copy, distribute and modify it.
9558+_ACEOF
9559+ exit
9560+fi
9561+
9562+## ------------------------ ##
9563+## Autoconf initialization. ##
9564+## ------------------------ ##
9565+
9566+# ac_fn_c_try_compile LINENO
9567+# --------------------------
9568+# Try to compile conftest.$ac_ext, and return whether this succeeded.
9569+ac_fn_c_try_compile ()
9570+{
9571+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9572+ rm -f conftest.$ac_objext
9573+ if { { ac_try="$ac_compile"
9574+case "(($ac_try" in
9575+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9576+ *) ac_try_echo=$ac_try;;
9577+esac
9578+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
9579+$as_echo "$ac_try_echo"; } >&5
9580+ (eval "$ac_compile") 2>conftest.err
9581+ ac_status=$?
9582+ if test -s conftest.err; then
9583+ grep -v '^ *+' conftest.err >conftest.er1
9584+ cat conftest.er1 >&5
9585+ mv -f conftest.er1 conftest.err
9586 fi
9587+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9588+ test $ac_status = 0; } && {
9589+ test -z "$ac_c_werror_flag" ||
9590+ test ! -s conftest.err
9591+ } && test -s conftest.$ac_objext; then :
9592+ ac_retval=0
9593+else
9594+ $as_echo "$as_me: failed program was:" >&5
9595+sed 's/^/| /' conftest.$ac_ext >&5
9596+
9597+ ac_retval=1
9598+fi
9599+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9600+ as_fn_set_status $ac_retval
9601+
9602+} # ac_fn_c_try_compile
9603+
9604+# ac_fn_c_try_cpp LINENO
9605+# ----------------------
9606+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
9607+ac_fn_c_try_cpp ()
9608+{
9609+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9610+ if { { ac_try="$ac_cpp conftest.$ac_ext"
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:${as_lineno-$LINENO}: $ac_try_echo\""
9616+$as_echo "$ac_try_echo"; } >&5
9617+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
9618+ ac_status=$?
9619+ if test -s conftest.err; then
9620+ grep -v '^ *+' conftest.err >conftest.er1
9621+ cat conftest.er1 >&5
9622+ mv -f conftest.er1 conftest.err
9623+ fi
9624+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9625+ test $ac_status = 0; } > conftest.i && {
9626+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
9627+ test ! -s conftest.err
9628+ }; then :
9629+ ac_retval=0
9630+else
9631+ $as_echo "$as_me: failed program was:" >&5
9632+sed 's/^/| /' conftest.$ac_ext >&5
9633+
9634+ ac_retval=1
9635+fi
9636+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9637+ as_fn_set_status $ac_retval
9638+
9639+} # ac_fn_c_try_cpp
9640+
9641+# ac_fn_c_try_link LINENO
9642+# -----------------------
9643+# Try to link conftest.$ac_ext, and return whether this succeeded.
9644+ac_fn_c_try_link ()
9645+{
9646+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9647+ rm -f conftest.$ac_objext conftest$ac_exeext
9648+ if { { ac_try="$ac_link"
9649+case "(($ac_try" in
9650+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9651+ *) ac_try_echo=$ac_try;;
9652+esac
9653+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
9654+$as_echo "$ac_try_echo"; } >&5
9655+ (eval "$ac_link") 2>conftest.err
9656+ ac_status=$?
9657+ if test -s conftest.err; then
9658+ grep -v '^ *+' conftest.err >conftest.er1
9659+ cat conftest.er1 >&5
9660+ mv -f conftest.er1 conftest.err
9661+ fi
9662+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9663+ test $ac_status = 0; } && {
9664+ test -z "$ac_c_werror_flag" ||
9665+ test ! -s conftest.err
9666+ } && test -s conftest$ac_exeext && {
9667+ test "$cross_compiling" = yes ||
9668+ test -x conftest$ac_exeext
9669+ }; then :
9670+ ac_retval=0
9671+else
9672+ $as_echo "$as_me: failed program was:" >&5
9673+sed 's/^/| /' conftest.$ac_ext >&5
9674+
9675+ ac_retval=1
9676+fi
9677+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
9678+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
9679+ # interfere with the next link command; also delete a directory that is
9680+ # left behind by Apple's compiler. We do this before executing the actions.
9681+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
9682+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9683+ as_fn_set_status $ac_retval
9684+
9685+} # ac_fn_c_try_link
9686+
9687+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
9688+# -------------------------------------------------------
9689+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
9690+# the include files in INCLUDES and setting the cache variable VAR
9691+# accordingly.
9692+ac_fn_c_check_header_mongrel ()
9693+{
9694+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9695+ if eval \${$3+:} false; then :
9696+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
9697+$as_echo_n "checking for $2... " >&6; }
9698+if eval \${$3+:} false; then :
9699+ $as_echo_n "(cached) " >&6
9700+fi
9701+eval ac_res=\$$3
9702+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9703+$as_echo "$ac_res" >&6; }
9704+else
9705+ # Is the header compilable?
9706+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
9707+$as_echo_n "checking $2 usability... " >&6; }
9708+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9709+/* end confdefs.h. */
9710+$4
9711+#include <$2>
9712+_ACEOF
9713+if ac_fn_c_try_compile "$LINENO"; then :
9714+ ac_header_compiler=yes
9715+else
9716+ ac_header_compiler=no
9717+fi
9718+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9719+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
9720+$as_echo "$ac_header_compiler" >&6; }
9721+
9722+# Is the header present?
9723+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
9724+$as_echo_n "checking $2 presence... " >&6; }
9725+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9726+/* end confdefs.h. */
9727+#include <$2>
9728+_ACEOF
9729+if ac_fn_c_try_cpp "$LINENO"; then :
9730+ ac_header_preproc=yes
9731+else
9732+ ac_header_preproc=no
9733+fi
9734+rm -f conftest.err conftest.i conftest.$ac_ext
9735+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
9736+$as_echo "$ac_header_preproc" >&6; }
9737+
9738+# So? What about this header?
9739+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
9740+ yes:no: )
9741+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
9742+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
9743+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
9744+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
9745+ ;;
9746+ no:yes:* )
9747+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
9748+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
9749+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
9750+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
9751+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
9752+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
9753+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
9754+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
9755+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
9756+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
9757+ ;;
9758+esac
9759+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
9760+$as_echo_n "checking for $2... " >&6; }
9761+if eval \${$3+:} false; then :
9762+ $as_echo_n "(cached) " >&6
9763+else
9764+ eval "$3=\$ac_header_compiler"
9765+fi
9766+eval ac_res=\$$3
9767+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9768+$as_echo "$ac_res" >&6; }
9769+fi
9770+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9771+
9772+} # ac_fn_c_check_header_mongrel
9773+
9774+# ac_fn_c_try_run LINENO
9775+# ----------------------
9776+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
9777+# that executables *can* be run.
9778+ac_fn_c_try_run ()
9779+{
9780+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9781+ if { { ac_try="$ac_link"
9782+case "(($ac_try" in
9783+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9784+ *) ac_try_echo=$ac_try;;
9785+esac
9786+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
9787+$as_echo "$ac_try_echo"; } >&5
9788+ (eval "$ac_link") 2>&5
9789+ ac_status=$?
9790+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9791+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
9792+ { { case "(($ac_try" in
9793+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
9794+ *) ac_try_echo=$ac_try;;
9795+esac
9796+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
9797+$as_echo "$ac_try_echo"; } >&5
9798+ (eval "$ac_try") 2>&5
9799+ ac_status=$?
9800+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
9801+ test $ac_status = 0; }; }; then :
9802+ ac_retval=0
9803+else
9804+ $as_echo "$as_me: program exited with status $ac_status" >&5
9805+ $as_echo "$as_me: failed program was:" >&5
9806+sed 's/^/| /' conftest.$ac_ext >&5
9807+
9808+ ac_retval=$ac_status
9809+fi
9810+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
9811+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9812+ as_fn_set_status $ac_retval
9813+
9814+} # ac_fn_c_try_run
9815+
9816+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
9817+# -------------------------------------------------------
9818+# Tests whether HEADER exists and can be compiled using the include files in
9819+# INCLUDES, setting the cache variable VAR accordingly.
9820+ac_fn_c_check_header_compile ()
9821+{
9822+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9823+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
9824+$as_echo_n "checking for $2... " >&6; }
9825+if eval \${$3+:} false; then :
9826+ $as_echo_n "(cached) " >&6
9827+else
9828+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9829+/* end confdefs.h. */
9830+$4
9831+#include <$2>
9832+_ACEOF
9833+if ac_fn_c_try_compile "$LINENO"; then :
9834+ eval "$3=yes"
9835+else
9836+ eval "$3=no"
9837+fi
9838+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9839+fi
9840+eval ac_res=\$$3
9841+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9842+$as_echo "$ac_res" >&6; }
9843+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9844+
9845+} # ac_fn_c_check_header_compile
9846+
9847+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
9848+# -------------------------------------------
9849+# Tests whether TYPE exists after having included INCLUDES, setting cache
9850+# variable VAR accordingly.
9851+ac_fn_c_check_type ()
9852+{
9853+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9854+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
9855+$as_echo_n "checking for $2... " >&6; }
9856+if eval \${$3+:} false; then :
9857+ $as_echo_n "(cached) " >&6
9858+else
9859+ eval "$3=no"
9860+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9861+/* end confdefs.h. */
9862+$4
9863+int
9864+main ()
9865+{
9866+if (sizeof ($2))
9867+ return 0;
9868+ ;
9869+ return 0;
9870+}
9871+_ACEOF
9872+if ac_fn_c_try_compile "$LINENO"; then :
9873+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9874+/* end confdefs.h. */
9875+$4
9876+int
9877+main ()
9878+{
9879+if (sizeof (($2)))
9880+ return 0;
9881+ ;
9882+ return 0;
9883+}
9884+_ACEOF
9885+if ac_fn_c_try_compile "$LINENO"; then :
9886+
9887+else
9888+ eval "$3=yes"
9889+fi
9890+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9891+fi
9892+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9893+fi
9894+eval ac_res=\$$3
9895+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9896+$as_echo "$ac_res" >&6; }
9897+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9898+
9899+} # ac_fn_c_check_type
9900+
9901+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
9902+# ----------------------------------------------------
9903+# Tries to find if the field MEMBER exists in type AGGR, after including
9904+# INCLUDES, setting cache variable VAR accordingly.
9905+ac_fn_c_check_member ()
9906+{
9907+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9908+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
9909+$as_echo_n "checking for $2.$3... " >&6; }
9910+if eval \${$4+:} false; then :
9911+ $as_echo_n "(cached) " >&6
9912+else
9913+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9914+/* end confdefs.h. */
9915+$5
9916+int
9917+main ()
9918+{
9919+static $2 ac_aggr;
9920+if (ac_aggr.$3)
9921+return 0;
9922+ ;
9923+ return 0;
9924+}
9925+_ACEOF
9926+if ac_fn_c_try_compile "$LINENO"; then :
9927+ eval "$4=yes"
9928+else
9929+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9930+/* end confdefs.h. */
9931+$5
9932+int
9933+main ()
9934+{
9935+static $2 ac_aggr;
9936+if (sizeof ac_aggr.$3)
9937+return 0;
9938+ ;
9939+ return 0;
9940+}
9941+_ACEOF
9942+if ac_fn_c_try_compile "$LINENO"; then :
9943+ eval "$4=yes"
9944+else
9945+ eval "$4=no"
9946+fi
9947+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9948 fi
9949-for ac_site_file in $CONFIG_SITE; do
9950- if test -r "$ac_site_file"; then
9951- echo "loading site script $ac_site_file"
9952- . "$ac_site_file"
9953+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
9954+fi
9955+eval ac_res=\$$4
9956+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
9957+$as_echo "$ac_res" >&6; }
9958+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
9959+
9960+} # ac_fn_c_check_member
9961+
9962+# ac_fn_c_check_func LINENO FUNC VAR
9963+# ----------------------------------
9964+# Tests whether FUNC exists, setting the cache variable VAR accordingly
9965+ac_fn_c_check_func ()
9966+{
9967+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
9968+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
9969+$as_echo_n "checking for $2... " >&6; }
9970+if eval \${$3+:} false; then :
9971+ $as_echo_n "(cached) " >&6
9972+else
9973+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9974+/* end confdefs.h. */
9975+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
9976+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
9977+#define $2 innocuous_$2
9978+
9979+/* System header to define __stub macros and hopefully few prototypes,
9980+ which can conflict with char $2 (); below.
9981+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9982+ <limits.h> exists even on freestanding compilers. */
9983+
9984+#ifdef __STDC__
9985+# include <limits.h>
9986+#else
9987+# include <assert.h>
9988+#endif
9989+
9990+#undef $2
9991+
9992+/* Override any GCC internal prototype to avoid an error.
9993+ Use char because int might match the return type of a GCC
9994+ builtin and then its argument prototype would still apply. */
9995+#ifdef __cplusplus
9996+extern "C"
9997+#endif
9998+char $2 ();
9999+/* The GNU C library defines this for functions which it implements
10000+ to always fail with ENOSYS. Some functions are actually named
10001+ something starting with __ and the normal name is an alias. */
10002+#if defined __stub_$2 || defined __stub___$2
10003+choke me
10004+#endif
10005+
10006+int
10007+main ()
10008+{
10009+return $2 ();
10010+ ;
10011+ return 0;
10012+}
10013+_ACEOF
10014+if ac_fn_c_try_link "$LINENO"; then :
10015+ eval "$3=yes"
10016+else
10017+ eval "$3=no"
10018+fi
10019+rm -f core conftest.err conftest.$ac_objext \
10020+ conftest$ac_exeext conftest.$ac_ext
10021+fi
10022+eval ac_res=\$$3
10023+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
10024+$as_echo "$ac_res" >&6; }
10025+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
10026+
10027+} # ac_fn_c_check_func
10028+cat >config.log <<_ACEOF
10029+This file contains any messages produced by compilers while
10030+running configure, to aid debugging if configure makes a mistake.
10031+
10032+It was created by $as_me, which was
10033+generated by GNU Autoconf 2.69. Invocation command line was
10034+
10035+ $ $0 $@
10036+
10037+_ACEOF
10038+exec 5>>config.log
10039+{
10040+cat <<_ASUNAME
10041+## --------- ##
10042+## Platform. ##
10043+## --------- ##
10044+
10045+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
10046+uname -m = `(uname -m) 2>/dev/null || echo unknown`
10047+uname -r = `(uname -r) 2>/dev/null || echo unknown`
10048+uname -s = `(uname -s) 2>/dev/null || echo unknown`
10049+uname -v = `(uname -v) 2>/dev/null || echo unknown`
10050+
10051+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
10052+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
10053+
10054+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
10055+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
10056+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
10057+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
10058+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
10059+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
10060+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
10061+
10062+_ASUNAME
10063+
10064+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10065+for as_dir in $PATH
10066+do
10067+ IFS=$as_save_IFS
10068+ test -z "$as_dir" && as_dir=.
10069+ $as_echo "PATH: $as_dir"
10070+ done
10071+IFS=$as_save_IFS
10072+
10073+} >&5
10074+
10075+cat >&5 <<_ACEOF
10076+
10077+
10078+## ----------- ##
10079+## Core tests. ##
10080+## ----------- ##
10081+
10082+_ACEOF
10083+
10084+
10085+# Keep a trace of the command line.
10086+# Strip out --no-create and --no-recursion so they do not pile up.
10087+# Strip out --silent because we don't want to record it for future runs.
10088+# Also quote any args containing shell meta-characters.
10089+# Make two passes to allow for proper duplicate-argument suppression.
10090+ac_configure_args=
10091+ac_configure_args0=
10092+ac_configure_args1=
10093+ac_must_keep_next=false
10094+for ac_pass in 1 2
10095+do
10096+ for ac_arg
10097+ do
10098+ case $ac_arg in
10099+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
10100+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
10101+ | -silent | --silent | --silen | --sile | --sil)
10102+ continue ;;
10103+ *\'*)
10104+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
10105+ esac
10106+ case $ac_pass in
10107+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
10108+ 2)
10109+ as_fn_append ac_configure_args1 " '$ac_arg'"
10110+ if test $ac_must_keep_next = true; then
10111+ ac_must_keep_next=false # Got value, back to normal.
10112+ else
10113+ case $ac_arg in
10114+ *=* | --config-cache | -C | -disable-* | --disable-* \
10115+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
10116+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
10117+ | -with-* | --with-* | -without-* | --without-* | --x)
10118+ case "$ac_configure_args0 " in
10119+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
10120+ esac
10121+ ;;
10122+ -* ) ac_must_keep_next=true ;;
10123+ esac
10124+ fi
10125+ as_fn_append ac_configure_args " '$ac_arg'"
10126+ ;;
10127+ esac
10128+ done
10129+done
10130+{ ac_configure_args0=; unset ac_configure_args0;}
10131+{ ac_configure_args1=; unset ac_configure_args1;}
10132+
10133+# When interrupted or exit'd, cleanup temporary files, and complete
10134+# config.log. We remove comments because anyway the quotes in there
10135+# would cause problems or look ugly.
10136+# WARNING: Use '\'' to represent an apostrophe within the trap.
10137+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
10138+trap 'exit_status=$?
10139+ # Save into config.log some information that might help in debugging.
10140+ {
10141+ echo
10142+
10143+ $as_echo "## ---------------- ##
10144+## Cache variables. ##
10145+## ---------------- ##"
10146+ echo
10147+ # The following way of writing the cache mishandles newlines in values,
10148+(
10149+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
10150+ eval ac_val=\$$ac_var
10151+ case $ac_val in #(
10152+ *${as_nl}*)
10153+ case $ac_var in #(
10154+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
10155+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
10156+ esac
10157+ case $ac_var in #(
10158+ _ | IFS | as_nl) ;; #(
10159+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
10160+ *) { eval $ac_var=; unset $ac_var;} ;;
10161+ esac ;;
10162+ esac
10163+ done
10164+ (set) 2>&1 |
10165+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
10166+ *${as_nl}ac_space=\ *)
10167+ sed -n \
10168+ "s/'\''/'\''\\\\'\'''\''/g;
10169+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
10170+ ;; #(
10171+ *)
10172+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
10173+ ;;
10174+ esac |
10175+ sort
10176+)
10177+ echo
10178+
10179+ $as_echo "## ----------------- ##
10180+## Output variables. ##
10181+## ----------------- ##"
10182+ echo
10183+ for ac_var in $ac_subst_vars
10184+ do
10185+ eval ac_val=\$$ac_var
10186+ case $ac_val in
10187+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
10188+ esac
10189+ $as_echo "$ac_var='\''$ac_val'\''"
10190+ done | sort
10191+ echo
10192+
10193+ if test -n "$ac_subst_files"; then
10194+ $as_echo "## ------------------- ##
10195+## File substitutions. ##
10196+## ------------------- ##"
10197+ echo
10198+ for ac_var in $ac_subst_files
10199+ do
10200+ eval ac_val=\$$ac_var
10201+ case $ac_val in
10202+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
10203+ esac
10204+ $as_echo "$ac_var='\''$ac_val'\''"
10205+ done | sort
10206+ echo
10207+ fi
10208+
10209+ if test -s confdefs.h; then
10210+ $as_echo "## ----------- ##
10211+## confdefs.h. ##
10212+## ----------- ##"
10213+ echo
10214+ cat confdefs.h
10215+ echo
10216+ fi
10217+ test "$ac_signal" != 0 &&
10218+ $as_echo "$as_me: caught signal $ac_signal"
10219+ $as_echo "$as_me: exit $exit_status"
10220+ } >&5
10221+ rm -f core *.core core.conftest.* &&
10222+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
10223+ exit $exit_status
10224+' 0
10225+for ac_signal in 1 2 13 15; do
10226+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
10227+done
10228+ac_signal=0
10229+
10230+# confdefs.h avoids OS command line length limits that DEFS can exceed.
10231+rm -f -r conftest* confdefs.h
10232+
10233+$as_echo "/* confdefs.h */" > confdefs.h
10234+
10235+# Predefined preprocessor variables.
10236+
10237+cat >>confdefs.h <<_ACEOF
10238+#define PACKAGE_NAME "$PACKAGE_NAME"
10239+_ACEOF
10240+
10241+cat >>confdefs.h <<_ACEOF
10242+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
10243+_ACEOF
10244+
10245+cat >>confdefs.h <<_ACEOF
10246+#define PACKAGE_VERSION "$PACKAGE_VERSION"
10247+_ACEOF
10248+
10249+cat >>confdefs.h <<_ACEOF
10250+#define PACKAGE_STRING "$PACKAGE_STRING"
10251+_ACEOF
10252+
10253+cat >>confdefs.h <<_ACEOF
10254+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
10255+_ACEOF
10256+
10257+cat >>confdefs.h <<_ACEOF
10258+#define PACKAGE_URL "$PACKAGE_URL"
10259+_ACEOF
10260+
10261+
10262+# Let the site file select an alternate cache file if it wants to.
10263+# Prefer an explicitly selected file to automatically selected ones.
10264+ac_site_file1=NONE
10265+if test -n "$CONFIG_SITE"; then
10266+ # We do not want a PATH search for config.site.
10267+ case $CONFIG_SITE in #((
10268+ -*) ac_site_file1=./$CONFIG_SITE;;
10269+ */*) ac_site_file1=$CONFIG_SITE;;
10270+ *) ac_site_file1=./$CONFIG_SITE;;
10271+ esac
10272+fi
10273+for ac_site_file in $ac_site_file1
10274+do
10275+ test "x$ac_site_file" = xNONE && continue
10276+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
10277+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
10278+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
10279+ sed 's/^/| /' "$ac_site_file" >&5
10280+ . "$ac_site_file" \
10281+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10282+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10283+as_fn_error $? "failed to load site script $ac_site_file
10284+See \`config.log' for more details" "$LINENO" 5; }
10285 fi
10286 done
10287
10288 if test -r "$cache_file"; then
10289- echo "loading cache $cache_file"
10290- . $cache_file
10291+ # Some versions of bash will fail to source /dev/null (special files
10292+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
10293+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
10294+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
10295+$as_echo "$as_me: loading cache $cache_file" >&6;}
10296+ case $cache_file in
10297+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
10298+ *) . "./$cache_file";;
10299+ esac
10300+ fi
10301 else
10302- echo "creating cache $cache_file"
10303- > $cache_file
10304-fi
10305+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
10306+$as_echo "$as_me: creating cache $cache_file" >&6;}
10307+ >$cache_file
10308+fi
10309+
10310+as_fn_append ac_header_list " stdlib.h"
10311+as_fn_append ac_header_list " unistd.h"
10312+as_fn_append ac_header_list " sys/param.h"
10313+gt_needs="$gt_needs "
10314+# Check that the precious variables saved in the cache have kept the same
10315+# value.
10316+ac_cache_corrupted=false
10317+for ac_var in $ac_precious_vars; do
10318+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
10319+ eval ac_new_set=\$ac_env_${ac_var}_set
10320+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
10321+ eval ac_new_val=\$ac_env_${ac_var}_value
10322+ case $ac_old_set,$ac_new_set in
10323+ set,)
10324+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
10325+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
10326+ ac_cache_corrupted=: ;;
10327+ ,set)
10328+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
10329+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
10330+ ac_cache_corrupted=: ;;
10331+ ,);;
10332+ *)
10333+ if test "x$ac_old_val" != "x$ac_new_val"; then
10334+ # differences in whitespace do not lead to failure.
10335+ ac_old_val_w=`echo x $ac_old_val`
10336+ ac_new_val_w=`echo x $ac_new_val`
10337+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
10338+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
10339+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
10340+ ac_cache_corrupted=:
10341+ else
10342+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
10343+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
10344+ eval $ac_var=\$ac_old_val
10345+ fi
10346+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
10347+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
10348+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
10349+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
10350+ fi;;
10351+ esac
10352+ # Pass precious variables to config.status.
10353+ if test "$ac_new_set" = set; then
10354+ case $ac_new_val in
10355+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
10356+ *) ac_arg=$ac_var=$ac_new_val ;;
10357+ esac
10358+ case " $ac_configure_args " in
10359+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
10360+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
10361+ esac
10362+ fi
10363+done
10364+if $ac_cache_corrupted; then
10365+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
10366+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
10367+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
10368+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
10369+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
10370+fi
10371+## -------------------- ##
10372+## Main body of script. ##
10373+## -------------------- ##
10374
10375 ac_ext=c
10376-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
10377 ac_cpp='$CPP $CPPFLAGS'
10378-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
10379-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
10380-cross_compiling=$ac_cv_prog_cc_cross
10381-
10382-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
10383- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
10384- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
10385- ac_n= ac_c='
10386-' ac_t=' '
10387- else
10388- ac_n=-n ac_c= ac_t=
10389- fi
10390-else
10391- ac_n= ac_c='\c' ac_t=
10392-fi
10393+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
10394+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
10395+ac_compiler_gnu=$ac_cv_c_compiler_gnu
10396
10397
10398+am__api_version='1.16'
10399+
10400 ac_aux_dir=
10401-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
10402- if test -f $ac_dir/install-sh; then
10403+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
10404+ if test -f "$ac_dir/install-sh"; then
10405 ac_aux_dir=$ac_dir
10406 ac_install_sh="$ac_aux_dir/install-sh -c"
10407 break
10408- elif test -f $ac_dir/install.sh; then
10409+ elif test -f "$ac_dir/install.sh"; then
10410 ac_aux_dir=$ac_dir
10411 ac_install_sh="$ac_aux_dir/install.sh -c"
10412 break
10413+ elif test -f "$ac_dir/shtool"; then
10414+ ac_aux_dir=$ac_dir
10415+ ac_install_sh="$ac_aux_dir/shtool install -c"
10416+ break
10417 fi
10418 done
10419 if test -z "$ac_aux_dir"; then
10420- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
10421+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
10422 fi
10423-ac_config_guess=$ac_aux_dir/config.guess
10424-ac_config_sub=$ac_aux_dir/config.sub
10425-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
10426+
10427+# These three variables are undocumented and unsupported,
10428+# and are intended to be withdrawn in a future Autoconf release.
10429+# They can cause serious problems if a builder's source tree is in a directory
10430+# whose full name contains unusual characters.
10431+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
10432+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
10433+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
10434+
10435
10436 # Find a good install program. We prefer a C program (faster),
10437 # so one script is as good as another. But avoid the broken or
10438@@ -558,250 +2305,546 @@ ac_configure=$ac_aux_dir/configure # Thi
10439 # SunOS /usr/etc/install
10440 # IRIX /sbin/install
10441 # AIX /bin/install
10442+# AmigaOS /C/install, which installs bootblocks on floppy discs
10443+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
10444 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
10445 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
10446+# OS/2's system install, which has a completely different semantic
10447 # ./install, which can be erroneously created by make from ./install.sh.
10448-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
10449-echo "configure:566: checking for a BSD compatible install" >&5
10450+# Reject install programs that cannot install multiple files.
10451+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
10452+$as_echo_n "checking for a BSD-compatible install... " >&6; }
10453 if test -z "$INSTALL"; then
10454-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
10455- echo $ac_n "(cached) $ac_c" 1>&6
10456+if ${ac_cv_path_install+:} false; then :
10457+ $as_echo_n "(cached) " >&6
10458 else
10459- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
10460- for ac_dir in $PATH; do
10461+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10462+for as_dir in $PATH
10463+do
10464+ IFS=$as_save_IFS
10465+ test -z "$as_dir" && as_dir=.
10466 # Account for people who put trailing slashes in PATH elements.
10467- case "$ac_dir/" in
10468- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
10469- *)
10470- # OSF1 and SCO ODT 3.0 have their own names for install.
10471- for ac_prog in ginstall installbsd scoinst install; do
10472- if test -f $ac_dir/$ac_prog; then
10473+case $as_dir/ in #((
10474+ ./ | .// | /[cC]/* | \
10475+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
10476+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
10477+ /usr/ucb/* ) ;;
10478+ *)
10479+ # OSF1 and SCO ODT 3.0 have their own names for install.
10480+ # Don't use installbsd from OSF since it installs stuff as root
10481+ # by default.
10482+ for ac_prog in ginstall scoinst install; do
10483+ for ac_exec_ext in '' $ac_executable_extensions; do
10484+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
10485 if test $ac_prog = install &&
10486- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
10487+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
10488 # AIX install. It has an incompatible calling convention.
10489- # OSF/1 installbsd also uses dspmsg, but is usable.
10490+ :
10491+ elif test $ac_prog = install &&
10492+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
10493+ # program-specific install script used by HP pwplus--don't use.
10494 :
10495 else
10496- ac_cv_path_install="$ac_dir/$ac_prog -c"
10497- break 2
10498+ rm -rf conftest.one conftest.two conftest.dir
10499+ echo one > conftest.one
10500+ echo two > conftest.two
10501+ mkdir conftest.dir
10502+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
10503+ test -s conftest.one && test -s conftest.two &&
10504+ test -s conftest.dir/conftest.one &&
10505+ test -s conftest.dir/conftest.two
10506+ then
10507+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
10508+ break 3
10509+ fi
10510 fi
10511 fi
10512 done
10513- ;;
10514- esac
10515+ done
10516+ ;;
10517+esac
10518+
10519 done
10520- IFS="$ac_save_IFS"
10521+IFS=$as_save_IFS
10522+
10523+rm -rf conftest.one conftest.two conftest.dir
10524
10525 fi
10526 if test "${ac_cv_path_install+set}" = set; then
10527- INSTALL="$ac_cv_path_install"
10528+ INSTALL=$ac_cv_path_install
10529 else
10530- # As a last resort, use the slow shell script. We don't cache a
10531- # path for INSTALL within a source directory, because that will
10532+ # As a last resort, use the slow shell script. Don't cache a
10533+ # value for INSTALL within a source directory, because that will
10534 # break other packages using the cache if that directory is
10535- # removed, or if the path is relative.
10536- INSTALL="$ac_install_sh"
10537+ # removed, or if the value is a relative name.
10538+ INSTALL=$ac_install_sh
10539 fi
10540 fi
10541-echo "$ac_t""$INSTALL" 1>&6
10542+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
10543+$as_echo "$INSTALL" >&6; }
10544
10545 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
10546 # It thinks the first close brace ends the variable substitution.
10547 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
10548
10549+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
10550+
10551 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
10552
10553+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
10554+$as_echo_n "checking whether build environment is sane... " >&6; }
10555+# Reject unsafe characters in $srcdir or the absolute working directory
10556+# name. Accept space and tab only in the latter.
10557+am_lf='
10558+'
10559+case `pwd` in
10560+ *[\\\"\#\$\&\'\`$am_lf]*)
10561+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
10562+esac
10563+case $srcdir in
10564+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
10565+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
10566+esac
10567
10568-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
10569+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10570+$as_echo "yes" >&6; }
10571
10572-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
10573-echo "configure:619: checking whether build environment is sane" >&5
10574-# Just in case
10575-sleep 1
10576-echo timestamp > conftestfile
10577-# Do `set' in a subshell so we don't clobber the current shell's
10578-# arguments. Must try -L first in case configure is actually a
10579-# symlink; some systems play weird games with the mod time of symlinks
10580-# (eg FreeBSD returns the mod time of the symlink's containing
10581-# directory).
10582-if (
10583- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
10584- if test "$*" = "X"; then
10585- # -L didn't work.
10586- set X `ls -t $srcdir/configure conftestfile`
10587- fi
10588- if test "$*" != "X $srcdir/configure conftestfile" \
10589- && test "$*" != "X conftestfile $srcdir/configure"; then
10590+test "$program_prefix" != NONE &&
10591+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
10592+# Use a double $ so make ignores it.
10593+test "$program_suffix" != NONE &&
10594+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
10595+# Double any \ or $.
10596+# By default was `s,x,x', remove it if useless.
10597+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
10598+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
10599+
10600+# Expand $ac_aux_dir to an absolute path.
10601+am_aux_dir=`cd "$ac_aux_dir" && pwd`
10602+
10603+if test x"${MISSING+set}" != xset; then
10604+ case $am_aux_dir in
10605+ *\ * | *\ *)
10606+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
10607+ *)
10608+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
10609+ esac
10610+fi
10611+# Use eval to expand $SHELL
10612+if eval "$MISSING --is-lightweight"; then
10613+ am_missing_run="$MISSING "
10614+else
10615+ am_missing_run=
10616+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
10617+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
10618+fi
10619
10620- # If neither matched, then we have a broken ls. This can happen
10621- # if, for instance, CONFIG_SHELL is bash and it inherits a
10622- # broken ls alias from the environment. This has actually
10623- # happened. Such a system could not be considered "sane".
10624- { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
10625-alias in your environment" 1>&2; exit 1; }
10626- fi
10627+if test x"${install_sh+set}" != xset; then
10628+ case $am_aux_dir in
10629+ *\ * | *\ *)
10630+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
10631+ *)
10632+ install_sh="\${SHELL} $am_aux_dir/install-sh"
10633+ esac
10634+fi
10635+
10636+# Installed binaries are usually stripped using 'strip' when the user
10637+# run "make install-strip". However 'strip' might not be the right
10638+# tool to use in cross-compilation environments, therefore Automake
10639+# will honor the 'STRIP' environment variable to overrule this program.
10640+if test "$cross_compiling" != no; then
10641+ if test -n "$ac_tool_prefix"; then
10642+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
10643+set dummy ${ac_tool_prefix}strip; ac_word=$2
10644+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10645+$as_echo_n "checking for $ac_word... " >&6; }
10646+if ${ac_cv_prog_STRIP+:} false; then :
10647+ $as_echo_n "(cached) " >&6
10648+else
10649+ if test -n "$STRIP"; then
10650+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
10651+else
10652+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10653+for as_dir in $PATH
10654+do
10655+ IFS=$as_save_IFS
10656+ test -z "$as_dir" && as_dir=.
10657+ for ac_exec_ext in '' $ac_executable_extensions; do
10658+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10659+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
10660+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10661+ break 2
10662+ fi
10663+done
10664+ done
10665+IFS=$as_save_IFS
10666
10667- test "$2" = conftestfile
10668- )
10669-then
10670- # Ok.
10671- :
10672+fi
10673+fi
10674+STRIP=$ac_cv_prog_STRIP
10675+if test -n "$STRIP"; then
10676+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
10677+$as_echo "$STRIP" >&6; }
10678 else
10679- { echo "configure: error: newly created file is older than distributed files!
10680-Check your system clock" 1>&2; exit 1; }
10681+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10682+$as_echo "no" >&6; }
10683 fi
10684-rm -f conftest*
10685-echo "$ac_t""yes" 1>&6
10686-if test "$program_transform_name" = s,x,x,; then
10687- program_transform_name=
10688-else
10689- # Double any \ or $. echo might interpret backslashes.
10690- cat <<\EOF_SED > conftestsed
10691-s,\\,\\\\,g; s,\$,$$,g
10692-EOF_SED
10693- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
10694- rm -f conftestsed
10695+
10696+
10697 fi
10698-test "$program_prefix" != NONE &&
10699- program_transform_name="s,^,${program_prefix},; $program_transform_name"
10700-# Use a double $ so make ignores it.
10701-test "$program_suffix" != NONE &&
10702- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
10703+if test -z "$ac_cv_prog_STRIP"; then
10704+ ac_ct_STRIP=$STRIP
10705+ # Extract the first word of "strip", so it can be a program name with args.
10706+set dummy strip; ac_word=$2
10707+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10708+$as_echo_n "checking for $ac_word... " >&6; }
10709+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
10710+ $as_echo_n "(cached) " >&6
10711+else
10712+ if test -n "$ac_ct_STRIP"; then
10713+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
10714+else
10715+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10716+for as_dir in $PATH
10717+do
10718+ IFS=$as_save_IFS
10719+ test -z "$as_dir" && as_dir=.
10720+ for ac_exec_ext in '' $ac_executable_extensions; do
10721+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10722+ ac_cv_prog_ac_ct_STRIP="strip"
10723+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10724+ break 2
10725+ fi
10726+done
10727+ done
10728+IFS=$as_save_IFS
10729
10730-# sed with no file args requires a program.
10731-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
10732+fi
10733+fi
10734+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
10735+if test -n "$ac_ct_STRIP"; then
10736+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
10737+$as_echo "$ac_ct_STRIP" >&6; }
10738+else
10739+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10740+$as_echo "no" >&6; }
10741+fi
10742
10743-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
10744-echo "configure:676: checking whether ${MAKE-make} sets \${MAKE}" >&5
10745-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
10746-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
10747- echo $ac_n "(cached) $ac_c" 1>&6
10748+ if test "x$ac_ct_STRIP" = x; then
10749+ STRIP=":"
10750+ else
10751+ case $cross_compiling:$ac_tool_warned in
10752+yes:)
10753+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
10754+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
10755+ac_tool_warned=yes ;;
10756+esac
10757+ STRIP=$ac_ct_STRIP
10758+ fi
10759 else
10760- cat > conftestmake <<\EOF
10761-all:
10762- @echo 'ac_maketemp="${MAKE}"'
10763-EOF
10764-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
10765-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
10766-if test -n "$ac_maketemp"; then
10767- eval ac_cv_prog_make_${ac_make}_set=yes
10768+ STRIP="$ac_cv_prog_STRIP"
10769+fi
10770+
10771+fi
10772+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
10773+
10774+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
10775+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
10776+if test -z "$MKDIR_P"; then
10777+ if ${ac_cv_path_mkdir+:} false; then :
10778+ $as_echo_n "(cached) " >&6
10779+else
10780+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10781+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
10782+do
10783+ IFS=$as_save_IFS
10784+ test -z "$as_dir" && as_dir=.
10785+ for ac_prog in mkdir gmkdir; do
10786+ for ac_exec_ext in '' $ac_executable_extensions; do
10787+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
10788+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
10789+ 'mkdir (GNU coreutils) '* | \
10790+ 'mkdir (coreutils) '* | \
10791+ 'mkdir (fileutils) '4.1*)
10792+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
10793+ break 3;;
10794+ esac
10795+ done
10796+ done
10797+ done
10798+IFS=$as_save_IFS
10799+
10800+fi
10801+
10802+ test -d ./--version && rmdir ./--version
10803+ if test "${ac_cv_path_mkdir+set}" = set; then
10804+ MKDIR_P="$ac_cv_path_mkdir -p"
10805+ else
10806+ # As a last resort, use the slow shell script. Don't cache a
10807+ # value for MKDIR_P within a source directory, because that will
10808+ # break other packages using the cache if that directory is
10809+ # removed, or if the value is a relative name.
10810+ MKDIR_P="$ac_install_sh -d"
10811+ fi
10812+fi
10813+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
10814+$as_echo "$MKDIR_P" >&6; }
10815+
10816+for ac_prog in gawk mawk nawk awk
10817+do
10818+ # Extract the first word of "$ac_prog", so it can be a program name with args.
10819+set dummy $ac_prog; ac_word=$2
10820+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
10821+$as_echo_n "checking for $ac_word... " >&6; }
10822+if ${ac_cv_prog_AWK+:} false; then :
10823+ $as_echo_n "(cached) " >&6
10824+else
10825+ if test -n "$AWK"; then
10826+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
10827 else
10828- eval ac_cv_prog_make_${ac_make}_set=no
10829+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10830+for as_dir in $PATH
10831+do
10832+ IFS=$as_save_IFS
10833+ test -z "$as_dir" && as_dir=.
10834+ for ac_exec_ext in '' $ac_executable_extensions; do
10835+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10836+ ac_cv_prog_AWK="$ac_prog"
10837+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
10838+ break 2
10839+ fi
10840+done
10841+ done
10842+IFS=$as_save_IFS
10843+
10844+fi
10845 fi
10846-rm -f conftestmake
10847+AWK=$ac_cv_prog_AWK
10848+if test -n "$AWK"; then
10849+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
10850+$as_echo "$AWK" >&6; }
10851+else
10852+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10853+$as_echo "no" >&6; }
10854 fi
10855-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
10856- echo "$ac_t""yes" 1>&6
10857+
10858+
10859+ test -n "$AWK" && break
10860+done
10861+
10862+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
10863+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
10864+set x ${MAKE-make}
10865+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
10866+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
10867+ $as_echo_n "(cached) " >&6
10868+else
10869+ cat >conftest.make <<\_ACEOF
10870+SHELL = /bin/sh
10871+all:
10872+ @echo '@@@%%%=$(MAKE)=@@@%%%'
10873+_ACEOF
10874+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
10875+case `${MAKE-make} -f conftest.make 2>/dev/null` in
10876+ *@@@%%%=?*=@@@%%%*)
10877+ eval ac_cv_prog_make_${ac_make}_set=yes;;
10878+ *)
10879+ eval ac_cv_prog_make_${ac_make}_set=no;;
10880+esac
10881+rm -f conftest.make
10882+fi
10883+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
10884+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10885+$as_echo "yes" >&6; }
10886 SET_MAKE=
10887 else
10888- echo "$ac_t""no" 1>&6
10889+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10890+$as_echo "no" >&6; }
10891 SET_MAKE="MAKE=${MAKE-make}"
10892 fi
10893
10894+rm -rf .tst 2>/dev/null
10895+mkdir .tst 2>/dev/null
10896+if test -d .tst; then
10897+ am__leading_dot=.
10898+else
10899+ am__leading_dot=_
10900+fi
10901+rmdir .tst 2>/dev/null
10902
10903-PACKAGE=lrzsz
10904+# Check whether --enable-silent-rules was given.
10905+if test "${enable_silent_rules+set}" = set; then :
10906+ enableval=$enable_silent_rules;
10907+fi
10908
10909-VERSION=0.12.20
10910+case $enable_silent_rules in # (((
10911+ yes) AM_DEFAULT_VERBOSITY=0;;
10912+ no) AM_DEFAULT_VERBOSITY=1;;
10913+ *) AM_DEFAULT_VERBOSITY=1;;
10914+esac
10915+am_make=${MAKE-make}
10916+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
10917+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
10918+if ${am_cv_make_support_nested_variables+:} false; then :
10919+ $as_echo_n "(cached) " >&6
10920+else
10921+ if $as_echo 'TRUE=$(BAR$(V))
10922+BAR0=false
10923+BAR1=true
10924+V=1
10925+am__doit:
10926+ @$(TRUE)
10927+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
10928+ am_cv_make_support_nested_variables=yes
10929+else
10930+ am_cv_make_support_nested_variables=no
10931+fi
10932+fi
10933+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
10934+$as_echo "$am_cv_make_support_nested_variables" >&6; }
10935+if test $am_cv_make_support_nested_variables = yes; then
10936+ AM_V='$(V)'
10937+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
10938+else
10939+ AM_V=$AM_DEFAULT_VERBOSITY
10940+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
10941+fi
10942+AM_BACKSLASH='\'
10943+
10944+if test "`cd $srcdir && pwd`" != "`pwd`"; then
10945+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
10946+ # is not polluted with repeated "-I."
10947+ am__isrc=' -I$(srcdir)'
10948+ # test to see if srcdir already configured
10949+ if test -f $srcdir/config.status; then
10950+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
10951+ fi
10952+fi
10953
10954-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
10955- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
10956+# test whether we have cygpath
10957+if test -z "$CYGPATH_W"; then
10958+ if (cygpath --version) >/dev/null 2>/dev/null; then
10959+ CYGPATH_W='cygpath -w'
10960+ else
10961+ CYGPATH_W=echo
10962+ fi
10963 fi
10964-cat >> confdefs.h <<EOF
10965+
10966+
10967+# Define the identity of the package.
10968+
10969+ PACKAGE=lrzsz
10970+ VERSION=0.12.20
10971+
10972+
10973+cat >>confdefs.h <<_ACEOF
10974 #define PACKAGE "$PACKAGE"
10975-EOF
10976+_ACEOF
10977
10978-cat >> confdefs.h <<EOF
10979+
10980+cat >>confdefs.h <<_ACEOF
10981 #define VERSION "$VERSION"
10982-EOF
10983+_ACEOF
10984
10985+# Some tools Automake needs.
10986
10987+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
10988
10989-missing_dir=`cd $ac_aux_dir && pwd`
10990-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
10991-echo "configure:722: checking for working aclocal" >&5
10992-# Run test in a subshell; some versions of sh will print an error if
10993-# an executable is not found, even if stderr is redirected.
10994-# Redirect stdin to placate older versions of autoconf. Sigh.
10995-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
10996- ACLOCAL=aclocal
10997- echo "$ac_t""found" 1>&6
10998-else
10999- ACLOCAL="$missing_dir/missing aclocal"
11000- echo "$ac_t""missing" 1>&6
11001-fi
11002-
11003-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
11004-echo "configure:735: checking for working autoconf" >&5
11005-# Run test in a subshell; some versions of sh will print an error if
11006-# an executable is not found, even if stderr is redirected.
11007-# Redirect stdin to placate older versions of autoconf. Sigh.
11008-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
11009- AUTOCONF=autoconf
11010- echo "$ac_t""found" 1>&6
11011-else
11012- AUTOCONF="$missing_dir/missing autoconf"
11013- echo "$ac_t""missing" 1>&6
11014-fi
11015-
11016-echo $ac_n "checking for working automake""... $ac_c" 1>&6
11017-echo "configure:748: checking for working automake" >&5
11018-# Run test in a subshell; some versions of sh will print an error if
11019-# an executable is not found, even if stderr is redirected.
11020-# Redirect stdin to placate older versions of autoconf. Sigh.
11021-if (automake --version) < /dev/null > /dev/null 2>&1; then
11022- AUTOMAKE=automake
11023- echo "$ac_t""found" 1>&6
11024-else
11025- AUTOMAKE="$missing_dir/missing automake"
11026- echo "$ac_t""missing" 1>&6
11027-fi
11028-
11029-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
11030-echo "configure:761: checking for working autoheader" >&5
11031-# Run test in a subshell; some versions of sh will print an error if
11032-# an executable is not found, even if stderr is redirected.
11033-# Redirect stdin to placate older versions of autoconf. Sigh.
11034-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
11035- AUTOHEADER=autoheader
11036- echo "$ac_t""found" 1>&6
11037-else
11038- AUTOHEADER="$missing_dir/missing autoheader"
11039- echo "$ac_t""missing" 1>&6
11040-fi
11041-
11042-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
11043-echo "configure:774: checking for working makeinfo" >&5
11044-# Run test in a subshell; some versions of sh will print an error if
11045-# an executable is not found, even if stderr is redirected.
11046-# Redirect stdin to placate older versions of autoconf. Sigh.
11047-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
11048- MAKEINFO=makeinfo
11049- echo "$ac_t""found" 1>&6
11050-else
11051- MAKEINFO="$missing_dir/missing makeinfo"
11052- echo "$ac_t""missing" 1>&6
11053-fi
11054+
11055+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
11056+
11057+
11058+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
11059+
11060+
11061+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
11062+
11063+
11064+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
11065+
11066+# For better backward compatibility. To be removed once Automake 1.9.x
11067+# dies out for good. For more background, see:
11068+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
11069+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
11070+mkdir_p='$(MKDIR_P)'
11071+
11072+# We need awk for the "check" target (and possibly the TAP driver). The
11073+# system "awk" is bad on some platforms.
11074+# Always define AMTAR for backward compatibility. Yes, it's still used
11075+# in the wild :-( We should find a proper way to deprecate it ...
11076+AMTAR='$${TAR-tar}'
11077
11078
11079+# We'll loop over all known methods to create a tar archive until one works.
11080+_am_tools='gnutar pax cpio none'
11081
11082+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
11083
11084
11085
11086
11087
11088
11089+# POSIX will say in a future version that running "rm -f" with no argument
11090+# is OK; and we want to be able to make that assumption in our Makefile
11091+# recipes. So use an aggressive probe to check that the usage we want is
11092+# actually supported "in the wild" to an acceptable degree.
11093+# See automake bug#10828.
11094+# To make any issue more visible, cause the running configure to be aborted
11095+# by default if the 'rm' program in use doesn't match our expectations; the
11096+# user can still override this though.
11097+if rm -f && rm -fr && rm -rf; then : OK; else
11098+ cat >&2 <<'END'
11099+Oops!
11100+
11101+Your 'rm' program seems unable to run without file operands specified
11102+on the command line, even when the '-f' option is present. This is contrary
11103+to the behaviour of most rm programs out there, and not conforming with
11104+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
11105+
11106+Please tell bug-automake@gnu.org about your system, including the value
11107+of your $PATH and any error possibly output before this message. This
11108+can help us improve future automake versions.
11109+
11110+END
11111+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
11112+ echo 'Configuration will proceed anyway, since you have set the' >&2
11113+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
11114+ echo >&2
11115+ else
11116+ cat >&2 <<'END'
11117+Aborting the configuration process, to ensure you take notice of the issue.
11118+
11119+You can download and install GNU coreutils to get an 'rm' implementation
11120+that behaves properly: <https://www.gnu.org/software/coreutils/>.
11121+
11122+If you want to complete the configuration process using your problematic
11123+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
11124+to "yes", and re-run configure.
11125+
11126+END
11127+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
11128+ fi
11129+fi
11130+
11131+ac_config_headers="$ac_config_headers config.h"
11132+
11133+
11134+
11135+
11136+
11137 PACKAGE_VERSION="$PACKAGE-$VERSION"
11138-cat >> confdefs.h <<EOF
11139+cat >>confdefs.h <<_ACEOF
11140 #define PACKAGE "$PACKAGE"
11141-EOF
11142+_ACEOF
11143
11144-cat >> confdefs.h <<EOF
11145+cat >>confdefs.h <<_ACEOF
11146 #define VERSION "$VERSION"
11147-EOF
11148+_ACEOF
11149
11150-cat >> confdefs.h <<EOF
11151+cat >>confdefs.h <<_ACEOF
11152 #define PACKAGE_VERSION "$PACKAGE_VERSION"
11153-EOF
11154+_ACEOF
11155
11156
11157
11158@@ -818,70 +2861,58 @@ case $VERSION in
11159 esac
11160
11161
11162-# Check whether --enable-timesync or --disable-timesync was given.
11163-if test "${enable_timesync+set}" = set; then
11164- enableval="$enable_timesync"
11165- if test "$enableval" = "no" ; then
11166+# Check whether --enable-timesync was given.
11167+if test "${enable_timesync+set}" = set; then :
11168+ enableval=$enable_timesync; if test "$enableval" = "no" ; then
11169 :
11170 else
11171- cat >> confdefs.h <<\EOF
11172-#define ENABLE_TIMESYNC 1
11173-EOF
11174+ $as_echo "#define ENABLE_TIMESYNC 1" >>confdefs.h
11175
11176 fi
11177 else
11178- cat >> confdefs.h <<\EOF
11179-#define ENABLE_TIMESYNC 1
11180-EOF
11181+ $as_echo "#define ENABLE_TIMESYNC 1" >>confdefs.h
11182
11183 fi
11184
11185
11186-# Check whether --enable-pubdir or --disable-pubdir was given.
11187-if test "${enable_pubdir+set}" = set; then
11188- enableval="$enable_pubdir"
11189- if test "$enableval" = "no" ; then
11190- :
11191- else
11192- cat >> confdefs.h <<EOF
11193+# Check whether --enable-pubdir was given.
11194+if test "${enable_pubdir+set}" = set; then :
11195+ enableval=$enable_pubdir; if test "$enableval" = "no" ; then
11196+ :
11197+ else
11198+ cat >>confdefs.h <<_ACEOF
11199 #define PUBDIR "$enableval"
11200-EOF
11201+_ACEOF
11202
11203 fi
11204 fi
11205
11206-# Check whether --enable-mkdir or --disable-mkdir was given.
11207-if test "${enable_mkdir+set}" = set; then
11208- enableval="$enable_mkdir"
11209- if test "$enableval" = "no" ; then
11210+# Check whether --enable-mkdir was given.
11211+if test "${enable_mkdir+set}" = set; then :
11212+ enableval=$enable_mkdir; if test "$enableval" = "no" ; then
11213 :
11214 else
11215- cat >> confdefs.h <<\EOF
11216-#define ENABLE_MKDIR 1
11217-EOF
11218+ $as_echo "#define ENABLE_MKDIR 1" >>confdefs.h
11219
11220 fi
11221 else
11222- cat >> confdefs.h <<\EOF
11223-#define ENABLE_MKDIR 1
11224-EOF
11225+ $as_echo "#define ENABLE_MKDIR 1" >>confdefs.h
11226
11227 fi
11228
11229-# Check whether --enable-syslog or --disable-syslog was given.
11230-if test "${enable_syslog+set}" = set; then
11231- enableval="$enable_syslog"
11232-
11233- if test "$enableval" = "no" ; then
11234+# Check whether --enable-syslog was given.
11235+if test "${enable_syslog+set}" = set; then :
11236+ enableval=$enable_syslog;
11237+ if test "$enableval" = "no" ; then
11238 :
11239 else
11240 case "$enableval" in
11241 *,*)
11242 level=`echo $enableval|sed -e 's/^.*,//'`
11243 fac=`echo $enableval|sed -e 's/,.*$//'`
11244- cat >> confdefs.h <<EOF
11245+ cat >>confdefs.h <<_ACEOF
11246 #define ENABLE_SYSLOG $fac
11247-EOF
11248+_ACEOF
11249
11250 ;;
11251 *)
11252@@ -890,568 +2921,1562 @@ EOF
11253 ;;
11254 esac
11255 if test "$level" = "force" ; then
11256- cat >> confdefs.h <<\EOF
11257-#define ENABLE_SYSLOG_FORCE 1
11258-EOF
11259+ $as_echo "#define ENABLE_SYSLOG_FORCE 1" >>confdefs.h
11260
11261- else
11262+ else
11263 if test "$level" = "optional" ; then
11264 :
11265 else
11266- cat >> confdefs.h <<\EOF
11267-#define ENABLE_SYSLOG_DEFAULT 1
11268-EOF
11269+ $as_echo "#define ENABLE_SYSLOG_DEFAULT 1" >>confdefs.h
11270
11271 fi
11272 fi
11273 fi
11274 else
11275-
11276- cat >> confdefs.h <<\EOF
11277-#define ENABLE_SYSLOG_DEFAULT 1
11278-EOF
11279+
11280+ $as_echo "#define ENABLE_SYSLOG_DEFAULT 1" >>confdefs.h
11281
11282 lookup_facility=LOG_UUCP
11283-
11284+
11285 fi
11286
11287
11288-# Extract the first word of "gcc", so it can be a program name with args.
11289+ac_ext=c
11290+ac_cpp='$CPP $CPPFLAGS'
11291+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
11292+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
11293+ac_compiler_gnu=$ac_cv_c_compiler_gnu
11294+if test -n "$ac_tool_prefix"; then
11295+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
11296+set dummy ${ac_tool_prefix}gcc; ac_word=$2
11297+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11298+$as_echo_n "checking for $ac_word... " >&6; }
11299+if ${ac_cv_prog_CC+:} false; then :
11300+ $as_echo_n "(cached) " >&6
11301+else
11302+ if test -n "$CC"; then
11303+ ac_cv_prog_CC="$CC" # Let the user override the test.
11304+else
11305+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11306+for as_dir in $PATH
11307+do
11308+ IFS=$as_save_IFS
11309+ test -z "$as_dir" && as_dir=.
11310+ for ac_exec_ext in '' $ac_executable_extensions; do
11311+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11312+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
11313+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11314+ break 2
11315+ fi
11316+done
11317+ done
11318+IFS=$as_save_IFS
11319+
11320+fi
11321+fi
11322+CC=$ac_cv_prog_CC
11323+if test -n "$CC"; then
11324+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
11325+$as_echo "$CC" >&6; }
11326+else
11327+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11328+$as_echo "no" >&6; }
11329+fi
11330+
11331+
11332+fi
11333+if test -z "$ac_cv_prog_CC"; then
11334+ ac_ct_CC=$CC
11335+ # Extract the first word of "gcc", so it can be a program name with args.
11336 set dummy gcc; ac_word=$2
11337-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
11338-echo "configure:923: checking for $ac_word" >&5
11339-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
11340- echo $ac_n "(cached) $ac_c" 1>&6
11341+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11342+$as_echo_n "checking for $ac_word... " >&6; }
11343+if ${ac_cv_prog_ac_ct_CC+:} false; then :
11344+ $as_echo_n "(cached) " >&6
11345+else
11346+ if test -n "$ac_ct_CC"; then
11347+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
11348+else
11349+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11350+for as_dir in $PATH
11351+do
11352+ IFS=$as_save_IFS
11353+ test -z "$as_dir" && as_dir=.
11354+ for ac_exec_ext in '' $ac_executable_extensions; do
11355+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11356+ ac_cv_prog_ac_ct_CC="gcc"
11357+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11358+ break 2
11359+ fi
11360+done
11361+ done
11362+IFS=$as_save_IFS
11363+
11364+fi
11365+fi
11366+ac_ct_CC=$ac_cv_prog_ac_ct_CC
11367+if test -n "$ac_ct_CC"; then
11368+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
11369+$as_echo "$ac_ct_CC" >&6; }
11370+else
11371+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11372+$as_echo "no" >&6; }
11373+fi
11374+
11375+ if test "x$ac_ct_CC" = x; then
11376+ CC=""
11377+ else
11378+ case $cross_compiling:$ac_tool_warned in
11379+yes:)
11380+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11381+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11382+ac_tool_warned=yes ;;
11383+esac
11384+ CC=$ac_ct_CC
11385+ fi
11386+else
11387+ CC="$ac_cv_prog_CC"
11388+fi
11389+
11390+if test -z "$CC"; then
11391+ if test -n "$ac_tool_prefix"; then
11392+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
11393+set dummy ${ac_tool_prefix}cc; ac_word=$2
11394+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11395+$as_echo_n "checking for $ac_word... " >&6; }
11396+if ${ac_cv_prog_CC+:} false; then :
11397+ $as_echo_n "(cached) " >&6
11398 else
11399 if test -n "$CC"; then
11400 ac_cv_prog_CC="$CC" # Let the user override the test.
11401 else
11402- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
11403- for ac_dir in $PATH; do
11404- test -z "$ac_dir" && ac_dir=.
11405- if test -f $ac_dir/$ac_word; then
11406- ac_cv_prog_CC="gcc"
11407- break
11408- fi
11409+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11410+for as_dir in $PATH
11411+do
11412+ IFS=$as_save_IFS
11413+ test -z "$as_dir" && as_dir=.
11414+ for ac_exec_ext in '' $ac_executable_extensions; do
11415+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11416+ ac_cv_prog_CC="${ac_tool_prefix}cc"
11417+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11418+ break 2
11419+ fi
11420+done
11421 done
11422- IFS="$ac_save_ifs"
11423+IFS=$as_save_IFS
11424+
11425 fi
11426 fi
11427-CC="$ac_cv_prog_CC"
11428+CC=$ac_cv_prog_CC
11429 if test -n "$CC"; then
11430- echo "$ac_t""$CC" 1>&6
11431+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
11432+$as_echo "$CC" >&6; }
11433 else
11434- echo "$ac_t""no" 1>&6
11435+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11436+$as_echo "no" >&6; }
11437 fi
11438
11439+
11440+ fi
11441+fi
11442 if test -z "$CC"; then
11443 # Extract the first word of "cc", so it can be a program name with args.
11444 set dummy cc; ac_word=$2
11445-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
11446-echo "configure:952: checking for $ac_word" >&5
11447-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
11448- echo $ac_n "(cached) $ac_c" 1>&6
11449+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11450+$as_echo_n "checking for $ac_word... " >&6; }
11451+if ${ac_cv_prog_CC+:} false; then :
11452+ $as_echo_n "(cached) " >&6
11453 else
11454 if test -n "$CC"; then
11455 ac_cv_prog_CC="$CC" # Let the user override the test.
11456 else
11457- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
11458 ac_prog_rejected=no
11459- for ac_dir in $PATH; do
11460- test -z "$ac_dir" && ac_dir=.
11461- if test -f $ac_dir/$ac_word; then
11462- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
11463- ac_prog_rejected=yes
11464- continue
11465- fi
11466- ac_cv_prog_CC="cc"
11467- break
11468- fi
11469+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11470+for as_dir in $PATH
11471+do
11472+ IFS=$as_save_IFS
11473+ test -z "$as_dir" && as_dir=.
11474+ for ac_exec_ext in '' $ac_executable_extensions; do
11475+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11476+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
11477+ ac_prog_rejected=yes
11478+ continue
11479+ fi
11480+ ac_cv_prog_CC="cc"
11481+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11482+ break 2
11483+ fi
11484+done
11485 done
11486- IFS="$ac_save_ifs"
11487+IFS=$as_save_IFS
11488+
11489 if test $ac_prog_rejected = yes; then
11490 # We found a bogon in the path, so make sure we never use it.
11491 set dummy $ac_cv_prog_CC
11492 shift
11493- if test $# -gt 0; then
11494+ if test $# != 0; then
11495 # We chose a different compiler from the bogus one.
11496 # However, it has the same basename, so the bogon will be chosen
11497 # first if we set CC to just the basename; use the full file name.
11498 shift
11499- set dummy "$ac_dir/$ac_word" "$@"
11500- shift
11501- ac_cv_prog_CC="$@"
11502+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
11503 fi
11504 fi
11505 fi
11506 fi
11507-CC="$ac_cv_prog_CC"
11508+CC=$ac_cv_prog_CC
11509+if test -n "$CC"; then
11510+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
11511+$as_echo "$CC" >&6; }
11512+else
11513+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11514+$as_echo "no" >&6; }
11515+fi
11516+
11517+
11518+fi
11519+if test -z "$CC"; then
11520+ if test -n "$ac_tool_prefix"; then
11521+ for ac_prog in cl.exe
11522+ do
11523+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
11524+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
11525+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11526+$as_echo_n "checking for $ac_word... " >&6; }
11527+if ${ac_cv_prog_CC+:} false; then :
11528+ $as_echo_n "(cached) " >&6
11529+else
11530+ if test -n "$CC"; then
11531+ ac_cv_prog_CC="$CC" # Let the user override the test.
11532+else
11533+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11534+for as_dir in $PATH
11535+do
11536+ IFS=$as_save_IFS
11537+ test -z "$as_dir" && as_dir=.
11538+ for ac_exec_ext in '' $ac_executable_extensions; do
11539+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11540+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
11541+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11542+ break 2
11543+ fi
11544+done
11545+ done
11546+IFS=$as_save_IFS
11547+
11548+fi
11549+fi
11550+CC=$ac_cv_prog_CC
11551 if test -n "$CC"; then
11552- echo "$ac_t""$CC" 1>&6
11553+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
11554+$as_echo "$CC" >&6; }
11555 else
11556- echo "$ac_t""no" 1>&6
11557+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11558+$as_echo "no" >&6; }
11559 fi
11560
11561- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
11562+
11563+ test -n "$CC" && break
11564+ done
11565+fi
11566+if test -z "$CC"; then
11567+ ac_ct_CC=$CC
11568+ for ac_prog in cl.exe
11569+do
11570+ # Extract the first word of "$ac_prog", so it can be a program name with args.
11571+set dummy $ac_prog; ac_word=$2
11572+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11573+$as_echo_n "checking for $ac_word... " >&6; }
11574+if ${ac_cv_prog_ac_ct_CC+:} false; then :
11575+ $as_echo_n "(cached) " >&6
11576+else
11577+ if test -n "$ac_ct_CC"; then
11578+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
11579+else
11580+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11581+for as_dir in $PATH
11582+do
11583+ IFS=$as_save_IFS
11584+ test -z "$as_dir" && as_dir=.
11585+ for ac_exec_ext in '' $ac_executable_extensions; do
11586+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11587+ ac_cv_prog_ac_ct_CC="$ac_prog"
11588+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11589+ break 2
11590+ fi
11591+done
11592+ done
11593+IFS=$as_save_IFS
11594+
11595+fi
11596+fi
11597+ac_ct_CC=$ac_cv_prog_ac_ct_CC
11598+if test -n "$ac_ct_CC"; then
11599+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
11600+$as_echo "$ac_ct_CC" >&6; }
11601+else
11602+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11603+$as_echo "no" >&6; }
11604 fi
11605
11606-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
11607-echo "configure:1000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
11608
11609-ac_ext=c
11610-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
11611-ac_cpp='$CPP $CPPFLAGS'
11612-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
11613-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
11614-cross_compiling=$ac_cv_prog_cc_cross
11615-
11616-cat > conftest.$ac_ext <<EOF
11617-#line 1010 "configure"
11618-#include "confdefs.h"
11619-main(){return(0);}
11620-EOF
11621-if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
11622- ac_cv_prog_cc_works=yes
11623- # If we can't run a trivial program, we are probably using a cross compiler.
11624- if (./conftest; exit) 2>/dev/null; then
11625- ac_cv_prog_cc_cross=no
11626+ test -n "$ac_ct_CC" && break
11627+done
11628+
11629+ if test "x$ac_ct_CC" = x; then
11630+ CC=""
11631 else
11632- ac_cv_prog_cc_cross=yes
11633+ case $cross_compiling:$ac_tool_warned in
11634+yes:)
11635+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
11636+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
11637+ac_tool_warned=yes ;;
11638+esac
11639+ CC=$ac_ct_CC
11640 fi
11641+fi
11642+
11643+fi
11644+
11645+
11646+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11647+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11648+as_fn_error $? "no acceptable C compiler found in \$PATH
11649+See \`config.log' for more details" "$LINENO" 5; }
11650+
11651+# Provide some information about the compiler.
11652+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
11653+set X $ac_compile
11654+ac_compiler=$2
11655+for ac_option in --version -v -V -qversion; do
11656+ { { ac_try="$ac_compiler $ac_option >&5"
11657+case "(($ac_try" in
11658+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11659+ *) ac_try_echo=$ac_try;;
11660+esac
11661+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11662+$as_echo "$ac_try_echo"; } >&5
11663+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
11664+ ac_status=$?
11665+ if test -s conftest.err; then
11666+ sed '10a\
11667+... rest of stderr output deleted ...
11668+ 10q' conftest.err >conftest.er1
11669+ cat conftest.er1 >&5
11670+ fi
11671+ rm -f conftest.er1 conftest.err
11672+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11673+ test $ac_status = 0; }
11674+done
11675+
11676+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11677+/* end confdefs.h. */
11678+
11679+int
11680+main ()
11681+{
11682+
11683+ ;
11684+ return 0;
11685+}
11686+_ACEOF
11687+ac_clean_files_save=$ac_clean_files
11688+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
11689+# Try to create an executable without -o first, disregard a.out.
11690+# It will help us diagnose broken compilers, and finding out an intuition
11691+# of exeext.
11692+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
11693+$as_echo_n "checking whether the C compiler works... " >&6; }
11694+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
11695+
11696+# The possible output files:
11697+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
11698+
11699+ac_rmfiles=
11700+for ac_file in $ac_files
11701+do
11702+ case $ac_file in
11703+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
11704+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
11705+ esac
11706+done
11707+rm -f $ac_rmfiles
11708+
11709+if { { ac_try="$ac_link_default"
11710+case "(($ac_try" in
11711+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11712+ *) ac_try_echo=$ac_try;;
11713+esac
11714+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11715+$as_echo "$ac_try_echo"; } >&5
11716+ (eval "$ac_link_default") 2>&5
11717+ ac_status=$?
11718+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11719+ test $ac_status = 0; }; then :
11720+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
11721+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
11722+# in a Makefile. We should not override ac_cv_exeext if it was cached,
11723+# so that the user can short-circuit this test for compilers unknown to
11724+# Autoconf.
11725+for ac_file in $ac_files ''
11726+do
11727+ test -f "$ac_file" || continue
11728+ case $ac_file in
11729+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
11730+ ;;
11731+ [ab].out )
11732+ # We found the default executable, but exeext='' is most
11733+ # certainly right.
11734+ break;;
11735+ *.* )
11736+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
11737+ then :; else
11738+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
11739+ fi
11740+ # We set ac_cv_exeext here because the later test for it is not
11741+ # safe: cross compilers may not add the suffix if given an `-o'
11742+ # argument, so we may need to know it at that point already.
11743+ # Even if this section looks crufty: it has the advantage of
11744+ # actually working.
11745+ break;;
11746+ * )
11747+ break;;
11748+ esac
11749+done
11750+test "$ac_cv_exeext" = no && ac_cv_exeext=
11751+
11752 else
11753- echo "configure: failed program was:" >&5
11754- cat conftest.$ac_ext >&5
11755- ac_cv_prog_cc_works=no
11756+ ac_file=''
11757 fi
11758-rm -fr conftest*
11759+if test -z "$ac_file"; then :
11760+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11761+$as_echo "no" >&6; }
11762+$as_echo "$as_me: failed program was:" >&5
11763+sed 's/^/| /' conftest.$ac_ext >&5
11764+
11765+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11766+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11767+as_fn_error 77 "C compiler cannot create executables
11768+See \`config.log' for more details" "$LINENO" 5; }
11769+else
11770+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11771+$as_echo "yes" >&6; }
11772+fi
11773+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
11774+$as_echo_n "checking for C compiler default output file name... " >&6; }
11775+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
11776+$as_echo "$ac_file" >&6; }
11777+ac_exeext=$ac_cv_exeext
11778+
11779+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
11780+ac_clean_files=$ac_clean_files_save
11781+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
11782+$as_echo_n "checking for suffix of executables... " >&6; }
11783+if { { ac_try="$ac_link"
11784+case "(($ac_try" in
11785+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11786+ *) ac_try_echo=$ac_try;;
11787+esac
11788+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11789+$as_echo "$ac_try_echo"; } >&5
11790+ (eval "$ac_link") 2>&5
11791+ ac_status=$?
11792+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11793+ test $ac_status = 0; }; then :
11794+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
11795+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
11796+# work properly (i.e., refer to `conftest.exe'), while it won't with
11797+# `rm'.
11798+for ac_file in conftest.exe conftest conftest.*; do
11799+ test -f "$ac_file" || continue
11800+ case $ac_file in
11801+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
11802+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
11803+ break;;
11804+ * ) break;;
11805+ esac
11806+done
11807+else
11808+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11809+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11810+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
11811+See \`config.log' for more details" "$LINENO" 5; }
11812+fi
11813+rm -f conftest conftest$ac_cv_exeext
11814+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
11815+$as_echo "$ac_cv_exeext" >&6; }
11816+
11817+rm -f conftest.$ac_ext
11818+EXEEXT=$ac_cv_exeext
11819+ac_exeext=$EXEEXT
11820+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11821+/* end confdefs.h. */
11822+#include <stdio.h>
11823+int
11824+main ()
11825+{
11826+FILE *f = fopen ("conftest.out", "w");
11827+ return ferror (f) || fclose (f) != 0;
11828
11829-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
11830-if test $ac_cv_prog_cc_works = no; then
11831- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
11832+ ;
11833+ return 0;
11834+}
11835+_ACEOF
11836+ac_clean_files="$ac_clean_files conftest.out"
11837+# Check that the compiler produces executables we can run. If not, either
11838+# the compiler is broken, or we cross compile.
11839+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
11840+$as_echo_n "checking whether we are cross compiling... " >&6; }
11841+if test "$cross_compiling" != yes; then
11842+ { { ac_try="$ac_link"
11843+case "(($ac_try" in
11844+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11845+ *) ac_try_echo=$ac_try;;
11846+esac
11847+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11848+$as_echo "$ac_try_echo"; } >&5
11849+ (eval "$ac_link") 2>&5
11850+ ac_status=$?
11851+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11852+ test $ac_status = 0; }
11853+ if { ac_try='./conftest$ac_cv_exeext'
11854+ { { case "(($ac_try" in
11855+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11856+ *) ac_try_echo=$ac_try;;
11857+esac
11858+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11859+$as_echo "$ac_try_echo"; } >&5
11860+ (eval "$ac_try") 2>&5
11861+ ac_status=$?
11862+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11863+ test $ac_status = 0; }; }; then
11864+ cross_compiling=no
11865+ else
11866+ if test "$cross_compiling" = maybe; then
11867+ cross_compiling=yes
11868+ else
11869+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11870+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11871+as_fn_error $? "cannot run C compiled programs.
11872+If you meant to cross compile, use \`--host'.
11873+See \`config.log' for more details" "$LINENO" 5; }
11874+ fi
11875+ fi
11876 fi
11877-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
11878-echo "configure:1034: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
11879-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
11880-cross_compiling=$ac_cv_prog_cc_cross
11881+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
11882+$as_echo "$cross_compiling" >&6; }
11883
11884-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
11885-echo "configure:1039: checking whether we are using GNU C" >&5
11886-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
11887- echo $ac_n "(cached) $ac_c" 1>&6
11888+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
11889+ac_clean_files=$ac_clean_files_save
11890+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
11891+$as_echo_n "checking for suffix of object files... " >&6; }
11892+if ${ac_cv_objext+:} false; then :
11893+ $as_echo_n "(cached) " >&6
11894 else
11895- cat > conftest.c <<EOF
11896-#ifdef __GNUC__
11897- yes;
11898+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11899+/* end confdefs.h. */
11900+
11901+int
11902+main ()
11903+{
11904+
11905+ ;
11906+ return 0;
11907+}
11908+_ACEOF
11909+rm -f conftest.o conftest.obj
11910+if { { ac_try="$ac_compile"
11911+case "(($ac_try" in
11912+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
11913+ *) ac_try_echo=$ac_try;;
11914+esac
11915+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
11916+$as_echo "$ac_try_echo"; } >&5
11917+ (eval "$ac_compile") 2>&5
11918+ ac_status=$?
11919+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
11920+ test $ac_status = 0; }; then :
11921+ for ac_file in conftest.o conftest.obj conftest.*; do
11922+ test -f "$ac_file" || continue;
11923+ case $ac_file in
11924+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
11925+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
11926+ break;;
11927+ esac
11928+done
11929+else
11930+ $as_echo "$as_me: failed program was:" >&5
11931+sed 's/^/| /' conftest.$ac_ext >&5
11932+
11933+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11934+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11935+as_fn_error $? "cannot compute suffix of object files: cannot compile
11936+See \`config.log' for more details" "$LINENO" 5; }
11937+fi
11938+rm -f conftest.$ac_cv_objext conftest.$ac_ext
11939+fi
11940+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
11941+$as_echo "$ac_cv_objext" >&6; }
11942+OBJEXT=$ac_cv_objext
11943+ac_objext=$OBJEXT
11944+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
11945+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
11946+if ${ac_cv_c_compiler_gnu+:} false; then :
11947+ $as_echo_n "(cached) " >&6
11948+else
11949+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
11950+/* end confdefs.h. */
11951+
11952+int
11953+main ()
11954+{
11955+#ifndef __GNUC__
11956+ choke me
11957 #endif
11958-EOF
11959-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
11960- ac_cv_prog_gcc=yes
11961+
11962+ ;
11963+ return 0;
11964+}
11965+_ACEOF
11966+if ac_fn_c_try_compile "$LINENO"; then :
11967+ ac_compiler_gnu=yes
11968 else
11969- ac_cv_prog_gcc=no
11970-fi
11971+ ac_compiler_gnu=no
11972 fi
11973+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
11974+ac_cv_c_compiler_gnu=$ac_compiler_gnu
11975
11976-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
11977-
11978-if test $ac_cv_prog_gcc = yes; then
11979+fi
11980+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
11981+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
11982+if test $ac_compiler_gnu = yes; then
11983 GCC=yes
11984- ac_test_CFLAGS="${CFLAGS+set}"
11985- ac_save_CFLAGS="$CFLAGS"
11986- CFLAGS=
11987- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
11988-echo "configure:1063: checking whether ${CC-cc} accepts -g" >&5
11989-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
11990- echo $ac_n "(cached) $ac_c" 1>&6
11991 else
11992- echo 'void f(){}' > conftest.c
11993-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
11994+ GCC=
11995+fi
11996+ac_test_CFLAGS=${CFLAGS+set}
11997+ac_save_CFLAGS=$CFLAGS
11998+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
11999+$as_echo_n "checking whether $CC accepts -g... " >&6; }
12000+if ${ac_cv_prog_cc_g+:} false; then :
12001+ $as_echo_n "(cached) " >&6
12002+else
12003+ ac_save_c_werror_flag=$ac_c_werror_flag
12004+ ac_c_werror_flag=yes
12005+ ac_cv_prog_cc_g=no
12006+ CFLAGS="-g"
12007+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12008+/* end confdefs.h. */
12009+
12010+int
12011+main ()
12012+{
12013+
12014+ ;
12015+ return 0;
12016+}
12017+_ACEOF
12018+if ac_fn_c_try_compile "$LINENO"; then :
12019 ac_cv_prog_cc_g=yes
12020 else
12021- ac_cv_prog_cc_g=no
12022-fi
12023-rm -f conftest*
12024+ CFLAGS=""
12025+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12026+/* end confdefs.h. */
12027
12028-fi
12029+int
12030+main ()
12031+{
12032+
12033+ ;
12034+ return 0;
12035+}
12036+_ACEOF
12037+if ac_fn_c_try_compile "$LINENO"; then :
12038+
12039+else
12040+ ac_c_werror_flag=$ac_save_c_werror_flag
12041+ CFLAGS="-g"
12042+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12043+/* end confdefs.h. */
12044
12045-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
12046- if test "$ac_test_CFLAGS" = set; then
12047- CFLAGS="$ac_save_CFLAGS"
12048- elif test $ac_cv_prog_cc_g = yes; then
12049+int
12050+main ()
12051+{
12052+
12053+ ;
12054+ return 0;
12055+}
12056+_ACEOF
12057+if ac_fn_c_try_compile "$LINENO"; then :
12058+ ac_cv_prog_cc_g=yes
12059+fi
12060+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12061+fi
12062+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12063+fi
12064+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
12065+ ac_c_werror_flag=$ac_save_c_werror_flag
12066+fi
12067+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
12068+$as_echo "$ac_cv_prog_cc_g" >&6; }
12069+if test "$ac_test_CFLAGS" = set; then
12070+ CFLAGS=$ac_save_CFLAGS
12071+elif test $ac_cv_prog_cc_g = yes; then
12072+ if test "$GCC" = yes; then
12073 CFLAGS="-g -O2"
12074 else
12075+ CFLAGS="-g"
12076+ fi
12077+else
12078+ if test "$GCC" = yes; then
12079 CFLAGS="-O2"
12080+ else
12081+ CFLAGS=
12082+ fi
12083+fi
12084+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
12085+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
12086+if ${ac_cv_prog_cc_c89+:} false; then :
12087+ $as_echo_n "(cached) " >&6
12088+else
12089+ ac_cv_prog_cc_c89=no
12090+ac_save_CC=$CC
12091+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12092+/* end confdefs.h. */
12093+#include <stdarg.h>
12094+#include <stdio.h>
12095+struct stat;
12096+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
12097+struct buf { int x; };
12098+FILE * (*rcsopen) (struct buf *, struct stat *, int);
12099+static char *e (p, i)
12100+ char **p;
12101+ int i;
12102+{
12103+ return p[i];
12104+}
12105+static char *f (char * (*g) (char **, int), char **p, ...)
12106+{
12107+ char *s;
12108+ va_list v;
12109+ va_start (v,p);
12110+ s = g (p, va_arg (v,int));
12111+ va_end (v);
12112+ return s;
12113+}
12114+
12115+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
12116+ function prototypes and stuff, but not '\xHH' hex character constants.
12117+ These don't provoke an error unfortunately, instead are silently treated
12118+ as 'x'. The following induces an error, until -std is added to get
12119+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
12120+ array size at least. It's necessary to write '\x00'==0 to get something
12121+ that's true only with -std. */
12122+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
12123+
12124+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
12125+ inside strings and character constants. */
12126+#define FOO(x) 'x'
12127+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
12128+
12129+int test (int i, double x);
12130+struct s1 {int (*f) (int a);};
12131+struct s2 {int (*f) (double a);};
12132+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
12133+int argc;
12134+char **argv;
12135+int
12136+main ()
12137+{
12138+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
12139+ ;
12140+ return 0;
12141+}
12142+_ACEOF
12143+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
12144+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
12145+do
12146+ CC="$ac_save_CC $ac_arg"
12147+ if ac_fn_c_try_compile "$LINENO"; then :
12148+ ac_cv_prog_cc_c89=$ac_arg
12149+fi
12150+rm -f core conftest.err conftest.$ac_objext
12151+ test "x$ac_cv_prog_cc_c89" != "xno" && break
12152+done
12153+rm -f conftest.$ac_ext
12154+CC=$ac_save_CC
12155+
12156+fi
12157+# AC_CACHE_VAL
12158+case "x$ac_cv_prog_cc_c89" in
12159+ x)
12160+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
12161+$as_echo "none needed" >&6; } ;;
12162+ xno)
12163+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
12164+$as_echo "unsupported" >&6; } ;;
12165+ *)
12166+ CC="$CC $ac_cv_prog_cc_c89"
12167+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
12168+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
12169+esac
12170+if test "x$ac_cv_prog_cc_c89" != xno; then :
12171+
12172+fi
12173+
12174+ac_ext=c
12175+ac_cpp='$CPP $CPPFLAGS'
12176+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12177+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12178+ac_compiler_gnu=$ac_cv_c_compiler_gnu
12179+
12180+ac_ext=c
12181+ac_cpp='$CPP $CPPFLAGS'
12182+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12183+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12184+ac_compiler_gnu=$ac_cv_c_compiler_gnu
12185+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
12186+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
12187+if ${am_cv_prog_cc_c_o+:} false; then :
12188+ $as_echo_n "(cached) " >&6
12189+else
12190+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12191+/* end confdefs.h. */
12192+
12193+int
12194+main ()
12195+{
12196+
12197+ ;
12198+ return 0;
12199+}
12200+_ACEOF
12201+ # Make sure it works both with $CC and with simple cc.
12202+ # Following AC_PROG_CC_C_O, we do the test twice because some
12203+ # compilers refuse to overwrite an existing .o file with -o,
12204+ # though they will create one.
12205+ am_cv_prog_cc_c_o=yes
12206+ for am_i in 1 2; do
12207+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
12208+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
12209+ ac_status=$?
12210+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12211+ (exit $ac_status); } \
12212+ && test -f conftest2.$ac_objext; then
12213+ : OK
12214+ else
12215+ am_cv_prog_cc_c_o=no
12216+ break
12217+ fi
12218+ done
12219+ rm -f core conftest*
12220+ unset am_i
12221+fi
12222+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
12223+$as_echo "$am_cv_prog_cc_c_o" >&6; }
12224+if test "$am_cv_prog_cc_c_o" != yes; then
12225+ # Losing compiler, so override with the script.
12226+ # FIXME: It is wrong to rewrite CC.
12227+ # But if we don't then we get into trouble of one sort or another.
12228+ # A longer-term fix would be to have automake use am__CC in this case,
12229+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
12230+ CC="$am_aux_dir/compile $CC"
12231+fi
12232+ac_ext=c
12233+ac_cpp='$CPP $CPPFLAGS'
12234+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12235+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12236+ac_compiler_gnu=$ac_cv_c_compiler_gnu
12237+
12238+DEPDIR="${am__leading_dot}deps"
12239+
12240+ac_config_commands="$ac_config_commands depfiles"
12241+
12242+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
12243+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
12244+cat > confinc.mk << 'END'
12245+am__doit:
12246+ @echo this is the am__doit target >confinc.out
12247+.PHONY: am__doit
12248+END
12249+am__include="#"
12250+am__quote=
12251+# BSD make does it like this.
12252+echo '.include "confinc.mk" # ignored' > confmf.BSD
12253+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
12254+echo 'include confinc.mk # ignored' > confmf.GNU
12255+_am_result=no
12256+for s in GNU BSD; do
12257+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
12258+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
12259+ ac_status=$?
12260+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
12261+ (exit $ac_status); }
12262+ case $?:`cat confinc.out 2>/dev/null` in #(
12263+ '0:this is the am__doit target') :
12264+ case $s in #(
12265+ BSD) :
12266+ am__include='.include' am__quote='"' ;; #(
12267+ *) :
12268+ am__include='include' am__quote='' ;;
12269+esac ;; #(
12270+ *) :
12271+ ;;
12272+esac
12273+ if test "$am__include" != "#"; then
12274+ _am_result="yes ($s style)"
12275+ break
12276 fi
12277+done
12278+rm -f confinc.* confmf.*
12279+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
12280+$as_echo "${_am_result}" >&6; }
12281+
12282+# Check whether --enable-dependency-tracking was given.
12283+if test "${enable_dependency_tracking+set}" = set; then :
12284+ enableval=$enable_dependency_tracking;
12285+fi
12286+
12287+if test "x$enable_dependency_tracking" != xno; then
12288+ am_depcomp="$ac_aux_dir/depcomp"
12289+ AMDEPBACKSLASH='\'
12290+ am__nodep='_no'
12291+fi
12292+ if test "x$enable_dependency_tracking" != xno; then
12293+ AMDEP_TRUE=
12294+ AMDEP_FALSE='#'
12295+else
12296+ AMDEP_TRUE='#'
12297+ AMDEP_FALSE=
12298+fi
12299+
12300+
12301+
12302+depcc="$CC" am_compiler_list=
12303+
12304+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
12305+$as_echo_n "checking dependency style of $depcc... " >&6; }
12306+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
12307+ $as_echo_n "(cached) " >&6
12308+else
12309+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
12310+ # We make a subdir and do the tests there. Otherwise we can end up
12311+ # making bogus files that we don't know about and never remove. For
12312+ # instance it was reported that on HP-UX the gcc test will end up
12313+ # making a dummy file named 'D' -- because '-MD' means "put the output
12314+ # in D".
12315+ rm -rf conftest.dir
12316+ mkdir conftest.dir
12317+ # Copy depcomp to subdir because otherwise we won't find it if we're
12318+ # using a relative directory.
12319+ cp "$am_depcomp" conftest.dir
12320+ cd conftest.dir
12321+ # We will build objects and dependencies in a subdirectory because
12322+ # it helps to detect inapplicable dependency modes. For instance
12323+ # both Tru64's cc and ICC support -MD to output dependencies as a
12324+ # side effect of compilation, but ICC will put the dependencies in
12325+ # the current directory while Tru64 will put them in the object
12326+ # directory.
12327+ mkdir sub
12328+
12329+ am_cv_CC_dependencies_compiler_type=none
12330+ if test "$am_compiler_list" = ""; then
12331+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
12332+ fi
12333+ am__universal=false
12334+ case " $depcc " in #(
12335+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
12336+ esac
12337+
12338+ for depmode in $am_compiler_list; do
12339+ # Setup a source with many dependencies, because some compilers
12340+ # like to wrap large dependency lists on column 80 (with \), and
12341+ # we should not choose a depcomp mode which is confused by this.
12342+ #
12343+ # We need to recreate these files for each test, as the compiler may
12344+ # overwrite some of them when testing with obscure command lines.
12345+ # This happens at least with the AIX C compiler.
12346+ : > sub/conftest.c
12347+ for i in 1 2 3 4 5 6; do
12348+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
12349+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
12350+ # Solaris 10 /bin/sh.
12351+ echo '/* dummy */' > sub/conftst$i.h
12352+ done
12353+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
12354+
12355+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
12356+ # mode. It turns out that the SunPro C++ compiler does not properly
12357+ # handle '-M -o', and we need to detect this. Also, some Intel
12358+ # versions had trouble with output in subdirs.
12359+ am__obj=sub/conftest.${OBJEXT-o}
12360+ am__minus_obj="-o $am__obj"
12361+ case $depmode in
12362+ gcc)
12363+ # This depmode causes a compiler race in universal mode.
12364+ test "$am__universal" = false || continue
12365+ ;;
12366+ nosideeffect)
12367+ # After this tag, mechanisms are not by side-effect, so they'll
12368+ # only be used when explicitly requested.
12369+ if test "x$enable_dependency_tracking" = xyes; then
12370+ continue
12371+ else
12372+ break
12373+ fi
12374+ ;;
12375+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
12376+ # This compiler won't grok '-c -o', but also, the minuso test has
12377+ # not run yet. These depmodes are late enough in the game, and
12378+ # so weak that their functioning should not be impacted.
12379+ am__obj=conftest.${OBJEXT-o}
12380+ am__minus_obj=
12381+ ;;
12382+ none) break ;;
12383+ esac
12384+ if depmode=$depmode \
12385+ source=sub/conftest.c object=$am__obj \
12386+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
12387+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
12388+ >/dev/null 2>conftest.err &&
12389+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
12390+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
12391+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
12392+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
12393+ # icc doesn't choke on unknown options, it will just issue warnings
12394+ # or remarks (even with -Werror). So we grep stderr for any message
12395+ # that says an option was ignored or not supported.
12396+ # When given -MP, icc 7.0 and 7.1 complain thusly:
12397+ # icc: Command line warning: ignoring option '-M'; no argument required
12398+ # The diagnosis changed in icc 8.0:
12399+ # icc: Command line remark: option '-MP' not supported
12400+ if (grep 'ignoring option' conftest.err ||
12401+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
12402+ am_cv_CC_dependencies_compiler_type=$depmode
12403+ break
12404+ fi
12405+ fi
12406+ done
12407+
12408+ cd ..
12409+ rm -rf conftest.dir
12410 else
12411- GCC=
12412- test "${CFLAGS+set}" = set || CFLAGS="-g"
12413+ am_cv_CC_dependencies_compiler_type=none
12414+fi
12415+
12416+fi
12417+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
12418+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
12419+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
12420+
12421+ if
12422+ test "x$enable_dependency_tracking" != xno \
12423+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
12424+ am__fastdepCC_TRUE=
12425+ am__fastdepCC_FALSE='#'
12426+else
12427+ am__fastdepCC_TRUE='#'
12428+ am__fastdepCC_FALSE=
12429 fi
12430
12431-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
12432-echo "configure:1091: checking how to run the C preprocessor" >&5
12433+
12434+
12435+ac_ext=c
12436+ac_cpp='$CPP $CPPFLAGS'
12437+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12438+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12439+ac_compiler_gnu=$ac_cv_c_compiler_gnu
12440+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
12441+$as_echo_n "checking how to run the C preprocessor... " >&6; }
12442 # On Suns, sometimes $CPP names a directory.
12443 if test -n "$CPP" && test -d "$CPP"; then
12444 CPP=
12445 fi
12446 if test -z "$CPP"; then
12447-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
12448- echo $ac_n "(cached) $ac_c" 1>&6
12449+ if ${ac_cv_prog_CPP+:} false; then :
12450+ $as_echo_n "(cached) " >&6
12451 else
12452- # This must be in double quotes, not single quotes, because CPP may get
12453- # substituted into the Makefile and "${CC-cc}" will confuse make.
12454- CPP="${CC-cc} -E"
12455+ # Double quotes because CPP needs to be expanded
12456+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
12457+ do
12458+ ac_preproc_ok=false
12459+for ac_c_preproc_warn_flag in '' yes
12460+do
12461+ # Use a header file that comes with gcc, so configuring glibc
12462+ # with a fresh cross-compiler works.
12463+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12464+ # <limits.h> exists even on freestanding compilers.
12465 # On the NeXT, cc -E runs the code through the compiler's parser,
12466- # not just through cpp.
12467- cat > conftest.$ac_ext <<EOF
12468-#line 1106 "configure"
12469-#include "confdefs.h"
12470-#include <assert.h>
12471-Syntax Error
12472-EOF
12473-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12474-{ (eval echo configure:1112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12475-ac_err=`grep -v '^ *+' conftest.out`
12476-if test -z "$ac_err"; then
12477- :
12478+ # not just through cpp. "Syntax error" is here to catch this case.
12479+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12480+/* end confdefs.h. */
12481+#ifdef __STDC__
12482+# include <limits.h>
12483+#else
12484+# include <assert.h>
12485+#endif
12486+ Syntax error
12487+_ACEOF
12488+if ac_fn_c_try_cpp "$LINENO"; then :
12489+
12490+else
12491+ # Broken: fails on valid input.
12492+continue
12493+fi
12494+rm -f conftest.err conftest.i conftest.$ac_ext
12495+
12496+ # OK, works on sane cases. Now check whether nonexistent headers
12497+ # can be detected and how.
12498+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12499+/* end confdefs.h. */
12500+#include <ac_nonexistent.h>
12501+_ACEOF
12502+if ac_fn_c_try_cpp "$LINENO"; then :
12503+ # Broken: success on invalid input.
12504+continue
12505+else
12506+ # Passes both tests.
12507+ac_preproc_ok=:
12508+break
12509+fi
12510+rm -f conftest.err conftest.i conftest.$ac_ext
12511+
12512+done
12513+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
12514+rm -f conftest.i conftest.err conftest.$ac_ext
12515+if $ac_preproc_ok; then :
12516+ break
12517+fi
12518+
12519+ done
12520+ ac_cv_prog_CPP=$CPP
12521+
12522+fi
12523+ CPP=$ac_cv_prog_CPP
12524 else
12525- echo "$ac_err" >&5
12526- echo "configure: failed program was:" >&5
12527- cat conftest.$ac_ext >&5
12528- rm -rf conftest*
12529- CPP="${CC-cc} -E -traditional-cpp"
12530- cat > conftest.$ac_ext <<EOF
12531-#line 1123 "configure"
12532-#include "confdefs.h"
12533-#include <assert.h>
12534-Syntax Error
12535-EOF
12536-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12537-{ (eval echo configure:1129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12538-ac_err=`grep -v '^ *+' conftest.out`
12539-if test -z "$ac_err"; then
12540- :
12541+ ac_cv_prog_CPP=$CPP
12542+fi
12543+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
12544+$as_echo "$CPP" >&6; }
12545+ac_preproc_ok=false
12546+for ac_c_preproc_warn_flag in '' yes
12547+do
12548+ # Use a header file that comes with gcc, so configuring glibc
12549+ # with a fresh cross-compiler works.
12550+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
12551+ # <limits.h> exists even on freestanding compilers.
12552+ # On the NeXT, cc -E runs the code through the compiler's parser,
12553+ # not just through cpp. "Syntax error" is here to catch this case.
12554+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12555+/* end confdefs.h. */
12556+#ifdef __STDC__
12557+# include <limits.h>
12558+#else
12559+# include <assert.h>
12560+#endif
12561+ Syntax error
12562+_ACEOF
12563+if ac_fn_c_try_cpp "$LINENO"; then :
12564+
12565+else
12566+ # Broken: fails on valid input.
12567+continue
12568+fi
12569+rm -f conftest.err conftest.i conftest.$ac_ext
12570+
12571+ # OK, works on sane cases. Now check whether nonexistent headers
12572+ # can be detected and how.
12573+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12574+/* end confdefs.h. */
12575+#include <ac_nonexistent.h>
12576+_ACEOF
12577+if ac_fn_c_try_cpp "$LINENO"; then :
12578+ # Broken: success on invalid input.
12579+continue
12580+else
12581+ # Passes both tests.
12582+ac_preproc_ok=:
12583+break
12584+fi
12585+rm -f conftest.err conftest.i conftest.$ac_ext
12586+
12587+done
12588+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
12589+rm -f conftest.i conftest.err conftest.$ac_ext
12590+if $ac_preproc_ok; then :
12591+
12592 else
12593- echo "$ac_err" >&5
12594- echo "configure: failed program was:" >&5
12595- cat conftest.$ac_ext >&5
12596- rm -rf conftest*
12597- CPP=/lib/cpp
12598+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12599+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12600+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
12601+See \`config.log' for more details" "$LINENO" 5; }
12602 fi
12603-rm -f conftest*
12604+
12605+ac_ext=c
12606+ac_cpp='$CPP $CPPFLAGS'
12607+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
12608+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12609+ac_compiler_gnu=$ac_cv_c_compiler_gnu
12610+
12611+
12612+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
12613+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
12614+if ${ac_cv_path_GREP+:} false; then :
12615+ $as_echo_n "(cached) " >&6
12616+else
12617+ if test -z "$GREP"; then
12618+ ac_path_GREP_found=false
12619+ # Loop through the user's path and test for each of PROGNAME-LIST
12620+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12621+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
12622+do
12623+ IFS=$as_save_IFS
12624+ test -z "$as_dir" && as_dir=.
12625+ for ac_prog in grep ggrep; do
12626+ for ac_exec_ext in '' $ac_executable_extensions; do
12627+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
12628+ as_fn_executable_p "$ac_path_GREP" || continue
12629+# Check for GNU ac_path_GREP and select it if it is found.
12630+ # Check for GNU $ac_path_GREP
12631+case `"$ac_path_GREP" --version 2>&1` in
12632+*GNU*)
12633+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
12634+*)
12635+ ac_count=0
12636+ $as_echo_n 0123456789 >"conftest.in"
12637+ while :
12638+ do
12639+ cat "conftest.in" "conftest.in" >"conftest.tmp"
12640+ mv "conftest.tmp" "conftest.in"
12641+ cp "conftest.in" "conftest.nl"
12642+ $as_echo 'GREP' >> "conftest.nl"
12643+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
12644+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
12645+ as_fn_arith $ac_count + 1 && ac_count=$as_val
12646+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
12647+ # Best one so far, save it but keep looking for a better one
12648+ ac_cv_path_GREP="$ac_path_GREP"
12649+ ac_path_GREP_max=$ac_count
12650+ fi
12651+ # 10*(2^10) chars as input seems more than enough
12652+ test $ac_count -gt 10 && break
12653+ done
12654+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
12655+esac
12656+
12657+ $ac_path_GREP_found && break 3
12658+ done
12659+ done
12660+ done
12661+IFS=$as_save_IFS
12662+ if test -z "$ac_cv_path_GREP"; then
12663+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
12664+ fi
12665+else
12666+ ac_cv_path_GREP=$GREP
12667 fi
12668-rm -f conftest*
12669- ac_cv_prog_CPP="$CPP"
12670+
12671 fi
12672- CPP="$ac_cv_prog_CPP"
12673+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
12674+$as_echo "$ac_cv_path_GREP" >&6; }
12675+ GREP="$ac_cv_path_GREP"
12676+
12677+
12678+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
12679+$as_echo_n "checking for egrep... " >&6; }
12680+if ${ac_cv_path_EGREP+:} false; then :
12681+ $as_echo_n "(cached) " >&6
12682+else
12683+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
12684+ then ac_cv_path_EGREP="$GREP -E"
12685+ else
12686+ if test -z "$EGREP"; then
12687+ ac_path_EGREP_found=false
12688+ # Loop through the user's path and test for each of PROGNAME-LIST
12689+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12690+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
12691+do
12692+ IFS=$as_save_IFS
12693+ test -z "$as_dir" && as_dir=.
12694+ for ac_prog in egrep; do
12695+ for ac_exec_ext in '' $ac_executable_extensions; do
12696+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
12697+ as_fn_executable_p "$ac_path_EGREP" || continue
12698+# Check for GNU ac_path_EGREP and select it if it is found.
12699+ # Check for GNU $ac_path_EGREP
12700+case `"$ac_path_EGREP" --version 2>&1` in
12701+*GNU*)
12702+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
12703+*)
12704+ ac_count=0
12705+ $as_echo_n 0123456789 >"conftest.in"
12706+ while :
12707+ do
12708+ cat "conftest.in" "conftest.in" >"conftest.tmp"
12709+ mv "conftest.tmp" "conftest.in"
12710+ cp "conftest.in" "conftest.nl"
12711+ $as_echo 'EGREP' >> "conftest.nl"
12712+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
12713+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
12714+ as_fn_arith $ac_count + 1 && ac_count=$as_val
12715+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
12716+ # Best one so far, save it but keep looking for a better one
12717+ ac_cv_path_EGREP="$ac_path_EGREP"
12718+ ac_path_EGREP_max=$ac_count
12719+ fi
12720+ # 10*(2^10) chars as input seems more than enough
12721+ test $ac_count -gt 10 && break
12722+ done
12723+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
12724+esac
12725+
12726+ $ac_path_EGREP_found && break 3
12727+ done
12728+ done
12729+ done
12730+IFS=$as_save_IFS
12731+ if test -z "$ac_cv_path_EGREP"; then
12732+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
12733+ fi
12734 else
12735- ac_cv_prog_CPP="$CPP"
12736+ ac_cv_path_EGREP=$EGREP
12737 fi
12738-echo "$ac_t""$CPP" 1>&6
12739
12740-if test $ac_cv_prog_gcc = yes; then
12741- echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
12742-echo "configure:1153: checking whether ${CC-cc} needs -traditional" >&5
12743-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
12744- echo $ac_n "(cached) $ac_c" 1>&6
12745+ fi
12746+fi
12747+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
12748+$as_echo "$ac_cv_path_EGREP" >&6; }
12749+ EGREP="$ac_cv_path_EGREP"
12750+
12751+
12752+if test $ac_cv_c_compiler_gnu = yes; then
12753+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
12754+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
12755+if ${ac_cv_prog_gcc_traditional+:} false; then :
12756+ $as_echo_n "(cached) " >&6
12757 else
12758 ac_pattern="Autoconf.*'x'"
12759- cat > conftest.$ac_ext <<EOF
12760-#line 1159 "configure"
12761-#include "confdefs.h"
12762+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12763+/* end confdefs.h. */
12764 #include <sgtty.h>
12765 Autoconf TIOCGETP
12766-EOF
12767+_ACEOF
12768 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12769- egrep "$ac_pattern" >/dev/null 2>&1; then
12770- rm -rf conftest*
12771+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
12772 ac_cv_prog_gcc_traditional=yes
12773 else
12774- rm -rf conftest*
12775 ac_cv_prog_gcc_traditional=no
12776 fi
12777 rm -f conftest*
12778
12779
12780 if test $ac_cv_prog_gcc_traditional = no; then
12781- cat > conftest.$ac_ext <<EOF
12782-#line 1177 "configure"
12783-#include "confdefs.h"
12784+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
12785+/* end confdefs.h. */
12786 #include <termio.h>
12787 Autoconf TCGETA
12788-EOF
12789+_ACEOF
12790 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12791- egrep "$ac_pattern" >/dev/null 2>&1; then
12792- rm -rf conftest*
12793+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
12794 ac_cv_prog_gcc_traditional=yes
12795 fi
12796 rm -f conftest*
12797
12798 fi
12799 fi
12800-
12801-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
12802+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
12803+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
12804 if test $ac_cv_prog_gcc_traditional = yes; then
12805 CC="$CC -traditional"
12806 fi
12807 fi
12808
12809-# Extract the first word of "ranlib", so it can be a program name with args.
12810-set dummy ranlib; ac_word=$2
12811-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12812-echo "configure:1201: checking for $ac_word" >&5
12813-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
12814- echo $ac_n "(cached) $ac_c" 1>&6
12815+if test -n "$ac_tool_prefix"; then
12816+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
12817+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
12818+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12819+$as_echo_n "checking for $ac_word... " >&6; }
12820+if ${ac_cv_prog_RANLIB+:} false; then :
12821+ $as_echo_n "(cached) " >&6
12822 else
12823 if test -n "$RANLIB"; then
12824 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
12825 else
12826- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
12827- for ac_dir in $PATH; do
12828- test -z "$ac_dir" && ac_dir=.
12829- if test -f $ac_dir/$ac_word; then
12830- ac_cv_prog_RANLIB="ranlib"
12831- break
12832- fi
12833+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12834+for as_dir in $PATH
12835+do
12836+ IFS=$as_save_IFS
12837+ test -z "$as_dir" && as_dir=.
12838+ for ac_exec_ext in '' $ac_executable_extensions; do
12839+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12840+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
12841+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12842+ break 2
12843+ fi
12844+done
12845 done
12846- IFS="$ac_save_ifs"
12847- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
12848+IFS=$as_save_IFS
12849+
12850 fi
12851 fi
12852-RANLIB="$ac_cv_prog_RANLIB"
12853+RANLIB=$ac_cv_prog_RANLIB
12854 if test -n "$RANLIB"; then
12855- echo "$ac_t""$RANLIB" 1>&6
12856+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
12857+$as_echo "$RANLIB" >&6; }
12858 else
12859- echo "$ac_t""no" 1>&6
12860+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12861+$as_echo "no" >&6; }
12862 fi
12863
12864-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
12865-echo "configure:1228: checking for POSIXized ISC" >&5
12866-if test -d /etc/conf/kconfig.d &&
12867- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
12868-then
12869- echo "$ac_t""yes" 1>&6
12870- ISC=yes # If later tests want to check for ISC.
12871- cat >> confdefs.h <<\EOF
12872-#define _POSIX_SOURCE 1
12873-EOF
12874
12875- if test "$GCC" = yes; then
12876- CC="$CC -posix"
12877- else
12878- CC="$CC -Xp"
12879- fi
12880-else
12881- echo "$ac_t""no" 1>&6
12882- ISC=
12883 fi
12884-
12885-echo $ac_n "checking for AIX""... $ac_c" 1>&6
12886-echo "configure:1249: checking for AIX" >&5
12887-cat > conftest.$ac_ext <<EOF
12888-#line 1251 "configure"
12889-#include "confdefs.h"
12890-#ifdef _AIX
12891- yes
12892-#endif
12893-
12894-EOF
12895-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
12896- egrep "yes" >/dev/null 2>&1; then
12897- rm -rf conftest*
12898- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
12899-#define _ALL_SOURCE 1
12900-EOF
12901-
12902+if test -z "$ac_cv_prog_RANLIB"; then
12903+ ac_ct_RANLIB=$RANLIB
12904+ # Extract the first word of "ranlib", so it can be a program name with args.
12905+set dummy ranlib; ac_word=$2
12906+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
12907+$as_echo_n "checking for $ac_word... " >&6; }
12908+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
12909+ $as_echo_n "(cached) " >&6
12910 else
12911- rm -rf conftest*
12912- echo "$ac_t""no" 1>&6
12913-fi
12914-rm -f conftest*
12915-
12916+ if test -n "$ac_ct_RANLIB"; then
12917+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
12918+else
12919+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
12920+for as_dir in $PATH
12921+do
12922+ IFS=$as_save_IFS
12923+ test -z "$as_dir" && as_dir=.
12924+ for ac_exec_ext in '' $ac_executable_extensions; do
12925+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12926+ ac_cv_prog_ac_ct_RANLIB="ranlib"
12927+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12928+ break 2
12929+ fi
12930+done
12931+ done
12932+IFS=$as_save_IFS
12933
12934-ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
12935-echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
12936-echo "configure:1274: checking for minix/config.h" >&5
12937-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
12938- echo $ac_n "(cached) $ac_c" 1>&6
12939-else
12940- cat > conftest.$ac_ext <<EOF
12941-#line 1279 "configure"
12942-#include "confdefs.h"
12943-#include <minix/config.h>
12944-EOF
12945-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12946-{ (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12947-ac_err=`grep -v '^ *+' conftest.out`
12948-if test -z "$ac_err"; then
12949- rm -rf conftest*
12950- eval "ac_cv_header_$ac_safe=yes"
12951-else
12952- echo "$ac_err" >&5
12953- echo "configure: failed program was:" >&5
12954- cat conftest.$ac_ext >&5
12955- rm -rf conftest*
12956- eval "ac_cv_header_$ac_safe=no"
12957 fi
12958-rm -f conftest*
12959 fi
12960-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
12961- echo "$ac_t""yes" 1>&6
12962- MINIX=yes
12963+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
12964+if test -n "$ac_ct_RANLIB"; then
12965+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
12966+$as_echo "$ac_ct_RANLIB" >&6; }
12967 else
12968- echo "$ac_t""no" 1>&6
12969-MINIX=
12970+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12971+$as_echo "no" >&6; }
12972 fi
12973
12974-if test "$MINIX" = yes; then
12975- cat >> confdefs.h <<\EOF
12976-#define _POSIX_SOURCE 1
12977-EOF
12978-
12979- cat >> confdefs.h <<\EOF
12980-#define _POSIX_1_SOURCE 2
12981-EOF
12982-
12983- cat >> confdefs.h <<\EOF
12984-#define _MINIX 1
12985-EOF
12986-
12987+ if test "x$ac_ct_RANLIB" = x; then
12988+ RANLIB=":"
12989+ else
12990+ case $cross_compiling:$ac_tool_warned in
12991+yes:)
12992+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
12993+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
12994+ac_tool_warned=yes ;;
12995+esac
12996+ RANLIB=$ac_ct_RANLIB
12997+ fi
12998+else
12999+ RANLIB="$ac_cv_prog_RANLIB"
13000 fi
13001
13002-
13003-
13004-
13005-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
13006-echo "configure:1325: checking for ${CC-cc} option to accept ANSI C" >&5
13007-if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
13008- echo $ac_n "(cached) $ac_c" 1>&6
13009+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
13010+$as_echo_n "checking for library containing strerror... " >&6; }
13011+if ${ac_cv_search_strerror+:} false; then :
13012+ $as_echo_n "(cached) " >&6
13013 else
13014- am_cv_prog_cc_stdc=no
13015-ac_save_CC="$CC"
13016-# Don't try gcc -ansi; that turns off useful extensions and
13017-# breaks some systems' header files.
13018-# AIX -qlanglvl=ansi
13019-# Ultrix and OSF/1 -std1
13020-# HP-UX -Aa -D_HPUX_SOURCE
13021-# SVR4 -Xc -D__EXTENSIONS__
13022-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
13023-do
13024- CC="$ac_save_CC $ac_arg"
13025- cat > conftest.$ac_ext <<EOF
13026-#line 1341 "configure"
13027-#include "confdefs.h"
13028-#include <stdarg.h>
13029-#include <stdio.h>
13030-#include <sys/types.h>
13031-#include <sys/stat.h>
13032-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
13033-struct buf { int x; };
13034-FILE * (*rcsopen) (struct buf *, struct stat *, int);
13035-static char *e (p, i)
13036- char **p;
13037- int i;
13038+ ac_func_search_save_LIBS=$LIBS
13039+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13040+/* end confdefs.h. */
13041+
13042+/* Override any GCC internal prototype to avoid an error.
13043+ Use char because int might match the return type of a GCC
13044+ builtin and then its argument prototype would still apply. */
13045+#ifdef __cplusplus
13046+extern "C"
13047+#endif
13048+char strerror ();
13049+int
13050+main ()
13051 {
13052- return p[i];
13053+return strerror ();
13054+ ;
13055+ return 0;
13056 }
13057-static char *f (char * (*g) (char **, int), char **p, ...)
13058-{
13059- char *s;
13060- va_list v;
13061- va_start (v,p);
13062- s = g (p, va_arg (v,int));
13063- va_end (v);
13064- return s;
13065-}
13066-int test (int i, double x);
13067-struct s1 {int (*f) (int a);};
13068-struct s2 {int (*f) (double a);};
13069-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
13070-int argc;
13071-char **argv;
13072-
13073-int main() {
13074-
13075-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
13076-
13077-; return 0; }
13078-EOF
13079-if { (eval echo configure:1378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13080- rm -rf conftest*
13081- am_cv_prog_cc_stdc="$ac_arg"; break
13082-else
13083- echo "configure: failed program was:" >&5
13084- cat conftest.$ac_ext >&5
13085+_ACEOF
13086+for ac_lib in '' cposix; do
13087+ if test -z "$ac_lib"; then
13088+ ac_res="none required"
13089+ else
13090+ ac_res=-l$ac_lib
13091+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
13092+ fi
13093+ if ac_fn_c_try_link "$LINENO"; then :
13094+ ac_cv_search_strerror=$ac_res
13095 fi
13096-rm -f conftest*
13097-done
13098-CC="$ac_save_CC"
13099-
13100+rm -f core conftest.err conftest.$ac_objext \
13101+ conftest$ac_exeext
13102+ if ${ac_cv_search_strerror+:} false; then :
13103+ break
13104 fi
13105+done
13106+if ${ac_cv_search_strerror+:} false; then :
13107
13108-if test -z "$am_cv_prog_cc_stdc"; then
13109- echo "$ac_t""none needed" 1>&6
13110 else
13111- echo "$ac_t""$am_cv_prog_cc_stdc" 1>&6
13112+ ac_cv_search_strerror=no
13113 fi
13114-case "x$am_cv_prog_cc_stdc" in
13115- x|xno) ;;
13116- *) CC="$CC $am_cv_prog_cc_stdc" ;;
13117-esac
13118-
13119-
13120+rm conftest.$ac_ext
13121+LIBS=$ac_func_search_save_LIBS
13122+fi
13123+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
13124+$as_echo "$ac_cv_search_strerror" >&6; }
13125+ac_res=$ac_cv_search_strerror
13126+if test "$ac_res" != no; then :
13127+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
13128
13129-echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
13130-echo "configure:1404: checking for function prototypes" >&5
13131-if test "$am_cv_prog_cc_stdc" != no; then
13132- echo "$ac_t""yes" 1>&6
13133- cat >> confdefs.h <<\EOF
13134-#define PROTOTYPES 1
13135-EOF
13136+fi
13137
13138- U= ANSI2KNR=
13139+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
13140+$as_echo_n "checking for ANSI C header files... " >&6; }
13141+if ${ac_cv_header_stdc+:} false; then :
13142+ $as_echo_n "(cached) " >&6
13143 else
13144- echo "$ac_t""no" 1>&6
13145- U=_ ANSI2KNR=./ansi2knr
13146- # Ensure some checks needed by ansi2knr itself.
13147- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
13148-echo "configure:1417: checking for ANSI C header files" >&5
13149-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
13150- echo $ac_n "(cached) $ac_c" 1>&6
13151-else
13152- cat > conftest.$ac_ext <<EOF
13153-#line 1422 "configure"
13154-#include "confdefs.h"
13155+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13156+/* end confdefs.h. */
13157 #include <stdlib.h>
13158 #include <stdarg.h>
13159 #include <string.h>
13160 #include <float.h>
13161-EOF
13162-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13163-{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13164-ac_err=`grep -v '^ *+' conftest.out`
13165-if test -z "$ac_err"; then
13166- rm -rf conftest*
13167+
13168+int
13169+main ()
13170+{
13171+
13172+ ;
13173+ return 0;
13174+}
13175+_ACEOF
13176+if ac_fn_c_try_compile "$LINENO"; then :
13177 ac_cv_header_stdc=yes
13178 else
13179- echo "$ac_err" >&5
13180- echo "configure: failed program was:" >&5
13181- cat conftest.$ac_ext >&5
13182- rm -rf conftest*
13183 ac_cv_header_stdc=no
13184 fi
13185-rm -f conftest*
13186+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13187
13188 if test $ac_cv_header_stdc = yes; then
13189 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
13190-cat > conftest.$ac_ext <<EOF
13191-#line 1447 "configure"
13192-#include "confdefs.h"
13193+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13194+/* end confdefs.h. */
13195 #include <string.h>
13196-EOF
13197+
13198+_ACEOF
13199 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13200- egrep "memchr" >/dev/null 2>&1; then
13201- :
13202+ $EGREP "memchr" >/dev/null 2>&1; then :
13203+
13204 else
13205- rm -rf conftest*
13206 ac_cv_header_stdc=no
13207 fi
13208 rm -f conftest*
13209@@ -1460,16 +4485,15 @@ fi
13210
13211 if test $ac_cv_header_stdc = yes; then
13212 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
13213-cat > conftest.$ac_ext <<EOF
13214-#line 1465 "configure"
13215-#include "confdefs.h"
13216+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13217+/* end confdefs.h. */
13218 #include <stdlib.h>
13219-EOF
13220+
13221+_ACEOF
13222 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13223- egrep "free" >/dev/null 2>&1; then
13224- :
13225+ $EGREP "free" >/dev/null 2>&1; then :
13226+
13227 else
13228- rm -rf conftest*
13229 ac_cv_header_stdc=no
13230 fi
13231 rm -f conftest*
13232@@ -1478,206 +4502,263 @@ fi
13233
13234 if test $ac_cv_header_stdc = yes; then
13235 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
13236-if test "$cross_compiling" = yes; then
13237+ if test "$cross_compiling" = yes; then :
13238 :
13239 else
13240- cat > conftest.$ac_ext <<EOF
13241-#line 1486 "configure"
13242-#include "confdefs.h"
13243+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13244+/* end confdefs.h. */
13245 #include <ctype.h>
13246-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
13247-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
13248+#include <stdlib.h>
13249+#if ((' ' & 0x0FF) == 0x020)
13250+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
13251+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
13252+#else
13253+# define ISLOWER(c) \
13254+ (('a' <= (c) && (c) <= 'i') \
13255+ || ('j' <= (c) && (c) <= 'r') \
13256+ || ('s' <= (c) && (c) <= 'z'))
13257+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
13258+#endif
13259+
13260 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
13261-int main () { int i; for (i = 0; i < 256; i++)
13262-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
13263-exit (0); }
13264-
13265-EOF
13266-if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
13267-then
13268- :
13269+int
13270+main ()
13271+{
13272+ int i;
13273+ for (i = 0; i < 256; i++)
13274+ if (XOR (islower (i), ISLOWER (i))
13275+ || toupper (i) != TOUPPER (i))
13276+ return 2;
13277+ return 0;
13278+}
13279+_ACEOF
13280+if ac_fn_c_try_run "$LINENO"; then :
13281+
13282 else
13283- echo "configure: failed program was:" >&5
13284- cat conftest.$ac_ext >&5
13285- rm -fr conftest*
13286 ac_cv_header_stdc=no
13287 fi
13288-rm -fr conftest*
13289+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
13290+ conftest.$ac_objext conftest.beam conftest.$ac_ext
13291 fi
13292
13293 fi
13294 fi
13295-
13296-echo "$ac_t""$ac_cv_header_stdc" 1>&6
13297+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
13298+$as_echo "$ac_cv_header_stdc" >&6; }
13299 if test $ac_cv_header_stdc = yes; then
13300- cat >> confdefs.h <<\EOF
13301-#define STDC_HEADERS 1
13302-EOF
13303
13304-fi
13305+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
13306
13307- for ac_hdr in string.h
13308-do
13309-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
13310-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
13311-echo "configure:1524: checking for $ac_hdr" >&5
13312-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13313- echo $ac_n "(cached) $ac_c" 1>&6
13314-else
13315- cat > conftest.$ac_ext <<EOF
13316-#line 1529 "configure"
13317-#include "confdefs.h"
13318-#include <$ac_hdr>
13319-EOF
13320-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13321-{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13322-ac_err=`grep -v '^ *+' conftest.out`
13323-if test -z "$ac_err"; then
13324- rm -rf conftest*
13325- eval "ac_cv_header_$ac_safe=yes"
13326-else
13327- echo "$ac_err" >&5
13328- echo "configure: failed program was:" >&5
13329- cat conftest.$ac_ext >&5
13330- rm -rf conftest*
13331- eval "ac_cv_header_$ac_safe=no"
13332-fi
13333-rm -f conftest*
13334 fi
13335-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
13336- echo "$ac_t""yes" 1>&6
13337- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
13338- cat >> confdefs.h <<EOF
13339-#define $ac_tr_hdr 1
13340-EOF
13341-
13342-else
13343- echo "$ac_t""no" 1>&6
13344+
13345+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
13346+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
13347+ inttypes.h stdint.h unistd.h
13348+do :
13349+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
13350+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
13351+"
13352+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
13353+ cat >>confdefs.h <<_ACEOF
13354+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
13355+_ACEOF
13356+
13357 fi
13358+
13359 done
13360
13361+
13362+
13363+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
13364+if test "x$ac_cv_header_minix_config_h" = xyes; then :
13365+ MINIX=yes
13366+else
13367+ MINIX=
13368+fi
13369+
13370+
13371+ if test "$MINIX" = yes; then
13372+
13373+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
13374+
13375+
13376+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
13377+
13378+
13379+$as_echo "#define _MINIX 1" >>confdefs.h
13380+
13381+ fi
13382+
13383+
13384+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
13385+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
13386+if ${ac_cv_safe_to_define___extensions__+:} false; then :
13387+ $as_echo_n "(cached) " >&6
13388+else
13389+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13390+/* end confdefs.h. */
13391+
13392+# define __EXTENSIONS__ 1
13393+ $ac_includes_default
13394+int
13395+main ()
13396+{
13397+
13398+ ;
13399+ return 0;
13400+}
13401+_ACEOF
13402+if ac_fn_c_try_compile "$LINENO"; then :
13403+ ac_cv_safe_to_define___extensions__=yes
13404+else
13405+ ac_cv_safe_to_define___extensions__=no
13406+fi
13407+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13408 fi
13409+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
13410+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
13411+ test $ac_cv_safe_to_define___extensions__ = yes &&
13412+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
13413
13414-echo $ac_n "checking for working const""... $ac_c" 1>&6
13415-echo "configure:1563: checking for working const" >&5
13416-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
13417- echo $ac_n "(cached) $ac_c" 1>&6
13418-else
13419- cat > conftest.$ac_ext <<EOF
13420-#line 1568 "configure"
13421-#include "confdefs.h"
13422-
13423-int main() {
13424-
13425-/* Ultrix mips cc rejects this. */
13426-typedef int charset[2]; const charset x;
13427-/* SunOS 4.1.1 cc rejects this. */
13428-char const *const *ccp;
13429-char **p;
13430-/* NEC SVR4.0.2 mips cc rejects this. */
13431-struct point {int x, y;};
13432-static struct point const zero = {0,0};
13433-/* AIX XL C 1.02.0.0 rejects this.
13434- It does not let you subtract one const X* pointer from another in an arm
13435- of an if-expression whose if-part is not a constant expression */
13436-const char *g = "string";
13437-ccp = &g + (g ? g-g : 0);
13438-/* HPUX 7.0 cc rejects these. */
13439-++ccp;
13440-p = (char**) ccp;
13441-ccp = (char const *const *) p;
13442-{ /* SCO 3.2v4 cc rejects this. */
13443- char *t;
13444- char const *s = 0 ? (char *) 0 : (char const *) 0;
13445-
13446- *t++ = 0;
13447-}
13448-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
13449- int x[] = {25, 17};
13450- const int *foo = &x[0];
13451- ++foo;
13452-}
13453-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
13454- typedef const int *iptr;
13455- iptr p = 0;
13456- ++p;
13457-}
13458-{ /* AIX XL C 1.02.0.0 rejects this saying
13459- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
13460- struct s { int j; const int *ap[3]; };
13461- struct s *b; b->j = 5;
13462-}
13463-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
13464- const int foo = 10;
13465-}
13466-
13467-; return 0; }
13468-EOF
13469-if { (eval echo configure:1617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13470- rm -rf conftest*
13471+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
13472+
13473+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
13474+
13475+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
13476+
13477+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
13478+
13479+
13480+
13481+
13482+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
13483+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
13484+if ${ac_cv_c_const+:} false; then :
13485+ $as_echo_n "(cached) " >&6
13486+else
13487+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13488+/* end confdefs.h. */
13489+
13490+int
13491+main ()
13492+{
13493+
13494+#ifndef __cplusplus
13495+ /* Ultrix mips cc rejects this sort of thing. */
13496+ typedef int charset[2];
13497+ const charset cs = { 0, 0 };
13498+ /* SunOS 4.1.1 cc rejects this. */
13499+ char const *const *pcpcc;
13500+ char **ppc;
13501+ /* NEC SVR4.0.2 mips cc rejects this. */
13502+ struct point {int x, y;};
13503+ static struct point const zero = {0,0};
13504+ /* AIX XL C 1.02.0.0 rejects this.
13505+ It does not let you subtract one const X* pointer from another in
13506+ an arm of an if-expression whose if-part is not a constant
13507+ expression */
13508+ const char *g = "string";
13509+ pcpcc = &g + (g ? g-g : 0);
13510+ /* HPUX 7.0 cc rejects these. */
13511+ ++pcpcc;
13512+ ppc = (char**) pcpcc;
13513+ pcpcc = (char const *const *) ppc;
13514+ { /* SCO 3.2v4 cc rejects this sort of thing. */
13515+ char tx;
13516+ char *t = &tx;
13517+ char const *s = 0 ? (char *) 0 : (char const *) 0;
13518+
13519+ *t++ = 0;
13520+ if (s) return 0;
13521+ }
13522+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
13523+ int x[] = {25, 17};
13524+ const int *foo = &x[0];
13525+ ++foo;
13526+ }
13527+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
13528+ typedef const int *iptr;
13529+ iptr p = 0;
13530+ ++p;
13531+ }
13532+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
13533+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
13534+ struct s { int j; const int *ap[3]; } bx;
13535+ struct s *b = &bx; b->j = 5;
13536+ }
13537+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
13538+ const int foo = 10;
13539+ if (!foo) return 0;
13540+ }
13541+ return !cs[0] && !zero.x;
13542+#endif
13543+
13544+ ;
13545+ return 0;
13546+}
13547+_ACEOF
13548+if ac_fn_c_try_compile "$LINENO"; then :
13549 ac_cv_c_const=yes
13550 else
13551- echo "configure: failed program was:" >&5
13552- cat conftest.$ac_ext >&5
13553- rm -rf conftest*
13554 ac_cv_c_const=no
13555 fi
13556-rm -f conftest*
13557+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13558 fi
13559-
13560-echo "$ac_t""$ac_cv_c_const" 1>&6
13561+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
13562+$as_echo "$ac_cv_c_const" >&6; }
13563 if test $ac_cv_c_const = no; then
13564- cat >> confdefs.h <<\EOF
13565-#define const
13566-EOF
13567+
13568+$as_echo "#define const /**/" >>confdefs.h
13569
13570 fi
13571
13572-echo $ac_n "checking for inline""... $ac_c" 1>&6
13573-echo "configure:1638: checking for inline" >&5
13574-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
13575- echo $ac_n "(cached) $ac_c" 1>&6
13576+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
13577+$as_echo_n "checking for inline... " >&6; }
13578+if ${ac_cv_c_inline+:} false; then :
13579+ $as_echo_n "(cached) " >&6
13580 else
13581 ac_cv_c_inline=no
13582 for ac_kw in inline __inline__ __inline; do
13583- cat > conftest.$ac_ext <<EOF
13584-#line 1645 "configure"
13585-#include "confdefs.h"
13586-
13587-int main() {
13588-} $ac_kw foo() {
13589-; return 0; }
13590-EOF
13591-if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13592- rm -rf conftest*
13593- ac_cv_c_inline=$ac_kw; break
13594-else
13595- echo "configure: failed program was:" >&5
13596- cat conftest.$ac_ext >&5
13597+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13598+/* end confdefs.h. */
13599+#ifndef __cplusplus
13600+typedef int foo_t;
13601+static $ac_kw foo_t static_foo () {return 0; }
13602+$ac_kw foo_t foo () {return 0; }
13603+#endif
13604+
13605+_ACEOF
13606+if ac_fn_c_try_compile "$LINENO"; then :
13607+ ac_cv_c_inline=$ac_kw
13608 fi
13609-rm -f conftest*
13610+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13611+ test "$ac_cv_c_inline" != no && break
13612 done
13613
13614 fi
13615+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
13616+$as_echo "$ac_cv_c_inline" >&6; }
13617
13618-echo "$ac_t""$ac_cv_c_inline" 1>&6
13619-case "$ac_cv_c_inline" in
13620+case $ac_cv_c_inline in
13621 inline | yes) ;;
13622- no) cat >> confdefs.h <<\EOF
13623-#define inline
13624-EOF
13625- ;;
13626- *) cat >> confdefs.h <<EOF
13627-#define inline $ac_cv_c_inline
13628-EOF
13629- ;;
13630+ *)
13631+ case $ac_cv_c_inline in
13632+ no) ac_val=;;
13633+ *) ac_val=$ac_cv_c_inline;;
13634+ esac
13635+ cat >>confdefs.h <<_ACEOF
13636+#ifndef __cplusplus
13637+#define inline $ac_val
13638+#endif
13639+_ACEOF
13640+ ;;
13641 esac
13642
13643
13644 if test `hostname` = tirka.ohse.de -a "$cross_compiling" = no ; then
13645 test $prefix = NONE && prefix=/usr
13646- if test -z "$CFLAGS" ; then
13647- case "$CC" in
13648+ if test -z "$CFLAGS" ; then
13649+ case "$CC" in
13650 *gcc*)
13651 CFLAGS="-Wall -Wstrict-prototypes -Wmissing-prototypes"
13652 # -Wnested_externs entfernt wegen dcgettext()
13653@@ -1691,195 +4772,185 @@ if test `hostname` = tirka.ohse.de -a "$
13654 fi
13655 case "$CFLAGS" in
13656 *-Wstrict-prototypes*)
13657- cat >> confdefs.h <<\EOF
13658-#define STRICT_PROTOTYPES 1
13659-EOF
13660+ $as_echo "#define STRICT_PROTOTYPES 1" >>confdefs.h
13661
13662 ;;
13663 esac
13664
13665-echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6
13666-echo "configure:1703: checking for syslog in -lsocket" >&5
13667-ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'`
13668-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13669- echo $ac_n "(cached) $ac_c" 1>&6
13670+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syslog in -lsocket" >&5
13671+$as_echo_n "checking for syslog in -lsocket... " >&6; }
13672+if ${ac_cv_lib_socket_syslog+:} false; then :
13673+ $as_echo_n "(cached) " >&6
13674 else
13675- ac_save_LIBS="$LIBS"
13676+ ac_check_lib_save_LIBS=$LIBS
13677 LIBS="-lsocket $LIBS"
13678-cat > conftest.$ac_ext <<EOF
13679-#line 1711 "configure"
13680-#include "confdefs.h"
13681-/* Override any gcc2 internal prototype to avoid an error. */
13682-/* We use char because int might match the return type of a gcc2
13683- builtin and then its argument prototype would still apply. */
13684-char syslog();
13685-
13686-int main() {
13687-syslog()
13688-; return 0; }
13689-EOF
13690-if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
13691- rm -rf conftest*
13692- eval "ac_cv_lib_$ac_lib_var=yes"
13693-else
13694- echo "configure: failed program was:" >&5
13695- cat conftest.$ac_ext >&5
13696- rm -rf conftest*
13697- eval "ac_cv_lib_$ac_lib_var=no"
13698-fi
13699-rm -f conftest*
13700-LIBS="$ac_save_LIBS"
13701+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13702+/* end confdefs.h. */
13703
13704-fi
13705-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
13706- echo "$ac_t""yes" 1>&6
13707- ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
13708- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
13709- cat >> confdefs.h <<EOF
13710-#define $ac_tr_lib 1
13711-EOF
13712+/* Override any GCC internal prototype to avoid an error.
13713+ Use char because int might match the return type of a GCC
13714+ builtin and then its argument prototype would still apply. */
13715+#ifdef __cplusplus
13716+extern "C"
13717+#endif
13718+char syslog ();
13719+int
13720+main ()
13721+{
13722+return syslog ();
13723+ ;
13724+ return 0;
13725+}
13726+_ACEOF
13727+if ac_fn_c_try_link "$LINENO"; then :
13728+ ac_cv_lib_socket_syslog=yes
13729+else
13730+ ac_cv_lib_socket_syslog=no
13731+fi
13732+rm -f core conftest.err conftest.$ac_objext \
13733+ conftest$ac_exeext conftest.$ac_ext
13734+LIBS=$ac_check_lib_save_LIBS
13735+fi
13736+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_syslog" >&5
13737+$as_echo "$ac_cv_lib_socket_syslog" >&6; }
13738+if test "x$ac_cv_lib_socket_syslog" = xyes; then :
13739+ cat >>confdefs.h <<_ACEOF
13740+#define HAVE_LIBSOCKET 1
13741+_ACEOF
13742
13743 LIBS="-lsocket $LIBS"
13744
13745-else
13746- echo "$ac_t""no" 1>&6
13747 fi
13748
13749-echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6
13750-echo "configure:1750: checking for syslog in -lbe" >&5
13751-ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'`
13752-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13753- echo $ac_n "(cached) $ac_c" 1>&6
13754+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syslog in -lbe" >&5
13755+$as_echo_n "checking for syslog in -lbe... " >&6; }
13756+if ${ac_cv_lib_be_syslog+:} false; then :
13757+ $as_echo_n "(cached) " >&6
13758 else
13759- ac_save_LIBS="$LIBS"
13760+ ac_check_lib_save_LIBS=$LIBS
13761 LIBS="-lbe $LIBS"
13762-cat > conftest.$ac_ext <<EOF
13763-#line 1758 "configure"
13764-#include "confdefs.h"
13765-/* Override any gcc2 internal prototype to avoid an error. */
13766-/* We use char because int might match the return type of a gcc2
13767- builtin and then its argument prototype would still apply. */
13768-char syslog();
13769-
13770-int main() {
13771-syslog()
13772-; return 0; }
13773-EOF
13774-if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
13775- rm -rf conftest*
13776- eval "ac_cv_lib_$ac_lib_var=yes"
13777-else
13778- echo "configure: failed program was:" >&5
13779- cat conftest.$ac_ext >&5
13780- rm -rf conftest*
13781- eval "ac_cv_lib_$ac_lib_var=no"
13782-fi
13783-rm -f conftest*
13784-LIBS="$ac_save_LIBS"
13785+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13786+/* end confdefs.h. */
13787
13788-fi
13789-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
13790- echo "$ac_t""yes" 1>&6
13791- ac_tr_lib=HAVE_LIB`echo be | sed -e 's/[^a-zA-Z0-9_]/_/g' \
13792- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
13793- cat >> confdefs.h <<EOF
13794-#define $ac_tr_lib 1
13795-EOF
13796+/* Override any GCC internal prototype to avoid an error.
13797+ Use char because int might match the return type of a GCC
13798+ builtin and then its argument prototype would still apply. */
13799+#ifdef __cplusplus
13800+extern "C"
13801+#endif
13802+char syslog ();
13803+int
13804+main ()
13805+{
13806+return syslog ();
13807+ ;
13808+ return 0;
13809+}
13810+_ACEOF
13811+if ac_fn_c_try_link "$LINENO"; then :
13812+ ac_cv_lib_be_syslog=yes
13813+else
13814+ ac_cv_lib_be_syslog=no
13815+fi
13816+rm -f core conftest.err conftest.$ac_objext \
13817+ conftest$ac_exeext conftest.$ac_ext
13818+LIBS=$ac_check_lib_save_LIBS
13819+fi
13820+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_be_syslog" >&5
13821+$as_echo "$ac_cv_lib_be_syslog" >&6; }
13822+if test "x$ac_cv_lib_be_syslog" = xyes; then :
13823+ cat >>confdefs.h <<_ACEOF
13824+#define HAVE_LIBBE 1
13825+_ACEOF
13826
13827 LIBS="-lbe $LIBS"
13828
13829-else
13830- echo "$ac_t""no" 1>&6
13831 fi
13832
13833-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
13834-echo "configure:1797: checking for gethostbyname in -lnsl" >&5
13835-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
13836-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13837- echo $ac_n "(cached) $ac_c" 1>&6
13838+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
13839+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
13840+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
13841+ $as_echo_n "(cached) " >&6
13842 else
13843- ac_save_LIBS="$LIBS"
13844+ ac_check_lib_save_LIBS=$LIBS
13845 LIBS="-lnsl $LIBS"
13846-cat > conftest.$ac_ext <<EOF
13847-#line 1805 "configure"
13848-#include "confdefs.h"
13849-/* Override any gcc2 internal prototype to avoid an error. */
13850-/* We use char because int might match the return type of a gcc2
13851- builtin and then its argument prototype would still apply. */
13852-char gethostbyname();
13853-
13854-int main() {
13855-gethostbyname()
13856-; return 0; }
13857-EOF
13858-if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
13859- rm -rf conftest*
13860- eval "ac_cv_lib_$ac_lib_var=yes"
13861-else
13862- echo "configure: failed program was:" >&5
13863- cat conftest.$ac_ext >&5
13864- rm -rf conftest*
13865- eval "ac_cv_lib_$ac_lib_var=no"
13866-fi
13867-rm -f conftest*
13868-LIBS="$ac_save_LIBS"
13869+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13870+/* end confdefs.h. */
13871
13872-fi
13873-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
13874- echo "$ac_t""yes" 1>&6
13875- ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
13876- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
13877- cat >> confdefs.h <<EOF
13878-#define $ac_tr_lib 1
13879-EOF
13880+/* Override any GCC internal prototype to avoid an error.
13881+ Use char because int might match the return type of a GCC
13882+ builtin and then its argument prototype would still apply. */
13883+#ifdef __cplusplus
13884+extern "C"
13885+#endif
13886+char gethostbyname ();
13887+int
13888+main ()
13889+{
13890+return gethostbyname ();
13891+ ;
13892+ return 0;
13893+}
13894+_ACEOF
13895+if ac_fn_c_try_link "$LINENO"; then :
13896+ ac_cv_lib_nsl_gethostbyname=yes
13897+else
13898+ ac_cv_lib_nsl_gethostbyname=no
13899+fi
13900+rm -f core conftest.err conftest.$ac_objext \
13901+ conftest$ac_exeext conftest.$ac_ext
13902+LIBS=$ac_check_lib_save_LIBS
13903+fi
13904+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
13905+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
13906+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
13907+ cat >>confdefs.h <<_ACEOF
13908+#define HAVE_LIBNSL 1
13909+_ACEOF
13910
13911 LIBS="-lnsl $LIBS"
13912
13913-else
13914- echo "$ac_t""no" 1>&6
13915 fi
13916
13917
13918-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
13919-echo "configure:1845: checking for ANSI C header files" >&5
13920-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
13921- echo $ac_n "(cached) $ac_c" 1>&6
13922+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
13923+$as_echo_n "checking for ANSI C header files... " >&6; }
13924+if ${ac_cv_header_stdc+:} false; then :
13925+ $as_echo_n "(cached) " >&6
13926 else
13927- cat > conftest.$ac_ext <<EOF
13928-#line 1850 "configure"
13929-#include "confdefs.h"
13930+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13931+/* end confdefs.h. */
13932 #include <stdlib.h>
13933 #include <stdarg.h>
13934 #include <string.h>
13935 #include <float.h>
13936-EOF
13937-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13938-{ (eval echo configure:1858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13939-ac_err=`grep -v '^ *+' conftest.out`
13940-if test -z "$ac_err"; then
13941- rm -rf conftest*
13942+
13943+int
13944+main ()
13945+{
13946+
13947+ ;
13948+ return 0;
13949+}
13950+_ACEOF
13951+if ac_fn_c_try_compile "$LINENO"; then :
13952 ac_cv_header_stdc=yes
13953 else
13954- echo "$ac_err" >&5
13955- echo "configure: failed program was:" >&5
13956- cat conftest.$ac_ext >&5
13957- rm -rf conftest*
13958 ac_cv_header_stdc=no
13959 fi
13960-rm -f conftest*
13961+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13962
13963 if test $ac_cv_header_stdc = yes; then
13964 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
13965-cat > conftest.$ac_ext <<EOF
13966-#line 1875 "configure"
13967-#include "confdefs.h"
13968+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13969+/* end confdefs.h. */
13970 #include <string.h>
13971-EOF
13972+
13973+_ACEOF
13974 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13975- egrep "memchr" >/dev/null 2>&1; then
13976- :
13977+ $EGREP "memchr" >/dev/null 2>&1; then :
13978+
13979 else
13980- rm -rf conftest*
13981 ac_cv_header_stdc=no
13982 fi
13983 rm -f conftest*
13984@@ -1888,16 +4959,15 @@ fi
13985
13986 if test $ac_cv_header_stdc = yes; then
13987 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
13988-cat > conftest.$ac_ext <<EOF
13989-#line 1893 "configure"
13990-#include "confdefs.h"
13991+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13992+/* end confdefs.h. */
13993 #include <stdlib.h>
13994-EOF
13995+
13996+_ACEOF
13997 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13998- egrep "free" >/dev/null 2>&1; then
13999- :
14000+ $EGREP "free" >/dev/null 2>&1; then :
14001+
14002 else
14003- rm -rf conftest*
14004 ac_cv_header_stdc=no
14005 fi
14006 rm -f conftest*
14007@@ -1906,354 +4976,163 @@ fi
14008
14009 if test $ac_cv_header_stdc = yes; then
14010 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
14011-if test "$cross_compiling" = yes; then
14012+ if test "$cross_compiling" = yes; then :
14013 :
14014 else
14015- cat > conftest.$ac_ext <<EOF
14016-#line 1914 "configure"
14017-#include "confdefs.h"
14018+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14019+/* end confdefs.h. */
14020 #include <ctype.h>
14021-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
14022-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
14023+#include <stdlib.h>
14024+#if ((' ' & 0x0FF) == 0x020)
14025+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
14026+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
14027+#else
14028+# define ISLOWER(c) \
14029+ (('a' <= (c) && (c) <= 'i') \
14030+ || ('j' <= (c) && (c) <= 'r') \
14031+ || ('s' <= (c) && (c) <= 'z'))
14032+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
14033+#endif
14034+
14035 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
14036-int main () { int i; for (i = 0; i < 256; i++)
14037-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
14038-exit (0); }
14039-
14040-EOF
14041-if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
14042-then
14043- :
14044+int
14045+main ()
14046+{
14047+ int i;
14048+ for (i = 0; i < 256; i++)
14049+ if (XOR (islower (i), ISLOWER (i))
14050+ || toupper (i) != TOUPPER (i))
14051+ return 2;
14052+ return 0;
14053+}
14054+_ACEOF
14055+if ac_fn_c_try_run "$LINENO"; then :
14056+
14057 else
14058- echo "configure: failed program was:" >&5
14059- cat conftest.$ac_ext >&5
14060- rm -fr conftest*
14061 ac_cv_header_stdc=no
14062 fi
14063-rm -fr conftest*
14064+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
14065+ conftest.$ac_objext conftest.beam conftest.$ac_ext
14066 fi
14067
14068 fi
14069 fi
14070-
14071-echo "$ac_t""$ac_cv_header_stdc" 1>&6
14072+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
14073+$as_echo "$ac_cv_header_stdc" >&6; }
14074 if test $ac_cv_header_stdc = yes; then
14075- cat >> confdefs.h <<\EOF
14076-#define STDC_HEADERS 1
14077-EOF
14078
14079-fi
14080+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
14081
14082-for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h
14083-do
14084-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14085-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14086-echo "configure:1952: checking for $ac_hdr" >&5
14087-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14088- echo $ac_n "(cached) $ac_c" 1>&6
14089-else
14090- cat > conftest.$ac_ext <<EOF
14091-#line 1957 "configure"
14092-#include "confdefs.h"
14093-#include <$ac_hdr>
14094-EOF
14095-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14096-{ (eval echo configure:1962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14097-ac_err=`grep -v '^ *+' conftest.out`
14098-if test -z "$ac_err"; then
14099- rm -rf conftest*
14100- eval "ac_cv_header_$ac_safe=yes"
14101-else
14102- echo "$ac_err" >&5
14103- echo "configure: failed program was:" >&5
14104- cat conftest.$ac_ext >&5
14105- rm -rf conftest*
14106- eval "ac_cv_header_$ac_safe=no"
14107-fi
14108-rm -f conftest*
14109 fi
14110-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14111- echo "$ac_t""yes" 1>&6
14112- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14113- cat >> confdefs.h <<EOF
14114-#define $ac_tr_hdr 1
14115-EOF
14116-
14117-else
14118- echo "$ac_t""no" 1>&6
14119+
14120+for ac_header in fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h sys/times.h
14121+do :
14122+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14123+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14124+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14125+ cat >>confdefs.h <<_ACEOF
14126+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14127+_ACEOF
14128+
14129 fi
14130+
14131 done
14132
14133
14134-for ac_hdr in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
14135-do
14136-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14137-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14138-echo "configure:1993: checking for $ac_hdr" >&5
14139-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14140- echo $ac_n "(cached) $ac_c" 1>&6
14141-else
14142- cat > conftest.$ac_ext <<EOF
14143-#line 1998 "configure"
14144-#include "confdefs.h"
14145-#include <$ac_hdr>
14146-EOF
14147-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14148-{ (eval echo configure:2003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14149-ac_err=`grep -v '^ *+' conftest.out`
14150-if test -z "$ac_err"; then
14151- rm -rf conftest*
14152- eval "ac_cv_header_$ac_safe=yes"
14153-else
14154- echo "$ac_err" >&5
14155- echo "configure: failed program was:" >&5
14156- cat conftest.$ac_ext >&5
14157- rm -rf conftest*
14158- eval "ac_cv_header_$ac_safe=no"
14159-fi
14160-rm -f conftest*
14161-fi
14162-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14163- echo "$ac_t""yes" 1>&6
14164- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14165- cat >> confdefs.h <<EOF
14166-#define $ac_tr_hdr 1
14167-EOF
14168-
14169-else
14170- echo "$ac_t""no" 1>&6
14171+for ac_header in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
14172+do :
14173+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14174+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14175+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14176+ cat >>confdefs.h <<_ACEOF
14177+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14178+_ACEOF
14179+
14180 fi
14181+
14182 done
14183
14184-for ac_hdr in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
14185-do
14186-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14187-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14188-echo "configure:2033: checking for $ac_hdr" >&5
14189-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14190- echo $ac_n "(cached) $ac_c" 1>&6
14191-else
14192- cat > conftest.$ac_ext <<EOF
14193-#line 2038 "configure"
14194-#include "confdefs.h"
14195-#include <$ac_hdr>
14196-EOF
14197-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14198-{ (eval echo configure:2043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14199-ac_err=`grep -v '^ *+' conftest.out`
14200-if test -z "$ac_err"; then
14201- rm -rf conftest*
14202- eval "ac_cv_header_$ac_safe=yes"
14203-else
14204- echo "$ac_err" >&5
14205- echo "configure: failed program was:" >&5
14206- cat conftest.$ac_ext >&5
14207- rm -rf conftest*
14208- eval "ac_cv_header_$ac_safe=no"
14209-fi
14210-rm -f conftest*
14211-fi
14212-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14213- echo "$ac_t""yes" 1>&6
14214- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14215- cat >> confdefs.h <<EOF
14216-#define $ac_tr_hdr 1
14217-EOF
14218-
14219-else
14220- echo "$ac_t""no" 1>&6
14221+for ac_header in termios.h sys/termios.h termio.h sys/termio.h sgtty.h
14222+do :
14223+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14224+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14225+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14226+ cat >>confdefs.h <<_ACEOF
14227+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14228+_ACEOF
14229+
14230 fi
14231+
14232 done
14233
14234-for ac_hdr in sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h
14235-do
14236-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14237-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14238-echo "configure:2073: checking for $ac_hdr" >&5
14239-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14240- echo $ac_n "(cached) $ac_c" 1>&6
14241-else
14242- cat > conftest.$ac_ext <<EOF
14243-#line 2078 "configure"
14244-#include "confdefs.h"
14245-#include <$ac_hdr>
14246-EOF
14247-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14248-{ (eval echo configure:2083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14249-ac_err=`grep -v '^ *+' conftest.out`
14250-if test -z "$ac_err"; then
14251- rm -rf conftest*
14252- eval "ac_cv_header_$ac_safe=yes"
14253-else
14254- echo "$ac_err" >&5
14255- echo "configure: failed program was:" >&5
14256- cat conftest.$ac_ext >&5
14257- rm -rf conftest*
14258- eval "ac_cv_header_$ac_safe=no"
14259-fi
14260-rm -f conftest*
14261-fi
14262-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14263- echo "$ac_t""yes" 1>&6
14264- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14265- cat >> confdefs.h <<EOF
14266-#define $ac_tr_hdr 1
14267-EOF
14268-
14269-else
14270- echo "$ac_t""no" 1>&6
14271+for ac_header in sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h
14272+do :
14273+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14274+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14275+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14276+ cat >>confdefs.h <<_ACEOF
14277+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14278+_ACEOF
14279+
14280 fi
14281+
14282 done
14283
14284-for ac_hdr in sys/select.h strings.h arpa/inet.h
14285-do
14286-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14287-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14288-echo "configure:2113: checking for $ac_hdr" >&5
14289-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14290- echo $ac_n "(cached) $ac_c" 1>&6
14291-else
14292- cat > conftest.$ac_ext <<EOF
14293-#line 2118 "configure"
14294-#include "confdefs.h"
14295-#include <$ac_hdr>
14296-EOF
14297-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14298-{ (eval echo configure:2123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14299-ac_err=`grep -v '^ *+' conftest.out`
14300-if test -z "$ac_err"; then
14301- rm -rf conftest*
14302- eval "ac_cv_header_$ac_safe=yes"
14303-else
14304- echo "$ac_err" >&5
14305- echo "configure: failed program was:" >&5
14306- cat conftest.$ac_ext >&5
14307- rm -rf conftest*
14308- eval "ac_cv_header_$ac_safe=no"
14309-fi
14310-rm -f conftest*
14311-fi
14312-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14313- echo "$ac_t""yes" 1>&6
14314- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14315- cat >> confdefs.h <<EOF
14316-#define $ac_tr_hdr 1
14317-EOF
14318-
14319-else
14320- echo "$ac_t""no" 1>&6
14321+for ac_header in sys/select.h strings.h arpa/inet.h
14322+do :
14323+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14324+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
14325+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14326+ cat >>confdefs.h <<_ACEOF
14327+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14328+_ACEOF
14329+
14330 fi
14331+
14332 done
14333
14334
14335-echo $ac_n "checking for size_t""... $ac_c" 1>&6
14336-echo "configure:2151: checking for size_t" >&5
14337-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
14338- echo $ac_n "(cached) $ac_c" 1>&6
14339-else
14340- cat > conftest.$ac_ext <<EOF
14341-#line 2156 "configure"
14342-#include "confdefs.h"
14343-#include <sys/types.h>
14344-#if STDC_HEADERS
14345-#include <stdlib.h>
14346-#include <stddef.h>
14347-#endif
14348-EOF
14349-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14350- egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
14351- rm -rf conftest*
14352- ac_cv_type_size_t=yes
14353+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
14354+if test "x$ac_cv_type_size_t" = xyes; then :
14355+
14356 else
14357- rm -rf conftest*
14358- ac_cv_type_size_t=no
14359-fi
14360-rm -f conftest*
14361
14362-fi
14363-echo "$ac_t""$ac_cv_type_size_t" 1>&6
14364-if test $ac_cv_type_size_t = no; then
14365- cat >> confdefs.h <<\EOF
14366-#define size_t unsigned
14367-EOF
14368+cat >>confdefs.h <<_ACEOF
14369+#define size_t unsigned int
14370+_ACEOF
14371
14372 fi
14373
14374-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
14375-echo "configure:2184: checking for mode_t" >&5
14376-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
14377- echo $ac_n "(cached) $ac_c" 1>&6
14378-else
14379- cat > conftest.$ac_ext <<EOF
14380-#line 2189 "configure"
14381-#include "confdefs.h"
14382-#include <sys/types.h>
14383-#if STDC_HEADERS
14384-#include <stdlib.h>
14385-#include <stddef.h>
14386-#endif
14387-EOF
14388-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14389- egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
14390- rm -rf conftest*
14391- ac_cv_type_mode_t=yes
14392+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
14393+if test "x$ac_cv_type_mode_t" = xyes; then :
14394+
14395 else
14396- rm -rf conftest*
14397- ac_cv_type_mode_t=no
14398-fi
14399-rm -f conftest*
14400
14401-fi
14402-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
14403-if test $ac_cv_type_mode_t = no; then
14404- cat >> confdefs.h <<\EOF
14405+cat >>confdefs.h <<_ACEOF
14406 #define mode_t int
14407-EOF
14408+_ACEOF
14409
14410 fi
14411
14412-echo $ac_n "checking for off_t""... $ac_c" 1>&6
14413-echo "configure:2217: checking for off_t" >&5
14414-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
14415- echo $ac_n "(cached) $ac_c" 1>&6
14416-else
14417- cat > conftest.$ac_ext <<EOF
14418-#line 2222 "configure"
14419-#include "confdefs.h"
14420-#include <sys/types.h>
14421-#if STDC_HEADERS
14422-#include <stdlib.h>
14423-#include <stddef.h>
14424-#endif
14425-EOF
14426-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14427- egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
14428- rm -rf conftest*
14429- ac_cv_type_off_t=yes
14430+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
14431+if test "x$ac_cv_type_off_t" = xyes; then :
14432+
14433 else
14434- rm -rf conftest*
14435- ac_cv_type_off_t=no
14436-fi
14437-rm -f conftest*
14438
14439-fi
14440-echo "$ac_t""$ac_cv_type_off_t" 1>&6
14441-if test $ac_cv_type_off_t = no; then
14442- cat >> confdefs.h <<\EOF
14443-#define off_t long
14444-EOF
14445+cat >>confdefs.h <<_ACEOF
14446+#define off_t long int
14447+_ACEOF
14448
14449 fi
14450
14451
14452-echo $ac_n "checking for speed_t""... $ac_c" 1>&6
14453-echo "configure:2251: checking for speed_t" >&5
14454-if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then
14455- echo $ac_n "(cached) $ac_c" 1>&6
14456+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
14457+$as_echo_n "checking for speed_t... " >&6; }
14458+if ${ac_cv_type_speed_t+:} false; then :
14459+ $as_echo_n "(cached) " >&6
14460 else
14461- cat > conftest.$ac_ext <<EOF
14462-#line 2256 "configure"
14463-#include "confdefs.h"
14464+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14465+/* end confdefs.h. */
14466 #include <sys/types.h>
14467 #if STDC_HEADERS
14468 #include <stdlib.h>
14469@@ -2281,394 +5160,261 @@ else
14470 #endif
14471 #endif
14472
14473-EOF
14474+_ACEOF
14475 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14476- egrep "speed_t" >/dev/null 2>&1; then
14477- rm -rf conftest*
14478+ $EGREP "speed_t" >/dev/null 2>&1; then :
14479 ac_cv_type_speed_t=yes
14480 else
14481- rm -rf conftest*
14482 ac_cv_type_speed_t=no
14483 fi
14484 rm -f conftest*
14485
14486 fi
14487-echo "$ac_t""$ac_cv_type_speed_t" 1>&6
14488+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_speed_t" >&5
14489+$as_echo "$ac_cv_type_speed_t" >&6; }
14490 if test $ac_cv_type_speed_t = no; then
14491- cat >> confdefs.h <<\EOF
14492-#define speed_t long
14493-EOF
14494+ $as_echo "#define speed_t long" >>confdefs.h
14495
14496 fi
14497
14498-echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
14499-echo "configure:2306: checking for st_rdev in struct stat" >&5
14500-if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
14501- echo $ac_n "(cached) $ac_c" 1>&6
14502-else
14503- cat > conftest.$ac_ext <<EOF
14504-#line 2311 "configure"
14505-#include "confdefs.h"
14506-#include <sys/types.h>
14507-#include <sys/stat.h>
14508-int main() {
14509-struct stat s; s.st_rdev;
14510-; return 0; }
14511-EOF
14512-if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14513- rm -rf conftest*
14514- ac_cv_struct_st_rdev=yes
14515-else
14516- echo "configure: failed program was:" >&5
14517- cat conftest.$ac_ext >&5
14518- rm -rf conftest*
14519- ac_cv_struct_st_rdev=no
14520-fi
14521-rm -f conftest*
14522-fi
14523+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
14524+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
14525+
14526+cat >>confdefs.h <<_ACEOF
14527+#define HAVE_STRUCT_STAT_ST_RDEV 1
14528+_ACEOF
14529+
14530
14531-echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
14532-if test $ac_cv_struct_st_rdev = yes; then
14533- cat >> confdefs.h <<\EOF
14534-#define HAVE_ST_RDEV 1
14535-EOF
14536+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
14537
14538 fi
14539
14540-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
14541-echo "configure:2340: checking whether time.h and sys/time.h may both be included" >&5
14542-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
14543- echo $ac_n "(cached) $ac_c" 1>&6
14544-else
14545- cat > conftest.$ac_ext <<EOF
14546-#line 2345 "configure"
14547-#include "confdefs.h"
14548+
14549+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
14550+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
14551+if ${ac_cv_header_time+:} false; then :
14552+ $as_echo_n "(cached) " >&6
14553+else
14554+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14555+/* end confdefs.h. */
14556 #include <sys/types.h>
14557 #include <sys/time.h>
14558 #include <time.h>
14559-int main() {
14560-struct tm *tp;
14561-; return 0; }
14562-EOF
14563-if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14564- rm -rf conftest*
14565+
14566+int
14567+main ()
14568+{
14569+if ((struct tm *) 0)
14570+return 0;
14571+ ;
14572+ return 0;
14573+}
14574+_ACEOF
14575+if ac_fn_c_try_compile "$LINENO"; then :
14576 ac_cv_header_time=yes
14577 else
14578- echo "configure: failed program was:" >&5
14579- cat conftest.$ac_ext >&5
14580- rm -rf conftest*
14581 ac_cv_header_time=no
14582 fi
14583-rm -f conftest*
14584+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14585 fi
14586-
14587-echo "$ac_t""$ac_cv_header_time" 1>&6
14588+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
14589+$as_echo "$ac_cv_header_time" >&6; }
14590 if test $ac_cv_header_time = yes; then
14591- cat >> confdefs.h <<\EOF
14592-#define TIME_WITH_SYS_TIME 1
14593-EOF
14594+
14595+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
14596
14597 fi
14598
14599-echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6
14600-echo "configure:2375: checking whether sys/time.h and sys/select.h may both be included" >&5
14601-if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then
14602- echo $ac_n "(cached) $ac_c" 1>&6
14603+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/time.h and sys/select.h may both be included" >&5
14604+$as_echo_n "checking whether sys/time.h and sys/select.h may both be included... " >&6; }
14605+if ${lrzsz_cv_header_sys_select+:} false; then :
14606+ $as_echo_n "(cached) " >&6
14607 else
14608- cat > conftest.$ac_ext <<EOF
14609-#line 2380 "configure"
14610-#include "confdefs.h"
14611+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14612+/* end confdefs.h. */
14613 #include <sys/types.h>
14614 #include <sys/time.h>
14615 #include <sys/select.h>
14616-int main() {
14617+int
14618+main ()
14619+{
14620 struct tm *tp;
14621-; return 0; }
14622-EOF
14623-if { (eval echo configure:2389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14624- rm -rf conftest*
14625+ ;
14626+ return 0;
14627+}
14628+_ACEOF
14629+if ac_fn_c_try_compile "$LINENO"; then :
14630 lrzsz_cv_header_sys_select=yes
14631 else
14632- echo "configure: failed program was:" >&5
14633- cat conftest.$ac_ext >&5
14634- rm -rf conftest*
14635 lrzsz_cv_header_sys_select=no
14636 fi
14637-rm -f conftest*
14638+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14639 fi
14640-
14641-echo "$ac_t""$lrzsz_cv_header_sys_select" 1>&6
14642+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lrzsz_cv_header_sys_select" >&5
14643+$as_echo "$lrzsz_cv_header_sys_select" >&6; }
14644 if test $lrzsz_cv_header_sys_select = no; then
14645- cat >> confdefs.h <<\EOF
14646-#define SYS_TIME_WITHOUT_SYS_SELECT 1
14647-EOF
14648+ $as_echo "#define SYS_TIME_WITHOUT_SYS_SELECT 1" >>confdefs.h
14649
14650 fi
14651
14652-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
14653-echo "configure:2410: checking whether struct tm is in sys/time.h or time.h" >&5
14654-if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
14655- echo $ac_n "(cached) $ac_c" 1>&6
14656+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
14657+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
14658+if ${ac_cv_struct_tm+:} false; then :
14659+ $as_echo_n "(cached) " >&6
14660 else
14661- cat > conftest.$ac_ext <<EOF
14662-#line 2415 "configure"
14663-#include "confdefs.h"
14664+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14665+/* end confdefs.h. */
14666 #include <sys/types.h>
14667 #include <time.h>
14668-int main() {
14669-struct tm *tp; tp->tm_sec;
14670-; return 0; }
14671-EOF
14672-if { (eval echo configure:2423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14673- rm -rf conftest*
14674+
14675+int
14676+main ()
14677+{
14678+struct tm tm;
14679+ int *p = &tm.tm_sec;
14680+ return !p;
14681+ ;
14682+ return 0;
14683+}
14684+_ACEOF
14685+if ac_fn_c_try_compile "$LINENO"; then :
14686 ac_cv_struct_tm=time.h
14687 else
14688- echo "configure: failed program was:" >&5
14689- cat conftest.$ac_ext >&5
14690- rm -rf conftest*
14691 ac_cv_struct_tm=sys/time.h
14692 fi
14693-rm -f conftest*
14694+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14695 fi
14696-
14697-echo "$ac_t""$ac_cv_struct_tm" 1>&6
14698+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
14699+$as_echo "$ac_cv_struct_tm" >&6; }
14700 if test $ac_cv_struct_tm = sys/time.h; then
14701- cat >> confdefs.h <<\EOF
14702-#define TM_IN_SYS_TIME 1
14703-EOF
14704+
14705+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
14706
14707 fi
14708
14709
14710-echo $ac_n "checking for errno declaration""... $ac_c" 1>&6
14711-echo "configure:2445: checking for errno declaration" >&5
14712-if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then
14713- echo $ac_n "(cached) $ac_c" 1>&6
14714+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
14715+$as_echo_n "checking for errno declaration... " >&6; }
14716+if ${lrzsz_cv_decl_errno+:} false; then :
14717+ $as_echo_n "(cached) " >&6
14718 else
14719- cat > conftest.$ac_ext <<EOF
14720-#line 2450 "configure"
14721-#include "confdefs.h"
14722+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14723+/* end confdefs.h. */
14724 #include <errno.h>
14725-int main() {
14726+int
14727+main ()
14728+{
14729 int i = errno; errno = 1;
14730-; return 0; }
14731-EOF
14732-if { (eval echo configure:2457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14733- rm -rf conftest*
14734+ ;
14735+ return 0;
14736+}
14737+_ACEOF
14738+if ac_fn_c_try_compile "$LINENO"; then :
14739 lrzsz_cv_decl_errno=yes
14740 else
14741- echo "configure: failed program was:" >&5
14742- cat conftest.$ac_ext >&5
14743- rm -rf conftest*
14744 lrzsz_cv_decl_errno=no
14745 fi
14746-rm -f conftest*
14747+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14748 fi
14749
14750-echo "$ac_t""$lrzsz_cv_decl_errno" 1>&6
14751+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lrzsz_cv_decl_errno" >&5
14752+$as_echo "$lrzsz_cv_decl_errno" >&6; }
14753 if test $lrzsz_cv_decl_errno = yes; then
14754- cat >> confdefs.h <<\EOF
14755-#define HAVE_ERRNO_DECLARATION 1
14756-EOF
14757+ $as_echo "#define HAVE_ERRNO_DECLARATION 1" >>confdefs.h
14758
14759 fi
14760
14761
14762 if test $cross_compiling = no ; then
14763- echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
14764-echo "configure:2480: checking whether setvbuf arguments are reversed" >&5
14765-if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
14766- echo $ac_n "(cached) $ac_c" 1>&6
14767-else
14768- if test "$cross_compiling" = yes; then
14769- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
14770-else
14771- cat > conftest.$ac_ext <<EOF
14772-#line 2488 "configure"
14773-#include "confdefs.h"
14774-#include <stdio.h>
14775-/* If setvbuf has the reversed format, exit 0. */
14776-main () {
14777- /* This call has the arguments reversed.
14778- A reversed system may check and see that the address of main
14779- is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */
14780- if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0)
14781- exit(1);
14782- putc('\r', stdout);
14783- exit(0); /* Non-reversed systems segv here. */
14784-}
14785-EOF
14786-if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
14787-then
14788- ac_cv_func_setvbuf_reversed=yes
14789-else
14790- echo "configure: failed program was:" >&5
14791- cat conftest.$ac_ext >&5
14792- rm -fr conftest*
14793+ if ${ac_cv_func_setvbuf_reversed+:} false; then :
14794+ $as_echo_n "(cached) " >&6
14795+else
14796 ac_cv_func_setvbuf_reversed=no
14797 fi
14798-rm -fr conftest*
14799-fi
14800
14801-rm -f core core.* *.core
14802-fi
14803-
14804-echo "$ac_t""$ac_cv_func_setvbuf_reversed" 1>&6
14805-if test $ac_cv_func_setvbuf_reversed = yes; then
14806- cat >> confdefs.h <<\EOF
14807-#define SETVBUF_REVERSED 1
14808-EOF
14809-
14810-fi
14811
14812 fi
14813-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
14814-echo "configure:2527: checking return type of signal handlers" >&5
14815-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
14816- echo $ac_n "(cached) $ac_c" 1>&6
14817+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
14818+$as_echo_n "checking return type of signal handlers... " >&6; }
14819+if ${ac_cv_type_signal+:} false; then :
14820+ $as_echo_n "(cached) " >&6
14821 else
14822- cat > conftest.$ac_ext <<EOF
14823-#line 2532 "configure"
14824-#include "confdefs.h"
14825+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14826+/* end confdefs.h. */
14827 #include <sys/types.h>
14828 #include <signal.h>
14829-#ifdef signal
14830-#undef signal
14831-#endif
14832-#ifdef __cplusplus
14833-extern "C" void (*signal (int, void (*)(int)))(int);
14834-#else
14835-void (*signal ()) ();
14836-#endif
14837
14838-int main() {
14839-int i;
14840-; return 0; }
14841-EOF
14842-if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14843- rm -rf conftest*
14844- ac_cv_type_signal=void
14845-else
14846- echo "configure: failed program was:" >&5
14847- cat conftest.$ac_ext >&5
14848- rm -rf conftest*
14849+int
14850+main ()
14851+{
14852+return *(signal (0, 0)) (0) == 1;
14853+ ;
14854+ return 0;
14855+}
14856+_ACEOF
14857+if ac_fn_c_try_compile "$LINENO"; then :
14858 ac_cv_type_signal=int
14859+else
14860+ ac_cv_type_signal=void
14861 fi
14862-rm -f conftest*
14863+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14864 fi
14865+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
14866+$as_echo "$ac_cv_type_signal" >&6; }
14867
14868-echo "$ac_t""$ac_cv_type_signal" 1>&6
14869-cat >> confdefs.h <<EOF
14870+cat >>confdefs.h <<_ACEOF
14871 #define RETSIGTYPE $ac_cv_type_signal
14872-EOF
14873+_ACEOF
14874
14875
14876-for ac_hdr in unistd.h
14877-do
14878-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14879-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14880-echo "configure:2571: checking for $ac_hdr" >&5
14881-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14882- echo $ac_n "(cached) $ac_c" 1>&6
14883-else
14884- cat > conftest.$ac_ext <<EOF
14885-#line 2576 "configure"
14886-#include "confdefs.h"
14887-#include <$ac_hdr>
14888-EOF
14889-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14890-{ (eval echo configure:2581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14891-ac_err=`grep -v '^ *+' conftest.out`
14892-if test -z "$ac_err"; then
14893- rm -rf conftest*
14894- eval "ac_cv_header_$ac_safe=yes"
14895-else
14896- echo "$ac_err" >&5
14897- echo "configure: failed program was:" >&5
14898- cat conftest.$ac_ext >&5
14899- rm -rf conftest*
14900- eval "ac_cv_header_$ac_safe=no"
14901-fi
14902-rm -f conftest*
14903-fi
14904-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14905- echo "$ac_t""yes" 1>&6
14906- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14907- cat >> confdefs.h <<EOF
14908-#define $ac_tr_hdr 1
14909-EOF
14910-
14911-else
14912- echo "$ac_t""no" 1>&6
14913+
14914+
14915+
14916+ for ac_header in $ac_header_list
14917+do :
14918+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
14919+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
14920+"
14921+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
14922+ cat >>confdefs.h <<_ACEOF
14923+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
14924+_ACEOF
14925+
14926 fi
14927+
14928 done
14929
14930-for ac_func in getpagesize
14931-do
14932-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
14933-echo "configure:2610: checking for $ac_func" >&5
14934-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
14935- echo $ac_n "(cached) $ac_c" 1>&6
14936-else
14937- cat > conftest.$ac_ext <<EOF
14938-#line 2615 "configure"
14939-#include "confdefs.h"
14940-/* System header to define __stub macros and hopefully few prototypes,
14941- which can conflict with char $ac_func(); below. */
14942-#include <assert.h>
14943-/* Override any gcc2 internal prototype to avoid an error. */
14944-/* We use char because int might match the return type of a gcc2
14945- builtin and then its argument prototype would still apply. */
14946-char $ac_func();
14947
14948-int main() {
14949
14950-/* The GNU C library defines this for functions which it implements
14951- to always fail with ENOSYS. Some functions are actually named
14952- something starting with __ and the normal name is an alias. */
14953-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
14954-choke me
14955-#else
14956-$ac_func();
14957-#endif
14958
14959-; return 0; }
14960-EOF
14961-if { (eval echo configure:2638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
14962- rm -rf conftest*
14963- eval "ac_cv_func_$ac_func=yes"
14964-else
14965- echo "configure: failed program was:" >&5
14966- cat conftest.$ac_ext >&5
14967- rm -rf conftest*
14968- eval "ac_cv_func_$ac_func=no"
14969-fi
14970-rm -f conftest*
14971-fi
14972
14973-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
14974- echo "$ac_t""yes" 1>&6
14975- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
14976- cat >> confdefs.h <<EOF
14977-#define $ac_tr_func 1
14978-EOF
14979-
14980-else
14981- echo "$ac_t""no" 1>&6
14982+
14983+
14984+
14985+for ac_func in getpagesize
14986+do :
14987+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
14988+if test "x$ac_cv_func_getpagesize" = xyes; then :
14989+ cat >>confdefs.h <<_ACEOF
14990+#define HAVE_GETPAGESIZE 1
14991+_ACEOF
14992+
14993 fi
14994 done
14995
14996-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
14997-echo "configure:2663: checking for working mmap" >&5
14998-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
14999- echo $ac_n "(cached) $ac_c" 1>&6
15000+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
15001+$as_echo_n "checking for working mmap... " >&6; }
15002+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
15003+ $as_echo_n "(cached) " >&6
15004 else
15005- if test "$cross_compiling" = yes; then
15006+ if test "$cross_compiling" = yes; then :
15007 ac_cv_func_mmap_fixed_mapped=no
15008 else
15009- cat > conftest.$ac_ext <<EOF
15010-#line 2671 "configure"
15011-#include "confdefs.h"
15012+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15013+/* end confdefs.h. */
15014+$ac_includes_default
15015+/* malloc might have been renamed as rpl_malloc. */
15016+#undef malloc
15017
15018 /* Thanks to Mike Haertel and Jim Avera for this test.
15019 Here is a matrix of mmap possibilities:
15020@@ -2682,30 +5428,25 @@ else
15021 back from the file, nor mmap's back from the file at a different
15022 address. (There have been systems where private was not correctly
15023 implemented like the infamous i386 svr4.0, and systems where the
15024- VM page cache was not coherent with the filesystem buffer cache
15025+ VM page cache was not coherent with the file system buffer cache
15026 like early versions of FreeBSD and possibly contemporary NetBSD.)
15027 For shared mappings, we should conversely verify that changes get
15028- propogated back to all the places they're supposed to be.
15029+ propagated back to all the places they're supposed to be.
15030
15031 Grep wants private fixed already mapped.
15032 The main things grep needs to know about mmap are:
15033 * does it exist and is it safe to write into the mmap'd area
15034 * how to use it (BSD variants) */
15035-#include <sys/types.h>
15036+
15037 #include <fcntl.h>
15038 #include <sys/mman.h>
15039
15040+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
15041+char *malloc ();
15042+#endif
15043+
15044 /* This mess was copied from the GNU getpagesize.h. */
15045 #ifndef HAVE_GETPAGESIZE
15046-# ifdef HAVE_UNISTD_H
15047-# include <unistd.h>
15048-# endif
15049-
15050-/* Assume that all systems that can run configure have sys/param.h. */
15051-# ifndef HAVE_SYS_PARAM_H
15052-# define HAVE_SYS_PARAM_H 1
15053-# endif
15054-
15055 # ifdef _SC_PAGESIZE
15056 # define getpagesize() sysconf(_SC_PAGESIZE)
15057 # else /* no _SC_PAGESIZE */
15058@@ -2736,736 +5477,504 @@ else
15059
15060 #endif /* no HAVE_GETPAGESIZE */
15061
15062-#ifdef __cplusplus
15063-extern "C" { void *malloc(unsigned); }
15064-#else
15065-char *malloc();
15066-#endif
15067-
15068 int
15069-main()
15070+main ()
15071 {
15072- char *data, *data2, *data3;
15073- int i, pagesize;
15074- int fd;
15075-
15076- pagesize = getpagesize();
15077-
15078- /*
15079- * First, make a file with some known garbage in it.
15080- */
15081- data = malloc(pagesize);
15082- if (!data)
15083- exit(1);
15084- for (i = 0; i < pagesize; ++i)
15085- *(data + i) = rand();
15086- umask(0);
15087- fd = creat("conftestmmap", 0600);
15088- if (fd < 0)
15089- exit(1);
15090- if (write(fd, data, pagesize) != pagesize)
15091- exit(1);
15092- close(fd);
15093-
15094- /*
15095- * Next, try to mmap the file at a fixed address which
15096- * already has something else allocated at it. If we can,
15097- * also make sure that we see the same garbage.
15098- */
15099- fd = open("conftestmmap", O_RDWR);
15100- if (fd < 0)
15101- exit(1);
15102- data2 = malloc(2 * pagesize);
15103- if (!data2)
15104- exit(1);
15105- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
15106- if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
15107- MAP_PRIVATE | MAP_FIXED, fd, 0L))
15108- exit(1);
15109- for (i = 0; i < pagesize; ++i)
15110- if (*(data + i) != *(data2 + i))
15111- exit(1);
15112-
15113- /*
15114- * Finally, make sure that changes to the mapped area
15115- * do not percolate back to the file as seen by read().
15116- * (This is a bug on some variants of i386 svr4.0.)
15117- */
15118- for (i = 0; i < pagesize; ++i)
15119- *(data2 + i) = *(data2 + i) + 1;
15120- data3 = malloc(pagesize);
15121- if (!data3)
15122- exit(1);
15123- if (read(fd, data3, pagesize) != pagesize)
15124- exit(1);
15125- for (i = 0; i < pagesize; ++i)
15126- if (*(data + i) != *(data3 + i))
15127- exit(1);
15128- close(fd);
15129- unlink("conftestmmap");
15130- exit(0);
15131-}
15132-
15133-EOF
15134-if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
15135-then
15136+ char *data, *data2, *data3;
15137+ const char *cdata2;
15138+ int i, pagesize;
15139+ int fd, fd2;
15140+
15141+ pagesize = getpagesize ();
15142+
15143+ /* First, make a file with some known garbage in it. */
15144+ data = (char *) malloc (pagesize);
15145+ if (!data)
15146+ return 1;
15147+ for (i = 0; i < pagesize; ++i)
15148+ *(data + i) = rand ();
15149+ umask (0);
15150+ fd = creat ("conftest.mmap", 0600);
15151+ if (fd < 0)
15152+ return 2;
15153+ if (write (fd, data, pagesize) != pagesize)
15154+ return 3;
15155+ close (fd);
15156+
15157+ /* Next, check that the tail of a page is zero-filled. File must have
15158+ non-zero length, otherwise we risk SIGBUS for entire page. */
15159+ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
15160+ if (fd2 < 0)
15161+ return 4;
15162+ cdata2 = "";
15163+ if (write (fd2, cdata2, 1) != 1)
15164+ return 5;
15165+ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
15166+ if (data2 == MAP_FAILED)
15167+ return 6;
15168+ for (i = 0; i < pagesize; ++i)
15169+ if (*(data2 + i))
15170+ return 7;
15171+ close (fd2);
15172+ if (munmap (data2, pagesize))
15173+ return 8;
15174+
15175+ /* Next, try to mmap the file at a fixed address which already has
15176+ something else allocated at it. If we can, also make sure that
15177+ we see the same garbage. */
15178+ fd = open ("conftest.mmap", O_RDWR);
15179+ if (fd < 0)
15180+ return 9;
15181+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
15182+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
15183+ return 10;
15184+ for (i = 0; i < pagesize; ++i)
15185+ if (*(data + i) != *(data2 + i))
15186+ return 11;
15187+
15188+ /* Finally, make sure that changes to the mapped area do not
15189+ percolate back to the file as seen by read(). (This is a bug on
15190+ some variants of i386 svr4.0.) */
15191+ for (i = 0; i < pagesize; ++i)
15192+ *(data2 + i) = *(data2 + i) + 1;
15193+ data3 = (char *) malloc (pagesize);
15194+ if (!data3)
15195+ return 12;
15196+ if (read (fd, data3, pagesize) != pagesize)
15197+ return 13;
15198+ for (i = 0; i < pagesize; ++i)
15199+ if (*(data + i) != *(data3 + i))
15200+ return 14;
15201+ close (fd);
15202+ return 0;
15203+}
15204+_ACEOF
15205+if ac_fn_c_try_run "$LINENO"; then :
15206 ac_cv_func_mmap_fixed_mapped=yes
15207 else
15208- echo "configure: failed program was:" >&5
15209- cat conftest.$ac_ext >&5
15210- rm -fr conftest*
15211 ac_cv_func_mmap_fixed_mapped=no
15212 fi
15213-rm -fr conftest*
15214+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
15215+ conftest.$ac_objext conftest.beam conftest.$ac_ext
15216 fi
15217
15218 fi
15219-
15220-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
15221+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
15222+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
15223 if test $ac_cv_func_mmap_fixed_mapped = yes; then
15224- cat >> confdefs.h <<\EOF
15225-#define HAVE_MMAP 1
15226-EOF
15227+
15228+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
15229
15230 fi
15231+rm -f conftest.mmap conftest.txt
15232
15233 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
15234 # for constant arguments. Useless!
15235-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
15236-echo "configure:2836: checking for working alloca.h" >&5
15237-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
15238- echo $ac_n "(cached) $ac_c" 1>&6
15239-else
15240- cat > conftest.$ac_ext <<EOF
15241-#line 2841 "configure"
15242-#include "confdefs.h"
15243+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
15244+$as_echo_n "checking for working alloca.h... " >&6; }
15245+if ${ac_cv_working_alloca_h+:} false; then :
15246+ $as_echo_n "(cached) " >&6
15247+else
15248+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15249+/* end confdefs.h. */
15250 #include <alloca.h>
15251-int main() {
15252-char *p = alloca(2 * sizeof(int));
15253-; return 0; }
15254-EOF
15255-if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15256- rm -rf conftest*
15257- ac_cv_header_alloca_h=yes
15258-else
15259- echo "configure: failed program was:" >&5
15260- cat conftest.$ac_ext >&5
15261- rm -rf conftest*
15262- ac_cv_header_alloca_h=no
15263+int
15264+main ()
15265+{
15266+char *p = (char *) alloca (2 * sizeof (int));
15267+ if (p) return 0;
15268+ ;
15269+ return 0;
15270+}
15271+_ACEOF
15272+if ac_fn_c_try_link "$LINENO"; then :
15273+ ac_cv_working_alloca_h=yes
15274+else
15275+ ac_cv_working_alloca_h=no
15276 fi
15277-rm -f conftest*
15278+rm -f core conftest.err conftest.$ac_objext \
15279+ conftest$ac_exeext conftest.$ac_ext
15280 fi
15281+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
15282+$as_echo "$ac_cv_working_alloca_h" >&6; }
15283+if test $ac_cv_working_alloca_h = yes; then
15284
15285-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
15286-if test $ac_cv_header_alloca_h = yes; then
15287- cat >> confdefs.h <<\EOF
15288-#define HAVE_ALLOCA_H 1
15289-EOF
15290+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
15291
15292 fi
15293
15294-echo $ac_n "checking for alloca""... $ac_c" 1>&6
15295-echo "configure:2869: checking for alloca" >&5
15296-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
15297- echo $ac_n "(cached) $ac_c" 1>&6
15298-else
15299- cat > conftest.$ac_ext <<EOF
15300-#line 2874 "configure"
15301-#include "confdefs.h"
15302-
15303+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
15304+$as_echo_n "checking for alloca... " >&6; }
15305+if ${ac_cv_func_alloca_works+:} false; then :
15306+ $as_echo_n "(cached) " >&6
15307+else
15308+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15309+/* end confdefs.h. */
15310 #ifdef __GNUC__
15311 # define alloca __builtin_alloca
15312 #else
15313-# if HAVE_ALLOCA_H
15314-# include <alloca.h>
15315+# ifdef _MSC_VER
15316+# include <malloc.h>
15317+# define alloca _alloca
15318 # else
15319-# ifdef _AIX
15320- #pragma alloca
15321+# ifdef HAVE_ALLOCA_H
15322+# include <alloca.h>
15323 # else
15324-# ifndef alloca /* predefined by HP cc +Olibcalls */
15325-char *alloca ();
15326+# ifdef _AIX
15327+ #pragma alloca
15328+# else
15329+# ifndef alloca /* predefined by HP cc +Olibcalls */
15330+void *alloca (size_t);
15331+# endif
15332 # endif
15333 # endif
15334 # endif
15335 #endif
15336
15337-int main() {
15338-char *p = (char *) alloca(1);
15339-; return 0; }
15340-EOF
15341-if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15342- rm -rf conftest*
15343+int
15344+main ()
15345+{
15346+char *p = (char *) alloca (1);
15347+ if (p) return 0;
15348+ ;
15349+ return 0;
15350+}
15351+_ACEOF
15352+if ac_fn_c_try_link "$LINENO"; then :
15353 ac_cv_func_alloca_works=yes
15354 else
15355- echo "configure: failed program was:" >&5
15356- cat conftest.$ac_ext >&5
15357- rm -rf conftest*
15358 ac_cv_func_alloca_works=no
15359 fi
15360-rm -f conftest*
15361+rm -f core conftest.err conftest.$ac_objext \
15362+ conftest$ac_exeext conftest.$ac_ext
15363 fi
15364+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
15365+$as_echo "$ac_cv_func_alloca_works" >&6; }
15366
15367-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
15368 if test $ac_cv_func_alloca_works = yes; then
15369- cat >> confdefs.h <<\EOF
15370-#define HAVE_ALLOCA 1
15371-EOF
15372
15373-fi
15374+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
15375
15376-if test $ac_cv_func_alloca_works = no; then
15377+else
15378 # The SVR3 libPW and SVR4 libucb both contain incompatible functions
15379- # that cause trouble. Some versions do not even contain alloca or
15380- # contain a buggy version. If you still want to use their alloca,
15381- # use ar to extract alloca.o from them instead of compiling alloca.c.
15382- ALLOCA=alloca.o
15383- cat >> confdefs.h <<\EOF
15384-#define C_ALLOCA 1
15385-EOF
15386-
15387-
15388-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
15389-echo "configure:2929: checking whether alloca needs Cray hooks" >&5
15390-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
15391- echo $ac_n "(cached) $ac_c" 1>&6
15392-else
15393- cat > conftest.$ac_ext <<EOF
15394-#line 2934 "configure"
15395-#include "confdefs.h"
15396-#if defined(CRAY) && ! defined(CRAY2)
15397+# that cause trouble. Some versions do not even contain alloca or
15398+# contain a buggy version. If you still want to use their alloca,
15399+# use ar to extract alloca.o from them instead of compiling alloca.c.
15400+
15401+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
15402+
15403+$as_echo "#define C_ALLOCA 1" >>confdefs.h
15404+
15405+
15406+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
15407+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
15408+if ${ac_cv_os_cray+:} false; then :
15409+ $as_echo_n "(cached) " >&6
15410+else
15411+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15412+/* end confdefs.h. */
15413+#if defined CRAY && ! defined CRAY2
15414 webecray
15415 #else
15416 wenotbecray
15417 #endif
15418
15419-EOF
15420+_ACEOF
15421 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
15422- egrep "webecray" >/dev/null 2>&1; then
15423- rm -rf conftest*
15424+ $EGREP "webecray" >/dev/null 2>&1; then :
15425 ac_cv_os_cray=yes
15426 else
15427- rm -rf conftest*
15428 ac_cv_os_cray=no
15429 fi
15430 rm -f conftest*
15431
15432 fi
15433-
15434-echo "$ac_t""$ac_cv_os_cray" 1>&6
15435+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
15436+$as_echo "$ac_cv_os_cray" >&6; }
15437 if test $ac_cv_os_cray = yes; then
15438-for ac_func in _getb67 GETB67 getb67; do
15439- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15440-echo "configure:2959: checking for $ac_func" >&5
15441-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15442- echo $ac_n "(cached) $ac_c" 1>&6
15443-else
15444- cat > conftest.$ac_ext <<EOF
15445-#line 2964 "configure"
15446-#include "confdefs.h"
15447-/* System header to define __stub macros and hopefully few prototypes,
15448- which can conflict with char $ac_func(); below. */
15449-#include <assert.h>
15450-/* Override any gcc2 internal prototype to avoid an error. */
15451-/* We use char because int might match the return type of a gcc2
15452- builtin and then its argument prototype would still apply. */
15453-char $ac_func();
15454-
15455-int main() {
15456+ for ac_func in _getb67 GETB67 getb67; do
15457+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15458+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
15459+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
15460
15461-/* The GNU C library defines this for functions which it implements
15462- to always fail with ENOSYS. Some functions are actually named
15463- something starting with __ and the normal name is an alias. */
15464-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15465-choke me
15466-#else
15467-$ac_func();
15468-#endif
15469-
15470-; return 0; }
15471-EOF
15472-if { (eval echo configure:2987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15473- rm -rf conftest*
15474- eval "ac_cv_func_$ac_func=yes"
15475-else
15476- echo "configure: failed program was:" >&5
15477- cat conftest.$ac_ext >&5
15478- rm -rf conftest*
15479- eval "ac_cv_func_$ac_func=no"
15480-fi
15481-rm -f conftest*
15482-fi
15483-
15484-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15485- echo "$ac_t""yes" 1>&6
15486- cat >> confdefs.h <<EOF
15487+cat >>confdefs.h <<_ACEOF
15488 #define CRAY_STACKSEG_END $ac_func
15489-EOF
15490+_ACEOF
15491
15492- break
15493-else
15494- echo "$ac_t""no" 1>&6
15495+ break
15496 fi
15497
15498-done
15499+ done
15500 fi
15501
15502-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
15503-echo "configure:3014: checking stack direction for C alloca" >&5
15504-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
15505- echo $ac_n "(cached) $ac_c" 1>&6
15506+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
15507+$as_echo_n "checking stack direction for C alloca... " >&6; }
15508+if ${ac_cv_c_stack_direction+:} false; then :
15509+ $as_echo_n "(cached) " >&6
15510 else
15511- if test "$cross_compiling" = yes; then
15512+ if test "$cross_compiling" = yes; then :
15513 ac_cv_c_stack_direction=0
15514 else
15515- cat > conftest.$ac_ext <<EOF
15516-#line 3022 "configure"
15517-#include "confdefs.h"
15518-find_stack_direction ()
15519-{
15520- static char *addr = 0;
15521- auto char dummy;
15522- if (addr == 0)
15523- {
15524- addr = &dummy;
15525- return find_stack_direction ();
15526- }
15527- else
15528- return (&dummy > addr) ? 1 : -1;
15529+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15530+/* end confdefs.h. */
15531+$ac_includes_default
15532+int
15533+find_stack_direction (int *addr, int depth)
15534+{
15535+ int dir, dummy = 0;
15536+ if (! addr)
15537+ addr = &dummy;
15538+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
15539+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
15540+ return dir + dummy;
15541 }
15542-main ()
15543+
15544+int
15545+main (int argc, char **argv)
15546 {
15547- exit (find_stack_direction() < 0);
15548+ return find_stack_direction (0, argc + !argv + 20) < 0;
15549 }
15550-EOF
15551-if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
15552-then
15553+_ACEOF
15554+if ac_fn_c_try_run "$LINENO"; then :
15555 ac_cv_c_stack_direction=1
15556 else
15557- echo "configure: failed program was:" >&5
15558- cat conftest.$ac_ext >&5
15559- rm -fr conftest*
15560 ac_cv_c_stack_direction=-1
15561 fi
15562-rm -fr conftest*
15563+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
15564+ conftest.$ac_objext conftest.beam conftest.$ac_ext
15565 fi
15566
15567 fi
15568-
15569-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
15570-cat >> confdefs.h <<EOF
15571+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
15572+$as_echo "$ac_cv_c_stack_direction" >&6; }
15573+cat >>confdefs.h <<_ACEOF
15574 #define STACK_DIRECTION $ac_cv_c_stack_direction
15575-EOF
15576+_ACEOF
15577+
15578
15579 fi
15580
15581-cat > conftest.$ac_ext <<EOF
15582-#line 3063 "configure"
15583-#include "confdefs.h"
15584+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15585+/* end confdefs.h. */
15586 #include <utime.h>
15587-EOF
15588+
15589+_ACEOF
15590 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
15591- egrep "struct.*utimbuf" >/dev/null 2>&1; then
15592- rm -rf conftest*
15593- cat >> confdefs.h <<\EOF
15594-#define HAVE_STRUCT_UTIMBUF 1
15595-EOF
15596+ $EGREP "struct.*utimbuf" >/dev/null 2>&1; then :
15597+ $as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h
15598
15599 fi
15600 rm -f conftest*
15601
15602
15603 for ac_func in gettimeofday settimeofday
15604-do
15605-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15606-echo "configure:3081: checking for $ac_func" >&5
15607-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15608- echo $ac_n "(cached) $ac_c" 1>&6
15609-else
15610- cat > conftest.$ac_ext <<EOF
15611-#line 3086 "configure"
15612-#include "confdefs.h"
15613-/* System header to define __stub macros and hopefully few prototypes,
15614- which can conflict with char $ac_func(); below. */
15615-#include <assert.h>
15616-/* Override any gcc2 internal prototype to avoid an error. */
15617-/* We use char because int might match the return type of a gcc2
15618- builtin and then its argument prototype would still apply. */
15619-char $ac_func();
15620-
15621-int main() {
15622-
15623-/* The GNU C library defines this for functions which it implements
15624- to always fail with ENOSYS. Some functions are actually named
15625- something starting with __ and the normal name is an alias. */
15626-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15627-choke me
15628-#else
15629-$ac_func();
15630-#endif
15631+do :
15632+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15633+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
15634+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
15635+ cat >>confdefs.h <<_ACEOF
15636+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15637+_ACEOF
15638
15639-; return 0; }
15640-EOF
15641-if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15642- rm -rf conftest*
15643- eval "ac_cv_func_$ac_func=yes"
15644-else
15645- echo "configure: failed program was:" >&5
15646- cat conftest.$ac_ext >&5
15647- rm -rf conftest*
15648- eval "ac_cv_func_$ac_func=no"
15649-fi
15650-rm -f conftest*
15651-fi
15652-
15653-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15654- echo "$ac_t""yes" 1>&6
15655- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
15656- cat >> confdefs.h <<EOF
15657-#define $ac_tr_func 1
15658-EOF
15659-
15660-else
15661- echo "$ac_t""no" 1>&6
15662 fi
15663 done
15664
15665 for ac_func in strchr memcpy select vprintf
15666-do
15667-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15668-echo "configure:3136: checking for $ac_func" >&5
15669-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15670- echo $ac_n "(cached) $ac_c" 1>&6
15671-else
15672- cat > conftest.$ac_ext <<EOF
15673-#line 3141 "configure"
15674-#include "confdefs.h"
15675-/* System header to define __stub macros and hopefully few prototypes,
15676- which can conflict with char $ac_func(); below. */
15677-#include <assert.h>
15678-/* Override any gcc2 internal prototype to avoid an error. */
15679-/* We use char because int might match the return type of a gcc2
15680- builtin and then its argument prototype would still apply. */
15681-char $ac_func();
15682+do :
15683+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15684+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
15685+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
15686+ cat >>confdefs.h <<_ACEOF
15687+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15688+_ACEOF
15689
15690-int main() {
15691+fi
15692+done
15693
15694-/* The GNU C library defines this for functions which it implements
15695- to always fail with ENOSYS. Some functions are actually named
15696- something starting with __ and the normal name is an alias. */
15697-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15698-choke me
15699-#else
15700-$ac_func();
15701-#endif
15702+for ac_func in times rdchk utime syslog siginterrupt
15703+do :
15704+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
15705+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
15706+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
15707+ cat >>confdefs.h <<_ACEOF
15708+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
15709+_ACEOF
15710
15711-; return 0; }
15712-EOF
15713-if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15714- rm -rf conftest*
15715- eval "ac_cv_func_$ac_func=yes"
15716-else
15717- echo "configure: failed program was:" >&5
15718- cat conftest.$ac_ext >&5
15719- rm -rf conftest*
15720- eval "ac_cv_func_$ac_func=no"
15721-fi
15722-rm -f conftest*
15723 fi
15724+done
15725+
15726+ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
15727+if test "x$ac_cv_func_mkdir" = xyes; then :
15728+ $as_echo "#define HAVE_MKDIR 1" >>confdefs.h
15729
15730-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15731- echo "$ac_t""yes" 1>&6
15732- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
15733- cat >> confdefs.h <<EOF
15734-#define $ac_tr_func 1
15735-EOF
15736-
15737 else
15738- echo "$ac_t""no" 1>&6
15739-fi
15740-done
15741+ case " $LIBOBJS " in
15742+ *" mkdir.$ac_objext "* ) ;;
15743+ *) LIBOBJS="$LIBOBJS mkdir.$ac_objext"
15744+ ;;
15745+esac
15746
15747-for ac_func in times rdchk utime syslog siginterrupt
15748-do
15749-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15750-echo "configure:3191: checking for $ac_func" >&5
15751-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15752- echo $ac_n "(cached) $ac_c" 1>&6
15753-else
15754- cat > conftest.$ac_ext <<EOF
15755-#line 3196 "configure"
15756-#include "confdefs.h"
15757-/* System header to define __stub macros and hopefully few prototypes,
15758- which can conflict with char $ac_func(); below. */
15759-#include <assert.h>
15760-/* Override any gcc2 internal prototype to avoid an error. */
15761-/* We use char because int might match the return type of a gcc2
15762- builtin and then its argument prototype would still apply. */
15763-char $ac_func();
15764+fi
15765
15766-int main() {
15767+ac_fn_c_check_func "$LINENO" "mktime" "ac_cv_func_mktime"
15768+if test "x$ac_cv_func_mktime" = xyes; then :
15769+ $as_echo "#define HAVE_MKTIME 1" >>confdefs.h
15770
15771-/* The GNU C library defines this for functions which it implements
15772- to always fail with ENOSYS. Some functions are actually named
15773- something starting with __ and the normal name is an alias. */
15774-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15775-choke me
15776-#else
15777-$ac_func();
15778-#endif
15779+else
15780+ case " $LIBOBJS " in
15781+ *" mktime.$ac_objext "* ) ;;
15782+ *) LIBOBJS="$LIBOBJS mktime.$ac_objext"
15783+ ;;
15784+esac
15785
15786-; return 0; }
15787-EOF
15788-if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15789- rm -rf conftest*
15790- eval "ac_cv_func_$ac_func=yes"
15791-else
15792- echo "configure: failed program was:" >&5
15793- cat conftest.$ac_ext >&5
15794- rm -rf conftest*
15795- eval "ac_cv_func_$ac_func=no"
15796-fi
15797-rm -f conftest*
15798 fi
15799
15800-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15801- echo "$ac_t""yes" 1>&6
15802- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
15803- cat >> confdefs.h <<EOF
15804-#define $ac_tr_func 1
15805-EOF
15806-
15807+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
15808+if test "x$ac_cv_func_strerror" = xyes; then :
15809+ $as_echo "#define HAVE_STRERROR 1" >>confdefs.h
15810+
15811 else
15812- echo "$ac_t""no" 1>&6
15813-fi
15814-done
15815+ case " $LIBOBJS " in
15816+ *" strerror.$ac_objext "* ) ;;
15817+ *) LIBOBJS="$LIBOBJS strerror.$ac_objext"
15818+ ;;
15819+esac
15820
15821-for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk
15822-do
15823-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15824-echo "configure:3246: checking for $ac_func" >&5
15825-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15826- echo $ac_n "(cached) $ac_c" 1>&6
15827-else
15828- cat > conftest.$ac_ext <<EOF
15829-#line 3251 "configure"
15830-#include "confdefs.h"
15831-/* System header to define __stub macros and hopefully few prototypes,
15832- which can conflict with char $ac_func(); below. */
15833-#include <assert.h>
15834-/* Override any gcc2 internal prototype to avoid an error. */
15835-/* We use char because int might match the return type of a gcc2
15836- builtin and then its argument prototype would still apply. */
15837-char $ac_func();
15838+fi
15839
15840-int main() {
15841+ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
15842+if test "x$ac_cv_func_strstr" = xyes; then :
15843+ $as_echo "#define HAVE_STRSTR 1" >>confdefs.h
15844
15845-/* The GNU C library defines this for functions which it implements
15846- to always fail with ENOSYS. Some functions are actually named
15847- something starting with __ and the normal name is an alias. */
15848-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15849-choke me
15850-#else
15851-$ac_func();
15852-#endif
15853+else
15854+ case " $LIBOBJS " in
15855+ *" strstr.$ac_objext "* ) ;;
15856+ *) LIBOBJS="$LIBOBJS strstr.$ac_objext"
15857+ ;;
15858+esac
15859
15860-; return 0; }
15861-EOF
15862-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15863- rm -rf conftest*
15864- eval "ac_cv_func_$ac_func=yes"
15865-else
15866- echo "configure: failed program was:" >&5
15867- cat conftest.$ac_ext >&5
15868- rm -rf conftest*
15869- eval "ac_cv_func_$ac_func=no"
15870-fi
15871-rm -f conftest*
15872 fi
15873
15874-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15875- echo "$ac_t""yes" 1>&6
15876- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
15877- cat >> confdefs.h <<EOF
15878-#define $ac_tr_func 1
15879-EOF
15880-
15881+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
15882+if test "x$ac_cv_func_strdup" = xyes; then :
15883+ $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
15884+
15885 else
15886- echo "$ac_t""no" 1>&6
15887-LIBOBJS="$LIBOBJS ${ac_func}.o"
15888+ case " $LIBOBJS " in
15889+ *" strdup.$ac_objext "* ) ;;
15890+ *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
15891+ ;;
15892+esac
15893+
15894 fi
15895-done
15896
15897+ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
15898+if test "x$ac_cv_func_strtoul" = xyes; then :
15899+ $as_echo "#define HAVE_STRTOUL 1" >>confdefs.h
15900
15901-for ac_func in stpcpy strftime vasprintf
15902-do
15903-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15904-echo "configure:3303: checking for $ac_func" >&5
15905-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15906- echo $ac_n "(cached) $ac_c" 1>&6
15907-else
15908- cat > conftest.$ac_ext <<EOF
15909-#line 3308 "configure"
15910-#include "confdefs.h"
15911-/* System header to define __stub macros and hopefully few prototypes,
15912- which can conflict with char $ac_func(); below. */
15913-#include <assert.h>
15914-/* Override any gcc2 internal prototype to avoid an error. */
15915-/* We use char because int might match the return type of a gcc2
15916- builtin and then its argument prototype would still apply. */
15917-char $ac_func();
15918+else
15919+ case " $LIBOBJS " in
15920+ *" strtoul.$ac_objext "* ) ;;
15921+ *) LIBOBJS="$LIBOBJS strtoul.$ac_objext"
15922+ ;;
15923+esac
15924
15925-int main() {
15926+fi
15927
15928-/* The GNU C library defines this for functions which it implements
15929- to always fail with ENOSYS. Some functions are actually named
15930- something starting with __ and the normal name is an alias. */
15931-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
15932-choke me
15933-#else
15934-$ac_func();
15935-#endif
15936+ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
15937+if test "x$ac_cv_func_strtol" = xyes; then :
15938+ $as_echo "#define HAVE_STRTOL 1" >>confdefs.h
15939+
15940+else
15941+ case " $LIBOBJS " in
15942+ *" strtol.$ac_objext "* ) ;;
15943+ *) LIBOBJS="$LIBOBJS strtol.$ac_objext"
15944+ ;;
15945+esac
15946
15947-; return 0; }
15948-EOF
15949-if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
15950- rm -rf conftest*
15951- eval "ac_cv_func_$ac_func=yes"
15952-else
15953- echo "configure: failed program was:" >&5
15954- cat conftest.$ac_ext >&5
15955- rm -rf conftest*
15956- eval "ac_cv_func_$ac_func=no"
15957-fi
15958-rm -f conftest*
15959 fi
15960
15961-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
15962- echo "$ac_t""yes" 1>&6
15963- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
15964- cat >> confdefs.h <<EOF
15965-#define $ac_tr_func 1
15966-EOF
15967-
15968+ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
15969+if test "x$ac_cv_func_strpbrk" = xyes; then :
15970+ $as_echo "#define HAVE_STRPBRK 1" >>confdefs.h
15971+
15972 else
15973- echo "$ac_t""no" 1>&6
15974-LIBOBJS="$LIBOBJS ${ac_func}.o"
15975+ case " $LIBOBJS " in
15976+ *" strpbrk.$ac_objext "* ) ;;
15977+ *) LIBOBJS="$LIBOBJS strpbrk.$ac_objext"
15978+ ;;
15979+esac
15980+
15981 fi
15982-done
15983
15984
15985+ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
15986+if test "x$ac_cv_func_stpcpy" = xyes; then :
15987+ $as_echo "#define HAVE_STPCPY 1" >>confdefs.h
15988
15989-echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
15990-echo "configure:3359: checking for getopt_long" >&5
15991-if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
15992- echo $ac_n "(cached) $ac_c" 1>&6
15993 else
15994- cat > conftest.$ac_ext <<EOF
15995-#line 3364 "configure"
15996-#include "confdefs.h"
15997-/* System header to define __stub macros and hopefully few prototypes,
15998- which can conflict with char getopt_long(); below. */
15999-#include <assert.h>
16000-/* Override any gcc2 internal prototype to avoid an error. */
16001-/* We use char because int might match the return type of a gcc2
16002- builtin and then its argument prototype would still apply. */
16003-char getopt_long();
16004+ case " $LIBOBJS " in
16005+ *" stpcpy.$ac_objext "* ) ;;
16006+ *) LIBOBJS="$LIBOBJS stpcpy.$ac_objext"
16007+ ;;
16008+esac
16009
16010-int main() {
16011+fi
16012
16013-/* The GNU C library defines this for functions which it implements
16014- to always fail with ENOSYS. Some functions are actually named
16015- something starting with __ and the normal name is an alias. */
16016-#if defined (__stub_getopt_long) || defined (__stub___getopt_long)
16017-choke me
16018-#else
16019-getopt_long();
16020-#endif
16021+ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
16022+if test "x$ac_cv_func_strftime" = xyes; then :
16023+ $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
16024+
16025+else
16026+ case " $LIBOBJS " in
16027+ *" strftime.$ac_objext "* ) ;;
16028+ *) LIBOBJS="$LIBOBJS strftime.$ac_objext"
16029+ ;;
16030+esac
16031
16032-; return 0; }
16033-EOF
16034-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16035- rm -rf conftest*
16036- eval "ac_cv_func_getopt_long=yes"
16037-else
16038- echo "configure: failed program was:" >&5
16039- cat conftest.$ac_ext >&5
16040- rm -rf conftest*
16041- eval "ac_cv_func_getopt_long=no"
16042-fi
16043-rm -f conftest*
16044 fi
16045
16046-if eval "test \"`echo '$ac_cv_func_'getopt_long`\" = yes"; then
16047- echo "$ac_t""yes" 1>&6
16048- :
16049+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
16050+if test "x$ac_cv_func_vasprintf" = xyes; then :
16051+ $as_echo "#define HAVE_VASPRINTF 1" >>confdefs.h
16052+
16053 else
16054- echo "$ac_t""no" 1>&6
16055-LIBOBJS="$LIBOBJS getopt1.o getopt.o"
16056+ case " $LIBOBJS " in
16057+ *" vasprintf.$ac_objext "* ) ;;
16058+ *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext"
16059+ ;;
16060+esac
16061+
16062 fi
16063
16064
16065
16066-cat >> confdefs.h <<\EOF
16067-#define HAVE_STRERROR 1
16068-EOF
16069+ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
16070+if test "x$ac_cv_func_getopt_long" = xyes; then :
16071
16072+else
16073+ LIBOBJS="$LIBOBJS getopt1.o getopt.o"
16074+fi
16075
16076
16077
16078-echo $ac_n "checking for ftime""... $ac_c" 1>&6
16079-echo "configure:3417: checking for ftime" >&5
16080-if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then
16081- echo $ac_n "(cached) $ac_c" 1>&6
16082-else
16083- cat > conftest.$ac_ext <<EOF
16084-#line 3422 "configure"
16085-#include "confdefs.h"
16086-/* System header to define __stub macros and hopefully few prototypes,
16087- which can conflict with char ftime(); below. */
16088-#include <assert.h>
16089-/* Override any gcc2 internal prototype to avoid an error. */
16090-/* We use char because int might match the return type of a gcc2
16091- builtin and then its argument prototype would still apply. */
16092-char ftime();
16093+$as_echo "#define HAVE_STRERROR 1" >>confdefs.h
16094
16095-int main() {
16096
16097-/* The GNU C library defines this for functions which it implements
16098- to always fail with ENOSYS. Some functions are actually named
16099- something starting with __ and the normal name is an alias. */
16100-#if defined (__stub_ftime) || defined (__stub___ftime)
16101-choke me
16102-#else
16103-ftime();
16104-#endif
16105
16106-; return 0; }
16107-EOF
16108-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16109- rm -rf conftest*
16110- eval "ac_cv_func_ftime=yes"
16111-else
16112- echo "configure: failed program was:" >&5
16113- cat conftest.$ac_ext >&5
16114- rm -rf conftest*
16115- eval "ac_cv_func_ftime=no"
16116-fi
16117-rm -f conftest*
16118-fi
16119
16120-if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then
16121- echo "$ac_t""yes" 1>&6
16122- echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6
16123-echo "configure:3460: checking that ftime works correctly" >&5
16124-if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then
16125- echo $ac_n "(cached) $ac_c" 1>&6
16126+ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime"
16127+if test "x$ac_cv_func_ftime" = xyes; then :
16128+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking that ftime works correctly" >&5
16129+$as_echo_n "checking that ftime works correctly... " >&6; }
16130+if ${lrzsz_cv_sys_ftime_ok+:} false; then :
16131+ $as_echo_n "(cached) " >&6
16132 else
16133- if test "$cross_compiling" = yes; then
16134+ if test "$cross_compiling" = yes; then :
16135 lrzsz_cv_sys_ftime_ok=runtime
16136 else
16137- cat > conftest.$ac_ext <<EOF
16138-#line 3468 "configure"
16139-#include "confdefs.h"
16140+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16141+/* end confdefs.h. */
16142
16143 #include <sys/types.h>
16144 #include <sys/timeb.h>
16145@@ -3492,88 +6001,82 @@ main ()
16146 exit (0);
16147 }
16148
16149-EOF
16150-if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
16151-then
16152+_ACEOF
16153+if ac_fn_c_try_run "$LINENO"; then :
16154 lrzsz_cv_sys_ftime_ok=yes
16155 else
16156- echo "configure: failed program was:" >&5
16157- cat conftest.$ac_ext >&5
16158- rm -fr conftest*
16159 lrzsz_cv_sys_ftime_ok=no
16160 fi
16161-rm -fr conftest*
16162+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
16163+ conftest.$ac_objext conftest.beam conftest.$ac_ext
16164 fi
16165
16166 fi
16167
16168 case $lrzsz_cv_sys_ftime_ok in
16169-yes) cat >> confdefs.h <<\EOF
16170-#define HAVE_FTIME 1
16171-EOF
16172- echo "$ac_t""yes" 1>&6 ;;
16173-no) echo "$ac_t""no" 1>&6
16174- echo "configure: warning: ftime seems to be buggy" 1>&2 ;;
16175-runtime) cat >> confdefs.h <<\EOF
16176-#define HAVE_FTIME 1
16177-EOF
16178+yes) $as_echo "#define HAVE_FTIME 1" >>confdefs.h
16179+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16180+$as_echo "yes" >&6; } ;;
16181+no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16182+$as_echo "no" >&6; }
16183+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ftime seems to be buggy" >&5
16184+$as_echo "$as_me: WARNING: ftime seems to be buggy" >&2;} ;;
16185+runtime) $as_echo "#define HAVE_FTIME 1" >>confdefs.h
16186
16187- echo "$ac_t""will check at run time" 1>&6 ;;
16188+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: will check at run time" >&5
16189+$as_echo "will check at run time" >&6; } ;;
16190 esac
16191
16192-else
16193- echo "$ac_t""no" 1>&6
16194 fi
16195
16196
16197-echo $ac_n "checking for timezone variable""... $ac_c" 1>&6
16198-echo "configure:3531: checking for timezone variable" >&5
16199-if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then
16200- echo $ac_n "(cached) $ac_c" 1>&6
16201+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5
16202+$as_echo_n "checking for timezone variable... " >&6; }
16203+if ${libquark_cv_var_timezone+:} false; then :
16204+ $as_echo_n "(cached) " >&6
16205 else
16206-
16207-cat > conftest.$ac_ext <<EOF
16208-#line 3537 "configure"
16209-#include "confdefs.h"
16210+
16211+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16212+/* end confdefs.h. */
16213 #include <time.h>
16214-int main() {
16215+int
16216+main ()
16217+{
16218 return(int)(timezone/2);
16219-; return 0; }
16220-EOF
16221-if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16222- rm -rf conftest*
16223+ ;
16224+ return 0;
16225+}
16226+_ACEOF
16227+if ac_fn_c_try_link "$LINENO"; then :
16228 libquark_cv_var_timezone=yes
16229 else
16230- echo "configure: failed program was:" >&5
16231- cat conftest.$ac_ext >&5
16232- rm -rf conftest*
16233 libquark_cv_var_timezone=no
16234 fi
16235-rm -f conftest*
16236+rm -f core conftest.err conftest.$ac_objext \
16237+ conftest$ac_exeext conftest.$ac_ext
16238
16239 fi
16240
16241 if test $libquark_cv_var_timezone = yes ; then
16242- echo "$ac_t""yes" 1>&6
16243- cat >> confdefs.h <<\EOF
16244-#define HAVE_TIMEZONE_VAR 1
16245-EOF
16246+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16247+$as_echo "yes" >&6; }
16248+ $as_echo "#define HAVE_TIMEZONE_VAR 1" >>confdefs.h
16249
16250 else
16251- echo "$ac_t""no" 1>&6
16252+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16253+$as_echo "no" >&6; }
16254 fi
16255 if test "x$lookup_facility" = x ; then
16256 :
16257 else
16258- echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6
16259-echo "configure:3570: checking for $lookup_facility" >&5
16260- if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then
16261- echo $ac_n "(cached) $ac_c" 1>&6
16262-else
16263-
16264- cat > conftest.$ac_ext <<EOF
16265-#line 3576 "configure"
16266-#include "confdefs.h"
16267+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $lookup_facility" >&5
16268+$as_echo_n "checking for $lookup_facility... " >&6; }
16269+ if ${lrzsz_cv_lookup_facility+:} false; then :
16270+ $as_echo_n "(cached) " >&6
16271+else
16272+
16273+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16274+/* end confdefs.h. */
16275
16276 #ifdef HAVE_SYSLOG_H
16277 #include <syslog.h>
16278@@ -3583,1562 +6086,4174 @@ else
16279 #ifdef $lookup_facility
16280 ihave$lookup_facility
16281 #endif
16282-
16283-EOF
16284+
16285+_ACEOF
16286 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
16287- egrep "ihave$lookup_facility" >/dev/null 2>&1; then
16288- rm -rf conftest*
16289+ $EGREP "ihave$lookup_facility" >/dev/null 2>&1; then :
16290 lrzsz_cv_lookup_facility=yes
16291 else
16292- rm -rf conftest*
16293 lrzsz_cv_lookup_facility=no
16294 fi
16295 rm -f conftest*
16296
16297-
16298+
16299 fi
16300
16301 if test $lrzsz_cv_lookup_facility = yes ; then
16302- echo "$ac_t""yes" 1>&6
16303- cat >> confdefs.h <<EOF
16304+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16305+$as_echo "yes" >&6; }
16306+ cat >>confdefs.h <<_ACEOF
16307 #define ENABLE_SYSLOG $lookup_facility
16308-EOF
16309+_ACEOF
16310
16311 else
16312- cat >> confdefs.h <<\EOF
16313-#define ENABLE_SYSLOG LOG_USER
16314-EOF
16315+ $as_echo "#define ENABLE_SYSLOG LOG_USER" >>confdefs.h
16316
16317- echo "$ac_t""no" 1>&6
16318+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16319+$as_echo "no" >&6; }
16320 fi
16321 fi
16322
16323
16324
16325
16326-
16327-
16328-
16329- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
16330-unistd.h values.h sys/param.h
16331-do
16332-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
16333-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
16334-echo "configure:3628: checking for $ac_hdr" >&5
16335-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
16336- echo $ac_n "(cached) $ac_c" 1>&6
16337-else
16338- cat > conftest.$ac_ext <<EOF
16339-#line 3633 "configure"
16340-#include "confdefs.h"
16341-#include <$ac_hdr>
16342-EOF
16343-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
16344-{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
16345-ac_err=`grep -v '^ *+' conftest.out`
16346-if test -z "$ac_err"; then
16347- rm -rf conftest*
16348- eval "ac_cv_header_$ac_safe=yes"
16349-else
16350- echo "$ac_err" >&5
16351- echo "configure: failed program was:" >&5
16352- cat conftest.$ac_ext >&5
16353- rm -rf conftest*
16354- eval "ac_cv_header_$ac_safe=no"
16355-fi
16356-rm -f conftest*
16357-fi
16358-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
16359- echo "$ac_t""yes" 1>&6
16360- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
16361- cat >> confdefs.h <<EOF
16362-#define $ac_tr_hdr 1
16363-EOF
16364-
16365-else
16366- echo "$ac_t""no" 1>&6
16367-fi
16368-done
16369-
16370- for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
16371-__argz_count __argz_stringify __argz_next
16372+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
16373+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
16374+if ${ac_cv_path_SED+:} false; then :
16375+ $as_echo_n "(cached) " >&6
16376+else
16377+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
16378+ for ac_i in 1 2 3 4 5 6 7; do
16379+ ac_script="$ac_script$as_nl$ac_script"
16380+ done
16381+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
16382+ { ac_script=; unset ac_script;}
16383+ if test -z "$SED"; then
16384+ ac_path_SED_found=false
16385+ # Loop through the user's path and test for each of PROGNAME-LIST
16386+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16387+for as_dir in $PATH
16388 do
16389-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
16390-echo "configure:3668: checking for $ac_func" >&5
16391-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
16392- echo $ac_n "(cached) $ac_c" 1>&6
16393-else
16394- cat > conftest.$ac_ext <<EOF
16395-#line 3673 "configure"
16396-#include "confdefs.h"
16397-/* System header to define __stub macros and hopefully few prototypes,
16398- which can conflict with char $ac_func(); below. */
16399-#include <assert.h>
16400-/* Override any gcc2 internal prototype to avoid an error. */
16401-/* We use char because int might match the return type of a gcc2
16402- builtin and then its argument prototype would still apply. */
16403-char $ac_func();
16404-
16405-int main() {
16406-
16407-/* The GNU C library defines this for functions which it implements
16408- to always fail with ENOSYS. Some functions are actually named
16409- something starting with __ and the normal name is an alias. */
16410-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
16411-choke me
16412-#else
16413-$ac_func();
16414-#endif
16415-
16416-; return 0; }
16417-EOF
16418-if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16419- rm -rf conftest*
16420- eval "ac_cv_func_$ac_func=yes"
16421-else
16422- echo "configure: failed program was:" >&5
16423- cat conftest.$ac_ext >&5
16424- rm -rf conftest*
16425- eval "ac_cv_func_$ac_func=no"
16426-fi
16427-rm -f conftest*
16428-fi
16429+ IFS=$as_save_IFS
16430+ test -z "$as_dir" && as_dir=.
16431+ for ac_prog in sed gsed; do
16432+ for ac_exec_ext in '' $ac_executable_extensions; do
16433+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
16434+ as_fn_executable_p "$ac_path_SED" || continue
16435+# Check for GNU ac_path_SED and select it if it is found.
16436+ # Check for GNU $ac_path_SED
16437+case `"$ac_path_SED" --version 2>&1` in
16438+*GNU*)
16439+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
16440+*)
16441+ ac_count=0
16442+ $as_echo_n 0123456789 >"conftest.in"
16443+ while :
16444+ do
16445+ cat "conftest.in" "conftest.in" >"conftest.tmp"
16446+ mv "conftest.tmp" "conftest.in"
16447+ cp "conftest.in" "conftest.nl"
16448+ $as_echo '' >> "conftest.nl"
16449+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
16450+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
16451+ as_fn_arith $ac_count + 1 && ac_count=$as_val
16452+ if test $ac_count -gt ${ac_path_SED_max-0}; then
16453+ # Best one so far, save it but keep looking for a better one
16454+ ac_cv_path_SED="$ac_path_SED"
16455+ ac_path_SED_max=$ac_count
16456+ fi
16457+ # 10*(2^10) chars as input seems more than enough
16458+ test $ac_count -gt 10 && break
16459+ done
16460+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
16461+esac
16462
16463-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
16464- echo "$ac_t""yes" 1>&6
16465- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
16466- cat >> confdefs.h <<EOF
16467-#define $ac_tr_func 1
16468-EOF
16469-
16470+ $ac_path_SED_found && break 3
16471+ done
16472+ done
16473+ done
16474+IFS=$as_save_IFS
16475+ if test -z "$ac_cv_path_SED"; then
16476+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
16477+ fi
16478 else
16479- echo "$ac_t""no" 1>&6
16480+ ac_cv_path_SED=$SED
16481 fi
16482-done
16483-
16484
16485- if test "${ac_cv_func_stpcpy+set}" != "set"; then
16486- for ac_func in stpcpy
16487-do
16488-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
16489-echo "configure:3725: checking for $ac_func" >&5
16490-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
16491- echo $ac_n "(cached) $ac_c" 1>&6
16492-else
16493- cat > conftest.$ac_ext <<EOF
16494-#line 3730 "configure"
16495-#include "confdefs.h"
16496-/* System header to define __stub macros and hopefully few prototypes,
16497- which can conflict with char $ac_func(); below. */
16498-#include <assert.h>
16499-/* Override any gcc2 internal prototype to avoid an error. */
16500-/* We use char because int might match the return type of a gcc2
16501- builtin and then its argument prototype would still apply. */
16502-char $ac_func();
16503-
16504-int main() {
16505-
16506-/* The GNU C library defines this for functions which it implements
16507- to always fail with ENOSYS. Some functions are actually named
16508- something starting with __ and the normal name is an alias. */
16509-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
16510-choke me
16511-#else
16512-$ac_func();
16513-#endif
16514-
16515-; return 0; }
16516-EOF
16517-if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16518- rm -rf conftest*
16519- eval "ac_cv_func_$ac_func=yes"
16520-else
16521- echo "configure: failed program was:" >&5
16522- cat conftest.$ac_ext >&5
16523- rm -rf conftest*
16524- eval "ac_cv_func_$ac_func=no"
16525-fi
16526-rm -f conftest*
16527 fi
16528+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
16529+$as_echo "$ac_cv_path_SED" >&6; }
16530+ SED="$ac_cv_path_SED"
16531+ rm -f conftest.sed
16532+
16533
16534-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
16535- echo "$ac_t""yes" 1>&6
16536- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
16537- cat >> confdefs.h <<EOF
16538-#define $ac_tr_func 1
16539-EOF
16540-
16541+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
16542+$as_echo_n "checking whether NLS is requested... " >&6; }
16543+ # Check whether --enable-nls was given.
16544+if test "${enable_nls+set}" = set; then :
16545+ enableval=$enable_nls; USE_NLS=$enableval
16546 else
16547- echo "$ac_t""no" 1>&6
16548+ USE_NLS=yes
16549 fi
16550-done
16551-
16552- fi
16553- if test "${ac_cv_func_stpcpy}" = "yes"; then
16554- cat >> confdefs.h <<\EOF
16555-#define HAVE_STPCPY 1
16556-EOF
16557
16558- fi
16559+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
16560+$as_echo "$USE_NLS" >&6; }
16561
16562- if test $ac_cv_header_locale_h = yes; then
16563- echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
16564-echo "configure:3787: checking for LC_MESSAGES" >&5
16565-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
16566- echo $ac_n "(cached) $ac_c" 1>&6
16567-else
16568- cat > conftest.$ac_ext <<EOF
16569-#line 3792 "configure"
16570-#include "confdefs.h"
16571-#include <locale.h>
16572-int main() {
16573-return LC_MESSAGES
16574-; return 0; }
16575-EOF
16576-if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16577- rm -rf conftest*
16578- am_cv_val_LC_MESSAGES=yes
16579-else
16580- echo "configure: failed program was:" >&5
16581- cat conftest.$ac_ext >&5
16582- rm -rf conftest*
16583- am_cv_val_LC_MESSAGES=no
16584-fi
16585-rm -f conftest*
16586-fi
16587
16588-echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
16589- if test $am_cv_val_LC_MESSAGES = yes; then
16590- cat >> confdefs.h <<\EOF
16591-#define HAVE_LC_MESSAGES 1
16592-EOF
16593
16594- fi
16595- fi
16596- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
16597-echo "configure:3820: checking whether NLS is requested" >&5
16598- # Check whether --enable-nls or --disable-nls was given.
16599-if test "${enable_nls+set}" = set; then
16600- enableval="$enable_nls"
16601- USE_NLS=$enableval
16602-else
16603- USE_NLS=yes
16604-fi
16605
16606- echo "$ac_t""$USE_NLS" 1>&6
16607-
16608+ GETTEXT_MACRO_VERSION=0.20
16609
16610- USE_INCLUDED_LIBINTL=no
16611
16612- if test "$USE_NLS" = "yes"; then
16613- cat >> confdefs.h <<\EOF
16614-#define ENABLE_NLS 1
16615-EOF
16616-
16617- echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
16618-echo "configure:3840: checking whether included gettext is requested" >&5
16619- # Check whether --with-included-gettext or --without-included-gettext was given.
16620-if test "${with_included_gettext+set}" = set; then
16621- withval="$with_included_gettext"
16622- nls_cv_force_use_gnu_gettext=$withval
16623-else
16624- nls_cv_force_use_gnu_gettext=no
16625-fi
16626-
16627- echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
16628-
16629- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
16630- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
16631- nls_cv_header_intl=
16632- nls_cv_header_libgt=
16633- CATOBJEXT=NONE
16634-
16635- ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
16636-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
16637-echo "configure:3859: checking for libintl.h" >&5
16638-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
16639- echo $ac_n "(cached) $ac_c" 1>&6
16640-else
16641- cat > conftest.$ac_ext <<EOF
16642-#line 3864 "configure"
16643-#include "confdefs.h"
16644-#include <libintl.h>
16645-EOF
16646-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
16647-{ (eval echo configure:3869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
16648-ac_err=`grep -v '^ *+' conftest.out`
16649-if test -z "$ac_err"; then
16650- rm -rf conftest*
16651- eval "ac_cv_header_$ac_safe=yes"
16652-else
16653- echo "$ac_err" >&5
16654- echo "configure: failed program was:" >&5
16655- cat conftest.$ac_ext >&5
16656- rm -rf conftest*
16657- eval "ac_cv_header_$ac_safe=no"
16658-fi
16659-rm -f conftest*
16660-fi
16661-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
16662- echo "$ac_t""yes" 1>&6
16663- echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
16664-echo "configure:3886: checking for gettext in libc" >&5
16665-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
16666- echo $ac_n "(cached) $ac_c" 1>&6
16667-else
16668- cat > conftest.$ac_ext <<EOF
16669-#line 3891 "configure"
16670-#include "confdefs.h"
16671-#include <libintl.h>
16672-int main() {
16673-return (int) gettext ("")
16674-; return 0; }
16675-EOF
16676-if { (eval echo configure:3898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16677- rm -rf conftest*
16678- gt_cv_func_gettext_libc=yes
16679-else
16680- echo "configure: failed program was:" >&5
16681- cat conftest.$ac_ext >&5
16682- rm -rf conftest*
16683- gt_cv_func_gettext_libc=no
16684-fi
16685-rm -f conftest*
16686-fi
16687
16688-echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
16689
16690- if test "$gt_cv_func_gettext_libc" != "yes"; then
16691- echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
16692-echo "configure:3914: checking for bindtextdomain in -lintl" >&5
16693-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
16694-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16695- echo $ac_n "(cached) $ac_c" 1>&6
16696-else
16697- ac_save_LIBS="$LIBS"
16698-LIBS="-lintl $LIBS"
16699-cat > conftest.$ac_ext <<EOF
16700-#line 3922 "configure"
16701-#include "confdefs.h"
16702-/* Override any gcc2 internal prototype to avoid an error. */
16703-/* We use char because int might match the return type of a gcc2
16704- builtin and then its argument prototype would still apply. */
16705-char bindtextdomain();
16706-
16707-int main() {
16708-bindtextdomain()
16709-; return 0; }
16710-EOF
16711-if { (eval echo configure:3933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16712- rm -rf conftest*
16713- eval "ac_cv_lib_$ac_lib_var=yes"
16714-else
16715- echo "configure: failed program was:" >&5
16716- cat conftest.$ac_ext >&5
16717- rm -rf conftest*
16718- eval "ac_cv_lib_$ac_lib_var=no"
16719-fi
16720-rm -f conftest*
16721-LIBS="$ac_save_LIBS"
16722-
16723-fi
16724-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
16725- echo "$ac_t""yes" 1>&6
16726- echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
16727-echo "configure:3949: checking for gettext in libintl" >&5
16728-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
16729- echo $ac_n "(cached) $ac_c" 1>&6
16730-else
16731- cat > conftest.$ac_ext <<EOF
16732-#line 3954 "configure"
16733-#include "confdefs.h"
16734-
16735-int main() {
16736-return (int) gettext ("")
16737-; return 0; }
16738-EOF
16739-if { (eval echo configure:3961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16740- rm -rf conftest*
16741- gt_cv_func_gettext_libintl=yes
16742-else
16743- echo "configure: failed program was:" >&5
16744- cat conftest.$ac_ext >&5
16745- rm -rf conftest*
16746- gt_cv_func_gettext_libintl=no
16747-fi
16748-rm -f conftest*
16749+# Prepare PATH_SEPARATOR.
16750+# The user is always right.
16751+if test "${PATH_SEPARATOR+set}" != set; then
16752+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
16753+ # contains only /bin. Note that ksh looks also at the FPATH variable,
16754+ # so we have to set that as well for the test.
16755+ PATH_SEPARATOR=:
16756+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
16757+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
16758+ || PATH_SEPARATOR=';'
16759+ }
16760 fi
16761
16762-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
16763+# Find out how to test for executable files. Don't use a zero-byte file,
16764+# as systems may use methods other than mode bits to determine executability.
16765+cat >conf$$.file <<_ASEOF
16766+#! /bin/sh
16767+exit 0
16768+_ASEOF
16769+chmod +x conf$$.file
16770+if test -x conf$$.file >/dev/null 2>&1; then
16771+ ac_executable_p="test -x"
16772 else
16773- echo "$ac_t""no" 1>&6
16774+ ac_executable_p="test -f"
16775 fi
16776+rm -f conf$$.file
16777
16778- fi
16779-
16780- if test "$gt_cv_func_gettext_libc" = "yes" \
16781- || test "$gt_cv_func_gettext_libintl" = "yes"; then
16782- cat >> confdefs.h <<\EOF
16783-#define HAVE_GETTEXT 1
16784-EOF
16785-
16786- # Extract the first word of "msgfmt", so it can be a program name with args.
16787+# Extract the first word of "msgfmt", so it can be a program name with args.
16788 set dummy msgfmt; ac_word=$2
16789-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
16790-echo "configure:3989: checking for $ac_word" >&5
16791-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
16792- echo $ac_n "(cached) $ac_c" 1>&6
16793+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16794+$as_echo_n "checking for $ac_word... " >&6; }
16795+if ${ac_cv_path_MSGFMT+:} false; then :
16796+ $as_echo_n "(cached) " >&6
16797 else
16798 case "$MSGFMT" in
16799- /*)
16800- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
16801- ;;
16802+ [\\/]* | ?:[\\/]*)
16803+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
16804+ ;;
16805 *)
16806- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
16807- for ac_dir in $PATH; do
16808- test -z "$ac_dir" && ac_dir=.
16809- if test -f $ac_dir/$ac_word; then
16810- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
16811- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
16812- break
16813- fi
16814- fi
16815- done
16816- IFS="$ac_save_ifs"
16817- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
16818- ;;
16819+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
16820+ for ac_dir in $PATH; do
16821+ IFS="$ac_save_IFS"
16822+ test -z "$ac_dir" && ac_dir=.
16823+ for ac_exec_ext in '' $ac_executable_extensions; do
16824+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
16825+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
16826+ if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
16827+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
16828+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
16829+ break 2
16830+ fi
16831+ fi
16832+ done
16833+ done
16834+ IFS="$ac_save_IFS"
16835+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
16836+ ;;
16837 esac
16838 fi
16839 MSGFMT="$ac_cv_path_MSGFMT"
16840-if test -n "$MSGFMT"; then
16841- echo "$ac_t""$MSGFMT" 1>&6
16842+if test "$MSGFMT" != ":"; then
16843+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
16844+$as_echo "$MSGFMT" >&6; }
16845 else
16846- echo "$ac_t""no" 1>&6
16847+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16848+$as_echo "no" >&6; }
16849 fi
16850- if test "$MSGFMT" != "no"; then
16851- for ac_func in dcgettext
16852-do
16853-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
16854-echo "configure:4023: checking for $ac_func" >&5
16855-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
16856- echo $ac_n "(cached) $ac_c" 1>&6
16857-else
16858- cat > conftest.$ac_ext <<EOF
16859-#line 4028 "configure"
16860-#include "confdefs.h"
16861-/* System header to define __stub macros and hopefully few prototypes,
16862- which can conflict with char $ac_func(); below. */
16863-#include <assert.h>
16864-/* Override any gcc2 internal prototype to avoid an error. */
16865-/* We use char because int might match the return type of a gcc2
16866- builtin and then its argument prototype would still apply. */
16867-char $ac_func();
16868
16869-int main() {
16870-
16871-/* The GNU C library defines this for functions which it implements
16872- to always fail with ENOSYS. Some functions are actually named
16873- something starting with __ and the normal name is an alias. */
16874-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
16875-choke me
16876-#else
16877-$ac_func();
16878-#endif
16879-
16880-; return 0; }
16881-EOF
16882-if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
16883- rm -rf conftest*
16884- eval "ac_cv_func_$ac_func=yes"
16885-else
16886- echo "configure: failed program was:" >&5
16887- cat conftest.$ac_ext >&5
16888- rm -rf conftest*
16889- eval "ac_cv_func_$ac_func=no"
16890-fi
16891-rm -f conftest*
16892-fi
16893-
16894-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
16895- echo "$ac_t""yes" 1>&6
16896- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
16897- cat >> confdefs.h <<EOF
16898-#define $ac_tr_func 1
16899-EOF
16900-
16901-else
16902- echo "$ac_t""no" 1>&6
16903-fi
16904-done
16905-
16906- # Extract the first word of "gmsgfmt", so it can be a program name with args.
16907+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
16908 set dummy gmsgfmt; ac_word=$2
16909-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
16910-echo "configure:4078: checking for $ac_word" >&5
16911-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
16912- echo $ac_n "(cached) $ac_c" 1>&6
16913+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16914+$as_echo_n "checking for $ac_word... " >&6; }
16915+if ${ac_cv_path_GMSGFMT+:} false; then :
16916+ $as_echo_n "(cached) " >&6
16917 else
16918- case "$GMSGFMT" in
16919- /*)
16920+ case $GMSGFMT in
16921+ [\\/]* | ?:[\\/]*)
16922 ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
16923 ;;
16924 *)
16925- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
16926- for ac_dir in $PATH; do
16927- test -z "$ac_dir" && ac_dir=.
16928- if test -f $ac_dir/$ac_word; then
16929- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
16930- break
16931- fi
16932+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16933+for as_dir in $PATH
16934+do
16935+ IFS=$as_save_IFS
16936+ test -z "$as_dir" && as_dir=.
16937+ for ac_exec_ext in '' $ac_executable_extensions; do
16938+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16939+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
16940+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16941+ break 2
16942+ fi
16943+done
16944 done
16945- IFS="$ac_save_ifs"
16946+IFS=$as_save_IFS
16947+
16948 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
16949 ;;
16950 esac
16951 fi
16952-GMSGFMT="$ac_cv_path_GMSGFMT"
16953+GMSGFMT=$ac_cv_path_GMSGFMT
16954 if test -n "$GMSGFMT"; then
16955- echo "$ac_t""$GMSGFMT" 1>&6
16956+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
16957+$as_echo "$GMSGFMT" >&6; }
16958+else
16959+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16960+$as_echo "no" >&6; }
16961+fi
16962+
16963+
16964+
16965+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
16966+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
16967+ *) GMSGFMT_015=$GMSGFMT ;;
16968+ esac
16969+
16970+
16971+
16972+# Prepare PATH_SEPARATOR.
16973+# The user is always right.
16974+if test "${PATH_SEPARATOR+set}" != set; then
16975+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
16976+ # contains only /bin. Note that ksh looks also at the FPATH variable,
16977+ # so we have to set that as well for the test.
16978+ PATH_SEPARATOR=:
16979+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
16980+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
16981+ || PATH_SEPARATOR=';'
16982+ }
16983+fi
16984+
16985+# Find out how to test for executable files. Don't use a zero-byte file,
16986+# as systems may use methods other than mode bits to determine executability.
16987+cat >conf$$.file <<_ASEOF
16988+#! /bin/sh
16989+exit 0
16990+_ASEOF
16991+chmod +x conf$$.file
16992+if test -x conf$$.file >/dev/null 2>&1; then
16993+ ac_executable_p="test -x"
16994 else
16995- echo "$ac_t""no" 1>&6
16996+ ac_executable_p="test -f"
16997 fi
16998+rm -f conf$$.file
16999
17000- # Extract the first word of "xgettext", so it can be a program name with args.
17001+# Extract the first word of "xgettext", so it can be a program name with args.
17002 set dummy xgettext; ac_word=$2
17003-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
17004-echo "configure:4110: checking for $ac_word" >&5
17005-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
17006- echo $ac_n "(cached) $ac_c" 1>&6
17007+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17008+$as_echo_n "checking for $ac_word... " >&6; }
17009+if ${ac_cv_path_XGETTEXT+:} false; then :
17010+ $as_echo_n "(cached) " >&6
17011 else
17012 case "$XGETTEXT" in
17013- /*)
17014- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
17015- ;;
17016+ [\\/]* | ?:[\\/]*)
17017+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
17018+ ;;
17019 *)
17020- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
17021- for ac_dir in $PATH; do
17022- test -z "$ac_dir" && ac_dir=.
17023- if test -f $ac_dir/$ac_word; then
17024- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
17025- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
17026- break
17027- fi
17028- fi
17029- done
17030- IFS="$ac_save_ifs"
17031+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
17032+ for ac_dir in $PATH; do
17033+ IFS="$ac_save_IFS"
17034+ test -z "$ac_dir" && ac_dir=.
17035+ for ac_exec_ext in '' $ac_executable_extensions; do
17036+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
17037+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
17038+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
17039+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
17040+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
17041+ break 2
17042+ fi
17043+ fi
17044+ done
17045+ done
17046+ IFS="$ac_save_IFS"
17047 test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
17048- ;;
17049+ ;;
17050 esac
17051 fi
17052 XGETTEXT="$ac_cv_path_XGETTEXT"
17053-if test -n "$XGETTEXT"; then
17054- echo "$ac_t""$XGETTEXT" 1>&6
17055+if test "$XGETTEXT" != ":"; then
17056+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
17057+$as_echo "$XGETTEXT" >&6; }
17058 else
17059- echo "$ac_t""no" 1>&6
17060+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17061+$as_echo "no" >&6; }
17062 fi
17063
17064- cat > conftest.$ac_ext <<EOF
17065-#line 4142 "configure"
17066-#include "confdefs.h"
17067+ rm -f messages.po
17068
17069-int main() {
17070-extern int _nl_msg_cat_cntr;
17071- return _nl_msg_cat_cntr
17072-; return 0; }
17073-EOF
17074-if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
17075- rm -rf conftest*
17076- CATOBJEXT=.gmo
17077- DATADIRNAME=share
17078-else
17079- echo "configure: failed program was:" >&5
17080- cat conftest.$ac_ext >&5
17081- rm -rf conftest*
17082- CATOBJEXT=.mo
17083- DATADIRNAME=lib
17084+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
17085+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
17086+ *) XGETTEXT_015=$XGETTEXT ;;
17087+ esac
17088+
17089+
17090+
17091+# Prepare PATH_SEPARATOR.
17092+# The user is always right.
17093+if test "${PATH_SEPARATOR+set}" != set; then
17094+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
17095+ # contains only /bin. Note that ksh looks also at the FPATH variable,
17096+ # so we have to set that as well for the test.
17097+ PATH_SEPARATOR=:
17098+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
17099+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
17100+ || PATH_SEPARATOR=';'
17101+ }
17102+fi
17103+
17104+# Find out how to test for executable files. Don't use a zero-byte file,
17105+# as systems may use methods other than mode bits to determine executability.
17106+cat >conf$$.file <<_ASEOF
17107+#! /bin/sh
17108+exit 0
17109+_ASEOF
17110+chmod +x conf$$.file
17111+if test -x conf$$.file >/dev/null 2>&1; then
17112+ ac_executable_p="test -x"
17113+else
17114+ ac_executable_p="test -f"
17115+fi
17116+rm -f conf$$.file
17117+
17118+# Extract the first word of "msgmerge", so it can be a program name with args.
17119+set dummy msgmerge; ac_word=$2
17120+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17121+$as_echo_n "checking for $ac_word... " >&6; }
17122+if ${ac_cv_path_MSGMERGE+:} false; then :
17123+ $as_echo_n "(cached) " >&6
17124+else
17125+ case "$MSGMERGE" in
17126+ [\\/]* | ?:[\\/]*)
17127+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
17128+ ;;
17129+ *)
17130+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
17131+ for ac_dir in $PATH; do
17132+ IFS="$ac_save_IFS"
17133+ test -z "$ac_dir" && ac_dir=.
17134+ for ac_exec_ext in '' $ac_executable_extensions; do
17135+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
17136+ echo "$as_me: trying $ac_dir/$ac_word..." >&5
17137+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then
17138+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
17139+ break 2
17140+ fi
17141+ fi
17142+ done
17143+ done
17144+ IFS="$ac_save_IFS"
17145+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
17146+ ;;
17147+esac
17148 fi
17149-rm -f conftest*
17150- INSTOBJEXT=.mo
17151- fi
17152- fi
17153-
17154+MSGMERGE="$ac_cv_path_MSGMERGE"
17155+if test "$MSGMERGE" != ":"; then
17156+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
17157+$as_echo "$MSGMERGE" >&6; }
17158 else
17159- echo "$ac_t""no" 1>&6
17160+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17161+$as_echo "no" >&6; }
17162 fi
17163
17164
17165- if test "$CATOBJEXT" = "NONE"; then
17166- echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
17167-echo "configure:4173: checking whether catgets can be used" >&5
17168- # Check whether --with-catgets or --without-catgets was given.
17169-if test "${with_catgets+set}" = set; then
17170- withval="$with_catgets"
17171- nls_cv_use_catgets=$withval
17172-else
17173- nls_cv_use_catgets=no
17174-fi
17175-
17176- echo "$ac_t""$nls_cv_use_catgets" 1>&6
17177-
17178- if test "$nls_cv_use_catgets" = "yes"; then
17179- echo $ac_n "checking for main in -li""... $ac_c" 1>&6
17180-echo "configure:4186: checking for main in -li" >&5
17181-ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
17182-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17183- echo $ac_n "(cached) $ac_c" 1>&6
17184-else
17185- ac_save_LIBS="$LIBS"
17186-LIBS="-li $LIBS"
17187-cat > conftest.$ac_ext <<EOF
17188-#line 4194 "configure"
17189-#include "confdefs.h"
17190-
17191-int main() {
17192-main()
17193-; return 0; }
17194-EOF
17195-if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
17196- rm -rf conftest*
17197- eval "ac_cv_lib_$ac_lib_var=yes"
17198-else
17199- echo "configure: failed program was:" >&5
17200- cat conftest.$ac_ext >&5
17201- rm -rf conftest*
17202- eval "ac_cv_lib_$ac_lib_var=no"
17203+ if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
17204+ MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
17205+ else
17206+ if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
17207+ MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
17208+ else
17209+ MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
17210+ fi
17211+ fi
17212+
17213+
17214+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
17215+
17216+
17217+ ac_config_commands="$ac_config_commands po-directories"
17218+
17219+
17220+
17221+ if test "X$prefix" = "XNONE"; then
17222+ acl_final_prefix="$ac_default_prefix"
17223+ else
17224+ acl_final_prefix="$prefix"
17225+ fi
17226+ if test "X$exec_prefix" = "XNONE"; then
17227+ acl_final_exec_prefix='${prefix}'
17228+ else
17229+ acl_final_exec_prefix="$exec_prefix"
17230+ fi
17231+ acl_save_prefix="$prefix"
17232+ prefix="$acl_final_prefix"
17233+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
17234+ prefix="$acl_save_prefix"
17235+
17236+# Make sure we can run config.sub.
17237+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
17238+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
17239+
17240+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
17241+$as_echo_n "checking build system type... " >&6; }
17242+if ${ac_cv_build+:} false; then :
17243+ $as_echo_n "(cached) " >&6
17244+else
17245+ ac_build_alias=$build_alias
17246+test "x$ac_build_alias" = x &&
17247+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
17248+test "x$ac_build_alias" = x &&
17249+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
17250+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
17251+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
17252+
17253+fi
17254+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
17255+$as_echo "$ac_cv_build" >&6; }
17256+case $ac_cv_build in
17257+*-*-*) ;;
17258+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
17259+esac
17260+build=$ac_cv_build
17261+ac_save_IFS=$IFS; IFS='-'
17262+set x $ac_cv_build
17263+shift
17264+build_cpu=$1
17265+build_vendor=$2
17266+shift; shift
17267+# Remember, the first character of IFS is used to create $*,
17268+# except with old shells:
17269+build_os=$*
17270+IFS=$ac_save_IFS
17271+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
17272+
17273+
17274+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
17275+$as_echo_n "checking host system type... " >&6; }
17276+if ${ac_cv_host+:} false; then :
17277+ $as_echo_n "(cached) " >&6
17278+else
17279+ if test "x$host_alias" = x; then
17280+ ac_cv_host=$ac_cv_build
17281+else
17282+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
17283+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
17284 fi
17285-rm -f conftest*
17286-LIBS="$ac_save_LIBS"
17287
17288 fi
17289-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17290- echo "$ac_t""yes" 1>&6
17291- ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
17292- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
17293- cat >> confdefs.h <<EOF
17294-#define $ac_tr_lib 1
17295-EOF
17296+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
17297+$as_echo "$ac_cv_host" >&6; }
17298+case $ac_cv_host in
17299+*-*-*) ;;
17300+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
17301+esac
17302+host=$ac_cv_host
17303+ac_save_IFS=$IFS; IFS='-'
17304+set x $ac_cv_host
17305+shift
17306+host_cpu=$1
17307+host_vendor=$2
17308+shift; shift
17309+# Remember, the first character of IFS is used to create $*,
17310+# except with old shells:
17311+host_os=$*
17312+IFS=$ac_save_IFS
17313+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
17314+
17315+
17316
17317- LIBS="-li $LIBS"
17318
17319+# Check whether --with-gnu-ld was given.
17320+if test "${with_gnu_ld+set}" = set; then :
17321+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
17322+else
17323+ with_gnu_ld=no
17324+fi
17325+
17326+# Prepare PATH_SEPARATOR.
17327+# The user is always right.
17328+if test "${PATH_SEPARATOR+set}" != set; then
17329+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
17330+ # contains only /bin. Note that ksh looks also at the FPATH variable,
17331+ # so we have to set that as well for the test.
17332+ PATH_SEPARATOR=:
17333+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
17334+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
17335+ || PATH_SEPARATOR=';'
17336+ }
17337+fi
17338+
17339+if test -n "$LD"; then
17340+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
17341+$as_echo_n "checking for ld... " >&6; }
17342+elif test "$GCC" = yes; then
17343+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
17344+$as_echo_n "checking for ld used by $CC... " >&6; }
17345+elif test "$with_gnu_ld" = yes; then
17346+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
17347+$as_echo_n "checking for GNU ld... " >&6; }
17348 else
17349- echo "$ac_t""no" 1>&6
17350+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
17351+$as_echo_n "checking for non-GNU ld... " >&6; }
17352 fi
17353-
17354- echo $ac_n "checking for catgets""... $ac_c" 1>&6
17355-echo "configure:4229: checking for catgets" >&5
17356-if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
17357- echo $ac_n "(cached) $ac_c" 1>&6
17358+if test -n "$LD"; then
17359+ # Let the user override the test with a path.
17360+ :
17361+else
17362+ if ${acl_cv_path_LD+:} false; then :
17363+ $as_echo_n "(cached) " >&6
17364 else
17365- cat > conftest.$ac_ext <<EOF
17366-#line 4234 "configure"
17367-#include "confdefs.h"
17368-/* System header to define __stub macros and hopefully few prototypes,
17369- which can conflict with char catgets(); below. */
17370-#include <assert.h>
17371-/* Override any gcc2 internal prototype to avoid an error. */
17372-/* We use char because int might match the return type of a gcc2
17373- builtin and then its argument prototype would still apply. */
17374-char catgets();
17375-
17376-int main() {
17377
17378-/* The GNU C library defines this for functions which it implements
17379- to always fail with ENOSYS. Some functions are actually named
17380- something starting with __ and the normal name is an alias. */
17381-#if defined (__stub_catgets) || defined (__stub___catgets)
17382-choke me
17383-#else
17384-catgets();
17385-#endif
17386+ acl_cv_path_LD= # Final result of this test
17387+ ac_prog=ld # Program to search in $PATH
17388+ if test "$GCC" = yes; then
17389+ # Check if gcc -print-prog-name=ld gives a path.
17390+ case $host in
17391+ *-*-mingw*)
17392+ # gcc leaves a trailing carriage return which upsets mingw
17393+ acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
17394+ *)
17395+ acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
17396+ esac
17397+ case $acl_output in
17398+ # Accept absolute paths.
17399+ [\\/]* | ?:[\\/]*)
17400+ re_direlt='/[^/][^/]*/\.\./'
17401+ # Canonicalize the pathname of ld
17402+ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
17403+ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
17404+ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
17405+ done
17406+ # Got the pathname. No search in PATH is needed.
17407+ acl_cv_path_LD="$acl_output"
17408+ ac_prog=
17409+ ;;
17410+ "")
17411+ # If it fails, then pretend we aren't using GCC.
17412+ ;;
17413+ *)
17414+ # If it is relative, then search for the first ld in PATH.
17415+ with_gnu_ld=unknown
17416+ ;;
17417+ esac
17418+ fi
17419+ if test -n "$ac_prog"; then
17420+ # Search for $ac_prog in $PATH.
17421+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
17422+ for ac_dir in $PATH; do
17423+ IFS="$acl_save_ifs"
17424+ test -z "$ac_dir" && ac_dir=.
17425+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
17426+ acl_cv_path_LD="$ac_dir/$ac_prog"
17427+ # Check to see if the program is GNU ld. I'd rather use --version,
17428+ # but apparently some variants of GNU ld only accept -v.
17429+ # Break only if it was the GNU/non-GNU ld that we prefer.
17430+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
17431+ *GNU* | *'with BFD'*)
17432+ test "$with_gnu_ld" != no && break
17433+ ;;
17434+ *)
17435+ test "$with_gnu_ld" != yes && break
17436+ ;;
17437+ esac
17438+ fi
17439+ done
17440+ IFS="$acl_save_ifs"
17441+ fi
17442+ case $host in
17443+ *-*-aix*)
17444+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17445+/* end confdefs.h. */
17446+#if defined __powerpc64__ || defined _ARCH_PPC64
17447+ int ok;
17448+ #else
17449+ error fail
17450+ #endif
17451+
17452+_ACEOF
17453+if ac_fn_c_try_compile "$LINENO"; then :
17454+ # The compiler produces 64-bit code. Add option '-b64' so that the
17455+ # linker groks 64-bit object files.
17456+ case "$acl_cv_path_LD " in
17457+ *" -b64 "*) ;;
17458+ *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
17459+ esac
17460+
17461+fi
17462+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17463+ ;;
17464+ sparc64-*-netbsd*)
17465+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17466+/* end confdefs.h. */
17467+#if defined __sparcv9 || defined __arch64__
17468+ int ok;
17469+ #else
17470+ error fail
17471+ #endif
17472+
17473+_ACEOF
17474+if ac_fn_c_try_compile "$LINENO"; then :
17475+
17476+else
17477+ # The compiler produces 32-bit code. Add option '-m elf32_sparc'
17478+ # so that the linker groks 32-bit object files.
17479+ case "$acl_cv_path_LD " in
17480+ *" -m elf32_sparc "*) ;;
17481+ *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
17482+ esac
17483
17484-; return 0; }
17485-EOF
17486-if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
17487- rm -rf conftest*
17488- eval "ac_cv_func_catgets=yes"
17489-else
17490- echo "configure: failed program was:" >&5
17491- cat conftest.$ac_ext >&5
17492- rm -rf conftest*
17493- eval "ac_cv_func_catgets=no"
17494 fi
17495-rm -f conftest*
17496+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17497+ ;;
17498+ esac
17499+
17500 fi
17501
17502-if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
17503- echo "$ac_t""yes" 1>&6
17504- cat >> confdefs.h <<\EOF
17505-#define HAVE_CATGETS 1
17506-EOF
17507-
17508- INTLOBJS="\$(CATOBJS)"
17509- # Extract the first word of "gencat", so it can be a program name with args.
17510-set dummy gencat; ac_word=$2
17511-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
17512-echo "configure:4279: checking for $ac_word" >&5
17513-if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
17514- echo $ac_n "(cached) $ac_c" 1>&6
17515-else
17516- case "$GENCAT" in
17517- /*)
17518- ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
17519+ LD="$acl_cv_path_LD"
17520+fi
17521+if test -n "$LD"; then
17522+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
17523+$as_echo "$LD" >&6; }
17524+else
17525+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17526+$as_echo "no" >&6; }
17527+ as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
17528+fi
17529+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
17530+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
17531+if ${acl_cv_prog_gnu_ld+:} false; then :
17532+ $as_echo_n "(cached) " >&6
17533+else
17534+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
17535+case `$LD -v 2>&1 </dev/null` in
17536+*GNU* | *'with BFD'*)
17537+ acl_cv_prog_gnu_ld=yes
17538 ;;
17539- *)
17540- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
17541- for ac_dir in $PATH; do
17542- test -z "$ac_dir" && ac_dir=.
17543- if test -f $ac_dir/$ac_word; then
17544- ac_cv_path_GENCAT="$ac_dir/$ac_word"
17545- break
17546- fi
17547- done
17548- IFS="$ac_save_ifs"
17549- test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
17550+*)
17551+ acl_cv_prog_gnu_ld=no
17552 ;;
17553 esac
17554 fi
17555-GENCAT="$ac_cv_path_GENCAT"
17556-if test -n "$GENCAT"; then
17557- echo "$ac_t""$GENCAT" 1>&6
17558+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
17559+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
17560+with_gnu_ld=$acl_cv_prog_gnu_ld
17561+
17562+
17563+
17564+
17565+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
17566+$as_echo_n "checking for shared library run path origin... " >&6; }
17567+if ${acl_cv_rpath+:} false; then :
17568+ $as_echo_n "(cached) " >&6
17569 else
17570- echo "$ac_t""no" 1>&6
17571+
17572+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
17573+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
17574+ . ./conftest.sh
17575+ rm -f ./conftest.sh
17576+ acl_cv_rpath=done
17577+
17578 fi
17579- if test "$GENCAT" != "no"; then
17580- # Extract the first word of "gmsgfmt", so it can be a program name with args.
17581-set dummy gmsgfmt; ac_word=$2
17582-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
17583-echo "configure:4311: checking for $ac_word" >&5
17584-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
17585- echo $ac_n "(cached) $ac_c" 1>&6
17586+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
17587+$as_echo "$acl_cv_rpath" >&6; }
17588+ wl="$acl_cv_wl"
17589+ acl_libext="$acl_cv_libext"
17590+ acl_shlibext="$acl_cv_shlibext"
17591+ acl_libname_spec="$acl_cv_libname_spec"
17592+ acl_library_names_spec="$acl_cv_library_names_spec"
17593+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
17594+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
17595+ acl_hardcode_direct="$acl_cv_hardcode_direct"
17596+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
17597+ # Check whether --enable-rpath was given.
17598+if test "${enable_rpath+set}" = set; then :
17599+ enableval=$enable_rpath; :
17600 else
17601- case "$GMSGFMT" in
17602- /*)
17603- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
17604- ;;
17605- *)
17606- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
17607- for ac_dir in $PATH; do
17608- test -z "$ac_dir" && ac_dir=.
17609- if test -f $ac_dir/$ac_word; then
17610- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
17611- break
17612- fi
17613- done
17614- IFS="$ac_save_ifs"
17615- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
17616- ;;
17617-esac
17618+ enable_rpath=yes
17619 fi
17620-GMSGFMT="$ac_cv_path_GMSGFMT"
17621-if test -n "$GMSGFMT"; then
17622- echo "$ac_t""$GMSGFMT" 1>&6
17623+
17624+
17625+
17626+
17627+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
17628+$as_echo_n "checking 32-bit host C ABI... " >&6; }
17629+if ${gl_cv_host_cpu_c_abi_32bit+:} false; then :
17630+ $as_echo_n "(cached) " >&6
17631 else
17632- echo "$ac_t""no" 1>&6
17633+ if test -n "$gl_cv_host_cpu_c_abi"; then
17634+ case "$gl_cv_host_cpu_c_abi" in
17635+ i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
17636+ gl_cv_host_cpu_c_abi_32bit=yes ;;
17637+ *)
17638+ gl_cv_host_cpu_c_abi_32bit=no ;;
17639+ esac
17640+ else
17641+ case "$host_cpu" in
17642+
17643+ i[4567]86 )
17644+ gl_cv_host_cpu_c_abi_32bit=yes
17645+ ;;
17646+
17647+ x86_64 )
17648+ # On x86_64 systems, the C compiler may be generating code in one of
17649+ # these ABIs:
17650+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
17651+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
17652+ # with native Windows (mingw, MSVC).
17653+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
17654+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
17655+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17656+/* end confdefs.h. */
17657+#if (defined __x86_64__ || defined __amd64__ \
17658+ || defined _M_X64 || defined _M_AMD64) \
17659+ && !(defined __ILP32__ || defined _ILP32)
17660+ int ok;
17661+ #else
17662+ error fail
17663+ #endif
17664+
17665+_ACEOF
17666+if ac_fn_c_try_compile "$LINENO"; then :
17667+ gl_cv_host_cpu_c_abi_32bit=no
17668+else
17669+ gl_cv_host_cpu_c_abi_32bit=yes
17670+fi
17671+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17672+ ;;
17673+
17674+ arm* | aarch64 )
17675+ # Assume arm with EABI.
17676+ # On arm64 systems, the C compiler may be generating code in one of
17677+ # these ABIs:
17678+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
17679+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
17680+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
17681+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17682+/* end confdefs.h. */
17683+#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
17684+ int ok;
17685+ #else
17686+ error fail
17687+ #endif
17688+
17689+_ACEOF
17690+if ac_fn_c_try_compile "$LINENO"; then :
17691+ gl_cv_host_cpu_c_abi_32bit=no
17692+else
17693+ gl_cv_host_cpu_c_abi_32bit=yes
17694+fi
17695+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17696+ ;;
17697+
17698+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
17699+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
17700+ # code. In the latter case, it defines _LP64 and __LP64__.
17701+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17702+/* end confdefs.h. */
17703+#ifdef __LP64__
17704+ int ok;
17705+ #else
17706+ error fail
17707+ #endif
17708+
17709+_ACEOF
17710+if ac_fn_c_try_compile "$LINENO"; then :
17711+ gl_cv_host_cpu_c_abi_32bit=no
17712+else
17713+ gl_cv_host_cpu_c_abi_32bit=yes
17714+fi
17715+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17716+ ;;
17717+
17718+ ia64* )
17719+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
17720+ # 32-bit code. In the latter case, it defines _ILP32.
17721+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17722+/* end confdefs.h. */
17723+#ifdef _ILP32
17724+ int ok;
17725+ #else
17726+ error fail
17727+ #endif
17728+
17729+_ACEOF
17730+if ac_fn_c_try_compile "$LINENO"; then :
17731+ gl_cv_host_cpu_c_abi_32bit=yes
17732+else
17733+ gl_cv_host_cpu_c_abi_32bit=no
17734+fi
17735+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17736+ ;;
17737+
17738+ mips* )
17739+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
17740+ # at 32.
17741+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17742+/* end confdefs.h. */
17743+#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
17744+ int ok;
17745+ #else
17746+ error fail
17747+ #endif
17748+
17749+_ACEOF
17750+if ac_fn_c_try_compile "$LINENO"; then :
17751+ gl_cv_host_cpu_c_abi_32bit=no
17752+else
17753+ gl_cv_host_cpu_c_abi_32bit=yes
17754+fi
17755+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17756+ ;;
17757+
17758+ powerpc* )
17759+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
17760+ # No need to distinguish them here; the caller may distinguish
17761+ # them based on the OS.
17762+ # On powerpc64 systems, the C compiler may still be generating
17763+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
17764+ # be generating 64-bit code.
17765+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17766+/* end confdefs.h. */
17767+#if defined __powerpc64__ || defined _ARCH_PPC64
17768+ int ok;
17769+ #else
17770+ error fail
17771+ #endif
17772+
17773+_ACEOF
17774+if ac_fn_c_try_compile "$LINENO"; then :
17775+ gl_cv_host_cpu_c_abi_32bit=no
17776+else
17777+ gl_cv_host_cpu_c_abi_32bit=yes
17778+fi
17779+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17780+ ;;
17781+
17782+ rs6000 )
17783+ gl_cv_host_cpu_c_abi_32bit=yes
17784+ ;;
17785+
17786+ riscv32 | riscv64 )
17787+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
17788+ # Size of 'long' and 'void *':
17789+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17790+/* end confdefs.h. */
17791+#if defined __LP64__
17792+ int ok;
17793+ #else
17794+ error fail
17795+ #endif
17796+
17797+_ACEOF
17798+if ac_fn_c_try_compile "$LINENO"; then :
17799+ gl_cv_host_cpu_c_abi_32bit=no
17800+else
17801+ gl_cv_host_cpu_c_abi_32bit=yes
17802+fi
17803+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17804+ ;;
17805+
17806+ s390* )
17807+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
17808+ # or 31-bit (= s390) code.
17809+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17810+/* end confdefs.h. */
17811+#if defined __LP64__ || defined __s390x__
17812+ int ok;
17813+ #else
17814+ error fail
17815+ #endif
17816+
17817+_ACEOF
17818+if ac_fn_c_try_compile "$LINENO"; then :
17819+ gl_cv_host_cpu_c_abi_32bit=no
17820+else
17821+ gl_cv_host_cpu_c_abi_32bit=yes
17822+fi
17823+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17824+ ;;
17825+
17826+ sparc | sparc64 )
17827+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
17828+ # C compiler still generates 32-bit code.
17829+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17830+/* end confdefs.h. */
17831+#if defined __sparcv9 || defined __arch64__
17832+ int ok;
17833+ #else
17834+ error fail
17835+ #endif
17836+
17837+_ACEOF
17838+if ac_fn_c_try_compile "$LINENO"; then :
17839+ gl_cv_host_cpu_c_abi_32bit=no
17840+else
17841+ gl_cv_host_cpu_c_abi_32bit=yes
17842+fi
17843+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17844+ ;;
17845+
17846+ *)
17847+ gl_cv_host_cpu_c_abi_32bit=no
17848+ ;;
17849+ esac
17850+ fi
17851+
17852 fi
17853+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
17854+$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; }
17855
17856- if test "$GMSGFMT" = "no"; then
17857- # Extract the first word of "msgfmt", so it can be a program name with args.
17858-set dummy msgfmt; ac_word=$2
17859-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
17860-echo "configure:4344: checking for $ac_word" >&5
17861-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
17862- echo $ac_n "(cached) $ac_c" 1>&6
17863+ HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
17864+
17865+
17866+
17867+
17868+
17869+ case "$host_os" in
17870+ solaris*)
17871+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
17872+$as_echo_n "checking for 64-bit host... " >&6; }
17873+if ${gl_cv_solaris_64bit+:} false; then :
17874+ $as_echo_n "(cached) " >&6
17875 else
17876- case "$GMSGFMT" in
17877- /*)
17878- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
17879- ;;
17880- *)
17881- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
17882- for ac_dir in $PATH; do
17883- test -z "$ac_dir" && ac_dir=.
17884- if test -f $ac_dir/$ac_word; then
17885- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
17886- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
17887- break
17888- fi
17889- fi
17890- done
17891- IFS="$ac_save_ifs"
17892- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
17893- ;;
17894-esac
17895-fi
17896-GMSGFMT="$ac_cv_path_GMSGFMT"
17897-if test -n "$GMSGFMT"; then
17898- echo "$ac_t""$GMSGFMT" 1>&6
17899+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
17900+/* end confdefs.h. */
17901+#ifdef _LP64
17902+ int ok;
17903+ #else
17904+ error fail
17905+ #endif
17906+
17907+_ACEOF
17908+if ac_fn_c_try_compile "$LINENO"; then :
17909+ gl_cv_solaris_64bit=yes
17910 else
17911- echo "$ac_t""no" 1>&6
17912+ gl_cv_solaris_64bit=no
17913 fi
17914+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17915
17916- fi
17917- # Extract the first word of "xgettext", so it can be a program name with args.
17918-set dummy xgettext; ac_word=$2
17919-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
17920-echo "configure:4379: checking for $ac_word" >&5
17921-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
17922- echo $ac_n "(cached) $ac_c" 1>&6
17923-else
17924- case "$XGETTEXT" in
17925- /*)
17926- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
17927- ;;
17928- *)
17929- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
17930- for ac_dir in $PATH; do
17931- test -z "$ac_dir" && ac_dir=.
17932- if test -f $ac_dir/$ac_word; then
17933- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
17934- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
17935- break
17936+fi
17937+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
17938+$as_echo "$gl_cv_solaris_64bit" >&6; };;
17939+ esac
17940+
17941+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
17942+$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
17943+if ${acl_cv_libdirstems+:} false; then :
17944+ $as_echo_n "(cached) " >&6
17945+else
17946+ acl_libdirstem=lib
17947+ acl_libdirstem2=
17948+ case "$host_os" in
17949+ solaris*)
17950+ if test $gl_cv_solaris_64bit = yes; then
17951+ acl_libdirstem=lib/64
17952+ case "$host_cpu" in
17953+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
17954+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
17955+ esac
17956+ fi
17957+ ;;
17958+ *)
17959+ if test "$HOST_CPU_C_ABI_32BIT" != yes; then
17960+ searchpath=`(if test -f /usr/bin/gcc \
17961+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
17962+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \
17963+ else \
17964+ LC_ALL=C $CC -print-search-dirs; \
17965+ fi) 2>/dev/null \
17966+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
17967+ if test -n "$searchpath"; then
17968+ acl_save_IFS="${IFS= }"; IFS=":"
17969+ for searchdir in $searchpath; do
17970+ if test -d "$searchdir"; then
17971+ case "$searchdir" in
17972+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
17973+ */../ | */.. )
17974+ # Better ignore directories of this form. They are misleading.
17975+ ;;
17976+ *) searchdir=`cd "$searchdir" && pwd`
17977+ case "$searchdir" in
17978+ */lib64 ) acl_libdirstem=lib64 ;;
17979+ esac ;;
17980+ esac
17981+ fi
17982+ done
17983+ IFS="$acl_save_IFS"
17984+ fi
17985+ fi
17986+ ;;
17987+ esac
17988+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
17989+ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
17990+
17991+fi
17992+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
17993+$as_echo "$acl_cv_libdirstems" >&6; }
17994+ # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
17995+ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
17996+ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
17997+
17998+
17999+
18000+
18001+
18002+
18003+
18004+
18005+
18006+
18007+
18008+ use_additional=yes
18009+
18010+ acl_save_prefix="$prefix"
18011+ prefix="$acl_final_prefix"
18012+ acl_save_exec_prefix="$exec_prefix"
18013+ exec_prefix="$acl_final_exec_prefix"
18014+
18015+ eval additional_includedir=\"$includedir\"
18016+ eval additional_libdir=\"$libdir\"
18017+
18018+ exec_prefix="$acl_save_exec_prefix"
18019+ prefix="$acl_save_prefix"
18020+
18021+
18022+# Check whether --with-libiconv-prefix was given.
18023+if test "${with_libiconv_prefix+set}" = set; then :
18024+ withval=$with_libiconv_prefix;
18025+ if test "X$withval" = "Xno"; then
18026+ use_additional=no
18027+ else
18028+ if test "X$withval" = "X"; then
18029+
18030+ acl_save_prefix="$prefix"
18031+ prefix="$acl_final_prefix"
18032+ acl_save_exec_prefix="$exec_prefix"
18033+ exec_prefix="$acl_final_exec_prefix"
18034+
18035+ eval additional_includedir=\"$includedir\"
18036+ eval additional_libdir=\"$libdir\"
18037+
18038+ exec_prefix="$acl_save_exec_prefix"
18039+ prefix="$acl_save_prefix"
18040+
18041+ else
18042+ additional_includedir="$withval/include"
18043+ additional_libdir="$withval/$acl_libdirstem"
18044+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
18045+ && test ! -d "$withval/$acl_libdirstem"; then
18046+ additional_libdir="$withval/$acl_libdirstem2"
18047+ fi
18048 fi
18049 fi
18050+
18051+fi
18052+
18053+ LIBICONV=
18054+ LTLIBICONV=
18055+ INCICONV=
18056+ LIBICONV_PREFIX=
18057+ HAVE_LIBICONV=
18058+ rpathdirs=
18059+ ltrpathdirs=
18060+ names_already_handled=
18061+ names_next_round='iconv '
18062+ while test -n "$names_next_round"; do
18063+ names_this_round="$names_next_round"
18064+ names_next_round=
18065+ for name in $names_this_round; do
18066+ already_handled=
18067+ for n in $names_already_handled; do
18068+ if test "$n" = "$name"; then
18069+ already_handled=yes
18070+ break
18071+ fi
18072+ done
18073+ if test -z "$already_handled"; then
18074+ names_already_handled="$names_already_handled $name"
18075+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
18076+ eval value=\"\$HAVE_LIB$uppername\"
18077+ if test -n "$value"; then
18078+ if test "$value" = yes; then
18079+ eval value=\"\$LIB$uppername\"
18080+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
18081+ eval value=\"\$LTLIB$uppername\"
18082+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
18083+ else
18084+ :
18085+ fi
18086+ else
18087+ found_dir=
18088+ found_la=
18089+ found_so=
18090+ found_a=
18091+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
18092+ if test -n "$acl_shlibext"; then
18093+ shrext=".$acl_shlibext" # typically: shrext=.so
18094+ else
18095+ shrext=
18096+ fi
18097+ if test $use_additional = yes; then
18098+ dir="$additional_libdir"
18099+ if test -n "$acl_shlibext"; then
18100+ if test -f "$dir/$libname$shrext"; then
18101+ found_dir="$dir"
18102+ found_so="$dir/$libname$shrext"
18103+ else
18104+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
18105+ ver=`(cd "$dir" && \
18106+ for f in "$libname$shrext".*; do echo "$f"; done \
18107+ | sed -e "s,^$libname$shrext\\\\.,," \
18108+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
18109+ | sed 1q ) 2>/dev/null`
18110+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
18111+ found_dir="$dir"
18112+ found_so="$dir/$libname$shrext.$ver"
18113+ fi
18114+ else
18115+ eval library_names=\"$acl_library_names_spec\"
18116+ for f in $library_names; do
18117+ if test -f "$dir/$f"; then
18118+ found_dir="$dir"
18119+ found_so="$dir/$f"
18120+ break
18121+ fi
18122+ done
18123+ fi
18124+ fi
18125+ fi
18126+ if test "X$found_dir" = "X"; then
18127+ if test -f "$dir/$libname.$acl_libext"; then
18128+ found_dir="$dir"
18129+ found_a="$dir/$libname.$acl_libext"
18130+ fi
18131+ fi
18132+ if test "X$found_dir" != "X"; then
18133+ if test -f "$dir/$libname.la"; then
18134+ found_la="$dir/$libname.la"
18135+ fi
18136+ fi
18137+ fi
18138+ if test "X$found_dir" = "X"; then
18139+ for x in $LDFLAGS $LTLIBICONV; do
18140+
18141+ acl_save_prefix="$prefix"
18142+ prefix="$acl_final_prefix"
18143+ acl_save_exec_prefix="$exec_prefix"
18144+ exec_prefix="$acl_final_exec_prefix"
18145+ eval x=\"$x\"
18146+ exec_prefix="$acl_save_exec_prefix"
18147+ prefix="$acl_save_prefix"
18148+
18149+ case "$x" in
18150+ -L*)
18151+ dir=`echo "X$x" | sed -e 's/^X-L//'`
18152+ if test -n "$acl_shlibext"; then
18153+ if test -f "$dir/$libname$shrext"; then
18154+ found_dir="$dir"
18155+ found_so="$dir/$libname$shrext"
18156+ else
18157+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
18158+ ver=`(cd "$dir" && \
18159+ for f in "$libname$shrext".*; do echo "$f"; done \
18160+ | sed -e "s,^$libname$shrext\\\\.,," \
18161+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
18162+ | sed 1q ) 2>/dev/null`
18163+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
18164+ found_dir="$dir"
18165+ found_so="$dir/$libname$shrext.$ver"
18166+ fi
18167+ else
18168+ eval library_names=\"$acl_library_names_spec\"
18169+ for f in $library_names; do
18170+ if test -f "$dir/$f"; then
18171+ found_dir="$dir"
18172+ found_so="$dir/$f"
18173+ break
18174+ fi
18175+ done
18176+ fi
18177+ fi
18178+ fi
18179+ if test "X$found_dir" = "X"; then
18180+ if test -f "$dir/$libname.$acl_libext"; then
18181+ found_dir="$dir"
18182+ found_a="$dir/$libname.$acl_libext"
18183+ fi
18184+ fi
18185+ if test "X$found_dir" != "X"; then
18186+ if test -f "$dir/$libname.la"; then
18187+ found_la="$dir/$libname.la"
18188+ fi
18189+ fi
18190+ ;;
18191+ esac
18192+ if test "X$found_dir" != "X"; then
18193+ break
18194+ fi
18195+ done
18196+ fi
18197+ if test "X$found_dir" != "X"; then
18198+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
18199+ if test "X$found_so" != "X"; then
18200+ if test "$enable_rpath" = no \
18201+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
18202+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
18203+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
18204+ else
18205+ haveit=
18206+ for x in $ltrpathdirs; do
18207+ if test "X$x" = "X$found_dir"; then
18208+ haveit=yes
18209+ break
18210+ fi
18211+ done
18212+ if test -z "$haveit"; then
18213+ ltrpathdirs="$ltrpathdirs $found_dir"
18214+ fi
18215+ if test "$acl_hardcode_direct" = yes; then
18216+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
18217+ else
18218+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
18219+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
18220+ haveit=
18221+ for x in $rpathdirs; do
18222+ if test "X$x" = "X$found_dir"; then
18223+ haveit=yes
18224+ break
18225+ fi
18226+ done
18227+ if test -z "$haveit"; then
18228+ rpathdirs="$rpathdirs $found_dir"
18229+ fi
18230+ else
18231+ haveit=
18232+ for x in $LDFLAGS $LIBICONV; do
18233+
18234+ acl_save_prefix="$prefix"
18235+ prefix="$acl_final_prefix"
18236+ acl_save_exec_prefix="$exec_prefix"
18237+ exec_prefix="$acl_final_exec_prefix"
18238+ eval x=\"$x\"
18239+ exec_prefix="$acl_save_exec_prefix"
18240+ prefix="$acl_save_prefix"
18241+
18242+ if test "X$x" = "X-L$found_dir"; then
18243+ haveit=yes
18244+ break
18245+ fi
18246+ done
18247+ if test -z "$haveit"; then
18248+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
18249+ fi
18250+ if test "$acl_hardcode_minus_L" != no; then
18251+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
18252+ else
18253+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
18254+ fi
18255+ fi
18256+ fi
18257+ fi
18258+ else
18259+ if test "X$found_a" != "X"; then
18260+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
18261+ else
18262+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
18263+ fi
18264+ fi
18265+ additional_includedir=
18266+ case "$found_dir" in
18267+ */$acl_libdirstem | */$acl_libdirstem/)
18268+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
18269+ if test "$name" = 'iconv'; then
18270+ LIBICONV_PREFIX="$basedir"
18271+ fi
18272+ additional_includedir="$basedir/include"
18273+ ;;
18274+ */$acl_libdirstem2 | */$acl_libdirstem2/)
18275+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
18276+ if test "$name" = 'iconv'; then
18277+ LIBICONV_PREFIX="$basedir"
18278+ fi
18279+ additional_includedir="$basedir/include"
18280+ ;;
18281+ esac
18282+ if test "X$additional_includedir" != "X"; then
18283+ if test "X$additional_includedir" != "X/usr/include"; then
18284+ haveit=
18285+ if test "X$additional_includedir" = "X/usr/local/include"; then
18286+ if test -n "$GCC"; then
18287+ case $host_os in
18288+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
18289+ esac
18290+ fi
18291+ fi
18292+ if test -z "$haveit"; then
18293+ for x in $CPPFLAGS $INCICONV; do
18294+
18295+ acl_save_prefix="$prefix"
18296+ prefix="$acl_final_prefix"
18297+ acl_save_exec_prefix="$exec_prefix"
18298+ exec_prefix="$acl_final_exec_prefix"
18299+ eval x=\"$x\"
18300+ exec_prefix="$acl_save_exec_prefix"
18301+ prefix="$acl_save_prefix"
18302+
18303+ if test "X$x" = "X-I$additional_includedir"; then
18304+ haveit=yes
18305+ break
18306+ fi
18307+ done
18308+ if test -z "$haveit"; then
18309+ if test -d "$additional_includedir"; then
18310+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
18311+ fi
18312+ fi
18313+ fi
18314+ fi
18315+ fi
18316+ if test -n "$found_la"; then
18317+ save_libdir="$libdir"
18318+ case "$found_la" in
18319+ */* | *\\*) . "$found_la" ;;
18320+ *) . "./$found_la" ;;
18321+ esac
18322+ libdir="$save_libdir"
18323+ for dep in $dependency_libs; do
18324+ case "$dep" in
18325+ -L*)
18326+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
18327+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
18328+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
18329+ haveit=
18330+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
18331+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
18332+ if test -n "$GCC"; then
18333+ case $host_os in
18334+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
18335+ esac
18336+ fi
18337+ fi
18338+ if test -z "$haveit"; then
18339+ haveit=
18340+ for x in $LDFLAGS $LIBICONV; do
18341+
18342+ acl_save_prefix="$prefix"
18343+ prefix="$acl_final_prefix"
18344+ acl_save_exec_prefix="$exec_prefix"
18345+ exec_prefix="$acl_final_exec_prefix"
18346+ eval x=\"$x\"
18347+ exec_prefix="$acl_save_exec_prefix"
18348+ prefix="$acl_save_prefix"
18349+
18350+ if test "X$x" = "X-L$additional_libdir"; then
18351+ haveit=yes
18352+ break
18353+ fi
18354+ done
18355+ if test -z "$haveit"; then
18356+ if test -d "$additional_libdir"; then
18357+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
18358+ fi
18359+ fi
18360+ haveit=
18361+ for x in $LDFLAGS $LTLIBICONV; do
18362+
18363+ acl_save_prefix="$prefix"
18364+ prefix="$acl_final_prefix"
18365+ acl_save_exec_prefix="$exec_prefix"
18366+ exec_prefix="$acl_final_exec_prefix"
18367+ eval x=\"$x\"
18368+ exec_prefix="$acl_save_exec_prefix"
18369+ prefix="$acl_save_prefix"
18370+
18371+ if test "X$x" = "X-L$additional_libdir"; then
18372+ haveit=yes
18373+ break
18374+ fi
18375+ done
18376+ if test -z "$haveit"; then
18377+ if test -d "$additional_libdir"; then
18378+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
18379+ fi
18380+ fi
18381+ fi
18382+ fi
18383+ ;;
18384+ -R*)
18385+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
18386+ if test "$enable_rpath" != no; then
18387+ haveit=
18388+ for x in $rpathdirs; do
18389+ if test "X$x" = "X$dir"; then
18390+ haveit=yes
18391+ break
18392+ fi
18393+ done
18394+ if test -z "$haveit"; then
18395+ rpathdirs="$rpathdirs $dir"
18396+ fi
18397+ haveit=
18398+ for x in $ltrpathdirs; do
18399+ if test "X$x" = "X$dir"; then
18400+ haveit=yes
18401+ break
18402+ fi
18403+ done
18404+ if test -z "$haveit"; then
18405+ ltrpathdirs="$ltrpathdirs $dir"
18406+ fi
18407+ fi
18408+ ;;
18409+ -l*)
18410+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
18411+ ;;
18412+ *.la)
18413+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
18414+ ;;
18415+ *)
18416+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
18417+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
18418+ ;;
18419+ esac
18420+ done
18421+ fi
18422+ else
18423+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
18424+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
18425+ fi
18426+ fi
18427+ fi
18428+ done
18429 done
18430- IFS="$ac_save_ifs"
18431- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
18432- ;;
18433-esac
18434+ if test "X$rpathdirs" != "X"; then
18435+ if test -n "$acl_hardcode_libdir_separator"; then
18436+ alldirs=
18437+ for found_dir in $rpathdirs; do
18438+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
18439+ done
18440+ acl_save_libdir="$libdir"
18441+ libdir="$alldirs"
18442+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
18443+ libdir="$acl_save_libdir"
18444+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
18445+ else
18446+ for found_dir in $rpathdirs; do
18447+ acl_save_libdir="$libdir"
18448+ libdir="$found_dir"
18449+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
18450+ libdir="$acl_save_libdir"
18451+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
18452+ done
18453+ fi
18454+ fi
18455+ if test "X$ltrpathdirs" != "X"; then
18456+ for found_dir in $ltrpathdirs; do
18457+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
18458+ done
18459+ fi
18460+
18461+
18462+
18463+
18464+
18465+
18466+
18467+
18468+
18469+
18470+
18471+
18472+
18473+
18474+
18475+
18476+
18477+
18478+
18479+
18480+
18481+
18482+
18483+
18484+
18485+
18486+
18487+
18488+
18489+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
18490+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
18491+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
18492+ $as_echo_n "(cached) " >&6
18493+else
18494+ gt_save_LIBS="$LIBS"
18495+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
18496+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18497+/* end confdefs.h. */
18498+#include <CoreFoundation/CFPreferences.h>
18499+int
18500+main ()
18501+{
18502+CFPreferencesCopyAppValue(NULL, NULL)
18503+ ;
18504+ return 0;
18505+}
18506+_ACEOF
18507+if ac_fn_c_try_link "$LINENO"; then :
18508+ gt_cv_func_CFPreferencesCopyAppValue=yes
18509+else
18510+ gt_cv_func_CFPreferencesCopyAppValue=no
18511 fi
18512-XGETTEXT="$ac_cv_path_XGETTEXT"
18513-if test -n "$XGETTEXT"; then
18514- echo "$ac_t""$XGETTEXT" 1>&6
18515+rm -f core conftest.err conftest.$ac_objext \
18516+ conftest$ac_exeext conftest.$ac_ext
18517+ LIBS="$gt_save_LIBS"
18518+fi
18519+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
18520+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
18521+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
18522+
18523+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
18524+
18525+ fi
18526+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
18527+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
18528+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
18529+ $as_echo_n "(cached) " >&6
18530+else
18531+ gt_save_LIBS="$LIBS"
18532+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
18533+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18534+/* end confdefs.h. */
18535+#include <CoreFoundation/CFLocale.h>
18536+int
18537+main ()
18538+{
18539+CFLocaleCopyCurrent();
18540+ ;
18541+ return 0;
18542+}
18543+_ACEOF
18544+if ac_fn_c_try_link "$LINENO"; then :
18545+ gt_cv_func_CFLocaleCopyCurrent=yes
18546 else
18547- echo "$ac_t""no" 1>&6
18548+ gt_cv_func_CFLocaleCopyCurrent=no
18549 fi
18550+rm -f core conftest.err conftest.$ac_objext \
18551+ conftest$ac_exeext conftest.$ac_ext
18552+ LIBS="$gt_save_LIBS"
18553+fi
18554+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
18555+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
18556+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
18557+
18558+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
18559
18560- USE_INCLUDED_LIBINTL=yes
18561- CATOBJEXT=.cat
18562- INSTOBJEXT=.cat
18563- DATADIRNAME=lib
18564- INTLDEPS='$(top_builddir)/intl/libintl.a'
18565- INTLLIBS=$INTLDEPS
18566- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
18567- nls_cv_header_intl=intl/libintl.h
18568- nls_cv_header_libgt=intl/libgettext.h
18569- fi
18570+ fi
18571+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
18572+$as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
18573+if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
18574+ $as_echo_n "(cached) " >&6
18575+else
18576+ gt_save_LIBS="$LIBS"
18577+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
18578+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18579+/* end confdefs.h. */
18580+#include <CoreFoundation/CFLocale.h>
18581+int
18582+main ()
18583+{
18584+CFLocaleCopyPreferredLanguages();
18585+ ;
18586+ return 0;
18587+}
18588+_ACEOF
18589+if ac_fn_c_try_link "$LINENO"; then :
18590+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
18591 else
18592- echo "$ac_t""no" 1>&6
18593+ gt_cv_func_CFLocaleCopyPreferredLanguages=no
18594+fi
18595+rm -f core conftest.err conftest.$ac_objext \
18596+ conftest$ac_exeext conftest.$ac_ext
18597+ LIBS="$gt_save_LIBS"
18598 fi
18599+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
18600+$as_echo "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
18601+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
18602
18603- fi
18604- fi
18605+$as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
18606
18607- if test "$CATOBJEXT" = "NONE"; then
18608- nls_cv_use_gnu_gettext=yes
18609+ fi
18610+ INTL_MACOSX_LIBS=
18611+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
18612+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
18613+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
18614+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
18615+ fi
18616+
18617+
18618+
18619+
18620+
18621+
18622+ LIBINTL=
18623+ LTLIBINTL=
18624+ POSUB=
18625+
18626+ case " $gt_needs " in
18627+ *" need-formatstring-macros "*) gt_api_version=3 ;;
18628+ *" need-ngettext "*) gt_api_version=2 ;;
18629+ *) gt_api_version=1 ;;
18630+ esac
18631+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
18632+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
18633+
18634+ if test "$USE_NLS" = "yes"; then
18635+ gt_use_preinstalled_gnugettext=no
18636+
18637+
18638+ if test $gt_api_version -ge 3; then
18639+ gt_revision_test_code='
18640+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
18641+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
18642+#endif
18643+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
18644+'
18645+ else
18646+ gt_revision_test_code=
18647+ fi
18648+ if test $gt_api_version -ge 2; then
18649+ gt_expression_test_code=' + * ngettext ("", "", 0)'
18650+ else
18651+ gt_expression_test_code=
18652 fi
18653- fi
18654
18655- if test "$nls_cv_use_gnu_gettext" = "yes"; then
18656- INTLOBJS="\$(GETTOBJS)"
18657- # Extract the first word of "msgfmt", so it can be a program name with args.
18658-set dummy msgfmt; ac_word=$2
18659-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18660-echo "configure:4437: checking for $ac_word" >&5
18661-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
18662- echo $ac_n "(cached) $ac_c" 1>&6
18663+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
18664+$as_echo_n "checking for GNU gettext in libc... " >&6; }
18665+if eval \${$gt_func_gnugettext_libc+:} false; then :
18666+ $as_echo_n "(cached) " >&6
18667 else
18668- case "$MSGFMT" in
18669- /*)
18670- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
18671- ;;
18672- *)
18673- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
18674- for ac_dir in $PATH; do
18675- test -z "$ac_dir" && ac_dir=.
18676- if test -f $ac_dir/$ac_word; then
18677- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
18678- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
18679- break
18680+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18681+/* end confdefs.h. */
18682+
18683+#include <libintl.h>
18684+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
18685+extern int _nl_msg_cat_cntr;
18686+extern int *_nl_domain_bindings;
18687+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
18688+#else
18689+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
18690+#endif
18691+$gt_revision_test_code
18692+
18693+int
18694+main ()
18695+{
18696+
18697+bindtextdomain ("", "");
18698+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
18699+
18700+ ;
18701+ return 0;
18702+}
18703+_ACEOF
18704+if ac_fn_c_try_link "$LINENO"; then :
18705+ eval "$gt_func_gnugettext_libc=yes"
18706+else
18707+ eval "$gt_func_gnugettext_libc=no"
18708+fi
18709+rm -f core conftest.err conftest.$ac_objext \
18710+ conftest$ac_exeext conftest.$ac_ext
18711+fi
18712+eval ac_res=\$$gt_func_gnugettext_libc
18713+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
18714+$as_echo "$ac_res" >&6; }
18715+
18716+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
18717+
18718+
18719+
18720+
18721+
18722+ am_save_CPPFLAGS="$CPPFLAGS"
18723+
18724+ for element in $INCICONV; do
18725+ haveit=
18726+ for x in $CPPFLAGS; do
18727+
18728+ acl_save_prefix="$prefix"
18729+ prefix="$acl_final_prefix"
18730+ acl_save_exec_prefix="$exec_prefix"
18731+ exec_prefix="$acl_final_exec_prefix"
18732+ eval x=\"$x\"
18733+ exec_prefix="$acl_save_exec_prefix"
18734+ prefix="$acl_save_prefix"
18735+
18736+ if test "X$x" = "X$element"; then
18737+ haveit=yes
18738+ break
18739 fi
18740+ done
18741+ if test -z "$haveit"; then
18742+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
18743 fi
18744 done
18745- IFS="$ac_save_ifs"
18746- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
18747- ;;
18748-esac
18749-fi
18750-MSGFMT="$ac_cv_path_MSGFMT"
18751-if test -n "$MSGFMT"; then
18752- echo "$ac_t""$MSGFMT" 1>&6
18753-else
18754- echo "$ac_t""no" 1>&6
18755-fi
18756
18757- # Extract the first word of "gmsgfmt", so it can be a program name with args.
18758-set dummy gmsgfmt; ac_word=$2
18759-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18760-echo "configure:4471: checking for $ac_word" >&5
18761-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
18762- echo $ac_n "(cached) $ac_c" 1>&6
18763+
18764+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
18765+$as_echo_n "checking for iconv... " >&6; }
18766+if ${am_cv_func_iconv+:} false; then :
18767+ $as_echo_n "(cached) " >&6
18768 else
18769- case "$GMSGFMT" in
18770- /*)
18771- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
18772- ;;
18773- *)
18774- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
18775- for ac_dir in $PATH; do
18776- test -z "$ac_dir" && ac_dir=.
18777- if test -f $ac_dir/$ac_word; then
18778- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
18779- break
18780+
18781+ am_cv_func_iconv="no, consider installing GNU libiconv"
18782+ am_cv_lib_iconv=no
18783+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18784+/* end confdefs.h. */
18785+
18786+#include <stdlib.h>
18787+#include <iconv.h>
18788+
18789+int
18790+main ()
18791+{
18792+iconv_t cd = iconv_open("","");
18793+ iconv(cd,NULL,NULL,NULL,NULL);
18794+ iconv_close(cd);
18795+ ;
18796+ return 0;
18797+}
18798+_ACEOF
18799+if ac_fn_c_try_link "$LINENO"; then :
18800+ am_cv_func_iconv=yes
18801+fi
18802+rm -f core conftest.err conftest.$ac_objext \
18803+ conftest$ac_exeext conftest.$ac_ext
18804+ if test "$am_cv_func_iconv" != yes; then
18805+ am_save_LIBS="$LIBS"
18806+ LIBS="$LIBS $LIBICONV"
18807+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18808+/* end confdefs.h. */
18809+
18810+#include <stdlib.h>
18811+#include <iconv.h>
18812+
18813+int
18814+main ()
18815+{
18816+iconv_t cd = iconv_open("","");
18817+ iconv(cd,NULL,NULL,NULL,NULL);
18818+ iconv_close(cd);
18819+ ;
18820+ return 0;
18821+}
18822+_ACEOF
18823+if ac_fn_c_try_link "$LINENO"; then :
18824+ am_cv_lib_iconv=yes
18825+ am_cv_func_iconv=yes
18826+fi
18827+rm -f core conftest.err conftest.$ac_objext \
18828+ conftest$ac_exeext conftest.$ac_ext
18829+ LIBS="$am_save_LIBS"
18830 fi
18831- done
18832- IFS="$ac_save_ifs"
18833- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
18834- ;;
18835-esac
18836+
18837 fi
18838-GMSGFMT="$ac_cv_path_GMSGFMT"
18839-if test -n "$GMSGFMT"; then
18840- echo "$ac_t""$GMSGFMT" 1>&6
18841+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
18842+$as_echo "$am_cv_func_iconv" >&6; }
18843+ if test "$am_cv_func_iconv" = yes; then
18844+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
18845+$as_echo_n "checking for working iconv... " >&6; }
18846+if ${am_cv_func_iconv_works+:} false; then :
18847+ $as_echo_n "(cached) " >&6
18848 else
18849- echo "$ac_t""no" 1>&6
18850-fi
18851
18852- # Extract the first word of "xgettext", so it can be a program name with args.
18853-set dummy xgettext; ac_word=$2
18854-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
18855-echo "configure:4503: checking for $ac_word" >&5
18856-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
18857- echo $ac_n "(cached) $ac_c" 1>&6
18858+ am_save_LIBS="$LIBS"
18859+ if test $am_cv_lib_iconv = yes; then
18860+ LIBS="$LIBS $LIBICONV"
18861+ fi
18862+ am_cv_func_iconv_works=no
18863+ for ac_iconv_const in '' 'const'; do
18864+ if test "$cross_compiling" = yes; then :
18865+ case "$host_os" in
18866+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
18867+ *) am_cv_func_iconv_works="guessing yes" ;;
18868+ esac
18869 else
18870- case "$XGETTEXT" in
18871- /*)
18872- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
18873- ;;
18874- *)
18875- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
18876- for ac_dir in $PATH; do
18877- test -z "$ac_dir" && ac_dir=.
18878- if test -f $ac_dir/$ac_word; then
18879- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
18880- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
18881- break
18882+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18883+/* end confdefs.h. */
18884+
18885+#include <iconv.h>
18886+#include <string.h>
18887+
18888+#ifndef ICONV_CONST
18889+# define ICONV_CONST $ac_iconv_const
18890+#endif
18891+
18892+int
18893+main ()
18894+{
18895+int result = 0;
18896+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
18897+ returns. */
18898+ {
18899+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
18900+ if (cd_utf8_to_88591 != (iconv_t)(-1))
18901+ {
18902+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
18903+ char buf[10];
18904+ ICONV_CONST char *inptr = input;
18905+ size_t inbytesleft = strlen (input);
18906+ char *outptr = buf;
18907+ size_t outbytesleft = sizeof (buf);
18908+ size_t res = iconv (cd_utf8_to_88591,
18909+ &inptr, &inbytesleft,
18910+ &outptr, &outbytesleft);
18911+ if (res == 0)
18912+ result |= 1;
18913+ iconv_close (cd_utf8_to_88591);
18914+ }
18915+ }
18916+ /* Test against Solaris 10 bug: Failures are not distinguishable from
18917+ successful returns. */
18918+ {
18919+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
18920+ if (cd_ascii_to_88591 != (iconv_t)(-1))
18921+ {
18922+ static ICONV_CONST char input[] = "\263";
18923+ char buf[10];
18924+ ICONV_CONST char *inptr = input;
18925+ size_t inbytesleft = strlen (input);
18926+ char *outptr = buf;
18927+ size_t outbytesleft = sizeof (buf);
18928+ size_t res = iconv (cd_ascii_to_88591,
18929+ &inptr, &inbytesleft,
18930+ &outptr, &outbytesleft);
18931+ if (res == 0)
18932+ result |= 2;
18933+ iconv_close (cd_ascii_to_88591);
18934+ }
18935+ }
18936+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
18937+ {
18938+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
18939+ if (cd_88591_to_utf8 != (iconv_t)(-1))
18940+ {
18941+ static ICONV_CONST char input[] = "\304";
18942+ static char buf[2] = { (char)0xDE, (char)0xAD };
18943+ ICONV_CONST char *inptr = input;
18944+ size_t inbytesleft = 1;
18945+ char *outptr = buf;
18946+ size_t outbytesleft = 1;
18947+ size_t res = iconv (cd_88591_to_utf8,
18948+ &inptr, &inbytesleft,
18949+ &outptr, &outbytesleft);
18950+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
18951+ result |= 4;
18952+ iconv_close (cd_88591_to_utf8);
18953+ }
18954+ }
18955+#if 0 /* This bug could be worked around by the caller. */
18956+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
18957+ {
18958+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
18959+ if (cd_88591_to_utf8 != (iconv_t)(-1))
18960+ {
18961+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
18962+ char buf[50];
18963+ ICONV_CONST char *inptr = input;
18964+ size_t inbytesleft = strlen (input);
18965+ char *outptr = buf;
18966+ size_t outbytesleft = sizeof (buf);
18967+ size_t res = iconv (cd_88591_to_utf8,
18968+ &inptr, &inbytesleft,
18969+ &outptr, &outbytesleft);
18970+ if ((int)res > 0)
18971+ result |= 8;
18972+ iconv_close (cd_88591_to_utf8);
18973+ }
18974+ }
18975+#endif
18976+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
18977+ provided. */
18978+ {
18979+ /* Try standardized names. */
18980+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
18981+ /* Try IRIX, OSF/1 names. */
18982+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
18983+ /* Try AIX names. */
18984+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
18985+ /* Try HP-UX names. */
18986+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
18987+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
18988+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
18989+ result |= 16;
18990+ if (cd1 != (iconv_t)(-1))
18991+ iconv_close (cd1);
18992+ if (cd2 != (iconv_t)(-1))
18993+ iconv_close (cd2);
18994+ if (cd3 != (iconv_t)(-1))
18995+ iconv_close (cd3);
18996+ if (cd4 != (iconv_t)(-1))
18997+ iconv_close (cd4);
18998+ }
18999+ return result;
19000+
19001+ ;
19002+ return 0;
19003+}
19004+_ACEOF
19005+if ac_fn_c_try_run "$LINENO"; then :
19006+ am_cv_func_iconv_works=yes
19007+fi
19008+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
19009+ conftest.$ac_objext conftest.beam conftest.$ac_ext
19010+fi
19011+
19012+ test "$am_cv_func_iconv_works" = no || break
19013+ done
19014+ LIBS="$am_save_LIBS"
19015+
19016+fi
19017+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
19018+$as_echo "$am_cv_func_iconv_works" >&6; }
19019+ case "$am_cv_func_iconv_works" in
19020+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
19021+ *) am_func_iconv=yes ;;
19022+ esac
19023+ else
19024+ am_func_iconv=no am_cv_lib_iconv=no
19025+ fi
19026+ if test "$am_func_iconv" = yes; then
19027+
19028+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
19029+
19030+ fi
19031+ if test "$am_cv_lib_iconv" = yes; then
19032+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
19033+$as_echo_n "checking how to link with libiconv... " >&6; }
19034+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
19035+$as_echo "$LIBICONV" >&6; }
19036+ else
19037+ CPPFLAGS="$am_save_CPPFLAGS"
19038+ LIBICONV=
19039+ LTLIBICONV=
19040+ fi
19041+
19042+
19043+
19044+
19045+
19046+
19047+
19048+
19049+
19050+
19051+ use_additional=yes
19052+
19053+ acl_save_prefix="$prefix"
19054+ prefix="$acl_final_prefix"
19055+ acl_save_exec_prefix="$exec_prefix"
19056+ exec_prefix="$acl_final_exec_prefix"
19057+
19058+ eval additional_includedir=\"$includedir\"
19059+ eval additional_libdir=\"$libdir\"
19060+
19061+ exec_prefix="$acl_save_exec_prefix"
19062+ prefix="$acl_save_prefix"
19063+
19064+
19065+# Check whether --with-libintl-prefix was given.
19066+if test "${with_libintl_prefix+set}" = set; then :
19067+ withval=$with_libintl_prefix;
19068+ if test "X$withval" = "Xno"; then
19069+ use_additional=no
19070+ else
19071+ if test "X$withval" = "X"; then
19072+
19073+ acl_save_prefix="$prefix"
19074+ prefix="$acl_final_prefix"
19075+ acl_save_exec_prefix="$exec_prefix"
19076+ exec_prefix="$acl_final_exec_prefix"
19077+
19078+ eval additional_includedir=\"$includedir\"
19079+ eval additional_libdir=\"$libdir\"
19080+
19081+ exec_prefix="$acl_save_exec_prefix"
19082+ prefix="$acl_save_prefix"
19083+
19084+ else
19085+ additional_includedir="$withval/include"
19086+ additional_libdir="$withval/$acl_libdirstem"
19087+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
19088+ && test ! -d "$withval/$acl_libdirstem"; then
19089+ additional_libdir="$withval/$acl_libdirstem2"
19090+ fi
19091 fi
19092 fi
19093- done
19094- IFS="$ac_save_ifs"
19095- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
19096- ;;
19097-esac
19098-fi
19099-XGETTEXT="$ac_cv_path_XGETTEXT"
19100-if test -n "$XGETTEXT"; then
19101- echo "$ac_t""$XGETTEXT" 1>&6
19102-else
19103- echo "$ac_t""no" 1>&6
19104+
19105 fi
19106
19107-
19108- USE_INCLUDED_LIBINTL=yes
19109- CATOBJEXT=.gmo
19110- INSTOBJEXT=.mo
19111- DATADIRNAME=share
19112- INTLDEPS='$(top_builddir)/intl/libintl.a'
19113- INTLLIBS=$INTLDEPS
19114- LIBS=`echo $LIBS | sed -e 's/-lintl//'`
19115- nls_cv_header_intl=intl/libintl.h
19116- nls_cv_header_libgt=intl/libgettext.h
19117+ LIBINTL=
19118+ LTLIBINTL=
19119+ INCINTL=
19120+ LIBINTL_PREFIX=
19121+ HAVE_LIBINTL=
19122+ rpathdirs=
19123+ ltrpathdirs=
19124+ names_already_handled=
19125+ names_next_round='intl '
19126+ while test -n "$names_next_round"; do
19127+ names_this_round="$names_next_round"
19128+ names_next_round=
19129+ for name in $names_this_round; do
19130+ already_handled=
19131+ for n in $names_already_handled; do
19132+ if test "$n" = "$name"; then
19133+ already_handled=yes
19134+ break
19135+ fi
19136+ done
19137+ if test -z "$already_handled"; then
19138+ names_already_handled="$names_already_handled $name"
19139+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
19140+ eval value=\"\$HAVE_LIB$uppername\"
19141+ if test -n "$value"; then
19142+ if test "$value" = yes; then
19143+ eval value=\"\$LIB$uppername\"
19144+ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
19145+ eval value=\"\$LTLIB$uppername\"
19146+ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
19147+ else
19148+ :
19149+ fi
19150+ else
19151+ found_dir=
19152+ found_la=
19153+ found_so=
19154+ found_a=
19155+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
19156+ if test -n "$acl_shlibext"; then
19157+ shrext=".$acl_shlibext" # typically: shrext=.so
19158+ else
19159+ shrext=
19160+ fi
19161+ if test $use_additional = yes; then
19162+ dir="$additional_libdir"
19163+ if test -n "$acl_shlibext"; then
19164+ if test -f "$dir/$libname$shrext"; then
19165+ found_dir="$dir"
19166+ found_so="$dir/$libname$shrext"
19167+ else
19168+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
19169+ ver=`(cd "$dir" && \
19170+ for f in "$libname$shrext".*; do echo "$f"; done \
19171+ | sed -e "s,^$libname$shrext\\\\.,," \
19172+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
19173+ | sed 1q ) 2>/dev/null`
19174+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
19175+ found_dir="$dir"
19176+ found_so="$dir/$libname$shrext.$ver"
19177+ fi
19178+ else
19179+ eval library_names=\"$acl_library_names_spec\"
19180+ for f in $library_names; do
19181+ if test -f "$dir/$f"; then
19182+ found_dir="$dir"
19183+ found_so="$dir/$f"
19184+ break
19185+ fi
19186+ done
19187+ fi
19188+ fi
19189+ fi
19190+ if test "X$found_dir" = "X"; then
19191+ if test -f "$dir/$libname.$acl_libext"; then
19192+ found_dir="$dir"
19193+ found_a="$dir/$libname.$acl_libext"
19194+ fi
19195+ fi
19196+ if test "X$found_dir" != "X"; then
19197+ if test -f "$dir/$libname.la"; then
19198+ found_la="$dir/$libname.la"
19199+ fi
19200+ fi
19201+ fi
19202+ if test "X$found_dir" = "X"; then
19203+ for x in $LDFLAGS $LTLIBINTL; do
19204+
19205+ acl_save_prefix="$prefix"
19206+ prefix="$acl_final_prefix"
19207+ acl_save_exec_prefix="$exec_prefix"
19208+ exec_prefix="$acl_final_exec_prefix"
19209+ eval x=\"$x\"
19210+ exec_prefix="$acl_save_exec_prefix"
19211+ prefix="$acl_save_prefix"
19212+
19213+ case "$x" in
19214+ -L*)
19215+ dir=`echo "X$x" | sed -e 's/^X-L//'`
19216+ if test -n "$acl_shlibext"; then
19217+ if test -f "$dir/$libname$shrext"; then
19218+ found_dir="$dir"
19219+ found_so="$dir/$libname$shrext"
19220+ else
19221+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
19222+ ver=`(cd "$dir" && \
19223+ for f in "$libname$shrext".*; do echo "$f"; done \
19224+ | sed -e "s,^$libname$shrext\\\\.,," \
19225+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
19226+ | sed 1q ) 2>/dev/null`
19227+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
19228+ found_dir="$dir"
19229+ found_so="$dir/$libname$shrext.$ver"
19230+ fi
19231+ else
19232+ eval library_names=\"$acl_library_names_spec\"
19233+ for f in $library_names; do
19234+ if test -f "$dir/$f"; then
19235+ found_dir="$dir"
19236+ found_so="$dir/$f"
19237+ break
19238+ fi
19239+ done
19240+ fi
19241+ fi
19242+ fi
19243+ if test "X$found_dir" = "X"; then
19244+ if test -f "$dir/$libname.$acl_libext"; then
19245+ found_dir="$dir"
19246+ found_a="$dir/$libname.$acl_libext"
19247+ fi
19248+ fi
19249+ if test "X$found_dir" != "X"; then
19250+ if test -f "$dir/$libname.la"; then
19251+ found_la="$dir/$libname.la"
19252+ fi
19253+ fi
19254+ ;;
19255+ esac
19256+ if test "X$found_dir" != "X"; then
19257+ break
19258+ fi
19259+ done
19260+ fi
19261+ if test "X$found_dir" != "X"; then
19262+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
19263+ if test "X$found_so" != "X"; then
19264+ if test "$enable_rpath" = no \
19265+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
19266+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
19267+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19268+ else
19269+ haveit=
19270+ for x in $ltrpathdirs; do
19271+ if test "X$x" = "X$found_dir"; then
19272+ haveit=yes
19273+ break
19274+ fi
19275+ done
19276+ if test -z "$haveit"; then
19277+ ltrpathdirs="$ltrpathdirs $found_dir"
19278+ fi
19279+ if test "$acl_hardcode_direct" = yes; then
19280+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19281+ else
19282+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
19283+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19284+ haveit=
19285+ for x in $rpathdirs; do
19286+ if test "X$x" = "X$found_dir"; then
19287+ haveit=yes
19288+ break
19289+ fi
19290+ done
19291+ if test -z "$haveit"; then
19292+ rpathdirs="$rpathdirs $found_dir"
19293+ fi
19294+ else
19295+ haveit=
19296+ for x in $LDFLAGS $LIBINTL; do
19297+
19298+ acl_save_prefix="$prefix"
19299+ prefix="$acl_final_prefix"
19300+ acl_save_exec_prefix="$exec_prefix"
19301+ exec_prefix="$acl_final_exec_prefix"
19302+ eval x=\"$x\"
19303+ exec_prefix="$acl_save_exec_prefix"
19304+ prefix="$acl_save_prefix"
19305+
19306+ if test "X$x" = "X-L$found_dir"; then
19307+ haveit=yes
19308+ break
19309+ fi
19310+ done
19311+ if test -z "$haveit"; then
19312+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
19313+ fi
19314+ if test "$acl_hardcode_minus_L" != no; then
19315+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
19316+ else
19317+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
19318+ fi
19319+ fi
19320+ fi
19321+ fi
19322+ else
19323+ if test "X$found_a" != "X"; then
19324+ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
19325+ else
19326+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
19327+ fi
19328+ fi
19329+ additional_includedir=
19330+ case "$found_dir" in
19331+ */$acl_libdirstem | */$acl_libdirstem/)
19332+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
19333+ if test "$name" = 'intl'; then
19334+ LIBINTL_PREFIX="$basedir"
19335+ fi
19336+ additional_includedir="$basedir/include"
19337+ ;;
19338+ */$acl_libdirstem2 | */$acl_libdirstem2/)
19339+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
19340+ if test "$name" = 'intl'; then
19341+ LIBINTL_PREFIX="$basedir"
19342+ fi
19343+ additional_includedir="$basedir/include"
19344+ ;;
19345+ esac
19346+ if test "X$additional_includedir" != "X"; then
19347+ if test "X$additional_includedir" != "X/usr/include"; then
19348+ haveit=
19349+ if test "X$additional_includedir" = "X/usr/local/include"; then
19350+ if test -n "$GCC"; then
19351+ case $host_os in
19352+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
19353+ esac
19354+ fi
19355+ fi
19356+ if test -z "$haveit"; then
19357+ for x in $CPPFLAGS $INCINTL; do
19358+
19359+ acl_save_prefix="$prefix"
19360+ prefix="$acl_final_prefix"
19361+ acl_save_exec_prefix="$exec_prefix"
19362+ exec_prefix="$acl_final_exec_prefix"
19363+ eval x=\"$x\"
19364+ exec_prefix="$acl_save_exec_prefix"
19365+ prefix="$acl_save_prefix"
19366+
19367+ if test "X$x" = "X-I$additional_includedir"; then
19368+ haveit=yes
19369+ break
19370+ fi
19371+ done
19372+ if test -z "$haveit"; then
19373+ if test -d "$additional_includedir"; then
19374+ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
19375+ fi
19376+ fi
19377+ fi
19378+ fi
19379+ fi
19380+ if test -n "$found_la"; then
19381+ save_libdir="$libdir"
19382+ case "$found_la" in
19383+ */* | *\\*) . "$found_la" ;;
19384+ *) . "./$found_la" ;;
19385+ esac
19386+ libdir="$save_libdir"
19387+ for dep in $dependency_libs; do
19388+ case "$dep" in
19389+ -L*)
19390+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
19391+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
19392+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
19393+ haveit=
19394+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
19395+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
19396+ if test -n "$GCC"; then
19397+ case $host_os in
19398+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
19399+ esac
19400+ fi
19401+ fi
19402+ if test -z "$haveit"; then
19403+ haveit=
19404+ for x in $LDFLAGS $LIBINTL; do
19405+
19406+ acl_save_prefix="$prefix"
19407+ prefix="$acl_final_prefix"
19408+ acl_save_exec_prefix="$exec_prefix"
19409+ exec_prefix="$acl_final_exec_prefix"
19410+ eval x=\"$x\"
19411+ exec_prefix="$acl_save_exec_prefix"
19412+ prefix="$acl_save_prefix"
19413+
19414+ if test "X$x" = "X-L$additional_libdir"; then
19415+ haveit=yes
19416+ break
19417+ fi
19418+ done
19419+ if test -z "$haveit"; then
19420+ if test -d "$additional_libdir"; then
19421+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
19422+ fi
19423+ fi
19424+ haveit=
19425+ for x in $LDFLAGS $LTLIBINTL; do
19426+
19427+ acl_save_prefix="$prefix"
19428+ prefix="$acl_final_prefix"
19429+ acl_save_exec_prefix="$exec_prefix"
19430+ exec_prefix="$acl_final_exec_prefix"
19431+ eval x=\"$x\"
19432+ exec_prefix="$acl_save_exec_prefix"
19433+ prefix="$acl_save_prefix"
19434+
19435+ if test "X$x" = "X-L$additional_libdir"; then
19436+ haveit=yes
19437+ break
19438+ fi
19439+ done
19440+ if test -z "$haveit"; then
19441+ if test -d "$additional_libdir"; then
19442+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
19443+ fi
19444+ fi
19445+ fi
19446+ fi
19447+ ;;
19448+ -R*)
19449+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
19450+ if test "$enable_rpath" != no; then
19451+ haveit=
19452+ for x in $rpathdirs; do
19453+ if test "X$x" = "X$dir"; then
19454+ haveit=yes
19455+ break
19456+ fi
19457+ done
19458+ if test -z "$haveit"; then
19459+ rpathdirs="$rpathdirs $dir"
19460+ fi
19461+ haveit=
19462+ for x in $ltrpathdirs; do
19463+ if test "X$x" = "X$dir"; then
19464+ haveit=yes
19465+ break
19466+ fi
19467+ done
19468+ if test -z "$haveit"; then
19469+ ltrpathdirs="$ltrpathdirs $dir"
19470+ fi
19471+ fi
19472+ ;;
19473+ -l*)
19474+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
19475+ ;;
19476+ *.la)
19477+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
19478+ ;;
19479+ *)
19480+ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
19481+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
19482+ ;;
19483+ esac
19484+ done
19485+ fi
19486+ else
19487+ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
19488+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
19489+ fi
19490+ fi
19491 fi
19492+ done
19493+ done
19494+ if test "X$rpathdirs" != "X"; then
19495+ if test -n "$acl_hardcode_libdir_separator"; then
19496+ alldirs=
19497+ for found_dir in $rpathdirs; do
19498+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
19499+ done
19500+ acl_save_libdir="$libdir"
19501+ libdir="$alldirs"
19502+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
19503+ libdir="$acl_save_libdir"
19504+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
19505+ else
19506+ for found_dir in $rpathdirs; do
19507+ acl_save_libdir="$libdir"
19508+ libdir="$found_dir"
19509+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
19510+ libdir="$acl_save_libdir"
19511+ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
19512+ done
19513+ fi
19514+ fi
19515+ if test "X$ltrpathdirs" != "X"; then
19516+ for found_dir in $ltrpathdirs; do
19517+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
19518+ done
19519+ fi
19520
19521- if test "$XGETTEXT" != ":"; then
19522- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
19523- : ;
19524- else
19525- echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
19526- XGETTEXT=":"
19527- fi
19528+
19529+
19530+
19531+
19532+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
19533+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
19534+if eval \${$gt_func_gnugettext_libintl+:} false; then :
19535+ $as_echo_n "(cached) " >&6
19536+else
19537+ gt_save_CPPFLAGS="$CPPFLAGS"
19538+ CPPFLAGS="$CPPFLAGS $INCINTL"
19539+ gt_save_LIBS="$LIBS"
19540+ LIBS="$LIBS $LIBINTL"
19541+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19542+/* end confdefs.h. */
19543+
19544+#include <libintl.h>
19545+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
19546+extern int _nl_msg_cat_cntr;
19547+extern
19548+#ifdef __cplusplus
19549+"C"
19550+#endif
19551+const char *_nl_expand_alias (const char *);
19552+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
19553+#else
19554+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
19555+#endif
19556+$gt_revision_test_code
19557+
19558+int
19559+main ()
19560+{
19561+
19562+bindtextdomain ("", "");
19563+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
19564+
19565+ ;
19566+ return 0;
19567+}
19568+_ACEOF
19569+if ac_fn_c_try_link "$LINENO"; then :
19570+ eval "$gt_func_gnugettext_libintl=yes"
19571+else
19572+ eval "$gt_func_gnugettext_libintl=no"
19573+fi
19574+rm -f core conftest.err conftest.$ac_objext \
19575+ conftest$ac_exeext conftest.$ac_ext
19576+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
19577+ LIBS="$LIBS $LIBICONV"
19578+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19579+/* end confdefs.h. */
19580+
19581+#include <libintl.h>
19582+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
19583+extern int _nl_msg_cat_cntr;
19584+extern
19585+#ifdef __cplusplus
19586+"C"
19587+#endif
19588+const char *_nl_expand_alias (const char *);
19589+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
19590+#else
19591+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
19592+#endif
19593+$gt_revision_test_code
19594+
19595+int
19596+main ()
19597+{
19598+
19599+bindtextdomain ("", "");
19600+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
19601+
19602+ ;
19603+ return 0;
19604+}
19605+_ACEOF
19606+if ac_fn_c_try_link "$LINENO"; then :
19607+ LIBINTL="$LIBINTL $LIBICONV"
19608+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
19609+ eval "$gt_func_gnugettext_libintl=yes"
19610+
19611+fi
19612+rm -f core conftest.err conftest.$ac_objext \
19613+ conftest$ac_exeext conftest.$ac_ext
19614+ fi
19615+ CPPFLAGS="$gt_save_CPPFLAGS"
19616+ LIBS="$gt_save_LIBS"
19617+fi
19618+eval ac_res=\$$gt_func_gnugettext_libintl
19619+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19620+$as_echo "$ac_res" >&6; }
19621+ fi
19622+
19623+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
19624+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
19625+ && test "$PACKAGE" != gettext-runtime \
19626+ && test "$PACKAGE" != gettext-tools; }; then
19627+ gt_use_preinstalled_gnugettext=yes
19628+ else
19629+ LIBINTL=
19630+ LTLIBINTL=
19631+ INCINTL=
19632+ fi
19633+
19634+
19635+
19636+ if test -n "$INTL_MACOSX_LIBS"; then
19637+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
19638+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
19639+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
19640+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
19641 fi
19642+ fi
19643+
19644+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
19645+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
19646+
19647+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
19648
19649- # We need to process the po/ directory.
19650- POSUB=po
19651 else
19652- DATADIRNAME=share
19653- nls_cv_header_intl=intl/libintl.h
19654- nls_cv_header_libgt=intl/libgettext.h
19655+ USE_NLS=no
19656 fi
19657+ fi
19658
19659- # If this is used in GNU gettext we have to set USE_NLS to `yes'
19660- # because some of the sources are only built for this goal.
19661- if test "$PACKAGE" = gettext; then
19662- USE_NLS=yes
19663- USE_INCLUDED_LIBINTL=yes
19664+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
19665+$as_echo_n "checking whether to use NLS... " >&6; }
19666+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
19667+$as_echo "$USE_NLS" >&6; }
19668+ if test "$USE_NLS" = "yes"; then
19669+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
19670+$as_echo_n "checking where the gettext function comes from... " >&6; }
19671+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
19672+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
19673+ gt_source="external libintl"
19674+ else
19675+ gt_source="libc"
19676+ fi
19677+ else
19678+ gt_source="included intl directory"
19679 fi
19680+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
19681+$as_echo "$gt_source" >&6; }
19682+ fi
19683+
19684+ if test "$USE_NLS" = "yes"; then
19685
19686- for lang in $ALL_LINGUAS; do
19687- GMOFILES="$GMOFILES $lang.gmo"
19688- POFILES="$POFILES $lang.po"
19689+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
19690+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
19691+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
19692+$as_echo_n "checking how to link with libintl... " >&6; }
19693+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
19694+$as_echo "$LIBINTL" >&6; }
19695+
19696+ for element in $INCINTL; do
19697+ haveit=
19698+ for x in $CPPFLAGS; do
19699+
19700+ acl_save_prefix="$prefix"
19701+ prefix="$acl_final_prefix"
19702+ acl_save_exec_prefix="$exec_prefix"
19703+ exec_prefix="$acl_final_exec_prefix"
19704+ eval x=\"$x\"
19705+ exec_prefix="$acl_save_exec_prefix"
19706+ prefix="$acl_save_prefix"
19707+
19708+ if test "X$x" = "X$element"; then
19709+ haveit=yes
19710+ break
19711+ fi
19712 done
19713+ if test -z "$haveit"; then
19714+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
19715+ fi
19716+ done
19717
19718-
19719-
19720-
19721-
19722-
19723-
19724-
19725-
19726-
19727-
19728-
19729-
19730-
19731- if test "x$CATOBJEXT" != "x"; then
19732- if test "x$ALL_LINGUAS" = "x"; then
19733- LINGUAS=
19734- else
19735- echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
19736-echo "configure:4593: checking for catalogs to be installed" >&5
19737- NEW_LINGUAS=
19738- for lang in ${LINGUAS=$ALL_LINGUAS}; do
19739- case "$ALL_LINGUAS" in
19740- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
19741- esac
19742- done
19743- LINGUAS=$NEW_LINGUAS
19744- echo "$ac_t""$LINGUAS" 1>&6
19745- fi
19746+ fi
19747
19748- if test -n "$LINGUAS"; then
19749- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
19750- fi
19751- fi
19752
19753- if test $ac_cv_header_locale_h = yes; then
19754- INCLUDE_LOCALE_H="#include <locale.h>"
19755- else
19756- INCLUDE_LOCALE_H="\
19757-/* The system does not provide the header <locale.h>. Take care yourself. */"
19758- fi
19759-
19760+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
19761
19762- test -d intl || mkdir intl
19763- if test "$CATOBJEXT" = ".cat"; then
19764- ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
19765-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
19766-echo "configure:4621: checking for linux/version.h" >&5
19767-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
19768- echo $ac_n "(cached) $ac_c" 1>&6
19769-else
19770- cat > conftest.$ac_ext <<EOF
19771-#line 4626 "configure"
19772-#include "confdefs.h"
19773-#include <linux/version.h>
19774-EOF
19775-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
19776-{ (eval echo configure:4631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
19777-ac_err=`grep -v '^ *+' conftest.out`
19778-if test -z "$ac_err"; then
19779- rm -rf conftest*
19780- eval "ac_cv_header_$ac_safe=yes"
19781-else
19782- echo "$ac_err" >&5
19783- echo "configure: failed program was:" >&5
19784- cat conftest.$ac_ext >&5
19785- rm -rf conftest*
19786- eval "ac_cv_header_$ac_safe=no"
19787-fi
19788-rm -f conftest*
19789-fi
19790-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
19791- echo "$ac_t""yes" 1>&6
19792- msgformat=linux
19793-else
19794- echo "$ac_t""no" 1>&6
19795-msgformat=xopen
19796-fi
19797
19798+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
19799
19800- sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
19801- fi
19802- sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
19803- $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
19804+ fi
19805
19806- if test "$PACKAGE" = "gettext"; then
19807- GT_NO="#NO#"
19808- GT_YES=
19809- else
19810- GT_NO=
19811- GT_YES="#YES#"
19812- fi
19813-
19814-
19815+ POSUB=po
19816+ fi
19817
19818- MKINSTALLDIRS=
19819- if test -n "$ac_aux_dir"; then
19820- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
19821- fi
19822- if test -z "$MKINSTALLDIRS"; then
19823- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
19824- fi
19825-
19826
19827- l=
19828-
19829
19830- test -d po || mkdir po
19831- if test "x$srcdir" != "x."; then
19832- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
19833- posrcprefix="$srcdir/"
19834- else
19835- posrcprefix="../$srcdir/"
19836- fi
19837- else
19838- posrcprefix="../"
19839- fi
19840- rm -f po/POTFILES
19841- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
19842- < $srcdir/po/POTFILES.in > po/POTFILES
19843-
19844+ INTLLIBS="$LIBINTL"
19845+
19846+
19847
19848-cat >> confdefs.h <<EOF
19849-#define LOCALEDIR "$prefix/$DATADIRNAME"
19850-EOF
19851
19852
19853
19854-trap '' 1 2 15
19855-cat > confcache <<\EOF
19856+
19857+ac_config_files="$ac_config_files Makefile lib/Makefile testsuite/Makefile man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype src/lrzszbug"
19858+
19859+ac_config_commands="$ac_config_commands default"
19860+
19861+cat >confcache <<\_ACEOF
19862 # This file is a shell script that caches the results of configure
19863 # tests run on this system so they can be shared between configure
19864-# scripts and configure runs. It is not useful on other systems.
19865-# If it contains results you don't want to keep, you may remove or edit it.
19866+# scripts and configure runs, see configure's option --config-cache.
19867+# It is not useful on other systems. If it contains results you don't
19868+# want to keep, you may remove or edit it.
19869 #
19870-# By default, configure uses ./config.cache as the cache file,
19871-# creating it if it does not exist already. You can give configure
19872-# the --cache-file=FILE option to use a different cache file; that is
19873-# what configure does when it calls configure scripts in
19874-# subdirectories, so they share the cache.
19875-# Giving --cache-file=/dev/null disables caching, for debugging configure.
19876-# config.status only pays attention to the cache file if you give it the
19877-# --recheck option to rerun configure.
19878+# config.status only pays attention to the cache file if you give it
19879+# the --recheck option to rerun configure.
19880 #
19881-EOF
19882+# `ac_cv_env_foo' variables (set or unset) will be overridden when
19883+# loading this file, other *unset* `ac_cv_foo' will be assigned the
19884+# following values.
19885+
19886+_ACEOF
19887+
19888 # The following way of writing the cache mishandles newlines in values,
19889 # but we know of no workaround that is simple, portable, and efficient.
19890-# So, don't put newlines in cache variables' values.
19891+# So, we kill variables containing newlines.
19892 # Ultrix sh set writes to stderr and can't be redirected directly,
19893 # and sets the high bit in the cache file unless we assign to the vars.
19894-(set) 2>&1 |
19895- case `(ac_space=' '; set) 2>&1` in
19896- *ac_space=\ *)
19897- # `set' does not quote correctly, so add quotes (double-quote substitution
19898- # turns \\\\ into \\, and sed turns \\ into \).
19899- sed -n \
19900- -e "s/'/'\\\\''/g" \
19901- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
19902- ;;
19903- *)
19904- # `set' quotes correctly as required by POSIX, so do not add quotes.
19905- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
19906- ;;
19907- esac >> confcache
19908-if cmp -s $cache_file confcache; then
19909- :
19910-else
19911- if test -w $cache_file; then
19912- echo "updating cache $cache_file"
19913- cat confcache > $cache_file
19914+(
19915+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
19916+ eval ac_val=\$$ac_var
19917+ case $ac_val in #(
19918+ *${as_nl}*)
19919+ case $ac_var in #(
19920+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
19921+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
19922+ esac
19923+ case $ac_var in #(
19924+ _ | IFS | as_nl) ;; #(
19925+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
19926+ *) { eval $ac_var=; unset $ac_var;} ;;
19927+ esac ;;
19928+ esac
19929+ done
19930+
19931+ (set) 2>&1 |
19932+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
19933+ *${as_nl}ac_space=\ *)
19934+ # `set' does not quote correctly, so add quotes: double-quote
19935+ # substitution turns \\\\ into \\, and sed turns \\ into \.
19936+ sed -n \
19937+ "s/'/'\\\\''/g;
19938+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
19939+ ;; #(
19940+ *)
19941+ # `set' quotes correctly as required by POSIX, so do not add quotes.
19942+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
19943+ ;;
19944+ esac |
19945+ sort
19946+) |
19947+ sed '
19948+ /^ac_cv_env_/b end
19949+ t clear
19950+ :clear
19951+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
19952+ t end
19953+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
19954+ :end' >>confcache
19955+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
19956+ if test -w "$cache_file"; then
19957+ if test "x$cache_file" != "x/dev/null"; then
19958+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
19959+$as_echo "$as_me: updating cache $cache_file" >&6;}
19960+ if test ! -f "$cache_file" || test -h "$cache_file"; then
19961+ cat confcache >"$cache_file"
19962+ else
19963+ case $cache_file in #(
19964+ */* | ?:*)
19965+ mv -f confcache "$cache_file"$$ &&
19966+ mv -f "$cache_file"$$ "$cache_file" ;; #(
19967+ *)
19968+ mv -f confcache "$cache_file" ;;
19969+ esac
19970+ fi
19971+ fi
19972 else
19973- echo "not updating unwritable cache $cache_file"
19974+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
19975+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
19976 fi
19977 fi
19978 rm -f confcache
19979
19980-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
19981-
19982 test "x$prefix" = xNONE && prefix=$ac_default_prefix
19983 # Let make expand exec_prefix.
19984 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
19985
19986-# Any assignment to VPATH causes Sun make to only execute
19987-# the first set of double-colon rules, so remove it if not needed.
19988-# If there is a colon in the path, we need to keep it.
19989-if test "x$srcdir" = x.; then
19990- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
19991-fi
19992+DEFS=-DHAVE_CONFIG_H
19993
19994-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
19995+ac_libobjs=
19996+ac_ltlibobjs=
19997+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
19998+ # 1. Remove the extension, and $U if already installed.
19999+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
20000+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
20001+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
20002+ # will be set to the directory where LIBOBJS objects are built.
20003+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
20004+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
20005+done
20006+LIBOBJS=$ac_libobjs
20007
20008-DEFS=-DHAVE_CONFIG_H
20009+LTLIBOBJS=$ac_ltlibobjs
20010
20011-# Without the "./", some shells look in PATH for config.status.
20012-: ${CONFIG_STATUS=./config.status}
20013
20014-echo creating $CONFIG_STATUS
20015-rm -f $CONFIG_STATUS
20016-cat > $CONFIG_STATUS <<EOF
20017-#! /bin/sh
20018-# Generated automatically by configure.
20019+ if test -n "$EXEEXT"; then
20020+ am__EXEEXT_TRUE=
20021+ am__EXEEXT_FALSE='#'
20022+else
20023+ am__EXEEXT_TRUE='#'
20024+ am__EXEEXT_FALSE=
20025+fi
20026+
20027+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
20028+ as_fn_error $? "conditional \"AMDEP\" was never defined.
20029+Usually this means the macro was only invoked conditionally." "$LINENO" 5
20030+fi
20031+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
20032+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
20033+Usually this means the macro was only invoked conditionally." "$LINENO" 5
20034+fi
20035+
20036+: "${CONFIG_STATUS=./config.status}"
20037+ac_write_fail=0
20038+ac_clean_files_save=$ac_clean_files
20039+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
20040+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
20041+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
20042+as_write_fail=0
20043+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
20044+#! $SHELL
20045+# Generated by $as_me.
20046 # Run this file to recreate the current configuration.
20047-# This directory was configured as follows,
20048-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
20049-#
20050-# $0 $ac_configure_args
20051-#
20052 # Compiler output produced by configure, useful for debugging
20053-# configure, is in ./config.log if it exists.
20054+# configure, is in config.log if it exists.
20055
20056-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
20057-for ac_option
20058+debug=false
20059+ac_cs_recheck=false
20060+ac_cs_silent=false
20061+
20062+SHELL=\${CONFIG_SHELL-$SHELL}
20063+export SHELL
20064+_ASEOF
20065+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
20066+## -------------------- ##
20067+## M4sh Initialization. ##
20068+## -------------------- ##
20069+
20070+# Be more Bourne compatible
20071+DUALCASE=1; export DUALCASE # for MKS sh
20072+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
20073+ emulate sh
20074+ NULLCMD=:
20075+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
20076+ # is contrary to our usage. Disable this feature.
20077+ alias -g '${1+"$@"}'='"$@"'
20078+ setopt NO_GLOB_SUBST
20079+else
20080+ case `(set -o) 2>/dev/null` in #(
20081+ *posix*) :
20082+ set -o posix ;; #(
20083+ *) :
20084+ ;;
20085+esac
20086+fi
20087+
20088+
20089+as_nl='
20090+'
20091+export as_nl
20092+as_echo='printf %s\n'
20093+as_echo_n='printf %s'
20094+
20095+# The user is always right.
20096+if test "${PATH_SEPARATOR+set}" != set; then
20097+ PATH_SEPARATOR=:
20098+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
20099+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
20100+ PATH_SEPARATOR=';'
20101+ }
20102+fi
20103+
20104+
20105+# IFS
20106+# We need space, tab and new line, in precisely that order. Quoting is
20107+# there to prevent editors from complaining about space-tab.
20108+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
20109+# splitting by setting IFS to empty value.)
20110+IFS=" "" $as_nl"
20111+
20112+# Find who we are. Look in the path if we contain no directory separator.
20113+as_myself=
20114+case $0 in #((
20115+ *[\\/]* ) as_myself=$0 ;;
20116+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20117+for as_dir in $PATH
20118 do
20119- case "\$ac_option" in
20120- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
20121- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
20122- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
20123- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
20124- echo "$CONFIG_STATUS generated by autoconf version 2.12"
20125- exit 0 ;;
20126- -help | --help | --hel | --he | --h)
20127- echo "\$ac_cs_usage"; exit 0 ;;
20128- *) echo "\$ac_cs_usage"; exit 1 ;;
20129- esac
20130+ IFS=$as_save_IFS
20131+ test -z "$as_dir" && as_dir=.
20132+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
20133+ done
20134+IFS=$as_save_IFS
20135+
20136+ ;;
20137+esac
20138+# We did not find ourselves, most probably we were run as `sh COMMAND'
20139+# in which case we are not to be found in the path.
20140+if test "x$as_myself" = x; then
20141+ as_myself=$0
20142+fi
20143+if test ! -f "$as_myself"; then
20144+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
20145+ exit 1
20146+fi
20147+
20148+# Unset variables that we do not need and which cause bugs (e.g. in
20149+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
20150+# suppresses any "Segmentation fault" message there. '((' could
20151+# trigger a bug in pdksh 5.2.14.
20152+for as_var in BASH_ENV ENV MAIL MAILPATH
20153+do eval test x\${$as_var+set} = xset \
20154+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
20155 done
20156+PS1='$ '
20157+PS2='> '
20158+PS4='+ '
20159
20160-ac_given_srcdir=$srcdir
20161-ac_given_INSTALL="$INSTALL"
20162+# NLS nuisances.
20163+LC_ALL=C
20164+export LC_ALL
20165+LANGUAGE=C
20166+export LANGUAGE
20167+
20168+# CDPATH.
20169+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
20170
20171-trap 'rm -fr `echo "Makefile intl/Makefile lib/Makefile testsuite/Makefile \
20172-man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
20173-src/lrzszbug config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
20174-EOF
20175-cat >> $CONFIG_STATUS <<EOF
20176-
20177-# Protect against being on the right side of a sed subst in config.status.
20178-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
20179- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
20180-$ac_vpsub
20181-$extrasub
20182-s%@CFLAGS@%$CFLAGS%g
20183-s%@CPPFLAGS@%$CPPFLAGS%g
20184-s%@CXXFLAGS@%$CXXFLAGS%g
20185-s%@DEFS@%$DEFS%g
20186-s%@LDFLAGS@%$LDFLAGS%g
20187-s%@LIBS@%$LIBS%g
20188-s%@exec_prefix@%$exec_prefix%g
20189-s%@prefix@%$prefix%g
20190-s%@program_transform_name@%$program_transform_name%g
20191-s%@bindir@%$bindir%g
20192-s%@sbindir@%$sbindir%g
20193-s%@libexecdir@%$libexecdir%g
20194-s%@datadir@%$datadir%g
20195-s%@sysconfdir@%$sysconfdir%g
20196-s%@sharedstatedir@%$sharedstatedir%g
20197-s%@localstatedir@%$localstatedir%g
20198-s%@libdir@%$libdir%g
20199-s%@includedir@%$includedir%g
20200-s%@oldincludedir@%$oldincludedir%g
20201-s%@infodir@%$infodir%g
20202-s%@mandir@%$mandir%g
20203-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
20204-s%@INSTALL_DATA@%$INSTALL_DATA%g
20205-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
20206-s%@PACKAGE@%$PACKAGE%g
20207-s%@VERSION@%$VERSION%g
20208-s%@ACLOCAL@%$ACLOCAL%g
20209-s%@AUTOCONF@%$AUTOCONF%g
20210-s%@AUTOMAKE@%$AUTOMAKE%g
20211-s%@AUTOHEADER@%$AUTOHEADER%g
20212-s%@MAKEINFO@%$MAKEINFO%g
20213-s%@SET_MAKE@%$SET_MAKE%g
20214-s%@PACKAGE_VERSION@%$PACKAGE_VERSION%g
20215-s%@ENABLE_TIMESYNC@%$ENABLE_TIMESYNC%g
20216-s%@CC@%$CC%g
20217-s%@CPP@%$CPP%g
20218-s%@RANLIB@%$RANLIB%g
20219-s%@U@%$U%g
20220-s%@ANSI2KNR@%$ANSI2KNR%g
20221-s%@ALLOCA@%$ALLOCA%g
20222-s%@LIBOBJS@%$LIBOBJS%g
20223-s%@USE_NLS@%$USE_NLS%g
20224-s%@MSGFMT@%$MSGFMT%g
20225-s%@GMSGFMT@%$GMSGFMT%g
20226-s%@XGETTEXT@%$XGETTEXT%g
20227-s%@GENCAT@%$GENCAT%g
20228-s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
20229-s%@CATALOGS@%$CATALOGS%g
20230-s%@CATOBJEXT@%$CATOBJEXT%g
20231-s%@DATADIRNAME@%$DATADIRNAME%g
20232-s%@GMOFILES@%$GMOFILES%g
20233-s%@INSTOBJEXT@%$INSTOBJEXT%g
20234-s%@INTLDEPS@%$INTLDEPS%g
20235-s%@INTLLIBS@%$INTLLIBS%g
20236-s%@INTLOBJS@%$INTLOBJS%g
20237-s%@POFILES@%$POFILES%g
20238-s%@POSUB@%$POSUB%g
20239-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
20240-s%@GT_NO@%$GT_NO%g
20241-s%@GT_YES@%$GT_YES%g
20242-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
20243-s%@l@%$l%g
20244-
20245-CEOF
20246-EOF
20247-
20248-cat >> $CONFIG_STATUS <<\EOF
20249-
20250-# Split the substitutions into bite-sized pieces for seds with
20251-# small command number limits, like on Digital OSF/1 and HP-UX.
20252-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
20253-ac_file=1 # Number of current file.
20254-ac_beg=1 # First line for current file.
20255-ac_end=$ac_max_sed_cmds # Line after last line for current file.
20256-ac_more_lines=:
20257-ac_sed_cmds=""
20258-while $ac_more_lines; do
20259- if test $ac_beg -gt 1; then
20260- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
20261- else
20262- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
20263+
20264+# as_fn_error STATUS ERROR [LINENO LOG_FD]
20265+# ----------------------------------------
20266+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
20267+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
20268+# script with STATUS, using 1 if that was 0.
20269+as_fn_error ()
20270+{
20271+ as_status=$1; test $as_status -eq 0 && as_status=1
20272+ if test "$4"; then
20273+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
20274+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
20275 fi
20276- if test ! -s conftest.s$ac_file; then
20277- ac_more_lines=false
20278- rm -f conftest.s$ac_file
20279- else
20280- if test -z "$ac_sed_cmds"; then
20281- ac_sed_cmds="sed -f conftest.s$ac_file"
20282- else
20283- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
20284- fi
20285- ac_file=`expr $ac_file + 1`
20286- ac_beg=$ac_end
20287- ac_end=`expr $ac_end + $ac_max_sed_cmds`
20288- fi
20289-done
20290-if test -z "$ac_sed_cmds"; then
20291- ac_sed_cmds=cat
20292-fi
20293-EOF
20294-
20295-cat >> $CONFIG_STATUS <<EOF
20296-
20297-CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile lib/Makefile testsuite/Makefile \
20298-man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
20299-src/lrzszbug"}
20300-EOF
20301-cat >> $CONFIG_STATUS <<\EOF
20302-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
20303- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
20304- case "$ac_file" in
20305- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
20306- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
20307- *) ac_file_in="${ac_file}.in" ;;
20308- esac
20309+ $as_echo "$as_me: error: $2" >&2
20310+ as_fn_exit $as_status
20311+} # as_fn_error
20312+
20313+
20314+# as_fn_set_status STATUS
20315+# -----------------------
20316+# Set $? to STATUS, without forking.
20317+as_fn_set_status ()
20318+{
20319+ return $1
20320+} # as_fn_set_status
20321
20322- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
20323+# as_fn_exit STATUS
20324+# -----------------
20325+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
20326+as_fn_exit ()
20327+{
20328+ set +e
20329+ as_fn_set_status $1
20330+ exit $1
20331+} # as_fn_exit
20332+
20333+# as_fn_unset VAR
20334+# ---------------
20335+# Portably unset VAR.
20336+as_fn_unset ()
20337+{
20338+ { eval $1=; unset $1;}
20339+}
20340+as_unset=as_fn_unset
20341+# as_fn_append VAR VALUE
20342+# ----------------------
20343+# Append the text in VALUE to the end of the definition contained in VAR. Take
20344+# advantage of any shell optimizations that allow amortized linear growth over
20345+# repeated appends, instead of the typical quadratic growth present in naive
20346+# implementations.
20347+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
20348+ eval 'as_fn_append ()
20349+ {
20350+ eval $1+=\$2
20351+ }'
20352+else
20353+ as_fn_append ()
20354+ {
20355+ eval $1=\$$1\$2
20356+ }
20357+fi # as_fn_append
20358+
20359+# as_fn_arith ARG...
20360+# ------------------
20361+# Perform arithmetic evaluation on the ARGs, and store the result in the
20362+# global $as_val. Take advantage of shells that can avoid forks. The arguments
20363+# must be portable across $(()) and expr.
20364+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
20365+ eval 'as_fn_arith ()
20366+ {
20367+ as_val=$(( $* ))
20368+ }'
20369+else
20370+ as_fn_arith ()
20371+ {
20372+ as_val=`expr "$@" || test $? -eq 1`
20373+ }
20374+fi # as_fn_arith
20375+
20376+
20377+if expr a : '\(a\)' >/dev/null 2>&1 &&
20378+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
20379+ as_expr=expr
20380+else
20381+ as_expr=false
20382+fi
20383+
20384+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
20385+ as_basename=basename
20386+else
20387+ as_basename=false
20388+fi
20389+
20390+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
20391+ as_dirname=dirname
20392+else
20393+ as_dirname=false
20394+fi
20395+
20396+as_me=`$as_basename -- "$0" ||
20397+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
20398+ X"$0" : 'X\(//\)$' \| \
20399+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
20400+$as_echo X/"$0" |
20401+ sed '/^.*\/\([^/][^/]*\)\/*$/{
20402+ s//\1/
20403+ q
20404+ }
20405+ /^X\/\(\/\/\)$/{
20406+ s//\1/
20407+ q
20408+ }
20409+ /^X\/\(\/\).*/{
20410+ s//\1/
20411+ q
20412+ }
20413+ s/.*/./; q'`
20414+
20415+# Avoid depending upon Character Ranges.
20416+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
20417+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
20418+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
20419+as_cr_digits='0123456789'
20420+as_cr_alnum=$as_cr_Letters$as_cr_digits
20421+
20422+ECHO_C= ECHO_N= ECHO_T=
20423+case `echo -n x` in #(((((
20424+-n*)
20425+ case `echo 'xy\c'` in
20426+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
20427+ xy) ECHO_C='\c';;
20428+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
20429+ ECHO_T=' ';;
20430+ esac;;
20431+*)
20432+ ECHO_N='-n';;
20433+esac
20434
20435- # Remove last slash and all that follows it. Not all systems have dirname.
20436- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
20437- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
20438- # The file is in a subdirectory.
20439- test ! -d "$ac_dir" && mkdir "$ac_dir"
20440- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
20441- # A "../" for each directory in $ac_dir_suffix.
20442- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
20443+rm -f conf$$ conf$$.exe conf$$.file
20444+if test -d conf$$.dir; then
20445+ rm -f conf$$.dir/conf$$.file
20446+else
20447+ rm -f conf$$.dir
20448+ mkdir conf$$.dir 2>/dev/null
20449+fi
20450+if (echo >conf$$.file) 2>/dev/null; then
20451+ if ln -s conf$$.file conf$$ 2>/dev/null; then
20452+ as_ln_s='ln -s'
20453+ # ... but there are two gotchas:
20454+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
20455+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
20456+ # In both cases, we have to default to `cp -pR'.
20457+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
20458+ as_ln_s='cp -pR'
20459+ elif ln conf$$.file conf$$ 2>/dev/null; then
20460+ as_ln_s=ln
20461 else
20462- ac_dir_suffix= ac_dots=
20463+ as_ln_s='cp -pR'
20464 fi
20465+else
20466+ as_ln_s='cp -pR'
20467+fi
20468+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
20469+rmdir conf$$.dir 2>/dev/null
20470+
20471+
20472+# as_fn_mkdir_p
20473+# -------------
20474+# Create "$as_dir" as a directory, including parents if necessary.
20475+as_fn_mkdir_p ()
20476+{
20477
20478- case "$ac_given_srcdir" in
20479- .) srcdir=.
20480- if test -z "$ac_dots"; then top_srcdir=.
20481- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
20482- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
20483- *) # Relative path.
20484- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
20485- top_srcdir="$ac_dots$ac_given_srcdir" ;;
20486+ case $as_dir in #(
20487+ -*) as_dir=./$as_dir;;
20488 esac
20489+ test -d "$as_dir" || eval $as_mkdir_p || {
20490+ as_dirs=
20491+ while :; do
20492+ case $as_dir in #(
20493+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
20494+ *) as_qdir=$as_dir;;
20495+ esac
20496+ as_dirs="'$as_qdir' $as_dirs"
20497+ as_dir=`$as_dirname -- "$as_dir" ||
20498+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
20499+ X"$as_dir" : 'X\(//\)[^/]' \| \
20500+ X"$as_dir" : 'X\(//\)$' \| \
20501+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
20502+$as_echo X"$as_dir" |
20503+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
20504+ s//\1/
20505+ q
20506+ }
20507+ /^X\(\/\/\)[^/].*/{
20508+ s//\1/
20509+ q
20510+ }
20511+ /^X\(\/\/\)$/{
20512+ s//\1/
20513+ q
20514+ }
20515+ /^X\(\/\).*/{
20516+ s//\1/
20517+ q
20518+ }
20519+ s/.*/./; q'`
20520+ test -d "$as_dir" && break
20521+ done
20522+ test -z "$as_dirs" || eval "mkdir $as_dirs"
20523+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
20524+
20525+
20526+} # as_fn_mkdir_p
20527+if mkdir -p . 2>/dev/null; then
20528+ as_mkdir_p='mkdir -p "$as_dir"'
20529+else
20530+ test -d ./-p && rmdir ./-p
20531+ as_mkdir_p=false
20532+fi
20533+
20534+
20535+# as_fn_executable_p FILE
20536+# -----------------------
20537+# Test if FILE is an executable regular file.
20538+as_fn_executable_p ()
20539+{
20540+ test -f "$1" && test -x "$1"
20541+} # as_fn_executable_p
20542+as_test_x='test -x'
20543+as_executable_p=as_fn_executable_p
20544+
20545+# Sed expression to map a string onto a valid CPP name.
20546+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
20547+
20548+# Sed expression to map a string onto a valid variable name.
20549+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
20550+
20551+
20552+exec 6>&1
20553+## ----------------------------------- ##
20554+## Main body of $CONFIG_STATUS script. ##
20555+## ----------------------------------- ##
20556+_ASEOF
20557+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
20558+
20559+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20560+# Save the log message, to keep $0 and so on meaningful, and to
20561+# report actual input values of CONFIG_FILES etc. instead of their
20562+# values after options handling.
20563+ac_log="
20564+This file was extended by $as_me, which was
20565+generated by GNU Autoconf 2.69. Invocation command line was
20566+
20567+ CONFIG_FILES = $CONFIG_FILES
20568+ CONFIG_HEADERS = $CONFIG_HEADERS
20569+ CONFIG_LINKS = $CONFIG_LINKS
20570+ CONFIG_COMMANDS = $CONFIG_COMMANDS
20571+ $ $0 $@
20572
20573- case "$ac_given_INSTALL" in
20574- [/$]*) INSTALL="$ac_given_INSTALL" ;;
20575- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
20576+on `(hostname || uname -n) 2>/dev/null | sed 1q`
20577+"
20578+
20579+_ACEOF
20580+
20581+case $ac_config_files in *"
20582+"*) set x $ac_config_files; shift; ac_config_files=$*;;
20583+esac
20584+
20585+case $ac_config_headers in *"
20586+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
20587+esac
20588+
20589+
20590+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20591+# Files that config.status was made for.
20592+config_files="$ac_config_files"
20593+config_headers="$ac_config_headers"
20594+config_commands="$ac_config_commands"
20595+
20596+_ACEOF
20597+
20598+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20599+ac_cs_usage="\
20600+\`$as_me' instantiates files and other configuration actions
20601+from templates according to the current configuration. Unless the files
20602+and actions are specified as TAGs, all are instantiated by default.
20603+
20604+Usage: $0 [OPTION]... [TAG]...
20605+
20606+ -h, --help print this help, then exit
20607+ -V, --version print version number and configuration settings, then exit
20608+ --config print configuration, then exit
20609+ -q, --quiet, --silent
20610+ do not print progress messages
20611+ -d, --debug don't remove temporary files
20612+ --recheck update $as_me by reconfiguring in the same conditions
20613+ --file=FILE[:TEMPLATE]
20614+ instantiate the configuration file FILE
20615+ --header=FILE[:TEMPLATE]
20616+ instantiate the configuration header FILE
20617+
20618+Configuration files:
20619+$config_files
20620+
20621+Configuration headers:
20622+$config_headers
20623+
20624+Configuration commands:
20625+$config_commands
20626+
20627+Report bugs to the package provider."
20628+
20629+_ACEOF
20630+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20631+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
20632+ac_cs_version="\\
20633+config.status
20634+configured by $0, generated by GNU Autoconf 2.69,
20635+ with options \\"\$ac_cs_config\\"
20636+
20637+Copyright (C) 2012 Free Software Foundation, Inc.
20638+This config.status script is free software; the Free Software Foundation
20639+gives unlimited permission to copy, distribute and modify it."
20640+
20641+ac_pwd='$ac_pwd'
20642+srcdir='$srcdir'
20643+INSTALL='$INSTALL'
20644+MKDIR_P='$MKDIR_P'
20645+AWK='$AWK'
20646+test -n "\$AWK" || AWK=awk
20647+_ACEOF
20648+
20649+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20650+# The default lists apply if the user does not specify any file.
20651+ac_need_defaults=:
20652+while test $# != 0
20653+do
20654+ case $1 in
20655+ --*=?*)
20656+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
20657+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
20658+ ac_shift=:
20659+ ;;
20660+ --*=)
20661+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
20662+ ac_optarg=
20663+ ac_shift=:
20664+ ;;
20665+ *)
20666+ ac_option=$1
20667+ ac_optarg=$2
20668+ ac_shift=shift
20669+ ;;
20670 esac
20671
20672- echo creating "$ac_file"
20673- rm -f "$ac_file"
20674- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
20675- case "$ac_file" in
20676- *Makefile*) ac_comsub="1i\\
20677-# $configure_input" ;;
20678- *) ac_comsub= ;;
20679+ case $ac_option in
20680+ # Handling of the options.
20681+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
20682+ ac_cs_recheck=: ;;
20683+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
20684+ $as_echo "$ac_cs_version"; exit ;;
20685+ --config | --confi | --conf | --con | --co | --c )
20686+ $as_echo "$ac_cs_config"; exit ;;
20687+ --debug | --debu | --deb | --de | --d | -d )
20688+ debug=: ;;
20689+ --file | --fil | --fi | --f )
20690+ $ac_shift
20691+ case $ac_optarg in
20692+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
20693+ '') as_fn_error $? "missing file argument" ;;
20694+ esac
20695+ as_fn_append CONFIG_FILES " '$ac_optarg'"
20696+ ac_need_defaults=false;;
20697+ --header | --heade | --head | --hea )
20698+ $ac_shift
20699+ case $ac_optarg in
20700+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
20701+ esac
20702+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
20703+ ac_need_defaults=false;;
20704+ --he | --h)
20705+ # Conflict between --help and --header
20706+ as_fn_error $? "ambiguous option: \`$1'
20707+Try \`$0 --help' for more information.";;
20708+ --help | --hel | -h )
20709+ $as_echo "$ac_cs_usage"; exit ;;
20710+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
20711+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
20712+ ac_cs_silent=: ;;
20713+
20714+ # This is an error.
20715+ -*) as_fn_error $? "unrecognized option: \`$1'
20716+Try \`$0 --help' for more information." ;;
20717+
20718+ *) as_fn_append ac_config_targets " $1"
20719+ ac_need_defaults=false ;;
20720+
20721 esac
20722+ shift
20723+done
20724
20725- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
20726- sed -e "$ac_comsub
20727-s%@configure_input@%$configure_input%g
20728-s%@srcdir@%$srcdir%g
20729-s%@top_srcdir@%$top_srcdir%g
20730-s%@INSTALL@%$INSTALL%g
20731-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
20732-fi; done
20733-rm -f conftest.s*
20734+ac_configure_extra_args=
20735
20736-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
20737-# NAME is the cpp macro being defined and VALUE is the value it is being given.
20738+if $ac_cs_silent; then
20739+ exec 6>/dev/null
20740+ ac_configure_extra_args="$ac_configure_extra_args --silent"
20741+fi
20742+
20743+_ACEOF
20744+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20745+if \$ac_cs_recheck; then
20746+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
20747+ shift
20748+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
20749+ CONFIG_SHELL='$SHELL'
20750+ export CONFIG_SHELL
20751+ exec "\$@"
20752+fi
20753+
20754+_ACEOF
20755+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20756+exec 5>>config.log
20757+{
20758+ echo
20759+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
20760+## Running $as_me. ##
20761+_ASBOX
20762+ $as_echo "$ac_log"
20763+} >&5
20764+
20765+_ACEOF
20766+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20767 #
20768-# ac_d sets the value in "#define NAME VALUE" lines.
20769-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
20770-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
20771-ac_dC='\3'
20772-ac_dD='%g'
20773-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
20774-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
20775-ac_uB='\([ ]\)%\1#\2define\3'
20776-ac_uC=' '
20777-ac_uD='\4%g'
20778-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
20779-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
20780-ac_eB='$%\1#\2define\3'
20781-ac_eC=' '
20782-ac_eD='%g'
20783-
20784-if test "${CONFIG_HEADERS+set}" != set; then
20785-EOF
20786-cat >> $CONFIG_STATUS <<EOF
20787- CONFIG_HEADERS="config.h"
20788-EOF
20789-cat >> $CONFIG_STATUS <<\EOF
20790-fi
20791-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
20792- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
20793- case "$ac_file" in
20794- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
20795- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
20796- *) ac_file_in="${ac_file}.in" ;;
20797- esac
20798+# INIT-COMMANDS
20799+#
20800+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
20801+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
20802+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
20803+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
20804+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
20805+ LINGUAS="${LINGUAS-%UNSET%}"
20806
20807- echo creating $ac_file
20808
20809- rm -f conftest.frag conftest.in conftest.out
20810- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
20811- cat $ac_file_inputs > conftest.in
20812-
20813-EOF
20814-
20815-# Transform confdefs.h into a sed script conftest.vals that substitutes
20816-# the proper values into config.h.in to produce config.h. And first:
20817-# Protect against being on the right side of a sed subst in config.status.
20818-# Protect against being in an unquoted here document in config.status.
20819-rm -f conftest.vals
20820-cat > conftest.hdr <<\EOF
20821-s/[\\&%]/\\&/g
20822-s%[\\$`]%\\&%g
20823-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
20824-s%ac_d%ac_u%gp
20825-s%ac_u%ac_e%gp
20826-EOF
20827-sed -n -f conftest.hdr confdefs.h > conftest.vals
20828-rm -f conftest.hdr
20829-
20830-# This sed command replaces #undef with comments. This is necessary, for
20831-# example, in the case of _POSIX_SOURCE, which is predefined and required
20832-# on some systems where configure will not decide to define it.
20833-cat >> conftest.vals <<\EOF
20834-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
20835-EOF
20836+_ACEOF
20837
20838-# Break up conftest.vals because some shells have a limit on
20839-# the size of here documents, and old seds have small limits too.
20840+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
20841
20842-rm -f conftest.tail
20843-while :
20844+# Handling of arguments.
20845+for ac_config_target in $ac_config_targets
20846 do
20847- ac_lines=`grep -c . conftest.vals`
20848- # grep -c gives empty output for an empty file on some AIX systems.
20849- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
20850- # Write a limited-size here document to conftest.frag.
20851- echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
20852- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
20853- echo 'CEOF
20854- sed -f conftest.frag conftest.in > conftest.out
20855- rm -f conftest.in
20856- mv conftest.out conftest.in
20857-' >> $CONFIG_STATUS
20858- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
20859- rm -f conftest.vals
20860- mv conftest.tail conftest.vals
20861-done
20862-rm -f conftest.vals
20863-
20864-cat >> $CONFIG_STATUS <<\EOF
20865- rm -f conftest.frag conftest.h
20866- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
20867- cat conftest.in >> conftest.h
20868- rm -f conftest.in
20869- if cmp -s $ac_file conftest.h 2>/dev/null; then
20870- echo "$ac_file is unchanged"
20871- rm -f conftest.h
20872+ case $ac_config_target in
20873+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
20874+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
20875+ "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
20876+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
20877+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
20878+ "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
20879+ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
20880+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
20881+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
20882+ "debian/rules") CONFIG_FILES="$CONFIG_FILES debian/rules" ;;
20883+ "Specfile") CONFIG_FILES="$CONFIG_FILES Specfile" ;;
20884+ "systype") CONFIG_FILES="$CONFIG_FILES systype" ;;
20885+ "src/lrzszbug") CONFIG_FILES="$CONFIG_FILES src/lrzszbug" ;;
20886+ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
20887+
20888+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
20889+ esac
20890+done
20891+
20892+
20893+# If the user did not use the arguments to specify the items to instantiate,
20894+# then the envvar interface is used. Set only those that are not.
20895+# We use the long form for the default assignment because of an extremely
20896+# bizarre bug on SunOS 4.1.3.
20897+if $ac_need_defaults; then
20898+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
20899+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
20900+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
20901+fi
20902+
20903+# Have a temporary directory for convenience. Make it in the build tree
20904+# simply because there is no reason against having it here, and in addition,
20905+# creating and moving files from /tmp can sometimes cause problems.
20906+# Hook for its removal unless debugging.
20907+# Note that there is a small window in which the directory will not be cleaned:
20908+# after its creation but before its name has been assigned to `$tmp'.
20909+$debug ||
20910+{
20911+ tmp= ac_tmp=
20912+ trap 'exit_status=$?
20913+ : "${ac_tmp:=$tmp}"
20914+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
20915+' 0
20916+ trap 'as_fn_exit 1' 1 2 13 15
20917+}
20918+# Create a (secure) tmp directory for tmp files.
20919+
20920+{
20921+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
20922+ test -d "$tmp"
20923+} ||
20924+{
20925+ tmp=./conf$$-$RANDOM
20926+ (umask 077 && mkdir "$tmp")
20927+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
20928+ac_tmp=$tmp
20929+
20930+# Set up the scripts for CONFIG_FILES section.
20931+# No need to generate them if there are no CONFIG_FILES.
20932+# This happens for instance with `./config.status config.h'.
20933+if test -n "$CONFIG_FILES"; then
20934+
20935+
20936+ac_cr=`echo X | tr X '\015'`
20937+# On cygwin, bash can eat \r inside `` if the user requested igncr.
20938+# But we know of no other shell where ac_cr would be empty at this
20939+# point, so we can use a bashism as a fallback.
20940+if test "x$ac_cr" = x; then
20941+ eval ac_cr=\$\'\\r\'
20942+fi
20943+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
20944+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
20945+ ac_cs_awk_cr='\\r'
20946+else
20947+ ac_cs_awk_cr=$ac_cr
20948+fi
20949+
20950+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
20951+_ACEOF
20952+
20953+
20954+{
20955+ echo "cat >conf$$subs.awk <<_ACEOF" &&
20956+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
20957+ echo "_ACEOF"
20958+} >conf$$subs.sh ||
20959+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
20960+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
20961+ac_delim='%!_!# '
20962+for ac_last_try in false false false false false :; do
20963+ . ./conf$$subs.sh ||
20964+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
20965+
20966+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
20967+ if test $ac_delim_n = $ac_delim_num; then
20968+ break
20969+ elif $ac_last_try; then
20970+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
20971 else
20972- # Remove last slash and all that follows it. Not all systems have dirname.
20973- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
20974- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
20975- # The file is in a subdirectory.
20976- test ! -d "$ac_dir" && mkdir "$ac_dir"
20977- fi
20978- rm -f $ac_file
20979- mv conftest.h $ac_file
20980+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
20981 fi
20982-fi; done
20983+done
20984+rm -f conf$$subs.sh
20985
20986-EOF
20987+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
20988+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
20989+_ACEOF
20990+sed -n '
20991+h
20992+s/^/S["/; s/!.*/"]=/
20993+p
20994+g
20995+s/^[^!]*!//
20996+:repl
20997+t repl
20998+s/'"$ac_delim"'$//
20999+t delim
21000+:nl
21001+h
21002+s/\(.\{148\}\)..*/\1/
21003+t more1
21004+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
21005+p
21006+n
21007+b repl
21008+:more1
21009+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
21010+p
21011+g
21012+s/.\{148\}//
21013+t nl
21014+:delim
21015+h
21016+s/\(.\{148\}\)..*/\1/
21017+t more2
21018+s/["\\]/\\&/g; s/^/"/; s/$/"/
21019+p
21020+b
21021+:more2
21022+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
21023+p
21024+g
21025+s/.\{148\}//
21026+t delim
21027+' <conf$$subs.awk | sed '
21028+/^[^""]/{
21029+ N
21030+ s/\n//
21031+}
21032+' >>$CONFIG_STATUS || ac_write_fail=1
21033+rm -f conf$$subs.awk
21034+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21035+_ACAWK
21036+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
21037+ for (key in S) S_is_set[key] = 1
21038+ FS = ""
21039
21040-cat >> $CONFIG_STATUS <<EOF
21041-ac_sources="$nls_cv_header_libgt"
21042-ac_dests="$nls_cv_header_intl"
21043-EOF
21044-
21045-cat >> $CONFIG_STATUS <<\EOF
21046-srcdir=$ac_given_srcdir
21047-while test -n "$ac_sources"; do
21048- set $ac_dests; ac_dest=$1; shift; ac_dests=$*
21049- set $ac_sources; ac_source=$1; shift; ac_sources=$*
21050-
21051- echo "linking $srcdir/$ac_source to $ac_dest"
21052-
21053- if test ! -r $srcdir/$ac_source; then
21054- { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
21055- fi
21056- rm -f $ac_dest
21057-
21058- # Make relative symlinks.
21059- # Remove last slash and all that follows it. Not all systems have dirname.
21060- ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
21061- if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
21062- # The dest file is in a subdirectory.
21063- test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
21064- ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
21065- # A "../" for each directory in $ac_dest_dir_suffix.
21066- ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
21067+}
21068+{
21069+ line = $ 0
21070+ nfields = split(line, field, "@")
21071+ substed = 0
21072+ len = length(field[1])
21073+ for (i = 2; i < nfields; i++) {
21074+ key = field[i]
21075+ keylen = length(key)
21076+ if (S_is_set[key]) {
21077+ value = S[key]
21078+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
21079+ len += length(value) + length(field[++i])
21080+ substed = 1
21081+ } else
21082+ len += 1 + keylen
21083+ }
21084+
21085+ print line
21086+}
21087+
21088+_ACAWK
21089+_ACEOF
21090+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21091+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
21092+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
21093+else
21094+ cat
21095+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
21096+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
21097+_ACEOF
21098+
21099+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
21100+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
21101+# trailing colons and then remove the whole line if VPATH becomes empty
21102+# (actually we leave an empty line to preserve line numbers).
21103+if test "x$srcdir" = x.; then
21104+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
21105+h
21106+s///
21107+s/^/:/
21108+s/[ ]*$/:/
21109+s/:\$(srcdir):/:/g
21110+s/:\${srcdir}:/:/g
21111+s/:@srcdir@:/:/g
21112+s/^:*//
21113+s/:*$//
21114+x
21115+s/\(=[ ]*\).*/\1/
21116+G
21117+s/\n//
21118+s/^[^=]*=[ ]*$//
21119+}'
21120+fi
21121+
21122+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21123+fi # test -n "$CONFIG_FILES"
21124+
21125+# Set up the scripts for CONFIG_HEADERS section.
21126+# No need to generate them if there are no CONFIG_HEADERS.
21127+# This happens for instance with `./config.status Makefile'.
21128+if test -n "$CONFIG_HEADERS"; then
21129+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
21130+BEGIN {
21131+_ACEOF
21132+
21133+# Transform confdefs.h into an awk script `defines.awk', embedded as
21134+# here-document in config.status, that substitutes the proper values into
21135+# config.h.in to produce config.h.
21136+
21137+# Create a delimiter string that does not exist in confdefs.h, to ease
21138+# handling of long lines.
21139+ac_delim='%!_!# '
21140+for ac_last_try in false false :; do
21141+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
21142+ if test -z "$ac_tt"; then
21143+ break
21144+ elif $ac_last_try; then
21145+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
21146 else
21147- ac_dest_dir_suffix= ac_dots=
21148+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
21149 fi
21150+done
21151+
21152+# For the awk script, D is an array of macro values keyed by name,
21153+# likewise P contains macro parameters if any. Preserve backslash
21154+# newline sequences.
21155+
21156+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
21157+sed -n '
21158+s/.\{148\}/&'"$ac_delim"'/g
21159+t rset
21160+:rset
21161+s/^[ ]*#[ ]*define[ ][ ]*/ /
21162+t def
21163+d
21164+:def
21165+s/\\$//
21166+t bsnl
21167+s/["\\]/\\&/g
21168+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
21169+D["\1"]=" \3"/p
21170+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
21171+d
21172+:bsnl
21173+s/["\\]/\\&/g
21174+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
21175+D["\1"]=" \3\\\\\\n"\\/p
21176+t cont
21177+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
21178+t cont
21179+d
21180+:cont
21181+n
21182+s/.\{148\}/&'"$ac_delim"'/g
21183+t clear
21184+:clear
21185+s/\\$//
21186+t bsnlc
21187+s/["\\]/\\&/g; s/^/"/; s/$/"/p
21188+d
21189+:bsnlc
21190+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
21191+b cont
21192+' <confdefs.h | sed '
21193+s/'"$ac_delim"'/"\\\
21194+"/g' >>$CONFIG_STATUS || ac_write_fail=1
21195+
21196+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21197+ for (key in D) D_is_set[key] = 1
21198+ FS = ""
21199+}
21200+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
21201+ line = \$ 0
21202+ split(line, arg, " ")
21203+ if (arg[1] == "#") {
21204+ defundef = arg[2]
21205+ mac1 = arg[3]
21206+ } else {
21207+ defundef = substr(arg[1], 2)
21208+ mac1 = arg[2]
21209+ }
21210+ split(mac1, mac2, "(") #)
21211+ macro = mac2[1]
21212+ prefix = substr(line, 1, index(line, defundef) - 1)
21213+ if (D_is_set[macro]) {
21214+ # Preserve the white space surrounding the "#".
21215+ print prefix "define", macro P[macro] D[macro]
21216+ next
21217+ } else {
21218+ # Replace #undef with comments. This is necessary, for example,
21219+ # in the case of _POSIX_SOURCE, which is predefined and required
21220+ # on some systems where configure will not decide to define it.
21221+ if (defundef == "undef") {
21222+ print "/*", prefix defundef, macro, "*/"
21223+ next
21224+ }
21225+ }
21226+}
21227+{ print }
21228+_ACAWK
21229+_ACEOF
21230+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21231+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
21232+fi # test -n "$CONFIG_HEADERS"
21233+
21234+
21235+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
21236+shift
21237+for ac_tag
21238+do
21239+ case $ac_tag in
21240+ :[FHLC]) ac_mode=$ac_tag; continue;;
21241+ esac
21242+ case $ac_mode$ac_tag in
21243+ :[FHL]*:*);;
21244+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
21245+ :[FH]-) ac_tag=-:-;;
21246+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
21247+ esac
21248+ ac_save_IFS=$IFS
21249+ IFS=:
21250+ set x $ac_tag
21251+ IFS=$ac_save_IFS
21252+ shift
21253+ ac_file=$1
21254+ shift
21255+
21256+ case $ac_mode in
21257+ :L) ac_source=$1;;
21258+ :[FH])
21259+ ac_file_inputs=
21260+ for ac_f
21261+ do
21262+ case $ac_f in
21263+ -) ac_f="$ac_tmp/stdin";;
21264+ *) # Look for the file first in the build tree, then in the source tree
21265+ # (if the path is not absolute). The absolute path cannot be DOS-style,
21266+ # because $ac_f cannot contain `:'.
21267+ test -f "$ac_f" ||
21268+ case $ac_f in
21269+ [\\/$]*) false;;
21270+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
21271+ esac ||
21272+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
21273+ esac
21274+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
21275+ as_fn_append ac_file_inputs " '$ac_f'"
21276+ done
21277+
21278+ # Let's still pretend it is `configure' which instantiates (i.e., don't
21279+ # use $as_me), people would be surprised to read:
21280+ # /* config.h. Generated by config.status. */
21281+ configure_input='Generated from '`
21282+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
21283+ `' by configure.'
21284+ if test x"$ac_file" != x-; then
21285+ configure_input="$ac_file. $configure_input"
21286+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
21287+$as_echo "$as_me: creating $ac_file" >&6;}
21288+ fi
21289+ # Neutralize special characters interpreted by sed in replacement strings.
21290+ case $configure_input in #(
21291+ *\&* | *\|* | *\\* )
21292+ ac_sed_conf_input=`$as_echo "$configure_input" |
21293+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
21294+ *) ac_sed_conf_input=$configure_input;;
21295+ esac
21296+
21297+ case $ac_tag in
21298+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
21299+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
21300+ esac
21301+ ;;
21302+ esac
21303+
21304+ ac_dir=`$as_dirname -- "$ac_file" ||
21305+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
21306+ X"$ac_file" : 'X\(//\)[^/]' \| \
21307+ X"$ac_file" : 'X\(//\)$' \| \
21308+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
21309+$as_echo X"$ac_file" |
21310+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
21311+ s//\1/
21312+ q
21313+ }
21314+ /^X\(\/\/\)[^/].*/{
21315+ s//\1/
21316+ q
21317+ }
21318+ /^X\(\/\/\)$/{
21319+ s//\1/
21320+ q
21321+ }
21322+ /^X\(\/\).*/{
21323+ s//\1/
21324+ q
21325+ }
21326+ s/.*/./; q'`
21327+ as_dir="$ac_dir"; as_fn_mkdir_p
21328+ ac_builddir=.
21329+
21330+case "$ac_dir" in
21331+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
21332+*)
21333+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
21334+ # A ".." for each directory in $ac_dir_suffix.
21335+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
21336+ case $ac_top_builddir_sub in
21337+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
21338+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
21339+ esac ;;
21340+esac
21341+ac_abs_top_builddir=$ac_pwd
21342+ac_abs_builddir=$ac_pwd$ac_dir_suffix
21343+# for backward compatibility:
21344+ac_top_builddir=$ac_top_build_prefix
21345+
21346+case $srcdir in
21347+ .) # We are building in place.
21348+ ac_srcdir=.
21349+ ac_top_srcdir=$ac_top_builddir_sub
21350+ ac_abs_top_srcdir=$ac_pwd ;;
21351+ [\\/]* | ?:[\\/]* ) # Absolute name.
21352+ ac_srcdir=$srcdir$ac_dir_suffix;
21353+ ac_top_srcdir=$srcdir
21354+ ac_abs_top_srcdir=$srcdir ;;
21355+ *) # Relative name.
21356+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
21357+ ac_top_srcdir=$ac_top_build_prefix$srcdir
21358+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
21359+esac
21360+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
21361
21362- case "$srcdir" in
21363- [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
21364- *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
21365+
21366+ case $ac_mode in
21367+ :F)
21368+ #
21369+ # CONFIG_FILE
21370+ #
21371+
21372+ case $INSTALL in
21373+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
21374+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
21375+ esac
21376+ ac_MKDIR_P=$MKDIR_P
21377+ case $MKDIR_P in
21378+ [\\/$]* | ?:[\\/]* ) ;;
21379+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
21380 esac
21381+_ACEOF
21382
21383- # Make a symlink if possible; otherwise try a hard link.
21384- if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
21385- ln $srcdir/$ac_source $ac_dest; then :
21386+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21387+# If the template does not know about datarootdir, expand it.
21388+# FIXME: This hack should be removed a few years after 2.60.
21389+ac_datarootdir_hack=; ac_datarootdir_seen=
21390+ac_sed_dataroot='
21391+/datarootdir/ {
21392+ p
21393+ q
21394+}
21395+/@datadir@/p
21396+/@docdir@/p
21397+/@infodir@/p
21398+/@localedir@/p
21399+/@mandir@/p'
21400+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
21401+*datarootdir*) ac_datarootdir_seen=yes;;
21402+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
21403+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
21404+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
21405+_ACEOF
21406+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21407+ ac_datarootdir_hack='
21408+ s&@datadir@&$datadir&g
21409+ s&@docdir@&$docdir&g
21410+ s&@infodir@&$infodir&g
21411+ s&@localedir@&$localedir&g
21412+ s&@mandir@&$mandir&g
21413+ s&\\\${datarootdir}&$datarootdir&g' ;;
21414+esac
21415+_ACEOF
21416+
21417+# Neutralize VPATH when `$srcdir' = `.'.
21418+# Shell code in configure.ac might set extrasub.
21419+# FIXME: do we really want to maintain this feature?
21420+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
21421+ac_sed_extra="$ac_vpsub
21422+$extrasub
21423+_ACEOF
21424+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
21425+:t
21426+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
21427+s|@configure_input@|$ac_sed_conf_input|;t t
21428+s&@top_builddir@&$ac_top_builddir_sub&;t t
21429+s&@top_build_prefix@&$ac_top_build_prefix&;t t
21430+s&@srcdir@&$ac_srcdir&;t t
21431+s&@abs_srcdir@&$ac_abs_srcdir&;t t
21432+s&@top_srcdir@&$ac_top_srcdir&;t t
21433+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
21434+s&@builddir@&$ac_builddir&;t t
21435+s&@abs_builddir@&$ac_abs_builddir&;t t
21436+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
21437+s&@INSTALL@&$ac_INSTALL&;t t
21438+s&@MKDIR_P@&$ac_MKDIR_P&;t t
21439+$ac_datarootdir_hack
21440+"
21441+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
21442+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
21443+
21444+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
21445+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
21446+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
21447+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
21448+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21449+which seems to be undefined. Please make sure it is defined" >&5
21450+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
21451+which seems to be undefined. Please make sure it is defined" >&2;}
21452+
21453+ rm -f "$ac_tmp/stdin"
21454+ case $ac_file in
21455+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
21456+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
21457+ esac \
21458+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
21459+ ;;
21460+ :H)
21461+ #
21462+ # CONFIG_HEADER
21463+ #
21464+ if test x"$ac_file" != x-; then
21465+ {
21466+ $as_echo "/* $configure_input */" \
21467+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
21468+ } >"$ac_tmp/config.h" \
21469+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
21470+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
21471+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
21472+$as_echo "$as_me: $ac_file is unchanged" >&6;}
21473+ else
21474+ rm -f "$ac_file"
21475+ mv "$ac_tmp/config.h" "$ac_file" \
21476+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
21477+ fi
21478 else
21479- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
21480+ $as_echo "/* $configure_input */" \
21481+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
21482+ || as_fn_error $? "could not create -" "$LINENO" 5
21483 fi
21484+# Compute "$ac_file"'s index in $config_headers.
21485+_am_arg="$ac_file"
21486+_am_stamp_count=1
21487+for _am_header in $config_headers :; do
21488+ case $_am_header in
21489+ $_am_arg | $_am_arg:* )
21490+ break ;;
21491+ * )
21492+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
21493+ esac
21494 done
21495-EOF
21496-cat >> $CONFIG_STATUS <<EOF
21497+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
21498+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
21499+ X"$_am_arg" : 'X\(//\)[^/]' \| \
21500+ X"$_am_arg" : 'X\(//\)$' \| \
21501+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
21502+$as_echo X"$_am_arg" |
21503+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
21504+ s//\1/
21505+ q
21506+ }
21507+ /^X\(\/\/\)[^/].*/{
21508+ s//\1/
21509+ q
21510+ }
21511+ /^X\(\/\/\)$/{
21512+ s//\1/
21513+ q
21514+ }
21515+ /^X\(\/\).*/{
21516+ s//\1/
21517+ q
21518+ }
21519+ s/.*/./; q'`/stamp-h$_am_stamp_count
21520+ ;;
21521
21522+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
21523+$as_echo "$as_me: executing $ac_file commands" >&6;}
21524+ ;;
21525+ esac
21526
21527-EOF
21528-cat >> $CONFIG_STATUS <<\EOF
21529-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
21530-sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile;
21531+
21532+ case $ac_file$ac_mode in
21533+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
21534+ # Older Autoconf quotes --file arguments for eval, but not when files
21535+ # are listed without --file. Let's play safe and only enable the eval
21536+ # if we detect the quoting.
21537+ # TODO: see whether this extra hack can be removed once we start
21538+ # requiring Autoconf 2.70 or later.
21539+ case $CONFIG_FILES in #(
21540+ *\'*) :
21541+ eval set x "$CONFIG_FILES" ;; #(
21542+ *) :
21543+ set x $CONFIG_FILES ;; #(
21544+ *) :
21545+ ;;
21546+esac
21547+ shift
21548+ # Used to flag and report bootstrapping failures.
21549+ am_rc=0
21550+ for am_mf
21551+ do
21552+ # Strip MF so we end up with the name of the file.
21553+ am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
21554+ # Check whether this is an Automake generated Makefile which includes
21555+ # dependency-tracking related rules and includes.
21556+ # Grep'ing the whole file directly is not great: AIX grep has a line
21557+ # limit of 2048, but all sed's we know have understand at least 4000.
21558+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
21559+ || continue
21560+ am_dirpart=`$as_dirname -- "$am_mf" ||
21561+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
21562+ X"$am_mf" : 'X\(//\)[^/]' \| \
21563+ X"$am_mf" : 'X\(//\)$' \| \
21564+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
21565+$as_echo X"$am_mf" |
21566+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
21567+ s//\1/
21568+ q
21569+ }
21570+ /^X\(\/\/\)[^/].*/{
21571+ s//\1/
21572+ q
21573+ }
21574+ /^X\(\/\/\)$/{
21575+ s//\1/
21576+ q
21577+ }
21578+ /^X\(\/\).*/{
21579+ s//\1/
21580+ q
21581+ }
21582+ s/.*/./; q'`
21583+ am_filepart=`$as_basename -- "$am_mf" ||
21584+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
21585+ X"$am_mf" : 'X\(//\)$' \| \
21586+ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
21587+$as_echo X/"$am_mf" |
21588+ sed '/^.*\/\([^/][^/]*\)\/*$/{
21589+ s//\1/
21590+ q
21591+ }
21592+ /^X\/\(\/\/\)$/{
21593+ s//\1/
21594+ q
21595+ }
21596+ /^X\/\(\/\).*/{
21597+ s//\1/
21598+ q
21599+ }
21600+ s/.*/./; q'`
21601+ { echo "$as_me:$LINENO: cd "$am_dirpart" \
21602+ && sed -e '/# am--include-marker/d' "$am_filepart" \
21603+ | $MAKE -f - am--depfiles" >&5
21604+ (cd "$am_dirpart" \
21605+ && sed -e '/# am--include-marker/d' "$am_filepart" \
21606+ | $MAKE -f - am--depfiles) >&5 2>&5
21607+ ac_status=$?
21608+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
21609+ (exit $ac_status); } || am_rc=$?
21610+ done
21611+ if test $am_rc -ne 0; then
21612+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21613+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
21614+as_fn_error $? "Something went wrong bootstrapping makefile fragments
21615+ for automatic dependency tracking. Try re-running configure with the
21616+ '--disable-dependency-tracking' option to at least be able to build
21617+ the package (albeit without support for automatic dependency tracking).
21618+See \`config.log' for more details" "$LINENO" 5; }
21619+ fi
21620+ { am_dirpart=; unset am_dirpart;}
21621+ { am_filepart=; unset am_filepart;}
21622+ { am_mf=; unset am_mf;}
21623+ { am_rc=; unset am_rc;}
21624+ rm -f conftest-deps.mk
21625+}
21626+ ;;
21627+ "po-directories":C)
21628+ for ac_file in $CONFIG_FILES; do
21629+ # Support "outfile[:infile[:infile...]]"
21630+ case "$ac_file" in
21631+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
21632+ esac
21633+ # PO directories have a Makefile.in generated from Makefile.in.in.
21634+ case "$ac_file" in */Makefile.in)
21635+ # Adjust a relative srcdir.
21636+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
21637+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
21638+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
21639+ # In autoconf-2.13 it is called $ac_given_srcdir.
21640+ # In autoconf-2.50 it is called $srcdir.
21641+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
21642+ case "$ac_given_srcdir" in
21643+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
21644+ /*) top_srcdir="$ac_given_srcdir" ;;
21645+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
21646+ esac
21647+ # Treat a directory as a PO directory if and only if it has a
21648+ # POTFILES.in file. This allows packages to have multiple PO
21649+ # directories under different names or in different locations.
21650+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
21651+ rm -f "$ac_dir/POTFILES"
21652+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
21653+ gt_tab=`printf '\t'`
21654+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
21655+ POMAKEFILEDEPS="POTFILES.in"
21656+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
21657+ # on $ac_dir but don't depend on user-specified configuration
21658+ # parameters.
21659+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
21660+ # The LINGUAS file contains the set of available languages.
21661+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
21662+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
21663+ fi
21664+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
21665+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
21666+ else
21667+ # The set of available languages was given in configure.in.
21668+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
21669+ fi
21670+ # Compute POFILES
21671+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
21672+ # Compute UPDATEPOFILES
21673+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
21674+ # Compute DUMMYPOFILES
21675+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
21676+ # Compute GMOFILES
21677+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
21678+ case "$ac_given_srcdir" in
21679+ .) srcdirpre= ;;
21680+ *) srcdirpre='$(srcdir)/' ;;
21681+ esac
21682+ POFILES=
21683+ UPDATEPOFILES=
21684+ DUMMYPOFILES=
21685+ GMOFILES=
21686+ for lang in $ALL_LINGUAS; do
21687+ POFILES="$POFILES $srcdirpre$lang.po"
21688+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
21689+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
21690+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
21691+ done
21692+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
21693+ # environment variable.
21694+ INST_LINGUAS=
21695+ if test -n "$ALL_LINGUAS"; then
21696+ for presentlang in $ALL_LINGUAS; do
21697+ useit=no
21698+ if test "%UNSET%" != "$LINGUAS"; then
21699+ desiredlanguages="$LINGUAS"
21700+ else
21701+ desiredlanguages="$ALL_LINGUAS"
21702+ fi
21703+ for desiredlang in $desiredlanguages; do
21704+ # Use the presentlang catalog if desiredlang is
21705+ # a. equal to presentlang, or
21706+ # b. a variant of presentlang (because in this case,
21707+ # presentlang can be used as a fallback for messages
21708+ # which are not translated in the desiredlang catalog).
21709+ case "$desiredlang" in
21710+ "$presentlang"*) useit=yes;;
21711+ esac
21712+ done
21713+ if test $useit = yes; then
21714+ INST_LINGUAS="$INST_LINGUAS $presentlang"
21715+ fi
21716+ done
21717+ fi
21718+ CATALOGS=
21719+ if test -n "$INST_LINGUAS"; then
21720+ for lang in $INST_LINGUAS; do
21721+ CATALOGS="$CATALOGS $lang.gmo"
21722+ done
21723+ fi
21724+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
21725+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
21726+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
21727+ if test -f "$f"; then
21728+ case "$f" in
21729+ *.orig | *.bak | *~) ;;
21730+ *) cat "$f" >> "$ac_dir/Makefile" ;;
21731+ esac
21732+ fi
21733+ done
21734+ fi
21735+ ;;
21736+ esac
21737+ done ;;
21738+ "default":C)
21739 chmod +x debian/rules;
21740-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
21741-exit 0
21742-EOF
21743-chmod +x $CONFIG_STATUS
21744-rm -fr confdefs* $ac_clean_files
21745-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
21746+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
21747+
21748+ esac
21749+done # for ac_tag
21750+
21751+
21752+as_fn_exit 0
21753+_ACEOF
21754+ac_clean_files=$ac_clean_files_save
21755+
21756+test $ac_write_fail = 0 ||
21757+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
21758+
21759+
21760+# configure is writing to config.log, and then calls config.status.
21761+# config.status does its own redirection, appending to config.log.
21762+# Unfortunately, on DOS this fails, as config.log is still kept open
21763+# by configure, so config.status won't be able to write to it; its
21764+# output is simply discarded. So we exec the FD to /dev/null,
21765+# effectively closing config.log, so it can be properly (re)opened and
21766+# appended to by config.status. When coming back to configure, we
21767+# need to make the FD available again.
21768+if test "$no_create" != yes; then
21769+ ac_cs_success=:
21770+ ac_config_status_args=
21771+ test "$silent" = yes &&
21772+ ac_config_status_args="$ac_config_status_args --quiet"
21773+ exec 5>/dev/null
21774+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
21775+ exec 5>>config.log
21776+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
21777+ # would make configure fail if this is the last instruction.
21778+ $ac_cs_success || as_fn_exit 1
21779+fi
21780+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
21781+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
21782+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
21783+fi
21784
21785diff -uprN clean/lrzsz-0.12.20/configure.in lrzsz-0.12.20/configure.in
21786--- clean/lrzsz-0.12.20/configure.in 1998-12-30 07:50:07.000000000 +0000
21787+++ lrzsz-0.12.20/configure.in 2019-11-25 16:22:37.000000000 +0000
21788@@ -92,7 +92,6 @@ AC_PROG_RANLIB
21789 AC_ISC_POSIX
21790 AC_AIX
21791 AC_MINIX
21792-AM_C_PROTOTYPES
21793 AC_C_CONST
21794 AC_C_INLINE
21795
21796@@ -253,18 +252,13 @@ ihave$lookup_facility
21797 fi
21798
21799
21800-AC_SUBST(CFLAGS)
21801-AC_SUBST(LDFLAGS)
21802 AC_SUBST(LIBS)
21803
21804-AM_GNU_GETTEXT
21805+AM_GNU_GETTEXT([external])
21806
21807-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
21808-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
21809-
21810-AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
21811+AC_OUTPUT([Makefile lib/Makefile testsuite/Makefile \
21812 man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
21813 src/lrzszbug],
21814-[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile;
21815+[
21816 chmod +x debian/rules;
21817 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
21818diff -uprN clean/lrzsz-0.12.20/depcomp lrzsz-0.12.20/depcomp
21819--- clean/lrzsz-0.12.20/depcomp 1970-01-01 01:00:00.000000000 +0100
21820+++ lrzsz-0.12.20/depcomp 2019-09-30 10:52:39.000000000 +0100
21821@@ -0,0 +1,791 @@
21822+#! /bin/sh
21823+# depcomp - compile a program generating dependencies as side-effects
21824+
21825+scriptversion=2016-01-11.22; # UTC
21826+
21827+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
21828+
21829+# This program is free software; you can redistribute it and/or modify
21830+# it under the terms of the GNU General Public License as published by
21831+# the Free Software Foundation; either version 2, or (at your option)
21832+# any later version.
21833+
21834+# This program is distributed in the hope that it will be useful,
21835+# but WITHOUT ANY WARRANTY; without even the implied warranty of
21836+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21837+# GNU General Public License for more details.
21838+
21839+# You should have received a copy of the GNU General Public License
21840+# along with this program. If not, see <http://www.gnu.org/licenses/>.
21841+
21842+# As a special exception to the GNU General Public License, if you
21843+# distribute this file as part of a program that contains a
21844+# configuration script generated by Autoconf, you may include it under
21845+# the same distribution terms that you use for the rest of that program.
21846+
21847+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
21848+
21849+case $1 in
21850+ '')
21851+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
21852+ exit 1;
21853+ ;;
21854+ -h | --h*)
21855+ cat <<\EOF
21856+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
21857+
21858+Run PROGRAMS ARGS to compile a file, generating dependencies
21859+as side-effects.
21860+
21861+Environment variables:
21862+ depmode Dependency tracking mode.
21863+ source Source file read by 'PROGRAMS ARGS'.
21864+ object Object file output by 'PROGRAMS ARGS'.
21865+ DEPDIR directory where to store dependencies.
21866+ depfile Dependency file to output.
21867+ tmpdepfile Temporary file to use when outputting dependencies.
21868+ libtool Whether libtool is used (yes/no).
21869+
21870+Report bugs to <bug-automake@gnu.org>.
21871+EOF
21872+ exit $?
21873+ ;;
21874+ -v | --v*)
21875+ echo "depcomp $scriptversion"
21876+ exit $?
21877+ ;;
21878+esac
21879+
21880+# Get the directory component of the given path, and save it in the
21881+# global variables '$dir'. Note that this directory component will
21882+# be either empty or ending with a '/' character. This is deliberate.
21883+set_dir_from ()
21884+{
21885+ case $1 in
21886+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
21887+ *) dir=;;
21888+ esac
21889+}
21890+
21891+# Get the suffix-stripped basename of the given path, and save it the
21892+# global variable '$base'.
21893+set_base_from ()
21894+{
21895+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
21896+}
21897+
21898+# If no dependency file was actually created by the compiler invocation,
21899+# we still have to create a dummy depfile, to avoid errors with the
21900+# Makefile "include basename.Plo" scheme.
21901+make_dummy_depfile ()
21902+{
21903+ echo "#dummy" > "$depfile"
21904+}
21905+
21906+# Factor out some common post-processing of the generated depfile.
21907+# Requires the auxiliary global variable '$tmpdepfile' to be set.
21908+aix_post_process_depfile ()
21909+{
21910+ # If the compiler actually managed to produce a dependency file,
21911+ # post-process it.
21912+ if test -f "$tmpdepfile"; then
21913+ # Each line is of the form 'foo.o: dependency.h'.
21914+ # Do two passes, one to just change these to
21915+ # $object: dependency.h
21916+ # and one to simply output
21917+ # dependency.h:
21918+ # which is needed to avoid the deleted-header problem.
21919+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
21920+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
21921+ } > "$depfile"
21922+ rm -f "$tmpdepfile"
21923+ else
21924+ make_dummy_depfile
21925+ fi
21926+}
21927+
21928+# A tabulation character.
21929+tab=' '
21930+# A newline character.
21931+nl='
21932+'
21933+# Character ranges might be problematic outside the C locale.
21934+# These definitions help.
21935+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
21936+lower=abcdefghijklmnopqrstuvwxyz
21937+digits=0123456789
21938+alpha=${upper}${lower}
21939+
21940+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
21941+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
21942+ exit 1
21943+fi
21944+
21945+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
21946+depfile=${depfile-`echo "$object" |
21947+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
21948+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
21949+
21950+rm -f "$tmpdepfile"
21951+
21952+# Avoid interferences from the environment.
21953+gccflag= dashmflag=
21954+
21955+# Some modes work just like other modes, but use different flags. We
21956+# parameterize here, but still list the modes in the big case below,
21957+# to make depend.m4 easier to write. Note that we *cannot* use a case
21958+# here, because this file can only contain one case statement.
21959+if test "$depmode" = hp; then
21960+ # HP compiler uses -M and no extra arg.
21961+ gccflag=-M
21962+ depmode=gcc
21963+fi
21964+
21965+if test "$depmode" = dashXmstdout; then
21966+ # This is just like dashmstdout with a different argument.
21967+ dashmflag=-xM
21968+ depmode=dashmstdout
21969+fi
21970+
21971+cygpath_u="cygpath -u -f -"
21972+if test "$depmode" = msvcmsys; then
21973+ # This is just like msvisualcpp but w/o cygpath translation.
21974+ # Just convert the backslash-escaped backslashes to single forward
21975+ # slashes to satisfy depend.m4
21976+ cygpath_u='sed s,\\\\,/,g'
21977+ depmode=msvisualcpp
21978+fi
21979+
21980+if test "$depmode" = msvc7msys; then
21981+ # This is just like msvc7 but w/o cygpath translation.
21982+ # Just convert the backslash-escaped backslashes to single forward
21983+ # slashes to satisfy depend.m4
21984+ cygpath_u='sed s,\\\\,/,g'
21985+ depmode=msvc7
21986+fi
21987+
21988+if test "$depmode" = xlc; then
21989+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
21990+ gccflag=-qmakedep=gcc,-MF
21991+ depmode=gcc
21992+fi
21993+
21994+case "$depmode" in
21995+gcc3)
21996+## gcc 3 implements dependency tracking that does exactly what
21997+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
21998+## it if -MD -MP comes after the -MF stuff. Hmm.
21999+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
22000+## the command line argument order; so add the flags where they
22001+## appear in depend2.am. Note that the slowdown incurred here
22002+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
22003+ for arg
22004+ do
22005+ case $arg in
22006+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
22007+ *) set fnord "$@" "$arg" ;;
22008+ esac
22009+ shift # fnord
22010+ shift # $arg
22011+ done
22012+ "$@"
22013+ stat=$?
22014+ if test $stat -ne 0; then
22015+ rm -f "$tmpdepfile"
22016+ exit $stat
22017+ fi
22018+ mv "$tmpdepfile" "$depfile"
22019+ ;;
22020+
22021+gcc)
22022+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
22023+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
22024+## (see the conditional assignment to $gccflag above).
22025+## There are various ways to get dependency output from gcc. Here's
22026+## why we pick this rather obscure method:
22027+## - Don't want to use -MD because we'd like the dependencies to end
22028+## up in a subdir. Having to rename by hand is ugly.
22029+## (We might end up doing this anyway to support other compilers.)
22030+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
22031+## -MM, not -M (despite what the docs say). Also, it might not be
22032+## supported by the other compilers which use the 'gcc' depmode.
22033+## - Using -M directly means running the compiler twice (even worse
22034+## than renaming).
22035+ if test -z "$gccflag"; then
22036+ gccflag=-MD,
22037+ fi
22038+ "$@" -Wp,"$gccflag$tmpdepfile"
22039+ stat=$?
22040+ if test $stat -ne 0; then
22041+ rm -f "$tmpdepfile"
22042+ exit $stat
22043+ fi
22044+ rm -f "$depfile"
22045+ echo "$object : \\" > "$depfile"
22046+ # The second -e expression handles DOS-style file names with drive
22047+ # letters.
22048+ sed -e 's/^[^:]*: / /' \
22049+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
22050+## This next piece of magic avoids the "deleted header file" problem.
22051+## The problem is that when a header file which appears in a .P file
22052+## is deleted, the dependency causes make to die (because there is
22053+## typically no way to rebuild the header). We avoid this by adding
22054+## dummy dependencies for each header file. Too bad gcc doesn't do
22055+## this for us directly.
22056+## Some versions of gcc put a space before the ':'. On the theory
22057+## that the space means something, we add a space to the output as
22058+## well. hp depmode also adds that space, but also prefixes the VPATH
22059+## to the object. Take care to not repeat it in the output.
22060+## Some versions of the HPUX 10.20 sed can't process this invocation
22061+## correctly. Breaking it into two sed invocations is a workaround.
22062+ tr ' ' "$nl" < "$tmpdepfile" \
22063+ | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
22064+ | sed -e 's/$/ :/' >> "$depfile"
22065+ rm -f "$tmpdepfile"
22066+ ;;
22067+
22068+hp)
22069+ # This case exists only to let depend.m4 do its work. It works by
22070+ # looking at the text of this script. This case will never be run,
22071+ # since it is checked for above.
22072+ exit 1
22073+ ;;
22074+
22075+sgi)
22076+ if test "$libtool" = yes; then
22077+ "$@" "-Wp,-MDupdate,$tmpdepfile"
22078+ else
22079+ "$@" -MDupdate "$tmpdepfile"
22080+ fi
22081+ stat=$?
22082+ if test $stat -ne 0; then
22083+ rm -f "$tmpdepfile"
22084+ exit $stat
22085+ fi
22086+ rm -f "$depfile"
22087+
22088+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
22089+ echo "$object : \\" > "$depfile"
22090+ # Clip off the initial element (the dependent). Don't try to be
22091+ # clever and replace this with sed code, as IRIX sed won't handle
22092+ # lines with more than a fixed number of characters (4096 in
22093+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
22094+ # the IRIX cc adds comments like '#:fec' to the end of the
22095+ # dependency line.
22096+ tr ' ' "$nl" < "$tmpdepfile" \
22097+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
22098+ | tr "$nl" ' ' >> "$depfile"
22099+ echo >> "$depfile"
22100+ # The second pass generates a dummy entry for each header file.
22101+ tr ' ' "$nl" < "$tmpdepfile" \
22102+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
22103+ >> "$depfile"
22104+ else
22105+ make_dummy_depfile
22106+ fi
22107+ rm -f "$tmpdepfile"
22108+ ;;
22109+
22110+xlc)
22111+ # This case exists only to let depend.m4 do its work. It works by
22112+ # looking at the text of this script. This case will never be run,
22113+ # since it is checked for above.
22114+ exit 1
22115+ ;;
22116+
22117+aix)
22118+ # The C for AIX Compiler uses -M and outputs the dependencies
22119+ # in a .u file. In older versions, this file always lives in the
22120+ # current directory. Also, the AIX compiler puts '$object:' at the
22121+ # start of each line; $object doesn't have directory information.
22122+ # Version 6 uses the directory in both cases.
22123+ set_dir_from "$object"
22124+ set_base_from "$object"
22125+ if test "$libtool" = yes; then
22126+ tmpdepfile1=$dir$base.u
22127+ tmpdepfile2=$base.u
22128+ tmpdepfile3=$dir.libs/$base.u
22129+ "$@" -Wc,-M
22130+ else
22131+ tmpdepfile1=$dir$base.u
22132+ tmpdepfile2=$dir$base.u
22133+ tmpdepfile3=$dir$base.u
22134+ "$@" -M
22135+ fi
22136+ stat=$?
22137+ if test $stat -ne 0; then
22138+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
22139+ exit $stat
22140+ fi
22141+
22142+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
22143+ do
22144+ test -f "$tmpdepfile" && break
22145+ done
22146+ aix_post_process_depfile
22147+ ;;
22148+
22149+tcc)
22150+ # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
22151+ # FIXME: That version still under development at the moment of writing.
22152+ # Make that this statement remains true also for stable, released
22153+ # versions.
22154+ # It will wrap lines (doesn't matter whether long or short) with a
22155+ # trailing '\', as in:
22156+ #
22157+ # foo.o : \
22158+ # foo.c \
22159+ # foo.h \
22160+ #
22161+ # It will put a trailing '\' even on the last line, and will use leading
22162+ # spaces rather than leading tabs (at least since its commit 0394caf7
22163+ # "Emit spaces for -MD").
22164+ "$@" -MD -MF "$tmpdepfile"
22165+ stat=$?
22166+ if test $stat -ne 0; then
22167+ rm -f "$tmpdepfile"
22168+ exit $stat
22169+ fi
22170+ rm -f "$depfile"
22171+ # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
22172+ # We have to change lines of the first kind to '$object: \'.
22173+ sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
22174+ # And for each line of the second kind, we have to emit a 'dep.h:'
22175+ # dummy dependency, to avoid the deleted-header problem.
22176+ sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
22177+ rm -f "$tmpdepfile"
22178+ ;;
22179+
22180+## The order of this option in the case statement is important, since the
22181+## shell code in configure will try each of these formats in the order
22182+## listed in this file. A plain '-MD' option would be understood by many
22183+## compilers, so we must ensure this comes after the gcc and icc options.
22184+pgcc)
22185+ # Portland's C compiler understands '-MD'.
22186+ # Will always output deps to 'file.d' where file is the root name of the
22187+ # source file under compilation, even if file resides in a subdirectory.
22188+ # The object file name does not affect the name of the '.d' file.
22189+ # pgcc 10.2 will output
22190+ # foo.o: sub/foo.c sub/foo.h
22191+ # and will wrap long lines using '\' :
22192+ # foo.o: sub/foo.c ... \
22193+ # sub/foo.h ... \
22194+ # ...
22195+ set_dir_from "$object"
22196+ # Use the source, not the object, to determine the base name, since
22197+ # that's sadly what pgcc will do too.
22198+ set_base_from "$source"
22199+ tmpdepfile=$base.d
22200+
22201+ # For projects that build the same source file twice into different object
22202+ # files, the pgcc approach of using the *source* file root name can cause
22203+ # problems in parallel builds. Use a locking strategy to avoid stomping on
22204+ # the same $tmpdepfile.
22205+ lockdir=$base.d-lock
22206+ trap "
22207+ echo '$0: caught signal, cleaning up...' >&2
22208+ rmdir '$lockdir'
22209+ exit 1
22210+ " 1 2 13 15
22211+ numtries=100
22212+ i=$numtries
22213+ while test $i -gt 0; do
22214+ # mkdir is a portable test-and-set.
22215+ if mkdir "$lockdir" 2>/dev/null; then
22216+ # This process acquired the lock.
22217+ "$@" -MD
22218+ stat=$?
22219+ # Release the lock.
22220+ rmdir "$lockdir"
22221+ break
22222+ else
22223+ # If the lock is being held by a different process, wait
22224+ # until the winning process is done or we timeout.
22225+ while test -d "$lockdir" && test $i -gt 0; do
22226+ sleep 1
22227+ i=`expr $i - 1`
22228+ done
22229+ fi
22230+ i=`expr $i - 1`
22231+ done
22232+ trap - 1 2 13 15
22233+ if test $i -le 0; then
22234+ echo "$0: failed to acquire lock after $numtries attempts" >&2
22235+ echo "$0: check lockdir '$lockdir'" >&2
22236+ exit 1
22237+ fi
22238+
22239+ if test $stat -ne 0; then
22240+ rm -f "$tmpdepfile"
22241+ exit $stat
22242+ fi
22243+ rm -f "$depfile"
22244+ # Each line is of the form `foo.o: dependent.h',
22245+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
22246+ # Do two passes, one to just change these to
22247+ # `$object: dependent.h' and one to simply `dependent.h:'.
22248+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
22249+ # Some versions of the HPUX 10.20 sed can't process this invocation
22250+ # correctly. Breaking it into two sed invocations is a workaround.
22251+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
22252+ | sed -e 's/$/ :/' >> "$depfile"
22253+ rm -f "$tmpdepfile"
22254+ ;;
22255+
22256+hp2)
22257+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
22258+ # compilers, which have integrated preprocessors. The correct option
22259+ # to use with these is +Maked; it writes dependencies to a file named
22260+ # 'foo.d', which lands next to the object file, wherever that
22261+ # happens to be.
22262+ # Much of this is similar to the tru64 case; see comments there.
22263+ set_dir_from "$object"
22264+ set_base_from "$object"
22265+ if test "$libtool" = yes; then
22266+ tmpdepfile1=$dir$base.d
22267+ tmpdepfile2=$dir.libs/$base.d
22268+ "$@" -Wc,+Maked
22269+ else
22270+ tmpdepfile1=$dir$base.d
22271+ tmpdepfile2=$dir$base.d
22272+ "$@" +Maked
22273+ fi
22274+ stat=$?
22275+ if test $stat -ne 0; then
22276+ rm -f "$tmpdepfile1" "$tmpdepfile2"
22277+ exit $stat
22278+ fi
22279+
22280+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
22281+ do
22282+ test -f "$tmpdepfile" && break
22283+ done
22284+ if test -f "$tmpdepfile"; then
22285+ sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
22286+ # Add 'dependent.h:' lines.
22287+ sed -ne '2,${
22288+ s/^ *//
22289+ s/ \\*$//
22290+ s/$/:/
22291+ p
22292+ }' "$tmpdepfile" >> "$depfile"
22293+ else
22294+ make_dummy_depfile
22295+ fi
22296+ rm -f "$tmpdepfile" "$tmpdepfile2"
22297+ ;;
22298+
22299+tru64)
22300+ # The Tru64 compiler uses -MD to generate dependencies as a side
22301+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
22302+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
22303+ # dependencies in 'foo.d' instead, so we check for that too.
22304+ # Subdirectories are respected.
22305+ set_dir_from "$object"
22306+ set_base_from "$object"
22307+
22308+ if test "$libtool" = yes; then
22309+ # Libtool generates 2 separate objects for the 2 libraries. These
22310+ # two compilations output dependencies in $dir.libs/$base.o.d and
22311+ # in $dir$base.o.d. We have to check for both files, because
22312+ # one of the two compilations can be disabled. We should prefer
22313+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
22314+ # automatically cleaned when .libs/ is deleted, while ignoring
22315+ # the former would cause a distcleancheck panic.
22316+ tmpdepfile1=$dir$base.o.d # libtool 1.5
22317+ tmpdepfile2=$dir.libs/$base.o.d # Likewise.
22318+ tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
22319+ "$@" -Wc,-MD
22320+ else
22321+ tmpdepfile1=$dir$base.d
22322+ tmpdepfile2=$dir$base.d
22323+ tmpdepfile3=$dir$base.d
22324+ "$@" -MD
22325+ fi
22326+
22327+ stat=$?
22328+ if test $stat -ne 0; then
22329+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
22330+ exit $stat
22331+ fi
22332+
22333+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
22334+ do
22335+ test -f "$tmpdepfile" && break
22336+ done
22337+ # Same post-processing that is required for AIX mode.
22338+ aix_post_process_depfile
22339+ ;;
22340+
22341+msvc7)
22342+ if test "$libtool" = yes; then
22343+ showIncludes=-Wc,-showIncludes
22344+ else
22345+ showIncludes=-showIncludes
22346+ fi
22347+ "$@" $showIncludes > "$tmpdepfile"
22348+ stat=$?
22349+ grep -v '^Note: including file: ' "$tmpdepfile"
22350+ if test $stat -ne 0; then
22351+ rm -f "$tmpdepfile"
22352+ exit $stat
22353+ fi
22354+ rm -f "$depfile"
22355+ echo "$object : \\" > "$depfile"
22356+ # The first sed program below extracts the file names and escapes
22357+ # backslashes for cygpath. The second sed program outputs the file
22358+ # name when reading, but also accumulates all include files in the
22359+ # hold buffer in order to output them again at the end. This only
22360+ # works with sed implementations that can handle large buffers.
22361+ sed < "$tmpdepfile" -n '
22362+/^Note: including file: *\(.*\)/ {
22363+ s//\1/
22364+ s/\\/\\\\/g
22365+ p
22366+}' | $cygpath_u | sort -u | sed -n '
22367+s/ /\\ /g
22368+s/\(.*\)/'"$tab"'\1 \\/p
22369+s/.\(.*\) \\/\1:/
22370+H
22371+$ {
22372+ s/.*/'"$tab"'/
22373+ G
22374+ p
22375+}' >> "$depfile"
22376+ echo >> "$depfile" # make sure the fragment doesn't end with a backslash
22377+ rm -f "$tmpdepfile"
22378+ ;;
22379+
22380+msvc7msys)
22381+ # This case exists only to let depend.m4 do its work. It works by
22382+ # looking at the text of this script. This case will never be run,
22383+ # since it is checked for above.
22384+ exit 1
22385+ ;;
22386+
22387+#nosideeffect)
22388+ # This comment above is used by automake to tell side-effect
22389+ # dependency tracking mechanisms from slower ones.
22390+
22391+dashmstdout)
22392+ # Important note: in order to support this mode, a compiler *must*
22393+ # always write the preprocessed file to stdout, regardless of -o.
22394+ "$@" || exit $?
22395+
22396+ # Remove the call to Libtool.
22397+ if test "$libtool" = yes; then
22398+ while test "X$1" != 'X--mode=compile'; do
22399+ shift
22400+ done
22401+ shift
22402+ fi
22403+
22404+ # Remove '-o $object'.
22405+ IFS=" "
22406+ for arg
22407+ do
22408+ case $arg in
22409+ -o)
22410+ shift
22411+ ;;
22412+ $object)
22413+ shift
22414+ ;;
22415+ *)
22416+ set fnord "$@" "$arg"
22417+ shift # fnord
22418+ shift # $arg
22419+ ;;
22420+ esac
22421+ done
22422+
22423+ test -z "$dashmflag" && dashmflag=-M
22424+ # Require at least two characters before searching for ':'
22425+ # in the target name. This is to cope with DOS-style filenames:
22426+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
22427+ "$@" $dashmflag |
22428+ sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
22429+ rm -f "$depfile"
22430+ cat < "$tmpdepfile" > "$depfile"
22431+ # Some versions of the HPUX 10.20 sed can't process this sed invocation
22432+ # correctly. Breaking it into two sed invocations is a workaround.
22433+ tr ' ' "$nl" < "$tmpdepfile" \
22434+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
22435+ | sed -e 's/$/ :/' >> "$depfile"
22436+ rm -f "$tmpdepfile"
22437+ ;;
22438+
22439+dashXmstdout)
22440+ # This case only exists to satisfy depend.m4. It is never actually
22441+ # run, as this mode is specially recognized in the preamble.
22442+ exit 1
22443+ ;;
22444+
22445+makedepend)
22446+ "$@" || exit $?
22447+ # Remove any Libtool call
22448+ if test "$libtool" = yes; then
22449+ while test "X$1" != 'X--mode=compile'; do
22450+ shift
22451+ done
22452+ shift
22453+ fi
22454+ # X makedepend
22455+ shift
22456+ cleared=no eat=no
22457+ for arg
22458+ do
22459+ case $cleared in
22460+ no)
22461+ set ""; shift
22462+ cleared=yes ;;
22463+ esac
22464+ if test $eat = yes; then
22465+ eat=no
22466+ continue
22467+ fi
22468+ case "$arg" in
22469+ -D*|-I*)
22470+ set fnord "$@" "$arg"; shift ;;
22471+ # Strip any option that makedepend may not understand. Remove
22472+ # the object too, otherwise makedepend will parse it as a source file.
22473+ -arch)
22474+ eat=yes ;;
22475+ -*|$object)
22476+ ;;
22477+ *)
22478+ set fnord "$@" "$arg"; shift ;;
22479+ esac
22480+ done
22481+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
22482+ touch "$tmpdepfile"
22483+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
22484+ rm -f "$depfile"
22485+ # makedepend may prepend the VPATH from the source file name to the object.
22486+ # No need to regex-escape $object, excess matching of '.' is harmless.
22487+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
22488+ # Some versions of the HPUX 10.20 sed can't process the last invocation
22489+ # correctly. Breaking it into two sed invocations is a workaround.
22490+ sed '1,2d' "$tmpdepfile" \
22491+ | tr ' ' "$nl" \
22492+ | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
22493+ | sed -e 's/$/ :/' >> "$depfile"
22494+ rm -f "$tmpdepfile" "$tmpdepfile".bak
22495+ ;;
22496+
22497+cpp)
22498+ # Important note: in order to support this mode, a compiler *must*
22499+ # always write the preprocessed file to stdout.
22500+ "$@" || exit $?
22501+
22502+ # Remove the call to Libtool.
22503+ if test "$libtool" = yes; then
22504+ while test "X$1" != 'X--mode=compile'; do
22505+ shift
22506+ done
22507+ shift
22508+ fi
22509+
22510+ # Remove '-o $object'.
22511+ IFS=" "
22512+ for arg
22513+ do
22514+ case $arg in
22515+ -o)
22516+ shift
22517+ ;;
22518+ $object)
22519+ shift
22520+ ;;
22521+ *)
22522+ set fnord "$@" "$arg"
22523+ shift # fnord
22524+ shift # $arg
22525+ ;;
22526+ esac
22527+ done
22528+
22529+ "$@" -E \
22530+ | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
22531+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
22532+ | sed '$ s: \\$::' > "$tmpdepfile"
22533+ rm -f "$depfile"
22534+ echo "$object : \\" > "$depfile"
22535+ cat < "$tmpdepfile" >> "$depfile"
22536+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
22537+ rm -f "$tmpdepfile"
22538+ ;;
22539+
22540+msvisualcpp)
22541+ # Important note: in order to support this mode, a compiler *must*
22542+ # always write the preprocessed file to stdout.
22543+ "$@" || exit $?
22544+
22545+ # Remove the call to Libtool.
22546+ if test "$libtool" = yes; then
22547+ while test "X$1" != 'X--mode=compile'; do
22548+ shift
22549+ done
22550+ shift
22551+ fi
22552+
22553+ IFS=" "
22554+ for arg
22555+ do
22556+ case "$arg" in
22557+ -o)
22558+ shift
22559+ ;;
22560+ $object)
22561+ shift
22562+ ;;
22563+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
22564+ set fnord "$@"
22565+ shift
22566+ shift
22567+ ;;
22568+ *)
22569+ set fnord "$@" "$arg"
22570+ shift
22571+ shift
22572+ ;;
22573+ esac
22574+ done
22575+ "$@" -E 2>/dev/null |
22576+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
22577+ rm -f "$depfile"
22578+ echo "$object : \\" > "$depfile"
22579+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
22580+ echo "$tab" >> "$depfile"
22581+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
22582+ rm -f "$tmpdepfile"
22583+ ;;
22584+
22585+msvcmsys)
22586+ # This case exists only to let depend.m4 do its work. It works by
22587+ # looking at the text of this script. This case will never be run,
22588+ # since it is checked for above.
22589+ exit 1
22590+ ;;
22591+
22592+none)
22593+ exec "$@"
22594+ ;;
22595+
22596+*)
22597+ echo "Unknown depmode $depmode" 1>&2
22598+ exit 1
22599+ ;;
22600+esac
22601+
22602+exit 0
22603+
22604+# Local Variables:
22605+# mode: shell-script
22606+# sh-indentation: 2
22607+# eval: (add-hook 'write-file-hooks 'time-stamp)
22608+# time-stamp-start: "scriptversion="
22609+# time-stamp-format: "%:y-%02m-%02d.%02H"
22610+# time-stamp-time-zone: "UTC0"
22611+# time-stamp-end: "; # UTC"
22612+# End:
22613diff -uprN clean/lrzsz-0.12.20/intl/bindtextdom.c lrzsz-0.12.20/intl/bindtextdom.c
22614--- clean/lrzsz-0.12.20/intl/bindtextdom.c 1998-04-26 14:22:36.000000000 +0100
22615+++ lrzsz-0.12.20/intl/bindtextdom.c 1970-01-01 01:00:00.000000000 +0100
22616@@ -1,199 +0,0 @@
22617-/* Implementation of the bindtextdomain(3) function
22618- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
22619-
22620- This program is free software; you can redistribute it and/or modify
22621- it under the terms of the GNU General Public License as published by
22622- the Free Software Foundation; either version 2, or (at your option)
22623- any later version.
22624-
22625- This program is distributed in the hope that it will be useful,
22626- but WITHOUT ANY WARRANTY; without even the implied warranty of
22627- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22628- GNU General Public License for more details.
22629-
22630- You should have received a copy of the GNU General Public License
22631- along with this program; if not, write to the Free Software Foundation,
22632- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
22633-
22634-#ifdef HAVE_CONFIG_H
22635-# include <config.h>
22636-#endif
22637-
22638-#if defined STDC_HEADERS || defined _LIBC
22639-# include <stdlib.h>
22640-#else
22641-# ifdef HAVE_MALLOC_H
22642-# include <malloc.h>
22643-# else
22644-void free ();
22645-# endif
22646-#endif
22647-
22648-#if defined HAVE_STRING_H || defined _LIBC
22649-# include <string.h>
22650-#else
22651-# include <strings.h>
22652-# ifndef memcpy
22653-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
22654-# endif
22655-#endif
22656-
22657-#ifdef _LIBC
22658-# include <libintl.h>
22659-#else
22660-# include "libgettext.h"
22661-#endif
22662-#include "gettext.h"
22663-#include "gettextP.h"
22664-
22665-/* @@ end of prolog @@ */
22666-
22667-/* Contains the default location of the message catalogs. */
22668-extern const char _nl_default_dirname[];
22669-
22670-/* List with bindings of specific domains. */
22671-extern struct binding *_nl_domain_bindings;
22672-
22673-
22674-/* Names for the libintl functions are a problem. They must not clash
22675- with existing names and they should follow ANSI C. But this source
22676- code is also used in GNU C Library where the names have a __
22677- prefix. So we have to make a difference here. */
22678-#ifdef _LIBC
22679-# define BINDTEXTDOMAIN __bindtextdomain
22680-# define strdup(str) __strdup (str)
22681-#else
22682-# define BINDTEXTDOMAIN bindtextdomain__
22683-#endif
22684-
22685-/* Specify that the DOMAINNAME message catalog will be found
22686- in DIRNAME rather than in the system locale data base. */
22687-char *
22688-BINDTEXTDOMAIN (domainname, dirname)
22689- const char *domainname;
22690- const char *dirname;
22691-{
22692- struct binding *binding;
22693-
22694- /* Some sanity checks. */
22695- if (domainname == NULL || domainname[0] == '\0')
22696- return NULL;
22697-
22698- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
22699- {
22700- int compare = strcmp (domainname, binding->domainname);
22701- if (compare == 0)
22702- /* We found it! */
22703- break;
22704- if (compare < 0)
22705- {
22706- /* It is not in the list. */
22707- binding = NULL;
22708- break;
22709- }
22710- }
22711-
22712- if (dirname == NULL)
22713- /* The current binding has be to returned. */
22714- return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
22715-
22716- if (binding != NULL)
22717- {
22718- /* The domain is already bound. If the new value and the old
22719- one are equal we simply do nothing. Otherwise replace the
22720- old binding. */
22721- if (strcmp (dirname, binding->dirname) != 0)
22722- {
22723- char *new_dirname;
22724-
22725- if (strcmp (dirname, _nl_default_dirname) == 0)
22726- new_dirname = (char *) _nl_default_dirname;
22727- else
22728- {
22729-#if defined _LIBC || defined HAVE_STRDUP
22730- new_dirname = strdup (dirname);
22731- if (new_dirname == NULL)
22732- return NULL;
22733-#else
22734- size_t len = strlen (dirname) + 1;
22735- new_dirname = (char *) malloc (len);
22736- if (new_dirname == NULL)
22737- return NULL;
22738-
22739- memcpy (new_dirname, dirname, len);
22740-#endif
22741- }
22742-
22743- if (binding->dirname != _nl_default_dirname)
22744- free (binding->dirname);
22745-
22746- binding->dirname = new_dirname;
22747- }
22748- }
22749- else
22750- {
22751- /* We have to create a new binding. */
22752- size_t len;
22753- struct binding *new_binding =
22754- (struct binding *) malloc (sizeof (*new_binding));
22755-
22756- if (new_binding == NULL)
22757- return NULL;
22758-
22759-#if defined _LIBC || defined HAVE_STRDUP
22760- new_binding->domainname = strdup (domainname);
22761- if (new_binding->domainname == NULL)
22762- return NULL;
22763-#else
22764- len = strlen (domainname) + 1;
22765- new_binding->domainname = (char *) malloc (len);
22766- if (new_binding->domainname == NULL)
22767- return NULL;
22768- memcpy (new_binding->domainname, domainname, len);
22769-#endif
22770-
22771- if (strcmp (dirname, _nl_default_dirname) == 0)
22772- new_binding->dirname = (char *) _nl_default_dirname;
22773- else
22774- {
22775-#if defined _LIBC || defined HAVE_STRDUP
22776- new_binding->dirname = strdup (dirname);
22777- if (new_binding->dirname == NULL)
22778- return NULL;
22779-#else
22780- len = strlen (dirname) + 1;
22781- new_binding->dirname = (char *) malloc (len);
22782- if (new_binding->dirname == NULL)
22783- return NULL;
22784- memcpy (new_binding->dirname, dirname, len);
22785-#endif
22786- }
22787-
22788- /* Now enqueue it. */
22789- if (_nl_domain_bindings == NULL
22790- || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
22791- {
22792- new_binding->next = _nl_domain_bindings;
22793- _nl_domain_bindings = new_binding;
22794- }
22795- else
22796- {
22797- binding = _nl_domain_bindings;
22798- while (binding->next != NULL
22799- && strcmp (domainname, binding->next->domainname) > 0)
22800- binding = binding->next;
22801-
22802- new_binding->next = binding->next;
22803- binding->next = new_binding;
22804- }
22805-
22806- binding = new_binding;
22807- }
22808-
22809- return binding->dirname;
22810-}
22811-
22812-#ifdef _LIBC
22813-/* Alias for function name in GNU C Library. */
22814-weak_alias (__bindtextdomain, bindtextdomain);
22815-#endif
22816diff -uprN clean/lrzsz-0.12.20/intl/cat-compat.c lrzsz-0.12.20/intl/cat-compat.c
22817--- clean/lrzsz-0.12.20/intl/cat-compat.c 1998-04-26 14:22:37.000000000 +0100
22818+++ lrzsz-0.12.20/intl/cat-compat.c 1970-01-01 01:00:00.000000000 +0100
22819@@ -1,262 +0,0 @@
22820-/* Compatibility code for gettext-using-catgets interface.
22821- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
22822-
22823- This program is free software; you can redistribute it and/or modify
22824- it under the terms of the GNU General Public License as published by
22825- the Free Software Foundation; either version 2, or (at your option)
22826- any later version.
22827-
22828- This program is distributed in the hope that it will be useful,
22829- but WITHOUT ANY WARRANTY; without even the implied warranty of
22830- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22831- GNU General Public License for more details.
22832-
22833- You should have received a copy of the GNU General Public License
22834- along with this program; if not, write to the Free Software Foundation,
22835- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
22836-
22837-#ifdef HAVE_CONFIG_H
22838-# include <config.h>
22839-#endif
22840-
22841-#include <stdio.h>
22842-
22843-#ifdef STDC_HEADERS
22844-# include <stdlib.h>
22845-# include <string.h>
22846-#else
22847-char *getenv ();
22848-# ifdef HAVE_MALLOC_H
22849-# include <malloc.h>
22850-# endif
22851-#endif
22852-
22853-#ifdef HAVE_NL_TYPES_H
22854-# include <nl_types.h>
22855-#endif
22856-
22857-#include "libgettext.h"
22858-
22859-/* @@ end of prolog @@ */
22860-
22861-/* XPG3 defines the result of `setlocale (category, NULL)' as:
22862- ``Directs `setlocale()' to query `category' and return the current
22863- setting of `local'.''
22864- However it does not specify the exact format. And even worse: POSIX
22865- defines this not at all. So we can use this feature only on selected
22866- system (e.g. those using GNU C Library). */
22867-#ifdef _LIBC
22868-# define HAVE_LOCALE_NULL
22869-#endif
22870-
22871-/* The catalog descriptor. */
22872-static nl_catd catalog = (nl_catd) -1;
22873-
22874-/* Name of the default catalog. */
22875-static const char default_catalog_name[] = "messages";
22876-
22877-/* Name of currently used catalog. */
22878-static const char *catalog_name = default_catalog_name;
22879-
22880-/* Get ID for given string. If not found return -1. */
22881-static int msg_to_cat_id PARAMS ((const char *msg));
22882-
22883-/* Substitution for systems lacking this function in their C library. */
22884-#if !_LIBC && !HAVE_STPCPY
22885-static char *stpcpy PARAMS ((char *dest, const char *src));
22886-#endif
22887-
22888-
22889-/* Set currently used domain/catalog. */
22890-char *
22891-textdomain (domainname)
22892- const char *domainname;
22893-{
22894- nl_catd new_catalog;
22895- char *new_name;
22896- size_t new_name_len;
22897- char *lang;
22898-
22899-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
22900- && defined HAVE_LOCALE_NULL
22901- lang = setlocale (LC_MESSAGES, NULL);
22902-#else
22903- lang = getenv ("LC_ALL");
22904- if (lang == NULL || lang[0] == '\0')
22905- {
22906- lang = getenv ("LC_MESSAGES");
22907- if (lang == NULL || lang[0] == '\0')
22908- lang = getenv ("LANG");
22909- }
22910-#endif
22911- if (lang == NULL || lang[0] == '\0')
22912- lang = "C";
22913-
22914- /* See whether name of currently used domain is asked. */
22915- if (domainname == NULL)
22916- return (char *) catalog_name;
22917-
22918- if (domainname[0] == '\0')
22919- domainname = default_catalog_name;
22920-
22921- /* Compute length of added path element. */
22922- new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
22923- + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
22924- + sizeof (".cat");
22925-
22926- new_name = (char *) malloc (new_name_len);
22927- if (new_name == NULL)
22928- return NULL;
22929-
22930- strcpy (new_name, PACKAGE);
22931- new_catalog = catopen (new_name, 0);
22932-
22933- if (new_catalog == (nl_catd) -1)
22934- {
22935- /* NLSPATH search didn't work, try absolute path */
22936- sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
22937- PACKAGE);
22938- new_catalog = catopen (new_name, 0);
22939-
22940- if (new_catalog == (nl_catd) -1)
22941- {
22942- free (new_name);
22943- return (char *) catalog_name;
22944- }
22945- }
22946-
22947- /* Close old catalog. */
22948- if (catalog != (nl_catd) -1)
22949- catclose (catalog);
22950- if (catalog_name != default_catalog_name)
22951- free ((char *) catalog_name);
22952-
22953- catalog = new_catalog;
22954- catalog_name = new_name;
22955-
22956- return (char *) catalog_name;
22957-}
22958-
22959-char *
22960-bindtextdomain (domainname, dirname)
22961- const char *domainname;
22962- const char *dirname;
22963-{
22964-#if HAVE_SETENV || HAVE_PUTENV
22965- char *old_val, *new_val, *cp;
22966- size_t new_val_len;
22967-
22968- /* This does not make much sense here but to be compatible do it. */
22969- if (domainname == NULL)
22970- return NULL;
22971-
22972- /* Compute length of added path element. If we use setenv we don't need
22973- the first byts for NLSPATH=, but why complicate the code for this
22974- peanuts. */
22975- new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
22976- + sizeof ("/%L/LC_MESSAGES/%N.cat");
22977-
22978- old_val = getenv ("NLSPATH");
22979- if (old_val == NULL || old_val[0] == '\0')
22980- {
22981- old_val = NULL;
22982- new_val_len += 1 + sizeof (LOCALEDIR) - 1
22983- + sizeof ("/%L/LC_MESSAGES/%N.cat");
22984- }
22985- else
22986- new_val_len += strlen (old_val);
22987-
22988- new_val = (char *) malloc (new_val_len);
22989- if (new_val == NULL)
22990- return NULL;
22991-
22992-# if HAVE_SETENV
22993- cp = new_val;
22994-# else
22995- cp = stpcpy (new_val, "NLSPATH=");
22996-# endif
22997-
22998- cp = stpcpy (cp, dirname);
22999- cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
23000-
23001- if (old_val == NULL)
23002- {
23003-# if __STDC__
23004- stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
23005-# else
23006-
23007- cp = stpcpy (cp, LOCALEDIR);
23008- stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
23009-# endif
23010- }
23011- else
23012- stpcpy (cp, old_val);
23013-
23014-# if HAVE_SETENV
23015- setenv ("NLSPATH", new_val, 1);
23016- free (new_val);
23017-# else
23018- putenv (new_val);
23019- /* Do *not* free the environment entry we just entered. It is used
23020- from now on. */
23021-# endif
23022-
23023-#endif
23024-
23025- return (char *) domainname;
23026-}
23027-
23028-#undef gettext
23029-char *
23030-gettext (msg)
23031- const char *msg;
23032-{
23033- int msgid;
23034-
23035- if (msg == NULL || catalog == (nl_catd) -1)
23036- return (char *) msg;
23037-
23038- /* Get the message from the catalog. We always use set number 1.
23039- The message ID is computed by the function `msg_to_cat_id'
23040- which works on the table generated by `po-to-tbl'. */
23041- msgid = msg_to_cat_id (msg);
23042- if (msgid == -1)
23043- return (char *) msg;
23044-
23045- return catgets (catalog, 1, msgid, (char *) msg);
23046-}
23047-
23048-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
23049- for the one equal to msg. If it is found return the ID. In case when
23050- the string is not found return -1. */
23051-static int
23052-msg_to_cat_id (msg)
23053- const char *msg;
23054-{
23055- int cnt;
23056-
23057- for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
23058- if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
23059- return _msg_tbl[cnt]._msg_number;
23060-
23061- return -1;
23062-}
23063-
23064-
23065-/* @@ begin of epilog @@ */
23066-
23067-/* We don't want libintl.a to depend on any other library. So we
23068- avoid the non-standard function stpcpy. In GNU C Library this
23069- function is available, though. Also allow the symbol HAVE_STPCPY
23070- to be defined. */
23071-#if !_LIBC && !HAVE_STPCPY
23072-static char *
23073-stpcpy (dest, src)
23074- char *dest;
23075- const char *src;
23076-{
23077- while ((*dest++ = *src++) != '\0')
23078- /* Do nothing. */ ;
23079- return dest - 1;
23080-}
23081-#endif
23082diff -uprN clean/lrzsz-0.12.20/intl/ChangeLog lrzsz-0.12.20/intl/ChangeLog
23083--- clean/lrzsz-0.12.20/intl/ChangeLog 1998-04-26 14:22:35.000000000 +0100
23084+++ lrzsz-0.12.20/intl/ChangeLog 1970-01-01 01:00:00.000000000 +0100
23085@@ -1,1022 +0,0 @@
23086-1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com>
23087-
23088- * intlh.inst.in: Reformat copyright.
23089-
23090-1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com>
23091-
23092- * dcgettext.c (DCGETTEXT): Remove wrong comment.
23093-
23094-1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com>
23095-
23096- * Makefile.in (install-data): Don't change directory to install.
23097-
23098-1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com>
23099-
23100- * cat-compat.c: Fix copyright.
23101-
23102- * localealias.c: Don't define strchr unless !HAVE_STRCHR.
23103-
23104- * loadmsgcat.c: Update copyright. Fix typos.
23105-
23106- * l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
23107- (_nl_make_l10nflist): Handle sponsor and revision correctly.
23108-
23109- * gettext.c: Update copyright.
23110- * gettext.h: Likewise.
23111- * hash-string.h: Likewise.
23112-
23113- * finddomain.c: Remoave dead code. Define strchr only if
23114- !HAVE_STRCHR.
23115-
23116- * explodename.c: Include <sys/types.h>.
23117-
23118- * explodename.c: Reformat copyright text.
23119- (_nl_explode_name): Fix typo.
23120-
23121- * dcgettext.c: Define and use __set_errno.
23122- (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
23123- not defined.
23124-
23125- * bindtextdom.c: Pretty printing.
23126-
23127-1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com>
23128-
23129- * dcgettext.c (guess_category_value): Don't depend on
23130- HAVE_LC_MESSAGES. We don't need the macro here.
23131- Patch by Bruno Haible <haible@ilog.fr>.
23132-
23133- * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
23134- macro. Instead use HAVE_LOCALE_NULL and define it when using
23135- glibc, as in dcgettext.c.
23136- Patch by Bruno Haible <haible@ilog.fr>.
23137-
23138- * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois
23139- Pinard.
23140-
23141-Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com>
23142-
23143- * Makefile.in: Implement handling of libtool.
23144-
23145- * gettextP.h: Change data structures for use of generic lowlevel
23146- i18n file handling.
23147-
23148-Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com>
23149-
23150- * textdomain.c: Put parentheses around arguments of memcpy macro
23151- definition.
23152- * localealias.c: Likewise.
23153- * l10nflist.c: Likewise.
23154- * finddomain.c: Likewise.
23155- * bindtextdom.c: Likewise.
23156- Reported by Thomas Esken.
23157-
23158-Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com>
23159-
23160- * textdomain.c: Move definition of `memcpy` macro to right
23161- position.
23162-
23163-Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com>
23164-
23165- * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
23166- bcopy if not already defined. Reported by Thomas Esken.
23167- * bindtextdom.c: Likewise.
23168- * l10nflist.c: Likewise.
23169- * localealias.c: Likewise.
23170- * textdomain.c: Likewise.
23171-
23172-Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com>
23173-
23174- * Makefile.in (libdir): Change to use exec_prefix instead of
23175- prefix. Reported by Knut-HvardAksnes <etokna@eto.ericsson.se>.
23176-
23177-Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com>
23178-
23179- * l10nflist.c (_nl_normalize_codeset): We convert to lower case,
23180- so don't prepend uppercase `ISO' for only numeric arg.
23181-
23182-Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com>
23183-
23184- * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
23185- definition of _GNU_SOURCE. Patch by Roland McGrath.
23186-
23187- * Makefile.in (uninstall): Fix another bug with `for' loop and
23188- empty arguments. Patch by Jim Meyering. Correct name os
23189- uninstalled files: no intl- prefix anymore.
23190-
23191- * Makefile.in (install-data): Again work around shells which
23192- cannot handle mpty for list. Reported by Jim Meyering.
23193-
23194-Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
23195-
23196- * Makefile.in (install): Split goal. Now depend on install-exec
23197- and install-data.
23198- (install-exec, install-data): New goals. Created from former
23199- install goal.
23200- Reported by Karl Berry.
23201-
23202-Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com>
23203-
23204- * Makefile.in (MKINSTALLDIRS): New variable. Path to
23205- mkinstalldirs script.
23206- (install): use MKINSTALLDIRS variable or if the script is not present
23207- try to find it in the $top_scrdir).
23208-
23209-Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com>
23210-
23211- * l10nflist.c: Linux libc *partly* includes the argz_* functions.
23212- Grr. Work around by renaming the static version and use macros
23213- for renaming.
23214-
23215-Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com>
23216-
23217- * l10nflist.c: Correct presence test macros of __argz_* functions.
23218-
23219- * l10nflist.c: Include <argz.h> based on test of it instead when
23220- __argz_* functions are available.
23221- Reported by Andreas Schwab.
23222-
23223-Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com>
23224-
23225- * explodename.c, l10nflist.c: Define NULL for dumb systems.
23226-
23227-Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com>
23228-
23229- * intlh.inst.in, libgettext.h (dcgettext): Rename local variable
23230- result to __result to prevent name clash.
23231-
23232- * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
23233- get prototype for stpcpy and strcasecmp.
23234-
23235- * intlh.inst.in, libgettext.h: Move declaration of
23236- `_nl_msg_cat_cntr' outside __extension__ block to prevent warning
23237- from gcc's -Wnested-extern option.
23238-
23239-Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com>
23240-
23241- * Makefile.in (install): Remove comment.
23242-
23243-Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com>
23244-
23245- * Makefile.in (install): Work around for another Buglix stupidity.
23246- Always use an `else' close for `if's. Reported by Nelson Beebe.
23247-
23248- * Makefile.in (intlh.inst): Correct typo in phony rule.
23249- Reported by Nelson Beebe.
23250-
23251-Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
23252-
23253- * dcgettext.c (read_alias_file): Rename variable alloca_list to
23254- block_list as the macro calls assume.
23255- Patch by Eric Backus.
23256-
23257- * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
23258- malloc.
23259- (read_alias_file): Rename varriabe alloca_list to block_list as the
23260- macro calls assume.
23261- Patch by Eric Backus.
23262-
23263- * l10nflist.c: Correct conditional for <argz.h> inclusion.
23264- Reported by Roland McGrath.
23265-
23266- * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
23267- all-@USE_NLS@.
23268-
23269- * Makefile.in (install): intlh.inst comes from local dir, not
23270- $(srcdir).
23271-
23272- * Makefile.in (intlh.inst): Special handling of this goal. If
23273- used in gettext, this is really a rul to construct this file. If
23274- used in any other package it is defined as a .PHONY rule with
23275- empty body.
23276-
23277- * finddomain.c: Extract locale file information handling into
23278- l10nfile.c. Rename local stpcpy__ function to stpcpy.
23279-
23280- * dcgettext.c (stpcpy): Add local definition.
23281-
23282- * l10nflist.c: Solve some portability problems. Patches partly by
23283- Thomas Esken. Add local definition of stpcpy.
23284-
23285-Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com>
23286-
23287- * intlh.inst.in: Don't depend including <locale.h> on
23288- HAVE_LOCALE_H. Instead configure must rewrite this fiile
23289- depending on the result of the configure run.
23290-
23291- * Makefile.in (install): libintl.inst is now called intlh.inst.
23292- Add rules for updating intlh.inst from intlh.inst.in.
23293-
23294- * libintl.inst: Renamed to intlh.inst.in.
23295-
23296- * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
23297- because gcc has __buitlin_alloca.
23298- Reported by Roland McGrath.
23299-
23300-Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
23301-
23302- * Makefile.in (installcheck): New goal to fulfill needs of
23303- automake's distcheck.
23304-
23305- * Makefile.in (install): Reorder commands so that VERSION is
23306- found.
23307-
23308- * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
23309- @datadir@/gettext.
23310- (COMSRCS): Add l10nfile.c.
23311- (OBJECTS): Add l10nfile.o.
23312- (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common).
23313- (DISTFILE.gettext): Remove $(DISTFILES.common).
23314- (all-gettext): Remove goal.
23315- (install): If $(PACKAGE) = gettext install, otherwose do nothing. No
23316- package but gettext itself should install libintl.h + headers.
23317- (dist): Extend goal to work for gettext, too.
23318- (dist-gettext): Remove goal.
23319-
23320- * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
23321-
23322-Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com>
23323-
23324- * loadmsgcat.c (_nl_load_domain): Parameter is now comes from
23325- find_l10nfile.
23326-
23327-Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com>
23328-
23329- * l10nflist.c (__argz_next): Add definition.
23330-
23331- * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
23332- code. Use new l10nfile handling.
23333-
23334- * localealias.c [!HAVE_ALLOCA]: Add code for handling missing
23335- alloca code.
23336-
23337- * l10nflist.c: Initial revision.
23338-
23339-Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware>
23340-
23341- * Makefile.in (all-gettext): New goal. Same as all-yes.
23342-
23343-Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de>
23344-
23345- * Makefile.in (gettextsrcdir): Define using @datadir@.
23346-
23347-Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware>
23348-
23349- * finddomain.c: Include <ctype.h>. Reported by Roland McGrath.
23350-
23351-Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
23352-
23353- * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
23354- with external declaration.
23355-
23356-Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
23357-
23358- * Makefile.in (all-no): Rename from all_no.
23359-
23360-Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
23361-
23362- * gettextP.h [loaded_domain]: Array `successor' must now contain up
23363- to 63 elements (because of codeset name normalization).
23364-
23365- * finddomain.c: Implement codeset name normalization.
23366-
23367-Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware>
23368-
23369- * Makefile.in (all): Define to `all-@USE_NLS@'.
23370- (all-yes, all_no): New goals. `all-no' is noop, `all-yes'
23371- is former all.
23372-
23373-Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com>
23374-
23375- * localealias.c (alias_compare): Increment string pointers in loop
23376- of strcasecmp replacement.
23377-
23378-Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware>
23379-
23380- * Makefile.in (install-src): Who commented this goal out ? :-)
23381-
23382-Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware>
23383-
23384- * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls
23385- should not effect it because a missing catalog is no error.
23386- Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
23387-
23388-Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware>
23389-
23390- * Makefile.in (Makefile): Explicitly use $(SHELL) for running
23391- shell scripts.
23392-
23393-Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
23394-
23395- * Makefile.in (install-src): Only install library and header when
23396- we use the own implementation. Don't do it when using the
23397- system's gettext or catgets functions.
23398-
23399- * dcgettext.c (find_msg): Must not swap domain->hash_size here.
23400-
23401-Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware>
23402-
23403- * localealias.c, libintl.inst, libgettext.h, hash-string.h,
23404- gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
23405- Use PARAMS instead of __P. Suggested by Roland McGrath.
23406-
23407-Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu>
23408-
23409- * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
23410- !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
23411-
23412-Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware>
23413-
23414- * Makefile.in (install-src):
23415- Install libintl.inst instead of libintl.h.install.
23416-
23417-Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu>
23418-
23419- * cat-compat.c (textdomain):
23420- Reverse order in which files are tried you load. First
23421- try local file, when this failed absolute path.
23422-
23423-Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
23424-
23425- * cat-compat.c (bindtextdomain): Add missing { }.
23426-
23427-Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware>
23428-
23429- * libintl.inst: Add missing __P definition. Reported by Nelson Beebe.
23430-
23431- * Makefile.in:
23432- Add dummy `all' and `dvi' goals. Reported by Tom Tromey.
23433-
23434-Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca>
23435-
23436- * hash-string.h: Capitalize arguments of macros.
23437-
23438-Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware>
23439-
23440- * Makefile.in (DISTFILES): Prevent files names longer than 13
23441- characters. libintl.h.glibc->libintl.glibc,
23442- libintl.h.install->libintl.inst. Reported by Joshua R. Poulson.
23443-
23444-Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com>
23445-
23446- * dcgettext.c: Fix bug in preprocessor conditionals.
23447-
23448-Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
23449-
23450- * libgettext.h: Solaris cc does not understand
23451- #if !SYMBOL1 && !SYMBOL2. Sad but true.
23452-
23453-Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware>
23454-
23455- * hash-string.h (hash_string):
23456- Fix for machine with >32 bit `unsigned long's.
23457-
23458- * dcgettext.c (DCGETTEXT):
23459- Fix horrible bug in loop for alternative translation.
23460-
23461-Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware>
23462-
23463- * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
23464- Some further simplifications in message number generation.
23465-
23466-Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware>
23467-
23468- * libintl.h.glibc: Use __const instead of const in prototypes.
23469-
23470- * Makefile.in (install-src):
23471- Install libintl.h.install instead of libintl.h. This
23472- is a stripped-down version. Suggested by Peter Miller.
23473-
23474- * libintl.h.install, libintl.h.glibc: Initial revision.
23475-
23476- * localealias.c (_nl_expand_alias, read_alias_file):
23477- Protect prototypes in type casts by __P.
23478-
23479-Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware>
23480-
23481- * hash-string.h: Correct prototype for hash_string.
23482-
23483-Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware>
23484-
23485- * hash-string.h (hash_string): Add prototype.
23486-
23487- * gettextP.h: Fix copyright.
23488- (SWAP): Add prototype.
23489-
23490-Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware>
23491-
23492- * localealias.c (read_alias_file): Forgot sizeof.
23493- Avoid calling *printf function. This introduces a big overhead.
23494- Patch by Roland McGrath.
23495-
23496-Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware>
23497-
23498- * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
23499-
23500- * finddomain.c (stpcpy):
23501- Define substitution function local. The macro was to flaky.
23502-
23503- * cat-compat.c: Fix typo.
23504-
23505- * xopen-msg.sed, linux-msg.sed:
23506- While bringing message number to right place only accept digits.
23507-
23508- * linux-msg.sed, xopen-msg.sed: Now that the counter does not have
23509- leading 0s we don't need to remove them. Reported by Marcus
23510- Daniels.
23511-
23512- * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
23513- dependency. Reported by Marcus Daniels.
23514-
23515- * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
23516- Generally cleanup using #if instead of #ifndef.
23517-
23518- * Makefile.in: Correct typos in comment. By Franc,ois Pinard.
23519-
23520-Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware>
23521-
23522- * Makefile.in (install-src): Don't install libintl.h and libintl.a
23523- if we use an available gettext implementation.
23524-
23525-Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware>
23526-
23527- * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported
23528- by Franc,ois Pinard.
23529-
23530- * libgettext.h: Use #if instead of #ifdef/#ifndef.
23531-
23532- * finddomain.c:
23533- Comments describing what has to be done should start with FIXME.
23534-
23535-Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware>
23536-
23537- * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning.
23538- DISTFILES.common names the files common to both dist goals.
23539- DISTFILES.gettext are the files only distributed in GNU gettext.
23540-
23541-Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware>
23542-
23543- * dcgettext.c (DCGETTEXT): Correct searching in derived locales.
23544- This was necessary since a change in _nl_find_msg several weeks
23545- ago. I really don't know this is still not fixed.
23546-
23547-Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware>
23548-
23549- * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This
23550- might mark a special condition.
23551-
23552- * finddomain.c (make_entry_rec): Don't make illegal entry as decided.
23553-
23554- * Makefile.in (dist): Suppress error message when ln failed.
23555- Get files from $(srcdir) explicitly.
23556-
23557- * libgettext.h (gettext_const): Rename to gettext_noop.
23558-
23559-Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware>
23560-
23561- * finddomain.c (make_entry_rec):
23562- Protect against wrong locale names by testing mask.
23563-
23564- * libgettext.h (gettext_const): Add macro definition.
23565- Capitalize macro arguments.
23566-
23567-Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware>
23568-
23569- * finddomain.c (_nl_find_domain):
23570- Test for pointer != NULL before accessing value.
23571- Reported by Tom Tromey.
23572-
23573- * gettext.c (NULL):
23574- Define as (void*)0 instad of 0. Reported by Franc,ois Pinard.
23575-
23576-Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware>
23577-
23578- * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
23579-
23580-Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware>
23581-
23582- * libgettext.h: Disable dcgettext optimization for Solaris 2.3.
23583-
23584- * localealias.c (alias_compare):
23585- Peter Miller reported that tolower in some systems is
23586- even dumber than I thought. Protect call by `isupper'.
23587-
23588-Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware>
23589-
23590- * Makefile.in (libdir, includedir): New variables.
23591- (install-src): Install libintl.a and libintl.h in correct dirs.
23592-
23593-Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware>
23594-
23595- * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
23596-
23597- * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
23598-
23599- * localealias.c:
23600- Fix typo and superflous test. Reported by Christian von Roques.
23601-
23602-Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware>
23603-
23604- * finddomain.c (_nl_find_domain):
23605- Correct some remainder from the pre-CEN syntax. Now
23606- we don't have a constant number of successors anymore.
23607-
23608-Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware>
23609-
23610- * Makefile.in (DISTFILES): Add libintl.h.glibc.
23611-
23612- * Makefile.in (dist-libc): Add goal for packing sources for glibc.
23613- (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
23614-
23615- * loadmsgcat.c: Forget to continue #if line.
23616-
23617- * localealias.c:
23618- [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
23619- space clean.
23620-
23621- * dcgettext.c, finddomain.c: Better comment to last change.
23622-
23623- * loadmsgcat.c:
23624- [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
23625- __fstat, __open, __close, __read, __mmap, and __munmap resp
23626- to keep ANSI C name space clean.
23627-
23628- * finddomain.c:
23629- [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
23630-
23631- * dcgettext.c:
23632- [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
23633- keep ANSI C name space clean.
23634-
23635- * libgettext.h:
23636- Include sys/types.h for those old SysV systems out there.
23637- Reported by Francesco Potorti`.
23638-
23639- * loadmsgcat.c (use_mmap): Define if compiled for glibc.
23640-
23641- * bindtextdom.c: Include all those standard headers
23642- unconditionally if _LIBC is defined.
23643-
23644- * finddomain.c: Fix 2 times defiend -> defined.
23645-
23646- * textdomain.c: Include libintl.h instead of libgettext.h when
23647- compiling for glibc. Include all those standard headers
23648- unconditionally if _LIBC is defined.
23649-
23650- * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
23651-
23652- * gettext.c:
23653- Include libintl.h instead of libgettext.h when compiling for glibc.
23654- Get NULL from stddef.h if we compile for glibc.
23655-
23656- * finddomain.c: Include libintl.h instead of libgettext.h when
23657- compiling for glibc. Include all those standard headers
23658- unconditionally if _LIBC is defined.
23659-
23660- * dcgettext.c: Include all those standard headers unconditionally
23661- if _LIBC is defined.
23662-
23663- * dgettext.c: If compiled in glibc include libintl.h instead of
23664- libgettext.h.
23665- (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
23666-
23667- * dcgettext.c: If compiled in glibc include libintl.h instead of
23668- libgettext.h.
23669- (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
23670-
23671- * bindtextdom.c:
23672- If compiled in glibc include libintl.h instead of libgettext.h.
23673-
23674-Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware>
23675-
23676- * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
23677- Reported by Marcus Daniels.
23678-
23679- * cat-compat.c (bindtextdomain):
23680- String used in putenv must not be recycled.
23681- Reported by Marcus Daniels.
23682-
23683- * libgettext.h (__USE_GNU_GETTEXT):
23684- Additional symbol to signal that we use GNU gettext
23685- library.
23686-
23687- * cat-compat.c (bindtextdomain):
23688- Fix bug with the strange stpcpy replacement.
23689- Reported by Nelson Beebe.
23690-
23691-Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware>
23692-
23693- * cat-compat.c: Include <string.h> for stpcpy prototype.
23694-
23695- * localealias.c (read_alias_file):
23696- While expand strdup code temporary variable `cp' hided
23697- higher level variable with same name. Rename to `tp'.
23698-
23699- * textdomain.c (textdomain):
23700- Avoid warning by using temporary variable in strdup code.
23701-
23702- * finddomain.c (_nl_find_domain): Remove unused variable `application'.
23703-
23704-Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware>
23705-
23706- * localealias.c (alias_compare):
23707- Use strcasecmp() only if available. Else use
23708- implementation in place.
23709-
23710- * intl-compat.c:
23711- Wrapper functions now call *__ functions instead of __*.
23712-
23713- * libgettext.h: Declare prototypes for *__ functions instead for __*.
23714-
23715- * cat-compat.c, loadmsgcat.c:
23716- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
23717- of the standard libc and so prevent libintl.a from being used
23718- standalone.
23719-
23720- * bindtextdom.c:
23721- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
23722- of the standard libc and so prevent libintl.a from being used
23723- standalone.
23724- Rename to bindtextdomain__ if not used in GNU C Library.
23725-
23726- * dgettext.c:
23727- Rename function to dgettext__ if not used in GNU C Library.
23728-
23729- * gettext.c:
23730- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
23731- of the standard libc and so prevent libintl.a from being used
23732- standalone.
23733- Functions now called gettext__ if not used in GNU C Library.
23734-
23735- * dcgettext.c, localealias.c, textdomain.c, finddomain.c:
23736- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
23737- of the standard libc and so prevent libintl.a from being used
23738- standalone.
23739-
23740-Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware>
23741-
23742- * finddomain.c: Correct some bugs in handling of CEN standard
23743- locale definitions.
23744-
23745-Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware>
23746-
23747- * finddomain.c: Implement CEN syntax.
23748-
23749- * gettextP.h (loaded_domain): Extend number of successors to 31.
23750-
23751-Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware>
23752-
23753- * Makefile.in (aliaspath): Remove path to X11 locale dir.
23754-
23755- * Makefile.in: Make install-src depend on install. This helps
23756- gettext to install the sources and other packages can use the
23757- install goal.
23758-
23759-Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware>
23760-
23761- * Makefile.in (uninstall): Remove stuff installed by install-src.
23762-
23763-Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware>
23764-
23765- * VERSION.in: Initial revision.
23766-
23767- * Makefile.in (DISTFILES):
23768- Add VERSION file. This is not necessary for gettext, but
23769- for other packages using this library.
23770-
23771-Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware>
23772-
23773- * gettextP.h (_nl_find_domain):
23774- New prototype after changing search strategy.
23775-
23776- * finddomain.c (_nl_find_domain):
23777- We now try only to find a specified catalog. Fall back to other
23778- catalogs listed in the locale list is now done in __dcgettext.
23779-
23780- * dcgettext.c (__dcgettext):
23781- Now we provide message fall back even to different languages.
23782- I.e. if a message is not available in one language all the other
23783- in the locale list a tried. Formerly fall back was only possible
23784- within one language. Implemented by moving one loop from
23785- _nl_find_domain to here.
23786-
23787-Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware>
23788-
23789- * Makefile.in (gettextsrcdir):
23790- Directory where source of GNU gettext library are made
23791- available.
23792- (INSTALL, INSTALL_DATA): Programs used for installing sources.
23793- (gettext-src): New. Rule to install GNU gettext sources for use in
23794- gettextize shell script.
23795-
23796-Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware>
23797-
23798- * loadmsgcat.c (_nl_load_domain):
23799- Use mmap for loading only when munmap function is
23800- also available.
23801-
23802- * Makefile.in (install): Depend on `all' goal.
23803-
23804-Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware>
23805-
23806- * localealias.c (read_alias_file):
23807- Do not overwrite '\n' when terminating alias value string.
23808-
23809- * localealias.c (read_alias_file):
23810- Handle long lines. Ignore the rest not fitting in
23811- the buffer after the initial `fgets' call.
23812-
23813-Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware>
23814-
23815- * gettextP.h (_nl_load_domain):
23816- Add prototype, replacing prototype for _nl_load_msg_cat.
23817-
23818- * finddomain.c (_nl_find_domain):
23819- Remove unneeded variable filename and filename_len.
23820- (expand_alias): Remove prototype because functions does not
23821- exist anymore.
23822-
23823- * localealias.c (read_alias_file):
23824- Change type of fname_len parameter to int.
23825- (xmalloc): Add prototype.
23826-
23827- * loadmsgcat.c: Better prototypes for xmalloc.
23828-
23829-Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware>
23830-
23831- * finddomain.c (_nl_find_domain):
23832- Allow alias name to be constructed from the four components.
23833-
23834- * Makefile.in (aliaspath): New variable. Set to preliminary value.
23835- (SOURCES): Add localealias.c.
23836- (OBJECTS): Add localealias.o.
23837-
23838- * gettextP.h: Add prototype for _nl_expand_alias.
23839-
23840- * finddomain.c: Aliasing handled in intl/localealias.c.
23841-
23842- * localealias.c: Aliasing for locale names.
23843-
23844- * bindtextdom.c: Better prototypes for xmalloc and xstrdup.
23845-
23846-Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware>
23847-
23848- * Makefile.in (DISTFILES): gettext.perl is now found in misc/.
23849-
23850- * cat-compat.c (bindtextdomain):
23851- Correct implementation. dirname parameter was not used.
23852- Reported by Marcus Daniels.
23853-
23854- * gettextP.h (loaded_domain):
23855- New fields `successor' and `decided' for oo, lazy
23856- message handling implementation.
23857-
23858- * dcgettext.c:
23859- Adopt for oo, lazy message handliing.
23860- Now we can inherit translations from less specific locales.
23861- (find_msg): New function.
23862-
23863- * loadmsgcat.c, finddomain.c:
23864- Complete rewrite. Implement oo, lazy message handling :-).
23865- We now have an additional environment variable `LANGUAGE' with
23866- a higher priority than LC_ALL for the LC_MESSAGE locale.
23867- Here we can set a colon separated list of specifications each
23868- of the form `language[_territory[.codeset]][@modifier]'.
23869-
23870-Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware>
23871-
23872- * finddomain.c (unistd.h):
23873- Include to get _PC_PATH_MAX defined on system having it.
23874-
23875-Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware>
23876-
23877- * finddomain.c (stpcpy): Include prototype.
23878-
23879- * Makefile.in (dist): Remove `copying instead' message.
23880-
23881-Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware>
23882-
23883- * Makefile.in (ID, TAGS): Do not use $^.
23884-
23885-Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware>
23886-
23887- * Makefile.in (TAGS, ID): Use $^ as command argument.
23888- (TAGS): Give etags -o option t write to current directory,
23889- not $(srcdir).
23890- (ID): Use $(srcdir) instead os $(top_srcdir)/src.
23891- (distclean): Remove ID.
23892-
23893-Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware>
23894-
23895- * Makefile.in (gnulocaledir):
23896- New variable, always using share/ for data directory.
23897- (DEFS): Add GNULOCALEDIR, used in finddomain.c.
23898-
23899- * finddomain.c (_nl_default_dirname):
23900- Set to GNULOCALEDIR, because it always has to point
23901- to the directory where GNU gettext Library writes it to.
23902-
23903- * intl-compat.c (textdomain, bindtextdomain):
23904- Undefine macros before function definition.
23905-
23906-Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware>
23907-
23908- * libgettext.h (_LIBINTL_H):
23909- Protect definition in case where this file is included as
23910- libgettext.h on Solaris machines. Add comment about this.
23911-
23912-Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware>
23913-
23914- * intl-compat.c (textdomain): Correct typo.
23915-
23916-Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware>
23917-
23918- * dcgettext.c (dcgettext): Function now called __dcgettext.
23919-
23920- * dgettext.c (dgettext): Now called __dgettext and calls
23921- __dcgettext.
23922-
23923- * gettext.c (gettext):
23924- Function now called __gettext and calls __dgettext.
23925-
23926- * textdomain.c (textdomain): Function now called __textdomain.
23927-
23928- * bindtextdom.c (bindtextdomain): Function now called
23929- __bindtextdomain.
23930-
23931- * intl-compat.c: Initial revision.
23932-
23933- * Makefile.in (SOURCES): Add intl-compat.c.
23934- (OBJECTS): We always compile the GNU gettext library functions.
23935- OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
23936- and intl-compat.o.
23937- (GETTOBJS): Contains now only intl-compat.o.
23938-
23939- * libgettext.h:
23940- Re-include protection matches dualistic character of libgettext.h.
23941- For all functions in GNU gettext library define __ counter part.
23942-
23943- * finddomain.c (strchr): Define as index if not found in C library.
23944- (_nl_find_domain): For relative paths paste / in between.
23945-
23946-Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware>
23947-
23948- * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
23949-
23950- * xopen-msg.sed: Fix bug with `msgstr ""' lines.
23951- A little bit better comments.
23952-
23953-Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware>
23954-
23955- * Makefile.in:
23956- po-mode.el, makelinks, combine-sh are now found in ../misc.
23957-
23958- * po-mode.el, makelinks, combine-sh, elisp-comp:
23959- Moved to ../misc/.
23960-
23961- * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
23962-
23963-Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware>
23964-
23965- * Makefile.in (INSTALL, INSTALL_DATA): New variables.
23966- (install-data, uninstall): Install/uninstall .elc file.
23967-
23968- * po-mode.el (Installation comment):
23969- Add .pox as possible extension of .po files.
23970-
23971-Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware>
23972-
23973- * elisp-comp: Complete new version by Franc,ois: This does not
23974- fail when not compiling in the source directory.
23975-
23976-Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware>
23977-
23978- * Makefile.in (../po/cat-id-tbl.o):
23979- Use $(MAKE) instead of make for recursive make.
23980-
23981- * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
23982- (install-exec): Add missing dummy goal.
23983- (install-data, uninstall): @ in multi-line shell command at
23984- beginning, not in front of echo. Reported by Eric Backus.
23985-
23986-Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware>
23987-
23988- * Makefile.in (DISTFILES):
23989- Rename libgettext.perl to gettext.perl to fit in 14 chars
23990- file systems.
23991-
23992- * gettext.perl:
23993- Rename to gettext.perl to fit in 14 chars file systems.
23994-
23995-Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware>
23996-
23997- * cat-compat.c: If !STDC_HEADERS try to include malloc.h.
23998-
23999-Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware>
24000-
24001- * po2tbl.sed.in: Pretty printing.
24002-
24003- * linux-msg.sed, xopen-msg.sed:
24004- Correct bugs with handling substitute flags in branches.
24005-
24006- * hash-string.h (hash_string):
24007- Old K&R compilers don't under stand `unsigned char'.
24008-
24009- * gettext.h (nls_uint32):
24010- Some old K&R compilers (eg HP) don't understand `unsigned int'.
24011-
24012- * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
24013-
24014-Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware>
24015-
24016- * Makefile.in (ELCFILES): New variable.
24017- (DISTFILES): Add elisp-comp.
24018- Add implicit rule for .el -> .elc compilation.
24019- (install-data): install $ELCFILES
24020- (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
24021-
24022- * elisp-comp: Initial revision
24023-
24024-Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware>
24025-
24026- * Makefile.in:
24027- cat-id-tbl.c is now found in po/. This enables us to use an identical
24028- intl/ directory in all packages.
24029-
24030- * dcgettext.c (dcgettext): hashing does not work for table size <= 2.
24031-
24032- * textdomain.c: fix typo (#if def -> #if defined)
24033-
24034-Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware>
24035-
24036- * Makefile.in (stamp-cat-id): use top_srcdir to address source files
24037- (DISTFILES,distclean): move tupdate.perl to src/
24038-
24039- * po-to-tbl.sed.in:
24040- add additional jump to clear change flag to recognize multiline strings
24041-
24042-Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware>
24043-
24044- * textdomain.c: Protect inclusion of stdlib.h and string.h.
24045-
24046- * loadmsgcat.c: Protect inclusion of stdlib.h.
24047-
24048- * libgettext.h: Protect inclusion of locale.h.
24049- Allow use in C++ programs.
24050- Define NULL is not happened already.
24051-
24052- * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
24053- po-to-tbl.sed.
24054- (distclean): remove po-to-tbl.sed and tupdate.perl.
24055-
24056- * tupdate.perl.in: Substitute Perl path even in exec line.
24057- Don't include entries without translation from old .po file.
24058-
24059-Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware>
24060-
24061- * tupdate.perl.in: use "Updated: " in msgid "".
24062-
24063- * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
24064- Define getenv if !__STDC__.
24065-
24066- * bindtextdom.c: Protect stdlib.h and string.h inclusion.
24067- Define free if !__STDC__.
24068-
24069- * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
24070- Define free if !__STDC__.
24071-
24072- * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
24073-
24074-Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware>
24075-
24076- * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
24077- Remove unneeded $(srcdir) from Makefile.in dependency.
24078-
24079- * makelinks: Add copyright and short description.
24080-
24081- * po-mode.el: Last version for 0.7.
24082-
24083- * tupdate.perl.in: Fix die message.
24084-
24085- * dcgettext.c: Protect include of string.h.
24086-
24087- * gettext.c: Protect include of stdlib.h and further tries to get NULL.
24088-
24089- * finddomain.c: Some corrections in includes.
24090-
24091- * Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
24092-
24093- * po-to-tbl.sed: Adopt for new .po file format.
24094-
24095- * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
24096-
24097-Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware>
24098-
24099- * tupdate.perl.in: Complete rewrite for new .po file format.
24100-
24101-Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware>
24102-
24103- * First official release. This directory contains all the code
24104- needed to internationalize own packages. It provides functions
24105- which allow to use the X/Open catgets function with an interface
24106- like the Uniforum gettext function. For system which does not
24107- have neither of those a complete implementation is provided.
24108diff -uprN clean/lrzsz-0.12.20/intl/dcgettext.c lrzsz-0.12.20/intl/dcgettext.c
24109--- clean/lrzsz-0.12.20/intl/dcgettext.c 1998-04-26 14:22:36.000000000 +0100
24110+++ lrzsz-0.12.20/intl/dcgettext.c 1970-01-01 01:00:00.000000000 +0100
24111@@ -1,593 +0,0 @@
24112-/* Implementation of the dcgettext(3) function
24113- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
24114-
24115- This program is free software; you can redistribute it and/or modify
24116- it under the terms of the GNU General Public License as published by
24117- the Free Software Foundation; either version 2, or (at your option)
24118- any later version.
24119-
24120- This program is distributed in the hope that it will be useful,
24121- but WITHOUT ANY WARRANTY; without even the implied warranty of
24122- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24123- GNU General Public License for more details.
24124-
24125- You should have received a copy of the GNU General Public License
24126- along with this program; if not, write to the Free Software Foundation,
24127- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
24128-
24129-#ifdef HAVE_CONFIG_H
24130-# include <config.h>
24131-#endif
24132-
24133-#include <sys/types.h>
24134-
24135-#ifdef __GNUC__
24136-# define alloca __builtin_alloca
24137-# define HAVE_ALLOCA 1
24138-#else
24139-# if defined HAVE_ALLOCA_H || defined _LIBC
24140-# include <alloca.h>
24141-# else
24142-# ifdef _AIX
24143- #pragma alloca
24144-# else
24145-# ifndef alloca
24146-char *alloca ();
24147-# endif
24148-# endif
24149-# endif
24150-#endif
24151-
24152-#include <errno.h>
24153-#ifndef errno
24154-extern int errno;
24155-#endif
24156-#ifndef __set_errno
24157-# define __set_errno(val) errno = (val)
24158-#endif
24159-
24160-#if defined STDC_HEADERS || defined _LIBC
24161-# include <stdlib.h>
24162-#else
24163-char *getenv ();
24164-# ifdef HAVE_MALLOC_H
24165-# include <malloc.h>
24166-# else
24167-void free ();
24168-# endif
24169-#endif
24170-
24171-#if defined HAVE_STRING_H || defined _LIBC
24172-# ifndef _GNU_SOURCE
24173-# define _GNU_SOURCE 1
24174-# endif
24175-# include <string.h>
24176-#else
24177-# include <strings.h>
24178-#endif
24179-#if !HAVE_STRCHR && !defined _LIBC
24180-# ifndef strchr
24181-# define strchr index
24182-# endif
24183-#endif
24184-
24185-#if defined HAVE_UNISTD_H || defined _LIBC
24186-# include <unistd.h>
24187-#endif
24188-
24189-#include "gettext.h"
24190-#include "gettextP.h"
24191-#ifdef _LIBC
24192-# include <libintl.h>
24193-#else
24194-# include "libgettext.h"
24195-#endif
24196-#include "hash-string.h"
24197-
24198-/* @@ end of prolog @@ */
24199-
24200-#ifdef _LIBC
24201-/* Rename the non ANSI C functions. This is required by the standard
24202- because some ANSI C functions will require linking with this object
24203- file and the name space must not be polluted. */
24204-# define getcwd __getcwd
24205-# define stpcpy __stpcpy
24206-#else
24207-# if !defined HAVE_GETCWD
24208-char *getwd ();
24209-# define getcwd(buf, max) getwd (buf)
24210-# else
24211-char *getcwd ();
24212-# endif
24213-# ifndef HAVE_STPCPY
24214-static char *stpcpy PARAMS ((char *dest, const char *src));
24215-# endif
24216-#endif
24217-
24218-/* Amount to increase buffer size by in each try. */
24219-#define PATH_INCR 32
24220-
24221-/* The following is from pathmax.h. */
24222-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
24223- PATH_MAX but might cause redefinition warnings when sys/param.h is
24224- later included (as on MORE/BSD 4.3). */
24225-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
24226-# include <limits.h>
24227-#endif
24228-
24229-#ifndef _POSIX_PATH_MAX
24230-# define _POSIX_PATH_MAX 255
24231-#endif
24232-
24233-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
24234-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
24235-#endif
24236-
24237-/* Don't include sys/param.h if it already has been. */
24238-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
24239-# include <sys/param.h>
24240-#endif
24241-
24242-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
24243-# define PATH_MAX MAXPATHLEN
24244-#endif
24245-
24246-#ifndef PATH_MAX
24247-# define PATH_MAX _POSIX_PATH_MAX
24248-#endif
24249-
24250-/* XPG3 defines the result of `setlocale (category, NULL)' as:
24251- ``Directs `setlocale()' to query `category' and return the current
24252- setting of `local'.''
24253- However it does not specify the exact format. And even worse: POSIX
24254- defines this not at all. So we can use this feature only on selected
24255- system (e.g. those using GNU C Library). */
24256-#ifdef _LIBC
24257-# define HAVE_LOCALE_NULL
24258-#endif
24259-
24260-/* Name of the default domain used for gettext(3) prior any call to
24261- textdomain(3). The default value for this is "messages". */
24262-const char _nl_default_default_domain[] = "messages";
24263-
24264-/* Value used as the default domain for gettext(3). */
24265-const char *_nl_current_default_domain = _nl_default_default_domain;
24266-
24267-/* Contains the default location of the message catalogs. */
24268-const char _nl_default_dirname[] = GNULOCALEDIR;
24269-
24270-/* List with bindings of specific domains created by bindtextdomain()
24271- calls. */
24272-struct binding *_nl_domain_bindings;
24273-
24274-/* Prototypes for local functions. */
24275-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
24276- const char *msgid));
24277-static const char *category_to_name PARAMS ((int category));
24278-static const char *guess_category_value PARAMS ((int category,
24279- const char *categoryname));
24280-
24281-
24282-/* For those loosing systems which don't have `alloca' we have to add
24283- some additional code emulating it. */
24284-#ifdef HAVE_ALLOCA
24285-/* Nothing has to be done. */
24286-# define ADD_BLOCK(list, address) /* nothing */
24287-# define FREE_BLOCKS(list) /* nothing */
24288-#else
24289-struct block_list
24290-{
24291- void *address;
24292- struct block_list *next;
24293-};
24294-# define ADD_BLOCK(list, addr) \
24295- do { \
24296- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
24297- /* If we cannot get a free block we cannot add the new element to \
24298- the list. */ \
24299- if (newp != NULL) { \
24300- newp->address = (addr); \
24301- newp->next = (list); \
24302- (list) = newp; \
24303- } \
24304- } while (0)
24305-# define FREE_BLOCKS(list) \
24306- do { \
24307- while (list != NULL) { \
24308- struct block_list *old = list; \
24309- list = list->next; \
24310- free (old); \
24311- } \
24312- } while (0)
24313-# undef alloca
24314-# define alloca(size) (malloc (size))
24315-#endif /* have alloca */
24316-
24317-
24318-/* Names for the libintl functions are a problem. They must not clash
24319- with existing names and they should follow ANSI C. But this source
24320- code is also used in GNU C Library where the names have a __
24321- prefix. So we have to make a difference here. */
24322-#ifdef _LIBC
24323-# define DCGETTEXT __dcgettext
24324-#else
24325-# define DCGETTEXT dcgettext__
24326-#endif
24327-
24328-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
24329- locale. */
24330-char *
24331-DCGETTEXT (domainname, msgid, category)
24332- const char *domainname;
24333- const char *msgid;
24334- int category;
24335-{
24336-#ifndef HAVE_ALLOCA
24337- struct block_list *block_list = NULL;
24338-#endif
24339- struct loaded_l10nfile *domain;
24340- struct binding *binding;
24341- const char *categoryname;
24342- const char *categoryvalue;
24343- char *dirname, *xdomainname;
24344- char *single_locale;
24345- char *retval;
24346- int saved_errno = errno;
24347-
24348- /* If no real MSGID is given return NULL. */
24349- if (msgid == NULL)
24350- return NULL;
24351-
24352- /* If DOMAINNAME is NULL, we are interested in the default domain. If
24353- CATEGORY is not LC_MESSAGES this might not make much sense but the
24354- defintion left this undefined. */
24355- if (domainname == NULL)
24356- domainname = _nl_current_default_domain;
24357-
24358- /* First find matching binding. */
24359- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
24360- {
24361- int compare = strcmp (domainname, binding->domainname);
24362- if (compare == 0)
24363- /* We found it! */
24364- break;
24365- if (compare < 0)
24366- {
24367- /* It is not in the list. */
24368- binding = NULL;
24369- break;
24370- }
24371- }
24372-
24373- if (binding == NULL)
24374- dirname = (char *) _nl_default_dirname;
24375- else if (binding->dirname[0] == '/')
24376- dirname = binding->dirname;
24377- else
24378- {
24379- /* We have a relative path. Make it absolute now. */
24380- size_t dirname_len = strlen (binding->dirname) + 1;
24381- size_t path_max;
24382- char *ret;
24383-
24384- path_max = (unsigned) PATH_MAX;
24385- path_max += 2; /* The getcwd docs say to do this. */
24386-
24387- dirname = (char *) alloca (path_max + dirname_len);
24388- ADD_BLOCK (block_list, dirname);
24389-
24390- __set_errno (0);
24391- while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
24392- {
24393- path_max += PATH_INCR;
24394- dirname = (char *) alloca (path_max + dirname_len);
24395- ADD_BLOCK (block_list, dirname);
24396- __set_errno (0);
24397- }
24398-
24399- if (ret == NULL)
24400- {
24401- /* We cannot get the current working directory. Don't signal an
24402- error but simply return the default string. */
24403- FREE_BLOCKS (block_list);
24404- __set_errno (saved_errno);
24405- return (char *) msgid;
24406- }
24407-
24408- stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
24409- }
24410-
24411- /* Now determine the symbolic name of CATEGORY and its value. */
24412- categoryname = category_to_name (category);
24413- categoryvalue = guess_category_value (category, categoryname);
24414-
24415- xdomainname = (char *) alloca (strlen (categoryname)
24416- + strlen (domainname) + 5);
24417- ADD_BLOCK (block_list, xdomainname);
24418-
24419- stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
24420- domainname),
24421- ".mo");
24422-
24423- /* Creating working area. */
24424- single_locale = (char *) alloca (strlen (categoryvalue) + 1);
24425- ADD_BLOCK (block_list, single_locale);
24426-
24427-
24428- /* Search for the given string. This is a loop because we perhaps
24429- got an ordered list of languages to consider for th translation. */
24430- while (1)
24431- {
24432- /* Make CATEGORYVALUE point to the next element of the list. */
24433- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
24434- ++categoryvalue;
24435- if (categoryvalue[0] == '\0')
24436- {
24437- /* The whole contents of CATEGORYVALUE has been searched but
24438- no valid entry has been found. We solve this situation
24439- by implicitly appending a "C" entry, i.e. no translation
24440- will take place. */
24441- single_locale[0] = 'C';
24442- single_locale[1] = '\0';
24443- }
24444- else
24445- {
24446- char *cp = single_locale;
24447- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
24448- *cp++ = *categoryvalue++;
24449- *cp = '\0';
24450- }
24451-
24452- /* If the current locale value is C (or POSIX) we don't load a
24453- domain. Return the MSGID. */
24454- if (strcmp (single_locale, "C") == 0
24455- || strcmp (single_locale, "POSIX") == 0)
24456- {
24457- FREE_BLOCKS (block_list);
24458- __set_errno (saved_errno);
24459- return (char *) msgid;
24460- }
24461-
24462-
24463- /* Find structure describing the message catalog matching the
24464- DOMAINNAME and CATEGORY. */
24465- domain = _nl_find_domain (dirname, single_locale, xdomainname);
24466-
24467- if (domain != NULL)
24468- {
24469- retval = find_msg (domain, msgid);
24470-
24471- if (retval == NULL)
24472- {
24473- int cnt;
24474-
24475- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
24476- {
24477- retval = find_msg (domain->successor[cnt], msgid);
24478-
24479- if (retval != NULL)
24480- break;
24481- }
24482- }
24483-
24484- if (retval != NULL)
24485- {
24486- FREE_BLOCKS (block_list);
24487- __set_errno (saved_errno);
24488- return retval;
24489- }
24490- }
24491- }
24492- /* NOTREACHED */
24493-}
24494-
24495-#ifdef _LIBC
24496-/* Alias for function name in GNU C Library. */
24497-weak_alias (__dcgettext, dcgettext);
24498-#endif
24499-
24500-
24501-static char *
24502-find_msg (domain_file, msgid)
24503- struct loaded_l10nfile *domain_file;
24504- const char *msgid;
24505-{
24506- size_t top, act, bottom;
24507- struct loaded_domain *domain;
24508-
24509- if (domain_file->decided == 0)
24510- _nl_load_domain (domain_file);
24511-
24512- if (domain_file->data == NULL)
24513- return NULL;
24514-
24515- domain = (struct loaded_domain *) domain_file->data;
24516-
24517- /* Locate the MSGID and its translation. */
24518- if (domain->hash_size > 2 && domain->hash_tab != NULL)
24519- {
24520- /* Use the hashing table. */
24521- nls_uint32 len = strlen (msgid);
24522- nls_uint32 hash_val = hash_string (msgid);
24523- nls_uint32 idx = hash_val % domain->hash_size;
24524- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
24525- nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
24526-
24527- if (nstr == 0)
24528- /* Hash table entry is empty. */
24529- return NULL;
24530-
24531- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
24532- && strcmp (msgid,
24533- domain->data + W (domain->must_swap,
24534- domain->orig_tab[nstr - 1].offset)) == 0)
24535- return (char *) domain->data + W (domain->must_swap,
24536- domain->trans_tab[nstr - 1].offset);
24537-
24538- while (1)
24539- {
24540- if (idx >= domain->hash_size - incr)
24541- idx -= domain->hash_size - incr;
24542- else
24543- idx += incr;
24544-
24545- nstr = W (domain->must_swap, domain->hash_tab[idx]);
24546- if (nstr == 0)
24547- /* Hash table entry is empty. */
24548- return NULL;
24549-
24550- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
24551- && strcmp (msgid,
24552- domain->data + W (domain->must_swap,
24553- domain->orig_tab[nstr - 1].offset))
24554- == 0)
24555- return (char *) domain->data
24556- + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
24557- }
24558- /* NOTREACHED */
24559- }
24560-
24561- /* Now we try the default method: binary search in the sorted
24562- array of messages. */
24563- bottom = 0;
24564- top = domain->nstrings;
24565- while (bottom < top)
24566- {
24567- int cmp_val;
24568-
24569- act = (bottom + top) / 2;
24570- cmp_val = strcmp (msgid, domain->data
24571- + W (domain->must_swap,
24572- domain->orig_tab[act].offset));
24573- if (cmp_val < 0)
24574- top = act;
24575- else if (cmp_val > 0)
24576- bottom = act + 1;
24577- else
24578- break;
24579- }
24580-
24581- /* If an translation is found return this. */
24582- return bottom >= top ? NULL : (char *) domain->data
24583- + W (domain->must_swap,
24584- domain->trans_tab[act].offset);
24585-}
24586-
24587-
24588-/* Return string representation of locale CATEGORY. */
24589-static const char *
24590-category_to_name (category)
24591- int category;
24592-{
24593- const char *retval;
24594-
24595- switch (category)
24596- {
24597-#ifdef LC_COLLATE
24598- case LC_COLLATE:
24599- retval = "LC_COLLATE";
24600- break;
24601-#endif
24602-#ifdef LC_CTYPE
24603- case LC_CTYPE:
24604- retval = "LC_CTYPE";
24605- break;
24606-#endif
24607-#ifdef LC_MONETARY
24608- case LC_MONETARY:
24609- retval = "LC_MONETARY";
24610- break;
24611-#endif
24612-#ifdef LC_NUMERIC
24613- case LC_NUMERIC:
24614- retval = "LC_NUMERIC";
24615- break;
24616-#endif
24617-#ifdef LC_TIME
24618- case LC_TIME:
24619- retval = "LC_TIME";
24620- break;
24621-#endif
24622-#ifdef LC_MESSAGES
24623- case LC_MESSAGES:
24624- retval = "LC_MESSAGES";
24625- break;
24626-#endif
24627-#ifdef LC_RESPONSE
24628- case LC_RESPONSE:
24629- retval = "LC_RESPONSE";
24630- break;
24631-#endif
24632-#ifdef LC_ALL
24633- case LC_ALL:
24634- /* This might not make sense but is perhaps better than any other
24635- value. */
24636- retval = "LC_ALL";
24637- break;
24638-#endif
24639- default:
24640- /* If you have a better idea for a default value let me know. */
24641- retval = "LC_XXX";
24642- }
24643-
24644- return retval;
24645-}
24646-
24647-/* Guess value of current locale from value of the environment variables. */
24648-static const char *
24649-guess_category_value (category, categoryname)
24650- int category;
24651- const char *categoryname;
24652-{
24653- const char *retval;
24654-
24655- /* The highest priority value is the `LANGUAGE' environment
24656- variable. This is a GNU extension. */
24657- retval = getenv ("LANGUAGE");
24658- if (retval != NULL && retval[0] != '\0')
24659- return retval;
24660-
24661- /* `LANGUAGE' is not set. So we have to proceed with the POSIX
24662- methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some
24663- systems this can be done by the `setlocale' function itself. */
24664-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
24665- return setlocale (category, NULL);
24666-#else
24667- /* Setting of LC_ALL overwrites all other. */
24668- retval = getenv ("LC_ALL");
24669- if (retval != NULL && retval[0] != '\0')
24670- return retval;
24671-
24672- /* Next comes the name of the desired category. */
24673- retval = getenv (categoryname);
24674- if (retval != NULL && retval[0] != '\0')
24675- return retval;
24676-
24677- /* Last possibility is the LANG environment variable. */
24678- retval = getenv ("LANG");
24679- if (retval != NULL && retval[0] != '\0')
24680- return retval;
24681-
24682- /* We use C as the default domain. POSIX says this is implementation
24683- defined. */
24684- return "C";
24685-#endif
24686-}
24687-
24688-/* @@ begin of epilog @@ */
24689-
24690-/* We don't want libintl.a to depend on any other library. So we
24691- avoid the non-standard function stpcpy. In GNU C Library this
24692- function is available, though. Also allow the symbol HAVE_STPCPY
24693- to be defined. */
24694-#if !_LIBC && !HAVE_STPCPY
24695-static char *
24696-stpcpy (dest, src)
24697- char *dest;
24698- const char *src;
24699-{
24700- while ((*dest++ = *src++) != '\0')
24701- /* Do nothing. */ ;
24702- return dest - 1;
24703-}
24704-#endif
24705diff -uprN clean/lrzsz-0.12.20/intl/dgettext.c lrzsz-0.12.20/intl/dgettext.c
24706--- clean/lrzsz-0.12.20/intl/dgettext.c 1998-04-26 14:20:52.000000000 +0100
24707+++ lrzsz-0.12.20/intl/dgettext.c 1970-01-01 01:00:00.000000000 +0100
24708@@ -1,59 +0,0 @@
24709-/* dgettext.c -- implementation of the dgettext(3) function
24710- Copyright (C) 1995 Software Foundation, Inc.
24711-
24712-This program is free software; you can redistribute it and/or modify
24713-it under the terms of the GNU General Public License as published by
24714-the Free Software Foundation; either version 2, or (at your option)
24715-any later version.
24716-
24717-This program is distributed in the hope that it will be useful,
24718-but WITHOUT ANY WARRANTY; without even the implied warranty of
24719-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24720-GNU General Public License for more details.
24721-
24722-You should have received a copy of the GNU General Public License
24723-along with this program; if not, write to the Free Software
24724-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
24725-
24726-#ifdef HAVE_CONFIG_H
24727-# include <config.h>
24728-#endif
24729-
24730-#if defined HAVE_LOCALE_H || defined _LIBC
24731-# include <locale.h>
24732-#endif
24733-
24734-#ifdef _LIBC
24735-# include <libintl.h>
24736-#else
24737-# include "libgettext.h"
24738-#endif
24739-
24740-/* @@ end of prolog @@ */
24741-
24742-/* Names for the libintl functions are a problem. They must not clash
24743- with existing names and they should follow ANSI C. But this source
24744- code is also used in GNU C Library where the names have a __
24745- prefix. So we have to make a difference here. */
24746-#ifdef _LIBC
24747-# define DGETTEXT __dgettext
24748-# define DCGETTEXT __dcgettext
24749-#else
24750-# define DGETTEXT dgettext__
24751-# define DCGETTEXT dcgettext__
24752-#endif
24753-
24754-/* Look up MSGID in the DOMAINNAME message catalog of the current
24755- LC_MESSAGES locale. */
24756-char *
24757-DGETTEXT (domainname, msgid)
24758- const char *domainname;
24759- const char *msgid;
24760-{
24761- return DCGETTEXT (domainname, msgid, LC_MESSAGES);
24762-}
24763-
24764-#ifdef _LIBC
24765-/* Alias for function name in GNU C Library. */
24766-weak_alias (__dgettext, dgettext);
24767-#endif
24768diff -uprN clean/lrzsz-0.12.20/intl/explodename.c lrzsz-0.12.20/intl/explodename.c
24769--- clean/lrzsz-0.12.20/intl/explodename.c 1998-04-26 14:22:37.000000000 +0100
24770+++ lrzsz-0.12.20/intl/explodename.c 1970-01-01 01:00:00.000000000 +0100
24771@@ -1,181 +0,0 @@
24772-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
24773- Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
24774-
24775- This program is free software; you can redistribute it and/or modify
24776- it under the terms of the GNU General Public License as published by
24777- the Free Software Foundation; either version 2, or (at your option)
24778- any later version.
24779-
24780- This program is distributed in the hope that it will be useful,
24781- but WITHOUT ANY WARRANTY; without even the implied warranty of
24782- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24783- GNU General Public License for more details.
24784-
24785- You should have received a copy of the GNU General Public License
24786- along with this program; if not, write to the Free Software Foundation,
24787- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
24788-
24789-#ifdef HAVE_CONFIG_H
24790-# include <config.h>
24791-#endif
24792-
24793-#include <stdlib.h>
24794-#include <string.h>
24795-#include <sys/types.h>
24796-
24797-#include "loadinfo.h"
24798-
24799-/* On some strange systems still no definition of NULL is found. Sigh! */
24800-#ifndef NULL
24801-# if defined __STDC__ && __STDC__
24802-# define NULL ((void *) 0)
24803-# else
24804-# define NULL 0
24805-# endif
24806-#endif
24807-
24808-/* @@ end of prolog @@ */
24809-
24810-int
24811-_nl_explode_name (name, language, modifier, territory, codeset,
24812- normalized_codeset, special, sponsor, revision)
24813- char *name;
24814- const char **language;
24815- const char **modifier;
24816- const char **territory;
24817- const char **codeset;
24818- const char **normalized_codeset;
24819- const char **special;
24820- const char **sponsor;
24821- const char **revision;
24822-{
24823- enum { undecided, xpg, cen } syntax;
24824- char *cp;
24825- int mask;
24826-
24827- *modifier = NULL;
24828- *territory = NULL;
24829- *codeset = NULL;
24830- *normalized_codeset = NULL;
24831- *special = NULL;
24832- *sponsor = NULL;
24833- *revision = NULL;
24834-
24835- /* Now we determine the single parts of the locale name. First
24836- look for the language. Termination symbols are `_' and `@' if
24837- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
24838- mask = 0;
24839- syntax = undecided;
24840- *language = cp = name;
24841- while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
24842- && cp[0] != '+' && cp[0] != ',')
24843- ++cp;
24844-
24845- if (*language == cp)
24846- /* This does not make sense: language has to be specified. Use
24847- this entry as it is without exploding. Perhaps it is an alias. */
24848- cp = strchr (*language, '\0');
24849- else if (cp[0] == '_')
24850- {
24851- /* Next is the territory. */
24852- cp[0] = '\0';
24853- *territory = ++cp;
24854-
24855- while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
24856- && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
24857- ++cp;
24858-
24859- mask |= TERRITORY;
24860-
24861- if (cp[0] == '.')
24862- {
24863- /* Next is the codeset. */
24864- syntax = xpg;
24865- cp[0] = '\0';
24866- *codeset = ++cp;
24867-
24868- while (cp[0] != '\0' && cp[0] != '@')
24869- ++cp;
24870-
24871- mask |= XPG_CODESET;
24872-
24873- if (*codeset != cp && (*codeset)[0] != '\0')
24874- {
24875- *normalized_codeset = _nl_normalize_codeset (*codeset,
24876- cp - *codeset);
24877- if (strcmp (*codeset, *normalized_codeset) == 0)
24878- free ((char *) *normalized_codeset);
24879- else
24880- mask |= XPG_NORM_CODESET;
24881- }
24882- }
24883- }
24884-
24885- if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
24886- {
24887- /* Next is the modifier. */
24888- syntax = cp[0] == '@' ? xpg : cen;
24889- cp[0] = '\0';
24890- *modifier = ++cp;
24891-
24892- while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
24893- && cp[0] != ',' && cp[0] != '_')
24894- ++cp;
24895-
24896- mask |= XPG_MODIFIER | CEN_AUDIENCE;
24897- }
24898-
24899- if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
24900- {
24901- syntax = cen;
24902-
24903- if (cp[0] == '+')
24904- {
24905- /* Next is special application (CEN syntax). */
24906- cp[0] = '\0';
24907- *special = ++cp;
24908-
24909- while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
24910- ++cp;
24911-
24912- mask |= CEN_SPECIAL;
24913- }
24914-
24915- if (cp[0] == ',')
24916- {
24917- /* Next is sponsor (CEN syntax). */
24918- cp[0] = '\0';
24919- *sponsor = ++cp;
24920-
24921- while (cp[0] != '\0' && cp[0] != '_')
24922- ++cp;
24923-
24924- mask |= CEN_SPONSOR;
24925- }
24926-
24927- if (cp[0] == '_')
24928- {
24929- /* Next is revision (CEN syntax). */
24930- cp[0] = '\0';
24931- *revision = ++cp;
24932-
24933- mask |= CEN_REVISION;
24934- }
24935- }
24936-
24937- /* For CEN syntax values it might be important to have the
24938- separator character in the file name, not for XPG syntax. */
24939- if (syntax == xpg)
24940- {
24941- if (*territory != NULL && (*territory)[0] == '\0')
24942- mask &= ~TERRITORY;
24943-
24944- if (*codeset != NULL && (*codeset)[0] == '\0')
24945- mask &= ~XPG_CODESET;
24946-
24947- if (*modifier != NULL && (*modifier)[0] == '\0')
24948- mask &= ~XPG_MODIFIER;
24949- }
24950-
24951- return mask;
24952-}
24953diff -uprN clean/lrzsz-0.12.20/intl/finddomain.c lrzsz-0.12.20/intl/finddomain.c
24954--- clean/lrzsz-0.12.20/intl/finddomain.c 1998-04-26 14:22:36.000000000 +0100
24955+++ lrzsz-0.12.20/intl/finddomain.c 1970-01-01 01:00:00.000000000 +0100
24956@@ -1,189 +0,0 @@
24957-/* Handle list of needed message catalogs
24958- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
24959- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
24960-
24961- This program is free software; you can redistribute it and/or modify
24962- it under the terms of the GNU General Public License as published by
24963- the Free Software Foundation; either version 2, or (at your option)
24964- any later version.
24965-
24966- This program is distributed in the hope that it will be useful,
24967- but WITHOUT ANY WARRANTY; without even the implied warranty of
24968- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24969- GNU General Public License for more details.
24970-
24971- You should have received a copy of the GNU General Public License
24972- along with this program; if not, write to the Free Software Foundation,
24973- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
24974-
24975-#ifdef HAVE_CONFIG_H
24976-# include <config.h>
24977-#endif
24978-
24979-#include <ctype.h>
24980-#include <errno.h>
24981-#include <stdio.h>
24982-#include <sys/types.h>
24983-
24984-#if defined STDC_HEADERS || defined _LIBC
24985-# include <stdlib.h>
24986-#else
24987-# ifdef HAVE_MALLOC_H
24988-# include <malloc.h>
24989-# else
24990-void free ();
24991-# endif
24992-#endif
24993-
24994-#if defined HAVE_STRING_H || defined _LIBC
24995-# include <string.h>
24996-#else
24997-# include <strings.h>
24998-# ifndef memcpy
24999-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
25000-# endif
25001-#endif
25002-#if !HAVE_STRCHR && !defined _LIBC
25003-# ifndef strchr
25004-# define strchr index
25005-# endif
25006-#endif
25007-
25008-#if defined HAVE_UNISTD_H || defined _LIBC
25009-# include <unistd.h>
25010-#endif
25011-
25012-#include "gettext.h"
25013-#include "gettextP.h"
25014-#ifdef _LIBC
25015-# include <libintl.h>
25016-#else
25017-# include "libgettext.h"
25018-#endif
25019-
25020-/* @@ end of prolog @@ */
25021-/* List of already loaded domains. */
25022-static struct loaded_l10nfile *_nl_loaded_domains;
25023-
25024-
25025-/* Return a data structure describing the message catalog described by
25026- the DOMAINNAME and CATEGORY parameters with respect to the currently
25027- established bindings. */
25028-struct loaded_l10nfile *
25029-_nl_find_domain (dirname, locale, domainname)
25030- const char *dirname;
25031- char *locale;
25032- const char *domainname;
25033-{
25034- struct loaded_l10nfile *retval;
25035- const char *language;
25036- const char *modifier;
25037- const char *territory;
25038- const char *codeset;
25039- const char *normalized_codeset;
25040- const char *special;
25041- const char *sponsor;
25042- const char *revision;
25043- const char *alias_value;
25044- int mask;
25045-
25046- /* LOCALE can consist of up to four recognized parts for the XPG syntax:
25047-
25048- language[_territory[.codeset]][@modifier]
25049-
25050- and six parts for the CEN syntax:
25051-
25052- language[_territory][+audience][+special][,[sponsor][_revision]]
25053-
25054- Beside the first all of them are allowed to be missing. If the
25055- full specified locale is not found, the less specific one are
25056- looked for. The various part will be stripped of according to
25057- the following order:
25058- (1) revision
25059- (2) sponsor
25060- (3) special
25061- (4) codeset
25062- (5) normalized codeset
25063- (6) territory
25064- (7) audience/modifier
25065- */
25066-
25067- /* If we have already tested for this locale entry there has to
25068- be one data set in the list of loaded domains. */
25069- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
25070- strlen (dirname) + 1, 0, locale, NULL, NULL,
25071- NULL, NULL, NULL, NULL, NULL, domainname, 0);
25072- if (retval != NULL)
25073- {
25074- /* We know something about this locale. */
25075- int cnt;
25076-
25077- if (retval->decided == 0)
25078- _nl_load_domain (retval);
25079-
25080- if (retval->data != NULL)
25081- return retval;
25082-
25083- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
25084- {
25085- if (retval->successor[cnt]->decided == 0)
25086- _nl_load_domain (retval->successor[cnt]);
25087-
25088- if (retval->successor[cnt]->data != NULL)
25089- break;
25090- }
25091- return cnt >= 0 ? retval : NULL;
25092- /* NOTREACHED */
25093- }
25094-
25095- /* See whether the locale value is an alias. If yes its value
25096- *overwrites* the alias name. No test for the original value is
25097- done. */
25098- alias_value = _nl_expand_alias (locale);
25099- if (alias_value != NULL)
25100- {
25101- size_t len = strlen (alias_value) + 1;
25102- locale = (char *) malloc (len);
25103- if (locale == NULL)
25104- return NULL;
25105-
25106- memcpy (locale, alias_value, len);
25107- }
25108-
25109- /* Now we determine the single parts of the locale name. First
25110- look for the language. Termination symbols are `_' and `@' if
25111- we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
25112- mask = _nl_explode_name (locale, &language, &modifier, &territory,
25113- &codeset, &normalized_codeset, &special,
25114- &sponsor, &revision);
25115-
25116- /* Create all possible locale entries which might be interested in
25117- generalization. */
25118- retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
25119- strlen (dirname) + 1, mask, language, territory,
25120- codeset, normalized_codeset, modifier, special,
25121- sponsor, revision, domainname, 1);
25122- if (retval == NULL)
25123- /* This means we are out of core. */
25124- return NULL;
25125-
25126- if (retval->decided == 0)
25127- _nl_load_domain (retval);
25128- if (retval->data == NULL)
25129- {
25130- int cnt;
25131- for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
25132- {
25133- if (retval->successor[cnt]->decided == 0)
25134- _nl_load_domain (retval->successor[cnt]);
25135- if (retval->successor[cnt]->data != NULL)
25136- break;
25137- }
25138- }
25139-
25140- /* The room for an alias was dynamically allocated. Free it now. */
25141- if (alias_value != NULL)
25142- free (locale);
25143-
25144- return retval;
25145-}
25146diff -uprN clean/lrzsz-0.12.20/intl/gettext.c lrzsz-0.12.20/intl/gettext.c
25147--- clean/lrzsz-0.12.20/intl/gettext.c 1998-04-26 14:22:36.000000000 +0100
25148+++ lrzsz-0.12.20/intl/gettext.c 1970-01-01 01:00:00.000000000 +0100
25149@@ -1,70 +0,0 @@
25150-/* Implementation of gettext(3) function
25151- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
25152-
25153- This program is free software; you can redistribute it and/or modify
25154- it under the terms of the GNU General Public License as published by
25155- the Free Software Foundation; either version 2, or (at your option)
25156- any later version.
25157-
25158- This program is distributed in the hope that it will be useful,
25159- but WITHOUT ANY WARRANTY; without even the implied warranty of
25160- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25161- GNU General Public License for more details.
25162-
25163- You should have received a copy of the GNU General Public License
25164- along with this program; if not, write to the Free Software Foundation,
25165- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
25166-
25167-#ifdef HAVE_CONFIG_H
25168-# include <config.h>
25169-#endif
25170-
25171-#ifdef _LIBC
25172-# define __need_NULL
25173-# include <stddef.h>
25174-#else
25175-# ifdef STDC_HEADERS
25176-# include <stdlib.h> /* Just for NULL. */
25177-# else
25178-# ifdef HAVE_STRING_H
25179-# include <string.h>
25180-# else
25181-# define NULL ((void *) 0)
25182-# endif
25183-# endif
25184-#endif
25185-
25186-#ifdef _LIBC
25187-# include <libintl.h>
25188-#else
25189-# include "libgettext.h"
25190-#endif
25191-
25192-/* @@ end of prolog @@ */
25193-
25194-/* Names for the libintl functions are a problem. They must not clash
25195- with existing names and they should follow ANSI C. But this source
25196- code is also used in GNU C Library where the names have a __
25197- prefix. So we have to make a difference here. */
25198-#ifdef _LIBC
25199-# define GETTEXT __gettext
25200-# define DGETTEXT __dgettext
25201-#else
25202-# define GETTEXT gettext__
25203-# define DGETTEXT dgettext__
25204-#endif
25205-
25206-/* Look up MSGID in the current default message catalog for the current
25207- LC_MESSAGES locale. If not found, returns MSGID itself (the default
25208- text). */
25209-char *
25210-GETTEXT (msgid)
25211- const char *msgid;
25212-{
25213- return DGETTEXT (NULL, msgid);
25214-}
25215-
25216-#ifdef _LIBC
25217-/* Alias for function name in GNU C Library. */
25218-weak_alias (__gettext, gettext);
25219-#endif
25220diff -uprN clean/lrzsz-0.12.20/intl/gettext.h lrzsz-0.12.20/intl/gettext.h
25221--- clean/lrzsz-0.12.20/intl/gettext.h 1998-04-26 14:22:35.000000000 +0100
25222+++ lrzsz-0.12.20/intl/gettext.h 1970-01-01 01:00:00.000000000 +0100
25223@@ -1,105 +0,0 @@
25224-/* Internal header for GNU gettext internationalization functions
25225- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
25226-
25227- This program is free software; you can redistribute it and/or modify
25228- it under the terms of the GNU General Public License as published by
25229- the Free Software Foundation; either version 2, or (at your option)
25230- any later version.
25231-
25232- This program is distributed in the hope that it will be useful,
25233- but WITHOUT ANY WARRANTY; without even the implied warranty of
25234- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25235- GNU General Public License for more details.
25236-
25237- You should have received a copy of the GNU Library General Public
25238- License along with the GNU C Library; see the file COPYING.LIB. If not,
25239- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25240- Boston, MA 02111-1307, USA. */
25241-
25242-#ifndef _GETTEXT_H
25243-#define _GETTEXT_H 1
25244-
25245-#include <stdio.h>
25246-
25247-#if HAVE_LIMITS_H || _LIBC
25248-# include <limits.h>
25249-#endif
25250-
25251-/* @@ end of prolog @@ */
25252-
25253-/* The magic number of the GNU message catalog format. */
25254-#define _MAGIC 0x950412de
25255-#define _MAGIC_SWAPPED 0xde120495
25256-
25257-/* Revision number of the currently used .mo (binary) file format. */
25258-#define MO_REVISION_NUMBER 0
25259-
25260-/* The following contortions are an attempt to use the C preprocessor
25261- to determine an unsigned integral type that is 32 bits wide. An
25262- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
25263- doing that would require that the configure script compile and *run*
25264- the resulting executable. Locally running cross-compiled executables
25265- is usually not possible. */
25266-
25267-#if __STDC__
25268-# define UINT_MAX_32_BITS 4294967295U
25269-#else
25270-# define UINT_MAX_32_BITS 0xFFFFFFFF
25271-#endif
25272-
25273-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
25274- This should be valid for all systems GNU cares about because
25275- that doesn't include 16-bit systems, and only modern systems
25276- (that certainly have <limits.h>) have 64+-bit integral types. */
25277-
25278-#ifndef UINT_MAX
25279-# define UINT_MAX UINT_MAX_32_BITS
25280-#endif
25281-
25282-#if UINT_MAX == UINT_MAX_32_BITS
25283-typedef unsigned nls_uint32;
25284-#else
25285-# if USHRT_MAX == UINT_MAX_32_BITS
25286-typedef unsigned short nls_uint32;
25287-# else
25288-# if ULONG_MAX == UINT_MAX_32_BITS
25289-typedef unsigned long nls_uint32;
25290-# else
25291- /* The following line is intended to throw an error. Using #error is
25292- not portable enough. */
25293- "Cannot determine unsigned 32-bit data type."
25294-# endif
25295-# endif
25296-#endif
25297-
25298-
25299-/* Header for binary .mo file format. */
25300-struct mo_file_header
25301-{
25302- /* The magic number. */
25303- nls_uint32 magic;
25304- /* The revision number of the file format. */
25305- nls_uint32 revision;
25306- /* The number of strings pairs. */
25307- nls_uint32 nstrings;
25308- /* Offset of table with start offsets of original strings. */
25309- nls_uint32 orig_tab_offset;
25310- /* Offset of table with start offsets of translation strings. */
25311- nls_uint32 trans_tab_offset;
25312- /* Size of hashing table. */
25313- nls_uint32 hash_tab_size;
25314- /* Offset of first hashing entry. */
25315- nls_uint32 hash_tab_offset;
25316-};
25317-
25318-struct string_desc
25319-{
25320- /* Length of addressed string. */
25321- nls_uint32 length;
25322- /* Offset of string in file. */
25323- nls_uint32 offset;
25324-};
25325-
25326-/* @@ begin of epilog @@ */
25327-
25328-#endif /* gettext.h */
25329diff -uprN clean/lrzsz-0.12.20/intl/gettextP.h lrzsz-0.12.20/intl/gettextP.h
25330--- clean/lrzsz-0.12.20/intl/gettextP.h 1998-04-26 14:22:35.000000000 +0100
25331+++ lrzsz-0.12.20/intl/gettextP.h 1970-01-01 01:00:00.000000000 +0100
25332@@ -1,73 +0,0 @@
25333-/* Header describing internals of gettext library
25334- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
25335-
25336- This program is free software; you can redistribute it and/or modify
25337- it under the terms of the GNU General Public License as published by
25338- the Free Software Foundation; either version 2, or (at your option)
25339- any later version.
25340-
25341- This program is distributed in the hope that it will be useful,
25342- but WITHOUT ANY WARRANTY; without even the implied warranty of
25343- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25344- GNU General Public License for more details.
25345-
25346- You should have received a copy of the GNU General Public License
25347- along with this program; if not, write to the Free Software Foundation,
25348- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
25349-
25350-#ifndef _GETTEXTP_H
25351-#define _GETTEXTP_H
25352-
25353-#include "loadinfo.h"
25354-
25355-/* @@ end of prolog @@ */
25356-
25357-#ifndef PARAMS
25358-# if __STDC__
25359-# define PARAMS(args) args
25360-# else
25361-# define PARAMS(args) ()
25362-# endif
25363-#endif
25364-
25365-#ifndef W
25366-# define W(flag, data) ((flag) ? SWAP (data) : (data))
25367-#endif
25368-
25369-
25370-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
25371-
25372-static inline nls_uint32
25373-SWAP (i)
25374- nls_uint32 i;
25375-{
25376- return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
25377-}
25378-
25379-
25380-struct loaded_domain
25381-{
25382- const char *data;
25383- int must_swap;
25384- nls_uint32 nstrings;
25385- struct string_desc *orig_tab;
25386- struct string_desc *trans_tab;
25387- nls_uint32 hash_size;
25388- nls_uint32 *hash_tab;
25389-};
25390-
25391-struct binding
25392-{
25393- struct binding *next;
25394- char *domainname;
25395- char *dirname;
25396-};
25397-
25398-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
25399- char *__locale,
25400- const char *__domainname));
25401-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain));
25402-
25403-/* @@ begin of epilog @@ */
25404-
25405-#endif /* gettextP.h */
25406diff -uprN clean/lrzsz-0.12.20/intl/hash-string.h lrzsz-0.12.20/intl/hash-string.h
25407--- clean/lrzsz-0.12.20/intl/hash-string.h 1998-04-26 14:22:36.000000000 +0100
25408+++ lrzsz-0.12.20/intl/hash-string.h 1970-01-01 01:00:00.000000000 +0100
25409@@ -1,63 +0,0 @@
25410-/* Implements a string hashing function.
25411- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
25412-
25413- This program is free software; you can redistribute it and/or modify
25414- it under the terms of the GNU General Public License as published by
25415- the Free Software Foundation; either version 2, or (at your option)
25416- any later version.
25417-
25418- This program is distributed in the hope that it will be useful,
25419- but WITHOUT ANY WARRANTY; without even the implied warranty of
25420- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25421- GNU General Public License for more details.
25422-
25423- You should have received a copy of the GNU Library General Public
25424- License along with the GNU C Library; see the file COPYING.LIB. If not,
25425- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25426- Boston, MA 02111-1307, USA. */
25427-
25428-#ifdef HAVE_VALUES_H
25429-# include <values.h>
25430-#endif
25431-
25432-/* @@ end of prolog @@ */
25433-
25434-#ifndef PARAMS
25435-# if __STDC__
25436-# define PARAMS(Args) Args
25437-# else
25438-# define PARAMS(Args) ()
25439-# endif
25440-#endif
25441-
25442-/* We assume to have `unsigned long int' value with at least 32 bits. */
25443-#define HASHWORDBITS 32
25444-
25445-
25446-/* Defines the so called `hashpjw' function by P.J. Weinberger
25447- [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
25448- 1986, 1987 Bell Telephone Laboratories, Inc.] */
25449-static unsigned long hash_string PARAMS ((const char *__str_param));
25450-
25451-static inline unsigned long
25452-hash_string (str_param)
25453- const char *str_param;
25454-{
25455- unsigned long int hval, g;
25456- const char *str = str_param;
25457-
25458- /* Compute the hash value for the given string. */
25459- hval = 0;
25460- while (*str != '\0')
25461- {
25462- hval <<= 4;
25463- hval += (unsigned long) *str++;
25464- g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
25465- if (g != 0)
25466- {
25467- hval ^= g >> (HASHWORDBITS - 8);
25468- hval ^= g;
25469- }
25470- }
25471- return hval;
25472-}
25473diff -uprN clean/lrzsz-0.12.20/intl/intl-compat.c lrzsz-0.12.20/intl/intl-compat.c
25474--- clean/lrzsz-0.12.20/intl/intl-compat.c 1998-04-26 14:20:52.000000000 +0100
25475+++ lrzsz-0.12.20/intl/intl-compat.c 1970-01-01 01:00:00.000000000 +0100
25476@@ -1,76 +0,0 @@
25477-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
25478- Library.
25479- Copyright (C) 1995 Software Foundation, Inc.
25480-
25481-This program is free software; you can redistribute it and/or modify
25482-it under the terms of the GNU General Public License as published by
25483-the Free Software Foundation; either version 2, or (at your option)
25484-any later version.
25485-
25486-This program is distributed in the hope that it will be useful,
25487-but WITHOUT ANY WARRANTY; without even the implied warranty of
25488-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25489-GNU General Public License for more details.
25490-
25491-You should have received a copy of the GNU General Public License
25492-along with this program; if not, write to the Free Software
25493-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
25494-
25495-#ifdef HAVE_CONFIG_H
25496-# include <config.h>
25497-#endif
25498-
25499-#include "libgettext.h"
25500-
25501-/* @@ end of prolog @@ */
25502-
25503-
25504-#undef gettext
25505-#undef dgettext
25506-#undef dcgettext
25507-#undef textdomain
25508-#undef bindtextdomain
25509-
25510-
25511-char *
25512-bindtextdomain (domainname, dirname)
25513- const char *domainname;
25514- const char *dirname;
25515-{
25516- return bindtextdomain__ (domainname, dirname);
25517-}
25518-
25519-
25520-char *
25521-dcgettext (domainname, msgid, category)
25522- const char *domainname;
25523- const char *msgid;
25524- int category;
25525-{
25526- return dcgettext__ (domainname, msgid, category);
25527-}
25528-
25529-
25530-char *
25531-dgettext (domainname, msgid)
25532- const char *domainname;
25533- const char *msgid;
25534-{
25535- return dgettext__ (domainname, msgid);
25536-}
25537-
25538-
25539-char *
25540-gettext (msgid)
25541- const char *msgid;
25542-{
25543- return gettext__ (msgid);
25544-}
25545-
25546-
25547-char *
25548-textdomain (domainname)
25549- const char *domainname;
25550-{
25551- return textdomain__ (domainname);
25552-}
25553diff -uprN clean/lrzsz-0.12.20/intl/l10nflist.c lrzsz-0.12.20/intl/l10nflist.c
25554--- clean/lrzsz-0.12.20/intl/l10nflist.c 1998-04-26 14:22:37.000000000 +0100
25555+++ lrzsz-0.12.20/intl/l10nflist.c 1970-01-01 01:00:00.000000000 +0100
25556@@ -1,409 +0,0 @@
25557-/* Handle list of needed message catalogs
25558- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
25559- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
25560-
25561- This program is free software; you can redistribute it and/or modify
25562- it under the terms of the GNU General Public License as published by
25563- the Free Software Foundation; either version 2, or (at your option)
25564- any later version.
25565-
25566- This program is distributed in the hope that it will be useful,
25567- but WITHOUT ANY WARRANTY; without even the implied warranty of
25568- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25569- GNU General Public License for more details.
25570-
25571- You should have received a copy of the GNU General Public License
25572- along with this program; if not, write to the Free Software Foundation,
25573- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
25574-
25575-#ifdef HAVE_CONFIG_H
25576-# include <config.h>
25577-#endif
25578-
25579-
25580-#if defined HAVE_STRING_H || defined _LIBC
25581-# ifndef _GNU_SOURCE
25582-# define _GNU_SOURCE 1
25583-# endif
25584-# include <string.h>
25585-#else
25586-# include <strings.h>
25587-# ifndef memcpy
25588-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
25589-# endif
25590-#endif
25591-#if !HAVE_STRCHR && !defined _LIBC
25592-# ifndef strchr
25593-# define strchr index
25594-# endif
25595-#endif
25596-
25597-#if defined _LIBC || defined HAVE_ARGZ_H
25598-# include <argz.h>
25599-#endif
25600-#include <ctype.h>
25601-#include <sys/types.h>
25602-
25603-#if defined STDC_HEADERS || defined _LIBC
25604-# include <stdlib.h>
25605-#endif
25606-
25607-#include "loadinfo.h"
25608-
25609-/* On some strange systems still no definition of NULL is found. Sigh! */
25610-#ifndef NULL
25611-# if defined __STDC__ && __STDC__
25612-# define NULL ((void *) 0)
25613-# else
25614-# define NULL 0
25615-# endif
25616-#endif
25617-
25618-/* @@ end of prolog @@ */
25619-
25620-#ifdef _LIBC
25621-/* Rename the non ANSI C functions. This is required by the standard
25622- because some ANSI C functions will require linking with this object
25623- file and the name space must not be polluted. */
25624-# define stpcpy(dest, src) __stpcpy(dest, src)
25625-#else
25626-# ifndef HAVE_STPCPY
25627-static char *stpcpy PARAMS ((char *dest, const char *src));
25628-# endif
25629-#endif
25630-
25631-/* Define function which are usually not available. */
25632-
25633-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
25634-/* Returns the number of strings in ARGZ. */
25635-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
25636-
25637-static size_t
25638-argz_count__ (argz, len)
25639- const char *argz;
25640- size_t len;
25641-{
25642- size_t count = 0;
25643- while (len > 0)
25644- {
25645- size_t part_len = strlen (argz);
25646- argz += part_len + 1;
25647- len -= part_len + 1;
25648- count++;
25649- }
25650- return count;
25651-}
25652-# undef __argz_count
25653-# define __argz_count(argz, len) argz_count__ (argz, len)
25654-#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
25655-
25656-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
25657-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
25658- except the last into the character SEP. */
25659-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
25660-
25661-static void
25662-argz_stringify__ (argz, len, sep)
25663- char *argz;
25664- size_t len;
25665- int sep;
25666-{
25667- while (len > 0)
25668- {
25669- size_t part_len = strlen (argz);
25670- argz += part_len;
25671- len -= part_len + 1;
25672- if (len > 0)
25673- *argz++ = sep;
25674- }
25675-}
25676-# undef __argz_stringify
25677-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
25678-#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
25679-
25680-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
25681-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
25682- const char *entry));
25683-
25684-static char *
25685-argz_next__ (argz, argz_len, entry)
25686- char *argz;
25687- size_t argz_len;
25688- const char *entry;
25689-{
25690- if (entry)
25691- {
25692- if (entry < argz + argz_len)
25693- entry = strchr (entry, '\0') + 1;
25694-
25695- return entry >= argz + argz_len ? NULL : (char *) entry;
25696- }
25697- else
25698- if (argz_len > 0)
25699- return argz;
25700- else
25701- return 0;
25702-}
25703-# undef __argz_next
25704-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
25705-#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
25706-
25707-
25708-/* Return number of bits set in X. */
25709-static int pop PARAMS ((int x));
25710-
25711-static inline int
25712-pop (x)
25713- int x;
25714-{
25715- /* We assume that no more than 16 bits are used. */
25716- x = ((x & ~0x5555) >> 1) + (x & 0x5555);
25717- x = ((x & ~0x3333) >> 2) + (x & 0x3333);
25718- x = ((x >> 4) + x) & 0x0f0f;
25719- x = ((x >> 8) + x) & 0xff;
25720-
25721- return x;
25722-}
25723-
25724-
25725-struct loaded_l10nfile *
25726-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
25727- territory, codeset, normalized_codeset, modifier, special,
25728- sponsor, revision, filename, do_allocate)
25729- struct loaded_l10nfile **l10nfile_list;
25730- const char *dirlist;
25731- size_t dirlist_len;
25732- int mask;
25733- const char *language;
25734- const char *territory;
25735- const char *codeset;
25736- const char *normalized_codeset;
25737- const char *modifier;
25738- const char *special;
25739- const char *sponsor;
25740- const char *revision;
25741- const char *filename;
25742- int do_allocate;
25743-{
25744- char *abs_filename;
25745- struct loaded_l10nfile *last = NULL;
25746- struct loaded_l10nfile *retval;
25747- char *cp;
25748- size_t entries;
25749- int cnt;
25750-
25751- /* Allocate room for the full file name. */
25752- abs_filename = (char *) malloc (dirlist_len
25753- + strlen (language)
25754- + ((mask & TERRITORY) != 0
25755- ? strlen (territory) + 1 : 0)
25756- + ((mask & XPG_CODESET) != 0
25757- ? strlen (codeset) + 1 : 0)
25758- + ((mask & XPG_NORM_CODESET) != 0
25759- ? strlen (normalized_codeset) + 1 : 0)
25760- + (((mask & XPG_MODIFIER) != 0
25761- || (mask & CEN_AUDIENCE) != 0)
25762- ? strlen (modifier) + 1 : 0)
25763- + ((mask & CEN_SPECIAL) != 0
25764- ? strlen (special) + 1 : 0)
25765- + (((mask & CEN_SPONSOR) != 0
25766- || (mask & CEN_REVISION) != 0)
25767- ? (1 + ((mask & CEN_SPONSOR) != 0
25768- ? strlen (sponsor) + 1 : 0)
25769- + ((mask & CEN_REVISION) != 0
25770- ? strlen (revision) + 1 : 0)) : 0)
25771- + 1 + strlen (filename) + 1);
25772-
25773- if (abs_filename == NULL)
25774- return NULL;
25775-
25776- retval = NULL;
25777- last = NULL;
25778-
25779- /* Construct file name. */
25780- memcpy (abs_filename, dirlist, dirlist_len);
25781- __argz_stringify (abs_filename, dirlist_len, ':');
25782- cp = abs_filename + (dirlist_len - 1);
25783- *cp++ = '/';
25784- cp = stpcpy (cp, language);
25785-
25786- if ((mask & TERRITORY) != 0)
25787- {
25788- *cp++ = '_';
25789- cp = stpcpy (cp, territory);
25790- }
25791- if ((mask & XPG_CODESET) != 0)
25792- {
25793- *cp++ = '.';
25794- cp = stpcpy (cp, codeset);
25795- }
25796- if ((mask & XPG_NORM_CODESET) != 0)
25797- {
25798- *cp++ = '.';
25799- cp = stpcpy (cp, normalized_codeset);
25800- }
25801- if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
25802- {
25803- /* This component can be part of both syntaces but has different
25804- leading characters. For CEN we use `+', else `@'. */
25805- *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
25806- cp = stpcpy (cp, modifier);
25807- }
25808- if ((mask & CEN_SPECIAL) != 0)
25809- {
25810- *cp++ = '+';
25811- cp = stpcpy (cp, special);
25812- }
25813- if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
25814- {
25815- *cp++ = ',';
25816- if ((mask & CEN_SPONSOR) != 0)
25817- cp = stpcpy (cp, sponsor);
25818- if ((mask & CEN_REVISION) != 0)
25819- {
25820- *cp++ = '_';
25821- cp = stpcpy (cp, revision);
25822- }
25823- }
25824-
25825- *cp++ = '/';
25826- stpcpy (cp, filename);
25827-
25828- /* Look in list of already loaded domains whether it is already
25829- available. */
25830- last = NULL;
25831- for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
25832- if (retval->filename != NULL)
25833- {
25834- int compare = strcmp (retval->filename, abs_filename);
25835- if (compare == 0)
25836- /* We found it! */
25837- break;
25838- if (compare < 0)
25839- {
25840- /* It's not in the list. */
25841- retval = NULL;
25842- break;
25843- }
25844-
25845- last = retval;
25846- }
25847-
25848- if (retval != NULL || do_allocate == 0)
25849- {
25850- free (abs_filename);
25851- return retval;
25852- }
25853-
25854- retval = (struct loaded_l10nfile *)
25855- malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
25856- * (1 << pop (mask))
25857- * sizeof (struct loaded_l10nfile *)));
25858- if (retval == NULL)
25859- return NULL;
25860-
25861- retval->filename = abs_filename;
25862- retval->decided = (__argz_count (dirlist, dirlist_len) != 1
25863- || ((mask & XPG_CODESET) != 0
25864- && (mask & XPG_NORM_CODESET) != 0));
25865- retval->data = NULL;
25866-
25867- if (last == NULL)
25868- {
25869- retval->next = *l10nfile_list;
25870- *l10nfile_list = retval;
25871- }
25872- else
25873- {
25874- retval->next = last->next;
25875- last->next = retval;
25876- }
25877-
25878- entries = 0;
25879- /* If the DIRLIST is a real list the RETVAL entry corresponds not to
25880- a real file. So we have to use the DIRLIST separation mechanism
25881- of the inner loop. */
25882- cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
25883- for (; cnt >= 0; --cnt)
25884- if ((cnt & ~mask) == 0
25885- && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
25886- && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
25887- {
25888- /* Iterate over all elements of the DIRLIST. */
25889- char *dir = NULL;
25890-
25891- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
25892- != NULL)
25893- retval->successor[entries++]
25894- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
25895- language, territory, codeset,
25896- normalized_codeset, modifier, special,
25897- sponsor, revision, filename, 1);
25898- }
25899- retval->successor[entries] = NULL;
25900-
25901- return retval;
25902-}
25903-
25904-/* Normalize codeset name. There is no standard for the codeset
25905- names. Normalization allows the user to use any of the common
25906- names. */
25907-const char *
25908-_nl_normalize_codeset (codeset, name_len)
25909- const char *codeset;
25910- size_t name_len;
25911-{
25912- int len = 0;
25913- int only_digit = 1;
25914- char *retval;
25915- char *wp;
25916- size_t cnt;
25917-
25918- for (cnt = 0; cnt < name_len; ++cnt)
25919- if (isalnum (codeset[cnt]))
25920- {
25921- ++len;
25922-
25923- if (isalpha (codeset[cnt]))
25924- only_digit = 0;
25925- }
25926-
25927- retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
25928-
25929- if (retval != NULL)
25930- {
25931- if (only_digit)
25932- wp = stpcpy (retval, "iso");
25933- else
25934- wp = retval;
25935-
25936- for (cnt = 0; cnt < name_len; ++cnt)
25937- if (isalpha (codeset[cnt]))
25938- *wp++ = tolower (codeset[cnt]);
25939- else if (isdigit (codeset[cnt]))
25940- *wp++ = codeset[cnt];
25941-
25942- *wp = '\0';
25943- }
25944-
25945- return (const char *) retval;
25946-}
25947-
25948-
25949-/* @@ begin of epilog @@ */
25950-
25951-/* We don't want libintl.a to depend on any other library. So we
25952- avoid the non-standard function stpcpy. In GNU C Library this
25953- function is available, though. Also allow the symbol HAVE_STPCPY
25954- to be defined. */
25955-#if !_LIBC && !HAVE_STPCPY
25956-static char *
25957-stpcpy (dest, src)
25958- char *dest;
25959- const char *src;
25960-{
25961- while ((*dest++ = *src++) != '\0')
25962- /* Do nothing. */ ;
25963- return dest - 1;
25964-}
25965-#endif
25966diff -uprN clean/lrzsz-0.12.20/intl/libgettext.h lrzsz-0.12.20/intl/libgettext.h
25967--- clean/lrzsz-0.12.20/intl/libgettext.h 1998-04-26 14:22:36.000000000 +0100
25968+++ lrzsz-0.12.20/intl/libgettext.h 1970-01-01 01:00:00.000000000 +0100
25969@@ -1,182 +0,0 @@
25970-/* Message catalogs for internationalization.
25971- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
25972-
25973- This program is free software; you can redistribute it and/or modify
25974- it under the terms of the GNU General Public License as published by
25975- the Free Software Foundation; either version 2, or (at your option)
25976- any later version.
25977-
25978- This program is distributed in the hope that it will be useful,
25979- but WITHOUT ANY WARRANTY; without even the implied warranty of
25980- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25981- GNU General Public License for more details.
25982-
25983- You should have received a copy of the GNU General Public License
25984- along with this program; if not, write to the Free Software Foundation,
25985- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
25986-
25987-/* Because on some systems (e.g. Solaris) we sometimes have to include
25988- the systems libintl.h as well as this file we have more complex
25989- include protection above. But the systems header might perhaps also
25990- define _LIBINTL_H and therefore we have to protect the definition here. */
25991-
25992-#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H)
25993-#if !defined (_LIBINTL_H)
25994-# define _LIBINTL_H 1
25995-#endif
25996-#define _LIBGETTEXT_H 1
25997-
25998-/* We define an additional symbol to signal that we use the GNU
25999- implementation of gettext. */
26000-#define __USE_GNU_GETTEXT 1
26001-
26002-#include <sys/types.h>
26003-
26004-#if HAVE_LOCALE_H
26005-# include <locale.h>
26006-#endif
26007-
26008-
26009-#ifdef __cplusplus
26010-extern "C" {
26011-#endif
26012-
26013-/* @@ end of prolog @@ */
26014-
26015-#ifndef PARAMS
26016-# if __STDC__
26017-# define PARAMS(args) args
26018-# else
26019-# define PARAMS(args) ()
26020-# endif
26021-#endif
26022-
26023-#ifndef NULL
26024-# if !defined __cplusplus || defined __GNUC__
26025-# define NULL ((void *) 0)
26026-# else
26027-# define NULL (0)
26028-# endif
26029-#endif
26030-
26031-#if !HAVE_LC_MESSAGES
26032-/* This value determines the behaviour of the gettext() and dgettext()
26033- function. But some system does not have this defined. Define it
26034- to a default value. */
26035-# define LC_MESSAGES (-1)
26036-#endif
26037-
26038-
26039-/* Declarations for gettext-using-catgets interface. Derived from
26040- Jim Meyering's libintl.h. */
26041-struct _msg_ent
26042-{
26043- const char *_msg;
26044- int _msg_number;
26045-};
26046-
26047-
26048-#if HAVE_CATGETS
26049-/* These two variables are defined in the automatically by po-to-tbl.sed
26050- generated file `cat-id-tbl.c'. */
26051-extern const struct _msg_ent _msg_tbl[];
26052-extern int _msg_tbl_length;
26053-#endif
26054-
26055-
26056-/* For automatical extraction of messages sometimes no real
26057- translation is needed. Instead the string itself is the result. */
26058-#define gettext_noop(Str) (Str)
26059-
26060-/* Look up MSGID in the current default message catalog for the current
26061- LC_MESSAGES locale. If not found, returns MSGID itself (the default
26062- text). */
26063-extern char *gettext PARAMS ((const char *__msgid));
26064-extern char *gettext__ PARAMS ((const char *__msgid));
26065-
26066-/* Look up MSGID in the DOMAINNAME message catalog for the current
26067- LC_MESSAGES locale. */
26068-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
26069-extern char *dgettext__ PARAMS ((const char *__domainname,
26070- const char *__msgid));
26071-
26072-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
26073- locale. */
26074-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
26075- int __category));
26076-extern char *dcgettext__ PARAMS ((const char *__domainname,
26077- const char *__msgid, int __category));
26078-
26079-
26080-/* Set the current default message catalog to DOMAINNAME.
26081- If DOMAINNAME is null, return the current default.
26082- If DOMAINNAME is "", reset to the default of "messages". */
26083-extern char *textdomain PARAMS ((const char *__domainname));
26084-extern char *textdomain__ PARAMS ((const char *__domainname));
26085-
26086-/* Specify that the DOMAINNAME message catalog will be found
26087- in DIRNAME rather than in the system locale data base. */
26088-extern char *bindtextdomain PARAMS ((const char *__domainname,
26089- const char *__dirname));
26090-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
26091- const char *__dirname));
26092-
26093-#if ENABLE_NLS
26094-
26095-/* Solaris 2.3 has the gettext function but dcgettext is missing.
26096- So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4
26097- has dcgettext. */
26098-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
26099-
26100-# define gettext(Msgid) \
26101- dgettext (NULL, Msgid)
26102-
26103-# define dgettext(Domainname, Msgid) \
26104- dcgettext (Domainname, Msgid, LC_MESSAGES)
26105-
26106-# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
26107-/* This global variable is defined in loadmsgcat.c. We need a sign,
26108- whether a new catalog was loaded, which can be associated with all
26109- translations. */
26110-extern int _nl_msg_cat_cntr;
26111-
26112-# define dcgettext(Domainname, Msgid, Category) \
26113- (__extension__ \
26114- ({ \
26115- char *__result; \
26116- if (__builtin_constant_p (Msgid)) \
26117- { \
26118- static char *__translation__; \
26119- static int __catalog_counter__; \
26120- if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \
26121- { \
26122- __translation__ = \
26123- dcgettext__ (Domainname, Msgid, Category); \
26124- __catalog_counter__ = _nl_msg_cat_cntr; \
26125- } \
26126- __result = __translation__; \
26127- } \
26128- else \
26129- __result = dcgettext__ (Domainname, Msgid, Category); \
26130- __result; \
26131- }))
26132-# endif
26133-# endif
26134-
26135-#else
26136-
26137-# define gettext(Msgid) (Msgid)
26138-# define dgettext(Domainname, Msgid) (Msgid)
26139-# define dcgettext(Domainname, Msgid, Category) (Msgid)
26140-# define textdomain(Domainname) while (0) /* nothing */
26141-# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
26142-
26143-#endif
26144-
26145-/* @@ begin of epilog @@ */
26146-
26147-#ifdef __cplusplus
26148-}
26149-#endif
26150-
26151-#endif
26152diff -uprN clean/lrzsz-0.12.20/intl/linux-msg.sed lrzsz-0.12.20/intl/linux-msg.sed
26153--- clean/lrzsz-0.12.20/intl/linux-msg.sed 1998-04-26 14:20:52.000000000 +0100
26154+++ lrzsz-0.12.20/intl/linux-msg.sed 1970-01-01 01:00:00.000000000 +0100
26155@@ -1,100 +0,0 @@
26156-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
26157-# Copyright (C) 1995 Free Software Foundation, Inc.
26158-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
26159-#
26160-# This program is free software; you can redistribute it and/or modify
26161-# it under the terms of the GNU General Public License as published by
26162-# the Free Software Foundation; either version 2, or (at your option)
26163-# any later version.
26164-#
26165-# This program is distributed in the hope that it will be useful,
26166-# but WITHOUT ANY WARRANTY; without even the implied warranty of
26167-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26168-# GNU General Public License for more details.
26169-#
26170-# You should have received a copy of the GNU General Public License
26171-# along with this program; if not, write to the Free Software
26172-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
26173-#
26174-#
26175-# The first directive in the .msg should be the definition of the
26176-# message set number. We use always set number 1.
26177-#
26178-1 {
26179- i\
26180-$set 1 # Automatically created by po2msg.sed
26181- h
26182- s/.*/0/
26183- x
26184-}
26185-#
26186-# Mitch's old catalog format does not allow comments.
26187-#
26188-# We copy the original message as a comment into the .msg file.
26189-#
26190-/^msgid/ {
26191- s/msgid[ ]*"//
26192-#
26193-# This does not work now with the new format.
26194-# /"$/! {
26195-# s/\\$//
26196-# s/$/ ... (more lines following)"/
26197-# }
26198- x
26199-# The following nice solution is by
26200-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
26201- td
26202-# Increment a decimal number in pattern space.
26203-# First hide trailing `9' digits.
26204- :d
26205- s/9\(_*\)$/_\1/
26206- td
26207-# Assure at least one digit is available.
26208- s/^\(_*\)$/0\1/
26209-# Increment the last digit.
26210- s/8\(_*\)$/9\1/
26211- s/7\(_*\)$/8\1/
26212- s/6\(_*\)$/7\1/
26213- s/5\(_*\)$/6\1/
26214- s/4\(_*\)$/5\1/
26215- s/3\(_*\)$/4\1/
26216- s/2\(_*\)$/3\1/
26217- s/1\(_*\)$/2\1/
26218- s/0\(_*\)$/1\1/
26219-# Convert the hidden `9' digits to `0's.
26220- s/_/0/g
26221- x
26222- G
26223- s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
26224-}
26225-#
26226-# The .msg file contains, other then the .po file, only the translations
26227-# but each given a unique ID. Starting from 1 and incrementing by 1 for
26228-# each message we assign them to the messages.
26229-# It is important that the .po file used to generate the cat-id-tbl.c file
26230-# (with po-to-tbl) is the same as the one used here. (At least the order
26231-# of declarations must not be changed.)
26232-#
26233-/^msgstr/ {
26234- s/msgstr[ ]*"\(.*\)"/# \1/
26235-# Clear substitution flag.
26236- tb
26237-# Append the next line.
26238- :b
26239- N
26240-# Look whether second part is continuation line.
26241- s/\(.*\n\)"\(.*\)"/\1\2/
26242-# Yes, then branch.
26243- ta
26244- P
26245- D
26246-# Note that D includes a jump to the start!!
26247-# We found a continuation line. But before printing insert '\'.
26248- :a
26249- s/\(.*\)\(\n.*\)/\1\\\2/
26250- P
26251-# We cannot use D here.
26252- s/.*\n\(.*\)/\1/
26253- tb
26254-}
26255-d
26256diff -uprN clean/lrzsz-0.12.20/intl/loadinfo.h lrzsz-0.12.20/intl/loadinfo.h
26257--- clean/lrzsz-0.12.20/intl/loadinfo.h 1998-04-26 14:20:52.000000000 +0100
26258+++ lrzsz-0.12.20/intl/loadinfo.h 1970-01-01 01:00:00.000000000 +0100
26259@@ -1,58 +0,0 @@
26260-#ifndef PARAMS
26261-# if __STDC__
26262-# define PARAMS(args) args
26263-# else
26264-# define PARAMS(args) ()
26265-# endif
26266-#endif
26267-
26268-/* Encoding of locale name parts. */
26269-#define CEN_REVISION 1
26270-#define CEN_SPONSOR 2
26271-#define CEN_SPECIAL 4
26272-#define XPG_NORM_CODESET 8
26273-#define XPG_CODESET 16
26274-#define TERRITORY 32
26275-#define CEN_AUDIENCE 64
26276-#define XPG_MODIFIER 128
26277-
26278-#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
26279-#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
26280-
26281-
26282-struct loaded_l10nfile
26283-{
26284- const char *filename;
26285- int decided;
26286-
26287- const void *data;
26288-
26289- struct loaded_l10nfile *next;
26290- struct loaded_l10nfile *successor[1];
26291-};
26292-
26293-
26294-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
26295- size_t name_len));
26296-
26297-extern struct loaded_l10nfile *
26298-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
26299- const char *dirlist, size_t dirlist_len, int mask,
26300- const char *language, const char *territory,
26301- const char *codeset,
26302- const char *normalized_codeset,
26303- const char *modifier, const char *special,
26304- const char *sponsor, const char *revision,
26305- const char *filename, int do_allocate));
26306-
26307-
26308-extern const char *_nl_expand_alias PARAMS ((const char *name));
26309-
26310-extern int _nl_explode_name PARAMS ((char *name, const char **language,
26311- const char **modifier,
26312- const char **territory,
26313- const char **codeset,
26314- const char **normalized_codeset,
26315- const char **special,
26316- const char **sponsor,
26317- const char **revision));
26318diff -uprN clean/lrzsz-0.12.20/intl/loadmsgcat.c lrzsz-0.12.20/intl/loadmsgcat.c
26319--- clean/lrzsz-0.12.20/intl/loadmsgcat.c 1998-04-26 14:22:37.000000000 +0100
26320+++ lrzsz-0.12.20/intl/loadmsgcat.c 1970-01-01 01:00:00.000000000 +0100
26321@@ -1,199 +0,0 @@
26322-/* Load needed message catalogs
26323- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
26324-
26325- This program is free software; you can redistribute it and/or modify
26326- it under the terms of the GNU General Public License as published by
26327- the Free Software Foundation; either version 2, or (at your option)
26328- any later version.
26329-
26330- This program is distributed in the hope that it will be useful,
26331- but WITHOUT ANY WARRANTY; without even the implied warranty of
26332- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26333- GNU General Public License for more details.
26334-
26335- You should have received a copy of the GNU General Public License
26336- along with this program; if not, write to the Free Software Foundation,
26337- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
26338-
26339-#ifdef HAVE_CONFIG_H
26340-# include <config.h>
26341-#endif
26342-
26343-#include <fcntl.h>
26344-#include <sys/types.h>
26345-#include <sys/stat.h>
26346-
26347-#if defined STDC_HEADERS || defined _LIBC
26348-# include <stdlib.h>
26349-#endif
26350-
26351-#if defined HAVE_UNISTD_H || defined _LIBC
26352-# include <unistd.h>
26353-#endif
26354-
26355-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
26356-# include <sys/mman.h>
26357-#endif
26358-
26359-#include "gettext.h"
26360-#include "gettextP.h"
26361-
26362-/* @@ end of prolog @@ */
26363-
26364-#ifdef _LIBC
26365-/* Rename the non ISO C functions. This is required by the standard
26366- because some ISO C functions will require linking with this object
26367- file and the name space must not be polluted. */
26368-# define fstat __fstat
26369-# define open __open
26370-# define close __close
26371-# define read __read
26372-# define mmap __mmap
26373-# define munmap __munmap
26374-#endif
26375-
26376-/* We need a sign, whether a new catalog was loaded, which can be associated
26377- with all translations. This is important if the translations are
26378- cached by one of GCC's features. */
26379-int _nl_msg_cat_cntr = 0;
26380-
26381-
26382-/* Load the message catalogs specified by FILENAME. If it is no valid
26383- message catalog do nothing. */
26384-void
26385-_nl_load_domain (domain_file)
26386- struct loaded_l10nfile *domain_file;
26387-{
26388- int fd;
26389- struct stat st;
26390- struct mo_file_header *data = (struct mo_file_header *) -1;
26391-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
26392- || defined _LIBC
26393- int use_mmap = 0;
26394-#endif
26395- struct loaded_domain *domain;
26396-
26397- domain_file->decided = 1;
26398- domain_file->data = NULL;
26399-
26400- /* If the record does not represent a valid locale the FILENAME
26401- might be NULL. This can happen when according to the given
26402- specification the locale file name is different for XPG and CEN
26403- syntax. */
26404- if (domain_file->filename == NULL)
26405- return;
26406-
26407- /* Try to open the addressed file. */
26408- fd = open (domain_file->filename, O_RDONLY);
26409- if (fd == -1)
26410- return;
26411-
26412- /* We must know about the size of the file. */
26413- if (fstat (fd, &st) != 0
26414- && st.st_size < (off_t) sizeof (struct mo_file_header))
26415- {
26416- /* Something went wrong. */
26417- close (fd);
26418- return;
26419- }
26420-
26421-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
26422- || defined _LIBC
26423- /* Now we are ready to load the file. If mmap() is available we try
26424- this first. If not available or it failed we try to load it. */
26425- data = (struct mo_file_header *) mmap (NULL, st.st_size, PROT_READ,
26426- MAP_PRIVATE, fd, 0);
26427-
26428- if (data != (struct mo_file_header *) -1)
26429- {
26430- /* mmap() call was successful. */
26431- close (fd);
26432- use_mmap = 1;
26433- }
26434-#endif
26435-
26436- /* If the data is not yet available (i.e. mmap'ed) we try to load
26437- it manually. */
26438- if (data == (struct mo_file_header *) -1)
26439- {
26440- off_t to_read;
26441- char *read_ptr;
26442-
26443- data = (struct mo_file_header *) malloc (st.st_size);
26444- if (data == NULL)
26445- return;
26446-
26447- to_read = st.st_size;
26448- read_ptr = (char *) data;
26449- do
26450- {
26451- long int nb = (long int) read (fd, read_ptr, to_read);
26452- if (nb == -1)
26453- {
26454- close (fd);
26455- return;
26456- }
26457-
26458- read_ptr += nb;
26459- to_read -= nb;
26460- }
26461- while (to_read > 0);
26462-
26463- close (fd);
26464- }
26465-
26466- /* Using the magic number we can test whether it really is a message
26467- catalog file. */
26468- if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
26469- {
26470- /* The magic number is wrong: not a message catalog file. */
26471-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
26472- || defined _LIBC
26473- if (use_mmap)
26474- munmap ((caddr_t) data, st.st_size);
26475- else
26476-#endif
26477- free (data);
26478- return;
26479- }
26480-
26481- domain_file->data
26482- = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
26483- if (domain_file->data == NULL)
26484- return;
26485-
26486- domain = (struct loaded_domain *) domain_file->data;
26487- domain->data = (char *) data;
26488- domain->must_swap = data->magic != _MAGIC;
26489-
26490- /* Fill in the information about the available tables. */
26491- switch (W (domain->must_swap, data->revision))
26492- {
26493- case 0:
26494- domain->nstrings = W (domain->must_swap, data->nstrings);
26495- domain->orig_tab = (struct string_desc *)
26496- ((char *) data + W (domain->must_swap, data->orig_tab_offset));
26497- domain->trans_tab = (struct string_desc *)
26498- ((char *) data + W (domain->must_swap, data->trans_tab_offset));
26499- domain->hash_size = W (domain->must_swap, data->hash_tab_size);
26500- domain->hash_tab = (nls_uint32 *)
26501- ((char *) data + W (domain->must_swap, data->hash_tab_offset));
26502- break;
26503- default:
26504- /* This is an illegal revision. */
26505-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
26506- || defined _LIBC
26507- if (use_mmap)
26508- munmap ((caddr_t) data, st.st_size);
26509- else
26510-#endif
26511- free (data);
26512- free (domain);
26513- domain_file->data = NULL;
26514- return;
26515- }
26516-
26517- /* Show that one domain is changed. This might make some cached
26518- translations invalid. */
26519- ++_nl_msg_cat_cntr;
26520-}
26521diff -uprN clean/lrzsz-0.12.20/intl/localealias.c lrzsz-0.12.20/intl/localealias.c
26522--- clean/lrzsz-0.12.20/intl/localealias.c 1998-04-26 14:22:37.000000000 +0100
26523+++ lrzsz-0.12.20/intl/localealias.c 1970-01-01 01:00:00.000000000 +0100
26524@@ -1,378 +0,0 @@
26525-/* Handle aliases for locale names
26526- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
26527- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
26528-
26529- This program is free software; you can redistribute it and/or modify
26530- it under the terms of the GNU General Public License as published by
26531- the Free Software Foundation; either version 2, or (at your option)
26532- any later version.
26533-
26534- This program is distributed in the hope that it will be useful,
26535- but WITHOUT ANY WARRANTY; without even the implied warranty of
26536- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26537- GNU General Public License for more details.
26538-
26539- You should have received a copy of the GNU General Public License
26540- along with this program; if not, write to the Free Software Foundation,
26541- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
26542-
26543-#ifdef HAVE_CONFIG_H
26544-# include <config.h>
26545-#endif
26546-
26547-#include <ctype.h>
26548-#include <stdio.h>
26549-#include <sys/types.h>
26550-
26551-#ifdef __GNUC__
26552-# define alloca __builtin_alloca
26553-# define HAVE_ALLOCA 1
26554-#else
26555-# if defined HAVE_ALLOCA_H || defined _LIBC
26556-# include <alloca.h>
26557-# else
26558-# ifdef _AIX
26559- #pragma alloca
26560-# else
26561-# ifndef alloca
26562-char *alloca ();
26563-# endif
26564-# endif
26565-# endif
26566-#endif
26567-
26568-#if defined STDC_HEADERS || defined _LIBC
26569-# include <stdlib.h>
26570-#else
26571-char *getenv ();
26572-# ifdef HAVE_MALLOC_H
26573-# include <malloc.h>
26574-# else
26575-void free ();
26576-# endif
26577-#endif
26578-
26579-#if defined HAVE_STRING_H || defined _LIBC
26580-# ifndef _GNU_SOURCE
26581-# define _GNU_SOURCE 1
26582-# endif
26583-# include <string.h>
26584-#else
26585-# include <strings.h>
26586-# ifndef memcpy
26587-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
26588-# endif
26589-#endif
26590-#if !HAVE_STRCHR && !defined _LIBC
26591-# ifndef strchr
26592-# define strchr index
26593-# endif
26594-#endif
26595-
26596-#include "gettext.h"
26597-#include "gettextP.h"
26598-
26599-/* @@ end of prolog @@ */
26600-
26601-#ifdef _LIBC
26602-/* Rename the non ANSI C functions. This is required by the standard
26603- because some ANSI C functions will require linking with this object
26604- file and the name space must not be polluted. */
26605-# define strcasecmp __strcasecmp
26606-#endif
26607-
26608-
26609-/* For those loosing systems which don't have `alloca' we have to add
26610- some additional code emulating it. */
26611-#ifdef HAVE_ALLOCA
26612-/* Nothing has to be done. */
26613-# define ADD_BLOCK(list, address) /* nothing */
26614-# define FREE_BLOCKS(list) /* nothing */
26615-#else
26616-struct block_list
26617-{
26618- void *address;
26619- struct block_list *next;
26620-};
26621-# define ADD_BLOCK(list, addr) \
26622- do { \
26623- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
26624- /* If we cannot get a free block we cannot add the new element to \
26625- the list. */ \
26626- if (newp != NULL) { \
26627- newp->address = (addr); \
26628- newp->next = (list); \
26629- (list) = newp; \
26630- } \
26631- } while (0)
26632-# define FREE_BLOCKS(list) \
26633- do { \
26634- while (list != NULL) { \
26635- struct block_list *old = list; \
26636- list = list->next; \
26637- free (old); \
26638- } \
26639- } while (0)
26640-# undef alloca
26641-# define alloca(size) (malloc (size))
26642-#endif /* have alloca */
26643-
26644-
26645-struct alias_map
26646-{
26647- const char *alias;
26648- const char *value;
26649-};
26650-
26651-
26652-static struct alias_map *map;
26653-static size_t nmap = 0;
26654-static size_t maxmap = 0;
26655-
26656-
26657-/* Prototypes for local functions. */
26658-static size_t read_alias_file PARAMS ((const char *fname, int fname_len));
26659-static void extend_alias_table PARAMS ((void));
26660-static int alias_compare PARAMS ((const struct alias_map *map1,
26661- const struct alias_map *map2));
26662-
26663-
26664-const char *
26665-_nl_expand_alias (name)
26666- const char *name;
26667-{
26668- static const char *locale_alias_path = LOCALE_ALIAS_PATH;
26669- struct alias_map *retval;
26670- size_t added;
26671-
26672- do
26673- {
26674- struct alias_map item;
26675-
26676- item.alias = name;
26677-
26678- if (nmap > 0)
26679- retval = (struct alias_map *) bsearch (&item, map, nmap,
26680- sizeof (struct alias_map),
26681- (int (*) PARAMS ((const void *,
26682- const void *))
26683- ) alias_compare);
26684- else
26685- retval = NULL;
26686-
26687- /* We really found an alias. Return the value. */
26688- if (retval != NULL)
26689- return retval->value;
26690-
26691- /* Perhaps we can find another alias file. */
26692- added = 0;
26693- while (added == 0 && locale_alias_path[0] != '\0')
26694- {
26695- const char *start;
26696-
26697- while (locale_alias_path[0] == ':')
26698- ++locale_alias_path;
26699- start = locale_alias_path;
26700-
26701- while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
26702- ++locale_alias_path;
26703-
26704- if (start < locale_alias_path)
26705- added = read_alias_file (start, locale_alias_path - start);
26706- }
26707- }
26708- while (added != 0);
26709-
26710- return NULL;
26711-}
26712-
26713-
26714-static size_t
26715-read_alias_file (fname, fname_len)
26716- const char *fname;
26717- int fname_len;
26718-{
26719-#ifndef HAVE_ALLOCA
26720- struct block_list *block_list = NULL;
26721-#endif
26722- FILE *fp;
26723- char *full_fname;
26724- size_t added;
26725- static const char aliasfile[] = "/locale.alias";
26726-
26727- full_fname = (char *) alloca (fname_len + sizeof aliasfile);
26728- ADD_BLOCK (block_list, full_fname);
26729- memcpy (full_fname, fname, fname_len);
26730- memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
26731-
26732- fp = fopen (full_fname, "r");
26733- if (fp == NULL)
26734- {
26735- FREE_BLOCKS (block_list);
26736- return 0;
26737- }
26738-
26739- added = 0;
26740- while (!feof (fp))
26741- {
26742- /* It is a reasonable approach to use a fix buffer here because
26743- a) we are only interested in the first two fields
26744- b) these fields must be usable as file names and so must not
26745- be that long
26746- */
26747- char buf[BUFSIZ];
26748- char *alias;
26749- char *value;
26750- char *cp;
26751-
26752- if (fgets (buf, BUFSIZ, fp) == NULL)
26753- /* EOF reached. */
26754- break;
26755-
26756- cp = buf;
26757- /* Ignore leading white space. */
26758- while (isspace (cp[0]))
26759- ++cp;
26760-
26761- /* A leading '#' signals a comment line. */
26762- if (cp[0] != '\0' && cp[0] != '#')
26763- {
26764- alias = cp++;
26765- while (cp[0] != '\0' && !isspace (cp[0]))
26766- ++cp;
26767- /* Terminate alias name. */
26768- if (cp[0] != '\0')
26769- *cp++ = '\0';
26770-
26771- /* Now look for the beginning of the value. */
26772- while (isspace (cp[0]))
26773- ++cp;
26774-
26775- if (cp[0] != '\0')
26776- {
26777- char *tp;
26778- size_t len;
26779-
26780- value = cp++;
26781- while (cp[0] != '\0' && !isspace (cp[0]))
26782- ++cp;
26783- /* Terminate value. */
26784- if (cp[0] == '\n')
26785- {
26786- /* This has to be done to make the following test
26787- for the end of line possible. We are looking for
26788- the terminating '\n' which do not overwrite here. */
26789- *cp++ = '\0';
26790- *cp = '\n';
26791- }
26792- else if (cp[0] != '\0')
26793- *cp++ = '\0';
26794-
26795- if (nmap >= maxmap)
26796- extend_alias_table ();
26797-
26798- /* We cannot depend on strdup available in the libc. Sigh! */
26799- len = strlen (alias) + 1;
26800- tp = (char *) malloc (len);
26801- if (tp == NULL)
26802- {
26803- FREE_BLOCKS (block_list);
26804- return added;
26805- }
26806- memcpy (tp, alias, len);
26807- map[nmap].alias = tp;
26808-
26809- len = strlen (value) + 1;
26810- tp = (char *) malloc (len);
26811- if (tp == NULL)
26812- {
26813- FREE_BLOCKS (block_list);
26814- return added;
26815- }
26816- memcpy (tp, value, len);
26817- map[nmap].value = tp;
26818-
26819- ++nmap;
26820- ++added;
26821- }
26822- }
26823-
26824- /* Possibly not the whole line fits into the buffer. Ignore
26825- the rest of the line. */
26826- while (strchr (cp, '\n') == NULL)
26827- {
26828- cp = buf;
26829- if (fgets (buf, BUFSIZ, fp) == NULL)
26830- /* Make sure the inner loop will be left. The outer loop
26831- will exit at the `feof' test. */
26832- *cp = '\n';
26833- }
26834- }
26835-
26836- /* Should we test for ferror()? I think we have to silently ignore
26837- errors. --drepper */
26838- fclose (fp);
26839-
26840- if (added > 0)
26841- qsort (map, nmap, sizeof (struct alias_map),
26842- (int (*) PARAMS ((const void *, const void *))) alias_compare);
26843-
26844- FREE_BLOCKS (block_list);
26845- return added;
26846-}
26847-
26848-
26849-static void
26850-extend_alias_table ()
26851-{
26852- size_t new_size;
26853- struct alias_map *new_map;
26854-
26855- new_size = maxmap == 0 ? 100 : 2 * maxmap;
26856- new_map = (struct alias_map *) malloc (new_size
26857- * sizeof (struct alias_map));
26858- if (new_map == NULL)
26859- /* Simply don't extend: we don't have any more core. */
26860- return;
26861-
26862- memcpy (new_map, map, nmap * sizeof (struct alias_map));
26863-
26864- if (maxmap != 0)
26865- free (map);
26866-
26867- map = new_map;
26868- maxmap = new_size;
26869-}
26870-
26871-
26872-static int
26873-alias_compare (map1, map2)
26874- const struct alias_map *map1;
26875- const struct alias_map *map2;
26876-{
26877-#if defined _LIBC || defined HAVE_STRCASECMP
26878- return strcasecmp (map1->alias, map2->alias);
26879-#else
26880- const unsigned char *p1 = (const unsigned char *) map1->alias;
26881- const unsigned char *p2 = (const unsigned char *) map2->alias;
26882- unsigned char c1, c2;
26883-
26884- if (p1 == p2)
26885- return 0;
26886-
26887- do
26888- {
26889- /* I know this seems to be odd but the tolower() function in
26890- some systems libc cannot handle nonalpha characters. */
26891- c1 = isupper (*p1) ? tolower (*p1) : *p1;
26892- c2 = isupper (*p2) ? tolower (*p2) : *p2;
26893- if (c1 == '\0')
26894- break;
26895- ++p1;
26896- ++p2;
26897- }
26898- while (c1 == c2);
26899-
26900- return c1 - c2;
26901-#endif
26902-}
26903diff -uprN clean/lrzsz-0.12.20/intl/Makefile.in lrzsz-0.12.20/intl/Makefile.in
26904--- clean/lrzsz-0.12.20/intl/Makefile.in 1998-04-26 14:22:35.000000000 +0100
26905+++ lrzsz-0.12.20/intl/Makefile.in 1970-01-01 01:00:00.000000000 +0100
26906@@ -1,214 +0,0 @@
26907-# Makefile for directory with message catalog handling in GNU NLS Utilities.
26908-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
26909-#
26910-# This program is free software; you can redistribute it and/or modify
26911-# it under the terms of the GNU General Public License as published by
26912-# the Free Software Foundation; either version 2, or (at your option)
26913-# any later version.
26914-#
26915-# This program is distributed in the hope that it will be useful,
26916-# but WITHOUT ANY WARRANTY; without even the implied warranty of
26917-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26918-# GNU General Public License for more details.
26919-#
26920-# You should have received a copy of the GNU General Public License
26921-# along with this program; if not, write to the Free Software
26922-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
26923-
26924-PACKAGE = @PACKAGE@
26925-VERSION = @VERSION@
26926-
26927-SHELL = /bin/sh
26928-
26929-srcdir = @srcdir@
26930-top_srcdir = @top_srcdir@
26931-top_builddir = ..
26932-VPATH = @srcdir@
26933-
26934-prefix = @prefix@
26935-exec_prefix = @exec_prefix@
26936-transform = @program_transform_name@
26937-libdir = $(exec_prefix)/lib
26938-includedir = $(prefix)/include
26939-datadir = $(prefix)/@DATADIRNAME@
26940-localedir = $(datadir)/locale
26941-gnulocaledir = $(prefix)/share/locale
26942-gettextsrcdir = @datadir@/gettext/intl
26943-aliaspath = $(localedir):.
26944-subdir = intl
26945-
26946-INSTALL = @INSTALL@
26947-INSTALL_DATA = @INSTALL_DATA@
26948-MKINSTALLDIRS = @MKINSTALLDIRS@
26949-
26950-l = @l@
26951-
26952-AR = ar
26953-CC = @CC@
26954-LIBTOOL = @LIBTOOL@
26955-RANLIB = @RANLIB@
26956-
26957-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
26958--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
26959-CPPFLAGS = @CPPFLAGS@
26960-CFLAGS = @CFLAGS@
26961-LDFLAGS = @LDFLAGS@
26962-
26963-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
26964-
26965-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
26966-COMHDRS = gettext.h gettextP.h hash-string.h
26967-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
26968-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
26969-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
26970-explodename.c
26971-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
26972-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
26973-explodename.$lo
26974-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
26975-GETTOBJS = intl-compat.$lo
26976-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
26977-xopen-msg.sed $(HEADERS) $(SOURCES)
26978-DISTFILES.normal = VERSION
26979-DISTFILES.gettext = libintl.glibc intlh.inst.in
26980-
26981-.SUFFIXES:
26982-.SUFFIXES: .c .o .lo
26983-.c.o:
26984- $(COMPILE) $<
26985-.c.lo:
26986- $(LIBTOOL) --mode=compile $(COMPILE) $<
26987-
26988-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
26989-
26990-all: all-@USE_INCLUDED_LIBINTL@
26991-
26992-all-yes: libintl.$la intlh.inst
26993-all-no:
26994-
26995-libintl.a: $(OBJECTS)
26996- rm -f $@
26997- $(AR) cru $@ $(OBJECTS)
26998- $(RANLIB) $@
26999-
27000-libintl.la: $(OBJECTS)
27001- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
27002- -version-info 1:0 -rpath $(libdir)
27003-
27004-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
27005- cd ../po && $(MAKE) cat-id-tbl.$lo
27006-
27007-check: all
27008-
27009-# This installation goal is only used in GNU gettext. Packages which
27010-# only use the library should use install instead.
27011-
27012-# We must not install the libintl.h/libintl.a files if we are on a
27013-# system which has the gettext() function in its C library or in a
27014-# separate library or use the catgets interface. A special case is
27015-# where configure found a previously installed GNU gettext library.
27016-# If you want to use the one which comes with this version of the
27017-# package, you have to use `configure --with-included-gettext'.
27018-install: install-exec install-data
27019-install-exec: all
27020- if test "$(PACKAGE)" = "gettext" \
27021- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
27022- if test -r $(MKINSTALLDIRS); then \
27023- $(MKINSTALLDIRS) $(libdir) $(includedir); \
27024- else \
27025- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
27026- fi; \
27027- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
27028- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
27029- else \
27030- : ; \
27031- fi
27032-install-data: all
27033- if test "$(PACKAGE)" = "gettext"; then \
27034- if test -r $(MKINSTALLDIRS); then \
27035- $(MKINSTALLDIRS) $(gettextsrcdir); \
27036- else \
27037- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
27038- fi; \
27039- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
27040- dists="$(DISTFILES.common)"; \
27041- for file in $$dists; do \
27042- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
27043- done; \
27044- else \
27045- : ; \
27046- fi
27047-
27048-# Define this as empty until I found a useful application.
27049-installcheck:
27050-
27051-uninstall:
27052- dists="$(DISTFILES.common)"; \
27053- for file in $$dists; do \
27054- rm -f $(gettextsrcdir)/$$file; \
27055- done
27056-
27057-info dvi:
27058-
27059-$(OBJECTS): ../config.h libgettext.h
27060-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
27061-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
27062-
27063-tags: TAGS
27064-
27065-TAGS: $(HEADERS) $(SOURCES)
27066- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
27067-
27068-id: ID
27069-
27070-ID: $(HEADERS) $(SOURCES)
27071- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
27072-
27073-
27074-mostlyclean:
27075- rm -f *.a *.o *.lo core core.*
27076-
27077-clean: mostlyclean
27078-
27079-distclean: clean
27080- rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h
27081-
27082-maintainer-clean: distclean
27083- @echo "This command is intended for maintainers to use;"
27084- @echo "it deletes files that may require special tools to rebuild."
27085-
27086-
27087-# GNU gettext needs not contain the file `VERSION' but contains some
27088-# other files which should not be distributed in other packages.
27089-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
27090-dist distdir: Makefile $(DISTFILES)
27091- if test "$(PACKAGE)" = gettext; then \
27092- additional="$(DISTFILES.gettext)"; \
27093- else \
27094- additional="$(DISTFILES.normal)"; \
27095- fi; \
27096- for file in $(DISTFILES.common) $$additional; do \
27097- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
27098- || cp -p $(srcdir)/$$file $(distdir); \
27099- done
27100-
27101-dist-libc:
27102- tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
27103-
27104-Makefile: Makefile.in ../config.status
27105- cd .. \
27106- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
27107-
27108-# The dependency for intlh.inst is different in gettext and all other
27109-# packages. Because we cannot you GNU make features we have to solve
27110-# the problem while rewriting Makefile.in.
27111-@GT_YES@intlh.inst: intlh.inst.in ../config.status
27112-@GT_YES@ cd .. \
27113-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
27114-@GT_YES@ $(SHELL) ./config.status
27115-@GT_NO@.PHONY: intlh.inst
27116-@GT_NO@intlh.inst:
27117-
27118-# Tell versions [3.59,3.63) of GNU make not to export all variables.
27119-# Otherwise a system limit (for SysV at least) may be exceeded.
27120-.NOEXPORT:
27121diff -uprN clean/lrzsz-0.12.20/intl/po2tbl.sed.in lrzsz-0.12.20/intl/po2tbl.sed.in
27122--- clean/lrzsz-0.12.20/intl/po2tbl.sed.in 1998-04-26 14:20:52.000000000 +0100
27123+++ lrzsz-0.12.20/intl/po2tbl.sed.in 1970-01-01 01:00:00.000000000 +0100
27124@@ -1,102 +0,0 @@
27125-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
27126-# Copyright (C) 1995 Free Software Foundation, Inc.
27127-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
27128-#
27129-# This program is free software; you can redistribute it and/or modify
27130-# it under the terms of the GNU General Public License as published by
27131-# the Free Software Foundation; either version 2, or (at your option)
27132-# any later version.
27133-#
27134-# This program is distributed in the hope that it will be useful,
27135-# but WITHOUT ANY WARRANTY; without even the implied warranty of
27136-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27137-# GNU General Public License for more details.
27138-#
27139-# You should have received a copy of the GNU General Public License
27140-# along with this program; if not, write to the Free Software
27141-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27142-#
27143-1 {
27144- i\
27145-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\
27146-\
27147-#if HAVE_CONFIG_H\
27148-# include <config.h>\
27149-#endif\
27150-\
27151-#include "libgettext.h"\
27152-\
27153-const struct _msg_ent _msg_tbl[] = {
27154- h
27155- s/.*/0/
27156- x
27157-}
27158-#
27159-# Write msgid entries in C array form.
27160-#
27161-/^msgid/ {
27162- s/msgid[ ]*\(".*"\)/ {\1/
27163- tb
27164-# Append the next line
27165- :b
27166- N
27167-# Look whether second part is continuation line.
27168- s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
27169-# Yes, then branch.
27170- ta
27171-# Because we assume that the input file correctly formed the line
27172-# just read cannot be again be a msgid line. So it's safe to ignore
27173-# it.
27174- s/\(.*\)\n.*/\1/
27175- bc
27176-# We found a continuation line. But before printing insert '\'.
27177- :a
27178- s/\(.*\)\(\n.*\)/\1\\\2/
27179- P
27180-# We cannot use D here.
27181- s/.*\n\(.*\)/\1/
27182-# Some buggy seds do not clear the `successful substitution since last ``t'''
27183-# flag on `N', so we do a `t' here to clear it.
27184- tb
27185-# Not reached
27186- :c
27187- x
27188-# The following nice solution is by
27189-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
27190- td
27191-# Increment a decimal number in pattern space.
27192-# First hide trailing `9' digits.
27193- :d
27194- s/9\(_*\)$/_\1/
27195- td
27196-# Assure at least one digit is available.
27197- s/^\(_*\)$/0\1/
27198-# Increment the last digit.
27199- s/8\(_*\)$/9\1/
27200- s/7\(_*\)$/8\1/
27201- s/6\(_*\)$/7\1/
27202- s/5\(_*\)$/6\1/
27203- s/4\(_*\)$/5\1/
27204- s/3\(_*\)$/4\1/
27205- s/2\(_*\)$/3\1/
27206- s/1\(_*\)$/2\1/
27207- s/0\(_*\)$/1\1/
27208-# Convert the hidden `9' digits to `0's.
27209- s/_/0/g
27210- x
27211- G
27212- s/\(.*\)\n\([0-9]*\)/\1, \2},/
27213- s/\(.*\)"$/\1/
27214- p
27215-}
27216-#
27217-# Last line.
27218-#
27219-$ {
27220- i\
27221-};\
27222-
27223- g
27224- s/0*\(.*\)/int _msg_tbl_length = \1;/p
27225-}
27226-d
27227diff -uprN clean/lrzsz-0.12.20/intl/textdomain.c lrzsz-0.12.20/intl/textdomain.c
27228--- clean/lrzsz-0.12.20/intl/textdomain.c 1998-04-26 14:22:37.000000000 +0100
27229+++ lrzsz-0.12.20/intl/textdomain.c 1970-01-01 01:00:00.000000000 +0100
27230@@ -1,106 +0,0 @@
27231-/* Implementation of the textdomain(3) function
27232- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
27233- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
27234-
27235- This program is free software; you can redistribute it and/or modify
27236- it under the terms of the GNU General Public License as published by
27237- the Free Software Foundation; either version 2, or (at your option)
27238- any later version.
27239-
27240- This program is distributed in the hope that it will be useful,
27241- but WITHOUT ANY WARRANTY; without even the implied warranty of
27242- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27243- GNU General Public License for more details.
27244-
27245- You should have received a copy of the GNU General Public License
27246- along with this program; if not, write to the Free Software Foundation,
27247- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
27248-
27249-#ifdef HAVE_CONFIG_H
27250-# include <config.h>
27251-#endif
27252-
27253-#if defined STDC_HEADERS || defined _LIBC
27254-# include <stdlib.h>
27255-#endif
27256-
27257-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
27258-# include <string.h>
27259-#else
27260-# include <strings.h>
27261-# ifndef memcpy
27262-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
27263-# endif
27264-#endif
27265-
27266-#ifdef _LIBC
27267-# include <libintl.h>
27268-#else
27269-# include "libgettext.h"
27270-#endif
27271-
27272-/* @@ end of prolog @@ */
27273-
27274-/* Name of the default text domain. */
27275-extern const char _nl_default_default_domain[];
27276-
27277-/* Default text domain in which entries for gettext(3) are to be found. */
27278-extern const char *_nl_current_default_domain;
27279-
27280-
27281-/* Names for the libintl functions are a problem. They must not clash
27282- with existing names and they should follow ANSI C. But this source
27283- code is also used in GNU C Library where the names have a __
27284- prefix. So we have to make a difference here. */
27285-#ifdef _LIBC
27286-# define TEXTDOMAIN __textdomain
27287-# define strdup(str) __strdup (str)
27288-#else
27289-# define TEXTDOMAIN textdomain__
27290-#endif
27291-
27292-/* Set the current default message catalog to DOMAINNAME.
27293- If DOMAINNAME is null, return the current default.
27294- If DOMAINNAME is "", reset to the default of "messages". */
27295-char *
27296-TEXTDOMAIN (domainname)
27297- const char *domainname;
27298-{
27299- char *old;
27300-
27301- /* A NULL pointer requests the current setting. */
27302- if (domainname == NULL)
27303- return (char *) _nl_current_default_domain;
27304-
27305- old = (char *) _nl_current_default_domain;
27306-
27307- /* If domain name is the null string set to default domain "messages". */
27308- if (domainname[0] == '\0'
27309- || strcmp (domainname, _nl_default_default_domain) == 0)
27310- _nl_current_default_domain = _nl_default_default_domain;
27311- else
27312- {
27313- /* If the following malloc fails `_nl_current_default_domain'
27314- will be NULL. This value will be returned and so signals we
27315- are out of core. */
27316-#if defined _LIBC || defined HAVE_STRDUP
27317- _nl_current_default_domain = strdup (domainname);
27318-#else
27319- size_t len = strlen (domainname) + 1;
27320- char *cp = (char *) malloc (len);
27321- if (cp != NULL)
27322- memcpy (cp, domainname, len);
27323- _nl_current_default_domain = cp;
27324-#endif
27325- }
27326-
27327- if (old != _nl_default_default_domain)
27328- free (old);
27329-
27330- return (char *) _nl_current_default_domain;
27331-}
27332-
27333-#ifdef _LIBC
27334-/* Alias for function name in GNU C Library. */
27335-weak_alias (__textdomain, textdomain);
27336-#endif
27337diff -uprN clean/lrzsz-0.12.20/intl/VERSION lrzsz-0.12.20/intl/VERSION
27338--- clean/lrzsz-0.12.20/intl/VERSION 1998-04-26 14:22:37.000000000 +0100
27339+++ lrzsz-0.12.20/intl/VERSION 1970-01-01 01:00:00.000000000 +0100
27340@@ -1 +0,0 @@
27341-GNU gettext library from gettext-0.10.32
27342diff -uprN clean/lrzsz-0.12.20/intl/xopen-msg.sed lrzsz-0.12.20/intl/xopen-msg.sed
27343--- clean/lrzsz-0.12.20/intl/xopen-msg.sed 1998-04-26 14:20:52.000000000 +0100
27344+++ lrzsz-0.12.20/intl/xopen-msg.sed 1970-01-01 01:00:00.000000000 +0100
27345@@ -1,104 +0,0 @@
27346-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
27347-# Copyright (C) 1995 Free Software Foundation, Inc.
27348-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
27349-#
27350-# This program is free software; you can redistribute it and/or modify
27351-# it under the terms of the GNU General Public License as published by
27352-# the Free Software Foundation; either version 2, or (at your option)
27353-# any later version.
27354-#
27355-# This program is distributed in the hope that it will be useful,
27356-# but WITHOUT ANY WARRANTY; without even the implied warranty of
27357-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27358-# GNU General Public License for more details.
27359-#
27360-# You should have received a copy of the GNU General Public License
27361-# along with this program; if not, write to the Free Software
27362-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27363-#
27364-#
27365-# The first directive in the .msg should be the definition of the
27366-# message set number. We use always set number 1.
27367-#
27368-1 {
27369- i\
27370-$set 1 # Automatically created by po2msg.sed
27371- h
27372- s/.*/0/
27373- x
27374-}
27375-#
27376-# We copy all comments into the .msg file. Perhaps they can help.
27377-#
27378-/^#/ s/^#[ ]*/$ /p
27379-#
27380-# We copy the original message as a comment into the .msg file.
27381-#
27382-/^msgid/ {
27383-# Does not work now
27384-# /"$/! {
27385-# s/\\$//
27386-# s/$/ ... (more lines following)"/
27387-# }
27388- s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/
27389- p
27390-}
27391-#
27392-# The .msg file contains, other then the .po file, only the translations
27393-# but each given a unique ID. Starting from 1 and incrementing by 1 for
27394-# each message we assign them to the messages.
27395-# It is important that the .po file used to generate the cat-id-tbl.c file
27396-# (with po-to-tbl) is the same as the one used here. (At least the order
27397-# of declarations must not be changed.)
27398-#
27399-/^msgstr/ {
27400- s/msgstr[ ]*"\(.*\)"/\1/
27401- x
27402-# The following nice solution is by
27403-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
27404- td
27405-# Increment a decimal number in pattern space.
27406-# First hide trailing `9' digits.
27407- :d
27408- s/9\(_*\)$/_\1/
27409- td
27410-# Assure at least one digit is available.
27411- s/^\(_*\)$/0\1/
27412-# Increment the last digit.
27413- s/8\(_*\)$/9\1/
27414- s/7\(_*\)$/8\1/
27415- s/6\(_*\)$/7\1/
27416- s/5\(_*\)$/6\1/
27417- s/4\(_*\)$/5\1/
27418- s/3\(_*\)$/4\1/
27419- s/2\(_*\)$/3\1/
27420- s/1\(_*\)$/2\1/
27421- s/0\(_*\)$/1\1/
27422-# Convert the hidden `9' digits to `0's.
27423- s/_/0/g
27424- x
27425-# Bring the line in the format `<number> <message>'
27426- G
27427- s/^[^\n]*$/& /
27428- s/\(.*\)\n\([0-9]*\)/\2 \1/
27429-# Clear flag from last substitution.
27430- tb
27431-# Append the next line.
27432- :b
27433- N
27434-# Look whether second part is a continuation line.
27435- s/\(.*\n\)"\(.*\)"/\1\2/
27436-# Yes, then branch.
27437- ta
27438- P
27439- D
27440-# Note that `D' includes a jump to the start!!
27441-# We found a continuation line. But before printing insert '\'.
27442- :a
27443- s/\(.*\)\(\n.*\)/\1\\\2/
27444- P
27445-# We cannot use the sed command `D' here
27446- s/.*\n\(.*\)/\1/
27447- tb
27448-}
27449-d
27450diff -uprN clean/lrzsz-0.12.20/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
27451--- clean/lrzsz-0.12.20/lib/Makefile.am 1998-12-27 16:25:26.000000000 +0000
27452+++ lrzsz-0.12.20/lib/Makefile.am 2019-11-25 16:22:34.000000000 +0000
27453@@ -1,6 +1,4 @@
27454 noinst_LIBRARIES=libzmodem.a
27455-CFLAGS=@CFLAGS@
27456-AUTOMAKE_OPTIONS=ansi2knr
27457
27458 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
27459 getopt.c getopt1.c mkdir.c mktime.c \
27460diff -uprN clean/lrzsz-0.12.20/lib/Makefile.in lrzsz-0.12.20/lib/Makefile.in
27461--- clean/lrzsz-0.12.20/lib/Makefile.in 1998-12-30 16:31:43.000000000 +0000
27462+++ lrzsz-0.12.20/lib/Makefile.in 2019-11-26 11:37:46.000000000 +0000
27463@@ -1,6 +1,8 @@
27464-# Makefile.in generated automatically by automake 1.3 from Makefile.am
27465+# Makefile.in generated by automake 1.16.1 from Makefile.am.
27466+# @configure_input@
27467+
27468+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
27469
27470-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
27471 # This Makefile.in is free software; the Free Software Foundation
27472 # gives unlimited permission to copy and/or distribute it,
27473 # with or without modifications, as long as this notice is preserved.
27474@@ -10,340 +12,623 @@
27475 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
27476 # PARTICULAR PURPOSE.
27477
27478+@SET_MAKE@
27479
27480-SHELL = /bin/sh
27481
27482-srcdir = @srcdir@
27483-top_srcdir = @top_srcdir@
27484 VPATH = @srcdir@
27485-prefix = @prefix@
27486-exec_prefix = @exec_prefix@
27487-
27488-bindir = @bindir@
27489-sbindir = @sbindir@
27490-libexecdir = @libexecdir@
27491-datadir = @datadir@
27492-sysconfdir = @sysconfdir@
27493-sharedstatedir = @sharedstatedir@
27494-localstatedir = @localstatedir@
27495-libdir = @libdir@
27496-infodir = @infodir@
27497-mandir = @mandir@
27498-includedir = @includedir@
27499-oldincludedir = /usr/include
27500-
27501-DISTDIR =
27502-
27503+am__is_gnu_make = { \
27504+ if test -z '$(MAKELEVEL)'; then \
27505+ false; \
27506+ elif test -n '$(MAKE_HOST)'; then \
27507+ true; \
27508+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
27509+ true; \
27510+ else \
27511+ false; \
27512+ fi; \
27513+}
27514+am__make_running_with_option = \
27515+ case $${target_option-} in \
27516+ ?) ;; \
27517+ *) echo "am__make_running_with_option: internal error: invalid" \
27518+ "target option '$${target_option-}' specified" >&2; \
27519+ exit 1;; \
27520+ esac; \
27521+ has_opt=no; \
27522+ sane_makeflags=$$MAKEFLAGS; \
27523+ if $(am__is_gnu_make); then \
27524+ sane_makeflags=$$MFLAGS; \
27525+ else \
27526+ case $$MAKEFLAGS in \
27527+ *\\[\ \ ]*) \
27528+ bs=\\; \
27529+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
27530+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
27531+ esac; \
27532+ fi; \
27533+ skip_next=no; \
27534+ strip_trailopt () \
27535+ { \
27536+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
27537+ }; \
27538+ for flg in $$sane_makeflags; do \
27539+ test $$skip_next = yes && { skip_next=no; continue; }; \
27540+ case $$flg in \
27541+ *=*|--*) continue;; \
27542+ -*I) strip_trailopt 'I'; skip_next=yes;; \
27543+ -*I?*) strip_trailopt 'I';; \
27544+ -*O) strip_trailopt 'O'; skip_next=yes;; \
27545+ -*O?*) strip_trailopt 'O';; \
27546+ -*l) strip_trailopt 'l'; skip_next=yes;; \
27547+ -*l?*) strip_trailopt 'l';; \
27548+ -[dEDm]) skip_next=yes;; \
27549+ -[JT]) skip_next=yes;; \
27550+ esac; \
27551+ case $$flg in \
27552+ *$$target_option*) has_opt=yes; break;; \
27553+ esac; \
27554+ done; \
27555+ test $$has_opt = yes
27556+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
27557+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
27558 pkgdatadir = $(datadir)/@PACKAGE@
27559-pkglibdir = $(libdir)/@PACKAGE@
27560 pkgincludedir = $(includedir)/@PACKAGE@
27561-
27562-top_builddir = ..
27563-
27564-ACLOCAL = @ACLOCAL@
27565-AUTOCONF = @AUTOCONF@
27566-AUTOMAKE = @AUTOMAKE@
27567-AUTOHEADER = @AUTOHEADER@
27568-
27569-INSTALL = @INSTALL@
27570-INSTALL_PROGRAM = @INSTALL_PROGRAM@
27571-INSTALL_DATA = @INSTALL_DATA@
27572-INSTALL_SCRIPT = @INSTALL_SCRIPT@
27573-transform = @program_transform_name@
27574-
27575+pkglibdir = $(libdir)/@PACKAGE@
27576+pkglibexecdir = $(libexecdir)/@PACKAGE@
27577+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
27578+install_sh_DATA = $(install_sh) -c -m 644
27579+install_sh_PROGRAM = $(install_sh) -c
27580+install_sh_SCRIPT = $(install_sh) -c
27581+INSTALL_HEADER = $(INSTALL_DATA)
27582+transform = $(program_transform_name)
27583 NORMAL_INSTALL = :
27584 PRE_INSTALL = :
27585 POST_INSTALL = :
27586 NORMAL_UNINSTALL = :
27587 PRE_UNINSTALL = :
27588 POST_UNINSTALL = :
27589-CATALOGS = @CATALOGS@
27590-CATOBJEXT = @CATOBJEXT@
27591+build_triplet = @build@
27592+host_triplet = @host@
27593+subdir = lib
27594+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
27595+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
27596+ $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
27597+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
27598+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
27599+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
27600+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
27601+ $(top_srcdir)/configure.in
27602+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
27603+ $(ACLOCAL_M4)
27604+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
27605+ $(am__DIST_COMMON)
27606+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27607+CONFIG_HEADER = $(top_builddir)/config.h
27608+CONFIG_CLEAN_FILES =
27609+CONFIG_CLEAN_VPATH_FILES =
27610+LIBRARIES = $(noinst_LIBRARIES)
27611+AR = ar
27612+ARFLAGS = cru
27613+AM_V_AR = $(am__v_AR_@AM_V@)
27614+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
27615+am__v_AR_0 = @echo " AR " $@;
27616+am__v_AR_1 =
27617+libzmodem_a_AR = $(AR) $(ARFLAGS)
27618+am_libzmodem_a_OBJECTS = long-options.$(OBJEXT) xstrtol.$(OBJEXT) \
27619+ xstrtoul.$(OBJEXT) error.$(OBJEXT)
27620+libzmodem_a_OBJECTS = $(am_libzmodem_a_OBJECTS)
27621+AM_V_P = $(am__v_P_@AM_V@)
27622+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
27623+am__v_P_0 = false
27624+am__v_P_1 = :
27625+AM_V_GEN = $(am__v_GEN_@AM_V@)
27626+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
27627+am__v_GEN_0 = @echo " GEN " $@;
27628+am__v_GEN_1 =
27629+AM_V_at = $(am__v_at_@AM_V@)
27630+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
27631+am__v_at_0 = @
27632+am__v_at_1 =
27633+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
27634+depcomp = $(SHELL) $(top_srcdir)/depcomp
27635+am__maybe_remake_depfiles = depfiles
27636+am__depfiles_remade = $(DEPDIR)/mkdir.Po $(DEPDIR)/mktime.Po \
27637+ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strdup.Po $(DEPDIR)/strerror.Po \
27638+ $(DEPDIR)/strftime.Po $(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \
27639+ $(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po \
27640+ $(DEPDIR)/vasprintf.Po ./$(DEPDIR)/alloca.Po \
27641+ ./$(DEPDIR)/error.Po ./$(DEPDIR)/long-options.Po \
27642+ ./$(DEPDIR)/xstrtol.Po ./$(DEPDIR)/xstrtoul.Po
27643+am__mv = mv -f
27644+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
27645+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
27646+AM_V_CC = $(am__v_CC_@AM_V@)
27647+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
27648+am__v_CC_0 = @echo " CC " $@;
27649+am__v_CC_1 =
27650+CCLD = $(CC)
27651+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
27652+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
27653+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
27654+am__v_CCLD_0 = @echo " CCLD " $@;
27655+am__v_CCLD_1 =
27656+SOURCES = $(libzmodem_a_SOURCES)
27657+DIST_SOURCES = $(libzmodem_a_SOURCES)
27658+am__can_run_installinfo = \
27659+ case $$AM_UPDATE_INFO_DIR in \
27660+ n|no|NO) false;; \
27661+ *) (install-info --version) >/dev/null 2>&1;; \
27662+ esac
27663+HEADERS = $(noinst_HEADERS)
27664+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
27665+# Read a list of newline-separated strings from the standard input,
27666+# and print each of them once, without duplicates. Input order is
27667+# *not* preserved.
27668+am__uniquify_input = $(AWK) '\
27669+ BEGIN { nonempty = 0; } \
27670+ { items[$$0] = 1; nonempty = 1; } \
27671+ END { if (nonempty) { for (i in items) print i; }; } \
27672+'
27673+# Make sure the list of sources is unique. This is necessary because,
27674+# e.g., the same source file might be shared among _SOURCES variables
27675+# for different programs/libraries.
27676+am__define_uniq_tagged_files = \
27677+ list='$(am__tagged_files)'; \
27678+ unique=`for i in $$list; do \
27679+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
27680+ done | $(am__uniquify_input)`
27681+ETAGS = etags
27682+CTAGS = ctags
27683+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
27684+ $(top_srcdir)/mkinstalldirs alloca.c mkdir.c mktime.c stpcpy.c \
27685+ strdup.c strerror.c strftime.c strpbrk.c strstr.c strtol.c \
27686+ strtoul.c vasprintf.c
27687+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
27688+ACLOCAL = @ACLOCAL@
27689+ALLOCA = @ALLOCA@
27690+AMTAR = @AMTAR@
27691+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
27692+AUTOCONF = @AUTOCONF@
27693+AUTOHEADER = @AUTOHEADER@
27694+AUTOMAKE = @AUTOMAKE@
27695+AWK = @AWK@
27696 CC = @CC@
27697+CCDEPMODE = @CCDEPMODE@
27698+CFLAGS = @CFLAGS@
27699 CPP = @CPP@
27700-DATADIRNAME = @DATADIRNAME@
27701+CPPFLAGS = @CPPFLAGS@
27702+CYGPATH_W = @CYGPATH_W@
27703+DEFS = @DEFS@
27704+DEPDIR = @DEPDIR@
27705+ECHO_C = @ECHO_C@
27706+ECHO_N = @ECHO_N@
27707+ECHO_T = @ECHO_T@
27708+EGREP = @EGREP@
27709 ENABLE_TIMESYNC = @ENABLE_TIMESYNC@
27710-GENCAT = @GENCAT@
27711-GMOFILES = @GMOFILES@
27712+EXEEXT = @EXEEXT@
27713+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
27714 GMSGFMT = @GMSGFMT@
27715-GT_NO = @GT_NO@
27716-GT_YES = @GT_YES@
27717-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
27718-INSTOBJEXT = @INSTOBJEXT@
27719-INTLDEPS = @INTLDEPS@
27720+GMSGFMT_015 = @GMSGFMT_015@
27721+GREP = @GREP@
27722+INSTALL = @INSTALL@
27723+INSTALL_DATA = @INSTALL_DATA@
27724+INSTALL_PROGRAM = @INSTALL_PROGRAM@
27725+INSTALL_SCRIPT = @INSTALL_SCRIPT@
27726+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
27727 INTLLIBS = @INTLLIBS@
27728-INTLOBJS = @INTLOBJS@
27729+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
27730 LDFLAGS = @LDFLAGS@
27731+LIBICONV = @LIBICONV@
27732+LIBINTL = @LIBINTL@
27733 LIBOBJS = @LIBOBJS@
27734 LIBS = @LIBS@
27735+LTLIBICONV = @LTLIBICONV@
27736+LTLIBINTL = @LTLIBINTL@
27737+LTLIBOBJS = @LTLIBOBJS@
27738 MAKEINFO = @MAKEINFO@
27739-MKINSTALLDIRS = @MKINSTALLDIRS@
27740+MKDIR_P = @MKDIR_P@
27741 MSGFMT = @MSGFMT@
27742+MSGMERGE = @MSGMERGE@
27743+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
27744+OBJEXT = @OBJEXT@
27745 PACKAGE = @PACKAGE@
27746+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
27747+PACKAGE_NAME = @PACKAGE_NAME@
27748+PACKAGE_STRING = @PACKAGE_STRING@
27749+PACKAGE_TARNAME = @PACKAGE_TARNAME@
27750+PACKAGE_URL = @PACKAGE_URL@
27751 PACKAGE_VERSION = @PACKAGE_VERSION@
27752-POFILES = @POFILES@
27753+PATH_SEPARATOR = @PATH_SEPARATOR@
27754 POSUB = @POSUB@
27755 RANLIB = @RANLIB@
27756-U = @U@
27757-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
27758+SED = @SED@
27759+SET_MAKE = @SET_MAKE@
27760+SHELL = @SHELL@
27761+STRIP = @STRIP@
27762 USE_NLS = @USE_NLS@
27763 VERSION = @VERSION@
27764-l = @l@
27765-
27766-noinst_LIBRARIES=libzmodem.a
27767-CFLAGS=@CFLAGS@
27768-AUTOMAKE_OPTIONS=ansi2knr
27769-
27770+XGETTEXT = @XGETTEXT@
27771+XGETTEXT_015 = @XGETTEXT_015@
27772+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
27773+abs_builddir = @abs_builddir@
27774+abs_srcdir = @abs_srcdir@
27775+abs_top_builddir = @abs_top_builddir@
27776+abs_top_srcdir = @abs_top_srcdir@
27777+ac_ct_CC = @ac_ct_CC@
27778+am__include = @am__include@
27779+am__leading_dot = @am__leading_dot@
27780+am__quote = @am__quote@
27781+am__tar = @am__tar@
27782+am__untar = @am__untar@
27783+bindir = @bindir@
27784+build = @build@
27785+build_alias = @build_alias@
27786+build_cpu = @build_cpu@
27787+build_os = @build_os@
27788+build_vendor = @build_vendor@
27789+builddir = @builddir@
27790+datadir = @datadir@
27791+datarootdir = @datarootdir@
27792+docdir = @docdir@
27793+dvidir = @dvidir@
27794+exec_prefix = @exec_prefix@
27795+host = @host@
27796+host_alias = @host_alias@
27797+host_cpu = @host_cpu@
27798+host_os = @host_os@
27799+host_vendor = @host_vendor@
27800+htmldir = @htmldir@
27801+includedir = @includedir@
27802+infodir = @infodir@
27803+install_sh = @install_sh@
27804+libdir = @libdir@
27805+libexecdir = @libexecdir@
27806+localedir = @localedir@
27807+localstatedir = @localstatedir@
27808+mandir = @mandir@
27809+mkdir_p = @mkdir_p@
27810+oldincludedir = @oldincludedir@
27811+pdfdir = @pdfdir@
27812+prefix = @prefix@
27813+program_transform_name = @program_transform_name@
27814+psdir = @psdir@
27815+sbindir = @sbindir@
27816+sharedstatedir = @sharedstatedir@
27817+srcdir = @srcdir@
27818+sysconfdir = @sysconfdir@
27819+target_alias = @target_alias@
27820+top_build_prefix = @top_build_prefix@
27821+top_builddir = @top_builddir@
27822+top_srcdir = @top_srcdir@
27823+noinst_LIBRARIES = libzmodem.a
27824 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
27825 getopt.c getopt1.c mkdir.c mktime.c \
27826 strdup.c strerror.c strstr.c strpbrk.c strtol.c strtoul.c stpcpy.c \
27827 strftime.c vasprintf.c
27828
27829 libzmodem_a_SOURCES = long-options.c xstrtol.c xstrtoul.c error.c
27830-libzmodem_a_LIBADD = @LIBOBJS@ @ALLOCA@
27831-libzmodem_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@
27832-
27833+libzmodem_a_LIBADD = @LIBOBJS@ @ALLOCA@
27834+libzmodem_a_DEPENDENCIES = @ALLOCA@ @LIBOBJS@
27835 noinst_HEADERS = getopt.h long-options.h xstrtol.h xstrtoul.h error.h
27836-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
27837-CONFIG_HEADER = ../config.h
27838-CONFIG_CLEAN_FILES =
27839-LIBRARIES = $(noinst_LIBRARIES)
27840+all: all-am
27841
27842+.SUFFIXES:
27843+.SUFFIXES: .c .o .obj
27844+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
27845+ @for dep in $?; do \
27846+ case '$(am__configure_deps)' in \
27847+ *$$dep*) \
27848+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
27849+ && { if test -f $@; then exit 0; else break; fi; }; \
27850+ exit 1;; \
27851+ esac; \
27852+ done; \
27853+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
27854+ $(am__cd) $(top_srcdir) && \
27855+ $(AUTOMAKE) --gnu lib/Makefile
27856+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27857+ @case '$?' in \
27858+ *config.status*) \
27859+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
27860+ *) \
27861+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
27862+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
27863+ esac;
27864+
27865+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
27866+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27867+
27868+$(top_srcdir)/configure: $(am__configure_deps)
27869+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27870+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
27871+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
27872+$(am__aclocal_m4_deps):
27873
27874-DEFS = @DEFS@ -I. -I$(srcdir) -I..
27875-CPPFLAGS = @CPPFLAGS@
27876-ANSI2KNR = @ANSI2KNR@
27877-libzmodem_a_OBJECTS = long-options$U.o xstrtol$U.o xstrtoul$U.o \
27878-error$U.o
27879-AR = ar
27880-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
27881-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
27882-HEADERS = $(noinst_HEADERS)
27883+clean-noinstLIBRARIES:
27884+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
27885
27886-DIST_COMMON = Makefile.am Makefile.in alloca.c ansi2knr.1 ansi2knr.c \
27887-getopt.c getopt1.c mkdir.c mktime.c stpcpy.c strdup.c strerror.c \
27888-strftime.c strpbrk.c strstr.c strtol.c strtoul.c vasprintf.c
27889+libzmodem.a: $(libzmodem_a_OBJECTS) $(libzmodem_a_DEPENDENCIES) $(EXTRA_libzmodem_a_DEPENDENCIES)
27890+ $(AM_V_at)-rm -f libzmodem.a
27891+ $(AM_V_AR)$(libzmodem_a_AR) libzmodem.a $(libzmodem_a_OBJECTS) $(libzmodem_a_LIBADD)
27892+ $(AM_V_at)$(RANLIB) libzmodem.a
27893
27894+mostlyclean-compile:
27895+ -rm -f *.$(OBJEXT)
27896
27897-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
27898+distclean-compile:
27899+ -rm -f *.tab.c
27900
27901-TAR = tar
27902-GZIP = --best
27903-SOURCES = $(libzmodem_a_SOURCES)
27904-OBJECTS = $(libzmodem_a_OBJECTS)
27905+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@ # am--include-marker
27906+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mktime.Po@am__quote@ # am--include-marker
27907+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Po@am__quote@ # am--include-marker
27908+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@ # am--include-marker
27909+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@ # am--include-marker
27910+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strftime.Po@am__quote@ # am--include-marker
27911+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strpbrk.Po@am__quote@ # am--include-marker
27912+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strstr.Po@am__quote@ # am--include-marker
27913+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtol.Po@am__quote@ # am--include-marker
27914+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoul.Po@am__quote@ # am--include-marker
27915+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Po@am__quote@ # am--include-marker
27916+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Po@am__quote@ # am--include-marker
27917+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ # am--include-marker
27918+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/long-options.Po@am__quote@ # am--include-marker
27919+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtol.Po@am__quote@ # am--include-marker
27920+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrtoul.Po@am__quote@ # am--include-marker
27921+
27922+$(am__depfiles_remade):
27923+ @$(MKDIR_P) $(@D)
27924+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
27925
27926-all: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS)
27927+am--depfiles: $(am__depfiles_remade)
27928
27929-.SUFFIXES:
27930-.SUFFIXES: .S .c .o .s
27931-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
27932- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
27933+.c.o:
27934+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
27935+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
27936+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
27937+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
27938+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
27939+
27940+.c.obj:
27941+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
27942+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
27943+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
27944+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
27945+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
27946+
27947+ID: $(am__tagged_files)
27948+ $(am__define_uniq_tagged_files); mkid -fID $$unique
27949+tags: tags-am
27950+TAGS: tags
27951+
27952+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
27953+ set x; \
27954+ here=`pwd`; \
27955+ $(am__define_uniq_tagged_files); \
27956+ shift; \
27957+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
27958+ test -n "$$unique" || unique=$$empty_fix; \
27959+ if test $$# -gt 0; then \
27960+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
27961+ "$$@" $$unique; \
27962+ else \
27963+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
27964+ $$unique; \
27965+ fi; \
27966+ fi
27967+ctags: ctags-am
27968+
27969+CTAGS: ctags
27970+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
27971+ $(am__define_uniq_tagged_files); \
27972+ test -z "$(CTAGS_ARGS)$$unique" \
27973+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
27974+ $$unique
27975+
27976+GTAGS:
27977+ here=`$(am__cd) $(top_builddir) && pwd` \
27978+ && $(am__cd) $(top_srcdir) \
27979+ && gtags -i $(GTAGS_ARGS) "$$here"
27980+cscopelist: cscopelist-am
27981+
27982+cscopelist-am: $(am__tagged_files)
27983+ list='$(am__tagged_files)'; \
27984+ case "$(srcdir)" in \
27985+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
27986+ *) sdir=$(subdir)/$(srcdir) ;; \
27987+ esac; \
27988+ for i in $$list; do \
27989+ if test -f "$$i"; then \
27990+ echo "$(subdir)/$$i"; \
27991+ else \
27992+ echo "$$sdir/$$i"; \
27993+ fi; \
27994+ done >> $(top_builddir)/cscope.files
27995
27996-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
27997- cd $(top_builddir) \
27998- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
27999+distclean-tags:
28000+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
28001
28002+distdir: $(BUILT_SOURCES)
28003+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
28004
28005-mostlyclean-noinstLIBRARIES:
28006+distdir-am: $(DISTFILES)
28007+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
28008+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
28009+ list='$(DISTFILES)'; \
28010+ dist_files=`for file in $$list; do echo $$file; done | \
28011+ sed -e "s|^$$srcdirstrip/||;t" \
28012+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
28013+ case $$dist_files in \
28014+ */*) $(MKDIR_P) `echo "$$dist_files" | \
28015+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
28016+ sort -u` ;; \
28017+ esac; \
28018+ for file in $$dist_files; do \
28019+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
28020+ if test -d $$d/$$file; then \
28021+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
28022+ if test -d "$(distdir)/$$file"; then \
28023+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
28024+ fi; \
28025+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
28026+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
28027+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
28028+ fi; \
28029+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
28030+ else \
28031+ test -f "$(distdir)/$$file" \
28032+ || cp -p $$d/$$file "$(distdir)/$$file" \
28033+ || exit 1; \
28034+ fi; \
28035+ done
28036+check-am: all-am
28037+check: check-am
28038+all-am: Makefile $(LIBRARIES) $(HEADERS)
28039+installdirs:
28040+install: install-am
28041+install-exec: install-exec-am
28042+install-data: install-data-am
28043+uninstall: uninstall-am
28044
28045-clean-noinstLIBRARIES:
28046- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
28047+install-am: all-am
28048+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
28049+
28050+installcheck: installcheck-am
28051+install-strip:
28052+ if test -z '$(STRIP)'; then \
28053+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
28054+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
28055+ install; \
28056+ else \
28057+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
28058+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
28059+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
28060+ fi
28061+mostlyclean-generic:
28062
28063-distclean-noinstLIBRARIES:
28064+clean-generic:
28065
28066-maintainer-clean-noinstLIBRARIES:
28067+distclean-generic:
28068+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
28069+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
28070
28071-.c.o:
28072- $(COMPILE) -c $<
28073+maintainer-clean-generic:
28074+ @echo "This command is intended for maintainers to use"
28075+ @echo "it deletes files that may require special tools to rebuild."
28076+clean: clean-am
28077
28078-.s.o:
28079- $(COMPILE) -c $<
28080+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
28081
28082-.S.o:
28083- $(COMPILE) -c $<
28084+distclean: distclean-am
28085+ -rm -f $(DEPDIR)/mkdir.Po
28086+ -rm -f $(DEPDIR)/mktime.Po
28087+ -rm -f $(DEPDIR)/stpcpy.Po
28088+ -rm -f $(DEPDIR)/strdup.Po
28089+ -rm -f $(DEPDIR)/strerror.Po
28090+ -rm -f $(DEPDIR)/strftime.Po
28091+ -rm -f $(DEPDIR)/strpbrk.Po
28092+ -rm -f $(DEPDIR)/strstr.Po
28093+ -rm -f $(DEPDIR)/strtol.Po
28094+ -rm -f $(DEPDIR)/strtoul.Po
28095+ -rm -f $(DEPDIR)/vasprintf.Po
28096+ -rm -f ./$(DEPDIR)/alloca.Po
28097+ -rm -f ./$(DEPDIR)/error.Po
28098+ -rm -f ./$(DEPDIR)/long-options.Po
28099+ -rm -f ./$(DEPDIR)/xstrtol.Po
28100+ -rm -f ./$(DEPDIR)/xstrtoul.Po
28101+ -rm -f Makefile
28102+distclean-am: clean-am distclean-compile distclean-generic \
28103+ distclean-tags
28104
28105-mostlyclean-compile:
28106- -rm -f *.o core *.core
28107+dvi: dvi-am
28108
28109-clean-compile:
28110+dvi-am:
28111
28112-distclean-compile:
28113- -rm -f *.tab.c
28114+html: html-am
28115
28116-maintainer-clean-compile:
28117+html-am:
28118
28119-mostlyclean-krextra:
28120+info: info-am
28121
28122-clean-krextra:
28123- -rm -f ansi2knr
28124+info-am:
28125
28126-distclean-krextra:
28127+install-data-am:
28128
28129-maintainer-clean-krextra:
28130-ansi2knr: ansi2knr.o
28131- $(LINK) ansi2knr.o $(LIBS)
28132-ansi2knr.o: $(CONFIG_HEADER)
28133-
28134-
28135-mostlyclean-kr:
28136- -rm -f *_.c
28137-
28138-clean-kr:
28139-
28140-distclean-kr:
28141-
28142-maintainer-clean-kr:
28143-
28144-libzmodem.a: $(libzmodem_a_OBJECTS) $(libzmodem_a_DEPENDENCIES)
28145- -rm -f libzmodem.a
28146- $(AR) cru libzmodem.a $(libzmodem_a_OBJECTS) $(libzmodem_a_LIBADD)
28147- $(RANLIB) libzmodem.a
28148-alloca_.c: alloca.c $(ANSI2KNR)
28149- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | $(ANSI2KNR) alloca_.c
28150-error_.c: error.c $(ANSI2KNR)
28151- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | $(ANSI2KNR) error_.c
28152-getopt_.c: getopt.c $(ANSI2KNR)
28153- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | $(ANSI2KNR) getopt_.c
28154-getopt1_.c: getopt1.c $(ANSI2KNR)
28155- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | $(ANSI2KNR) getopt1_.c
28156-long-options_.c: long-options.c $(ANSI2KNR)
28157- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/long-options.c; then echo $(srcdir)/long-options.c; else echo long-options.c; fi` | $(ANSI2KNR) long-options_.c
28158-mkdir_.c: mkdir.c $(ANSI2KNR)
28159- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | $(ANSI2KNR) mkdir_.c
28160-mktime_.c: mktime.c $(ANSI2KNR)
28161- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | $(ANSI2KNR) mktime_.c
28162-stpcpy_.c: stpcpy.c $(ANSI2KNR)
28163- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | $(ANSI2KNR) stpcpy_.c
28164-strdup_.c: strdup.c $(ANSI2KNR)
28165- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strdup.c; then echo $(srcdir)/strdup.c; else echo strdup.c; fi` | $(ANSI2KNR) strdup_.c
28166-strerror_.c: strerror.c $(ANSI2KNR)
28167- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strerror.c; then echo $(srcdir)/strerror.c; else echo strerror.c; fi` | $(ANSI2KNR) strerror_.c
28168-strftime_.c: strftime.c $(ANSI2KNR)
28169- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strftime.c; then echo $(srcdir)/strftime.c; else echo strftime.c; fi` | $(ANSI2KNR) strftime_.c
28170-strpbrk_.c: strpbrk.c $(ANSI2KNR)
28171- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | $(ANSI2KNR) strpbrk_.c
28172-strstr_.c: strstr.c $(ANSI2KNR)
28173- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strstr.c; then echo $(srcdir)/strstr.c; else echo strstr.c; fi` | $(ANSI2KNR) strstr_.c
28174-strtol_.c: strtol.c $(ANSI2KNR)
28175- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strtol.c; then echo $(srcdir)/strtol.c; else echo strtol.c; fi` | $(ANSI2KNR) strtol_.c
28176-strtoul_.c: strtoul.c $(ANSI2KNR)
28177- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/strtoul.c; then echo $(srcdir)/strtoul.c; else echo strtoul.c; fi` | $(ANSI2KNR) strtoul_.c
28178-vasprintf_.c: vasprintf.c $(ANSI2KNR)
28179- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/vasprintf.c; then echo $(srcdir)/vasprintf.c; else echo vasprintf.c; fi` | $(ANSI2KNR) vasprintf_.c
28180-xstrtol_.c: xstrtol.c $(ANSI2KNR)
28181- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/xstrtol.c; then echo $(srcdir)/xstrtol.c; else echo xstrtol.c; fi` | $(ANSI2KNR) xstrtol_.c
28182-xstrtoul_.c: xstrtoul.c $(ANSI2KNR)
28183- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoul.c; then echo $(srcdir)/xstrtoul.c; else echo xstrtoul.c; fi` | $(ANSI2KNR) xstrtoul_.c
28184-alloca_.o error_.o getopt_.o getopt1_.o long-options_.o mkdir_.o \
28185-mktime_.o stpcpy_.o strdup_.o strerror_.o strftime_.o strpbrk_.o \
28186-strstr_.o strtol_.o strtoul_.o vasprintf_.o xstrtol_.o xstrtoul_.o : \
28187-$(ANSI2KNR)
28188-
28189-tags: TAGS
28190-
28191-ID: $(HEADERS) $(SOURCES) $(LISP)
28192- here=`pwd` && cd $(srcdir) \
28193- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
28194+install-dvi: install-dvi-am
28195
28196-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
28197- tags=; \
28198- here=`pwd`; \
28199- list='$(SOURCES) $(HEADERS)'; \
28200- unique=`for i in $$list; do echo $$i; done | \
28201- awk ' { files[$$0] = 1; } \
28202- END { for (i in files) print i; }'`; \
28203- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
28204- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
28205+install-dvi-am:
28206
28207-mostlyclean-tags:
28208+install-exec-am:
28209
28210-clean-tags:
28211+install-html: install-html-am
28212
28213-distclean-tags:
28214- -rm -f TAGS ID
28215+install-html-am:
28216
28217-maintainer-clean-tags:
28218+install-info: install-info-am
28219
28220-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
28221+install-info-am:
28222
28223-subdir = lib
28224+install-man:
28225
28226-distdir: $(DISTFILES)
28227- @for file in $(DISTFILES); do \
28228- d=$(srcdir); \
28229- test -f $(distdir)/$$file \
28230- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
28231- || cp -p $$d/$$file $(distdir)/$$file; \
28232- done
28233-error.o: error.c ../config.h
28234-long-options.o: long-options.c ../config.h getopt.h long-options.h
28235-xstrtol.o: xstrtol.c ../config.h xstrtol.h
28236-xstrtoul.o: xstrtoul.c xstrtol.c ../config.h xstrtol.h
28237-
28238-info:
28239-dvi:
28240-check: all
28241- $(MAKE)
28242-installcheck:
28243-install-exec:
28244- @$(NORMAL_INSTALL)
28245+install-pdf: install-pdf-am
28246
28247-install-data:
28248- @$(NORMAL_INSTALL)
28249+install-pdf-am:
28250
28251-install: install-exec install-data all
28252- @:
28253+install-ps: install-ps-am
28254
28255-uninstall:
28256+install-ps-am:
28257
28258-install-strip:
28259- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
28260-installdirs:
28261+installcheck-am:
28262
28263+maintainer-clean: maintainer-clean-am
28264+ -rm -f $(DEPDIR)/mkdir.Po
28265+ -rm -f $(DEPDIR)/mktime.Po
28266+ -rm -f $(DEPDIR)/stpcpy.Po
28267+ -rm -f $(DEPDIR)/strdup.Po
28268+ -rm -f $(DEPDIR)/strerror.Po
28269+ -rm -f $(DEPDIR)/strftime.Po
28270+ -rm -f $(DEPDIR)/strpbrk.Po
28271+ -rm -f $(DEPDIR)/strstr.Po
28272+ -rm -f $(DEPDIR)/strtol.Po
28273+ -rm -f $(DEPDIR)/strtoul.Po
28274+ -rm -f $(DEPDIR)/vasprintf.Po
28275+ -rm -f ./$(DEPDIR)/alloca.Po
28276+ -rm -f ./$(DEPDIR)/error.Po
28277+ -rm -f ./$(DEPDIR)/long-options.Po
28278+ -rm -f ./$(DEPDIR)/xstrtol.Po
28279+ -rm -f ./$(DEPDIR)/xstrtoul.Po
28280+ -rm -f Makefile
28281+maintainer-clean-am: distclean-am maintainer-clean-generic
28282
28283-mostlyclean-generic:
28284- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
28285+mostlyclean: mostlyclean-am
28286
28287-clean-generic:
28288- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
28289+mostlyclean-am: mostlyclean-compile mostlyclean-generic
28290
28291-distclean-generic:
28292- -rm -f Makefile $(DISTCLEANFILES)
28293- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
28294- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
28295+pdf: pdf-am
28296
28297-maintainer-clean-generic:
28298- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
28299- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
28300-mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \
28301- mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
28302- mostlyclean-generic
28303-
28304-clean: clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
28305- clean-tags clean-generic mostlyclean
28306-
28307-distclean: distclean-noinstLIBRARIES distclean-compile \
28308- distclean-krextra distclean-kr distclean-tags \
28309- distclean-generic clean
28310- -rm -f config.status
28311-
28312-maintainer-clean: maintainer-clean-noinstLIBRARIES \
28313- maintainer-clean-compile maintainer-clean-krextra \
28314- maintainer-clean-kr maintainer-clean-tags \
28315- maintainer-clean-generic distclean
28316- @echo "This command is intended for maintainers to use;"
28317- @echo "it deletes files that may require special tools to rebuild."
28318+pdf-am:
28319+
28320+ps: ps-am
28321+
28322+ps-am:
28323+
28324+uninstall-am:
28325+
28326+.MAKE: install-am install-strip
28327+
28328+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
28329+ clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
28330+ ctags-am distclean distclean-compile distclean-generic \
28331+ distclean-tags distdir dvi dvi-am html html-am info info-am \
28332+ install install-am install-data install-data-am install-dvi \
28333+ install-dvi-am install-exec install-exec-am install-html \
28334+ install-html-am install-info install-info-am install-man \
28335+ install-pdf install-pdf-am install-ps install-ps-am \
28336+ install-strip installcheck installcheck-am installdirs \
28337+ maintainer-clean maintainer-clean-generic mostlyclean \
28338+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
28339+ tags tags-am uninstall uninstall-am
28340
28341-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
28342-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
28343-mostlyclean-compile distclean-compile clean-compile \
28344-maintainer-clean-compile mostlyclean-krextra distclean-krextra \
28345-clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
28346-clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
28347-clean-tags maintainer-clean-tags distdir info dvi installcheck \
28348-install-exec install-data install uninstall all installdirs \
28349-mostlyclean-generic distclean-generic clean-generic \
28350-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
28351+.PRECIOUS: Makefile
28352
28353
28354 # Tell versions [3.59,3.63) of GNU make to not export all variables.
28355diff -uprN clean/lrzsz-0.12.20/m4/ChangeLog lrzsz-0.12.20/m4/ChangeLog
28356--- clean/lrzsz-0.12.20/m4/ChangeLog 1970-01-01 01:00:00.000000000 +0100
28357+++ lrzsz-0.12.20/m4/ChangeLog 2019-11-25 18:21:04.000000000 +0000
28358@@ -0,0 +1,24 @@
28359+2019-11-25 gettextize <bug-gnu-gettext@gnu.org>
28360+
28361+ * gettext.m4: Upgrade to gettext-0.20.1.
28362+ * host-cpu-c-abi.m4: New file, from gettext-0.20.1.
28363+ * iconv.m4: Upgrade to gettext-0.20.1.
28364+ * intlmacosx.m4: New file, from gettext-0.20.1.
28365+ * lib-ld.m4: Upgrade to gettext-0.20.1.
28366+ * lib-link.m4: Upgrade to gettext-0.20.1.
28367+ * lib-prefix.m4: Upgrade to gettext-0.20.1.
28368+ * nls.m4: Upgrade to gettext-0.20.1.
28369+ * po.m4: Upgrade to gettext-0.20.1.
28370+ * progtest.m4: Upgrade to gettext-0.20.1.
28371+
28372+2019-11-25 gettextize <bug-gnu-gettext@gnu.org>
28373+
28374+ * gettext.m4: New file, from gettext-0.19.8.1.
28375+ * iconv.m4: New file, from gettext-0.19.8.1.
28376+ * lib-ld.m4: New file, from gettext-0.19.8.1.
28377+ * lib-link.m4: New file, from gettext-0.19.8.1.
28378+ * lib-prefix.m4: New file, from gettext-0.19.8.1.
28379+ * nls.m4: New file, from gettext-0.19.8.1.
28380+ * po.m4: New file, from gettext-0.19.8.1.
28381+ * progtest.m4: New file, from gettext-0.19.8.1.
28382+
28383diff -uprN clean/lrzsz-0.12.20/m4/gettext.m4 lrzsz-0.12.20/m4/gettext.m4
28384--- clean/lrzsz-0.12.20/m4/gettext.m4 1970-01-01 01:00:00.000000000 +0100
28385+++ lrzsz-0.12.20/m4/gettext.m4 2019-11-25 18:21:18.000000000 +0000
28386@@ -0,0 +1,386 @@
28387+# gettext.m4 serial 70 (gettext-0.20)
28388+dnl Copyright (C) 1995-2014, 2016, 2018 Free Software Foundation, Inc.
28389+dnl This file is free software; the Free Software Foundation
28390+dnl gives unlimited permission to copy and/or distribute it,
28391+dnl with or without modifications, as long as this notice is preserved.
28392+dnl
28393+dnl This file can be used in projects which are not available under
28394+dnl the GNU General Public License or the GNU Library General Public
28395+dnl License but which still want to provide support for the GNU gettext
28396+dnl functionality.
28397+dnl Please note that the actual code of the GNU gettext library is covered
28398+dnl by the GNU Library General Public License, and the rest of the GNU
28399+dnl gettext package is covered by the GNU General Public License.
28400+dnl They are *not* in the public domain.
28401+
28402+dnl Authors:
28403+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
28404+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
28405+
28406+dnl Macro to add for using GNU gettext.
28407+
28408+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
28409+dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
28410+dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and
28411+dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
28412+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
28413+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
28414+dnl depending on --{enable,disable}-{shared,static} and on the presence of
28415+dnl AM-DISABLE-SHARED).
28416+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
28417+dnl implementations (in libc or libintl) without the ngettext() function
28418+dnl will be ignored. If NEEDSYMBOL is specified and is
28419+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
28420+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
28421+dnl INTLDIR is used to find the intl libraries. If empty,
28422+dnl the value '$(top_builddir)/intl/' is used.
28423+dnl
28424+dnl The result of the configuration is one of three cases:
28425+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
28426+dnl and used.
28427+dnl Catalog format: GNU --> install in $(datadir)
28428+dnl Catalog extension: .mo after installation, .gmo in source tree
28429+dnl 2) GNU gettext has been found in the system's C library.
28430+dnl Catalog format: GNU --> install in $(datadir)
28431+dnl Catalog extension: .mo after installation, .gmo in source tree
28432+dnl 3) No internationalization, always use English msgid.
28433+dnl Catalog format: none
28434+dnl Catalog extension: none
28435+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
28436+dnl The use of .gmo is historical (it was needed to avoid overwriting the
28437+dnl GNU format catalogs when building on a platform with an X/Open gettext),
28438+dnl but we keep it in order not to force irrelevant filename changes on the
28439+dnl maintainers.
28440+dnl
28441+AC_DEFUN([AM_GNU_GETTEXT],
28442+[
28443+ dnl Argument checking.
28444+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
28445+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
28446+])])])])
28447+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
28448+ [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
28449+])])
28450+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
28451+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
28452+])])])])
28453+ define([gt_included_intl],
28454+ ifelse([$1], [external], [no], [yes]))
28455+ gt_NEEDS_INIT
28456+ AM_GNU_GETTEXT_NEED([$2])
28457+
28458+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
28459+ ifelse(gt_included_intl, yes, [
28460+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
28461+ ])
28462+
28463+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
28464+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
28465+ AC_REQUIRE([AC_LIB_RPATH])
28466+
28467+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
28468+ dnl Ideally we would do this search only after the
28469+ dnl if test "$USE_NLS" = "yes"; then
28470+ dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
28471+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
28472+ dnl the configure script would need to contain the same shell code
28473+ dnl again, outside any 'if'. There are two solutions:
28474+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
28475+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
28476+ dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
28477+ ifelse(gt_included_intl, yes, , [
28478+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
28479+ ])
28480+
28481+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
28482+ gt_INTL_MACOSX
28483+
28484+ dnl Set USE_NLS.
28485+ AC_REQUIRE([AM_NLS])
28486+
28487+ ifelse(gt_included_intl, yes, [
28488+ BUILD_INCLUDED_LIBINTL=no
28489+ USE_INCLUDED_LIBINTL=no
28490+ ])
28491+ LIBINTL=
28492+ LTLIBINTL=
28493+ POSUB=
28494+
28495+ dnl Add a version number to the cache macros.
28496+ case " $gt_needs " in
28497+ *" need-formatstring-macros "*) gt_api_version=3 ;;
28498+ *" need-ngettext "*) gt_api_version=2 ;;
28499+ *) gt_api_version=1 ;;
28500+ esac
28501+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
28502+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
28503+
28504+ dnl If we use NLS figure out what method
28505+ if test "$USE_NLS" = "yes"; then
28506+ gt_use_preinstalled_gnugettext=no
28507+ ifelse(gt_included_intl, yes, [
28508+ AC_MSG_CHECKING([whether included gettext is requested])
28509+ AC_ARG_WITH([included-gettext],
28510+ [ --with-included-gettext use the GNU gettext library included here],
28511+ nls_cv_force_use_gnu_gettext=$withval,
28512+ nls_cv_force_use_gnu_gettext=no)
28513+ AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
28514+
28515+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
28516+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
28517+ ])
28518+ dnl User does not insist on using GNU NLS library. Figure out what
28519+ dnl to use. If GNU gettext is available we use this. Else we have
28520+ dnl to fall back to GNU NLS library.
28521+
28522+ if test $gt_api_version -ge 3; then
28523+ gt_revision_test_code='
28524+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
28525+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
28526+#endif
28527+changequote(,)dnl
28528+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
28529+changequote([,])dnl
28530+'
28531+ else
28532+ gt_revision_test_code=
28533+ fi
28534+ if test $gt_api_version -ge 2; then
28535+ gt_expression_test_code=' + * ngettext ("", "", 0)'
28536+ else
28537+ gt_expression_test_code=
28538+ fi
28539+
28540+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
28541+ [AC_LINK_IFELSE(
28542+ [AC_LANG_PROGRAM(
28543+ [[
28544+#include <libintl.h>
28545+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
28546+extern int _nl_msg_cat_cntr;
28547+extern int *_nl_domain_bindings;
28548+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
28549+#else
28550+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
28551+#endif
28552+$gt_revision_test_code
28553+ ]],
28554+ [[
28555+bindtextdomain ("", "");
28556+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
28557+ ]])],
28558+ [eval "$gt_func_gnugettext_libc=yes"],
28559+ [eval "$gt_func_gnugettext_libc=no"])])
28560+
28561+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
28562+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
28563+ ifelse(gt_included_intl, yes, , [
28564+ AM_ICONV_LINK
28565+ ])
28566+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
28567+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
28568+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
28569+ dnl even if libiconv doesn't exist.
28570+ AC_LIB_LINKFLAGS_BODY([intl])
28571+ AC_CACHE_CHECK([for GNU gettext in libintl],
28572+ [$gt_func_gnugettext_libintl],
28573+ [gt_save_CPPFLAGS="$CPPFLAGS"
28574+ CPPFLAGS="$CPPFLAGS $INCINTL"
28575+ gt_save_LIBS="$LIBS"
28576+ LIBS="$LIBS $LIBINTL"
28577+ dnl Now see whether libintl exists and does not depend on libiconv.
28578+ AC_LINK_IFELSE(
28579+ [AC_LANG_PROGRAM(
28580+ [[
28581+#include <libintl.h>
28582+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
28583+extern int _nl_msg_cat_cntr;
28584+extern
28585+#ifdef __cplusplus
28586+"C"
28587+#endif
28588+const char *_nl_expand_alias (const char *);
28589+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
28590+#else
28591+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
28592+#endif
28593+$gt_revision_test_code
28594+ ]],
28595+ [[
28596+bindtextdomain ("", "");
28597+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
28598+ ]])],
28599+ [eval "$gt_func_gnugettext_libintl=yes"],
28600+ [eval "$gt_func_gnugettext_libintl=no"])
28601+ dnl Now see whether libintl exists and depends on libiconv.
28602+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
28603+ LIBS="$LIBS $LIBICONV"
28604+ AC_LINK_IFELSE(
28605+ [AC_LANG_PROGRAM(
28606+ [[
28607+#include <libintl.h>
28608+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
28609+extern int _nl_msg_cat_cntr;
28610+extern
28611+#ifdef __cplusplus
28612+"C"
28613+#endif
28614+const char *_nl_expand_alias (const char *);
28615+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
28616+#else
28617+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
28618+#endif
28619+$gt_revision_test_code
28620+ ]],
28621+ [[
28622+bindtextdomain ("", "");
28623+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
28624+ ]])],
28625+ [LIBINTL="$LIBINTL $LIBICONV"
28626+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
28627+ eval "$gt_func_gnugettext_libintl=yes"
28628+ ])
28629+ fi
28630+ CPPFLAGS="$gt_save_CPPFLAGS"
28631+ LIBS="$gt_save_LIBS"])
28632+ fi
28633+
28634+ dnl If an already present or preinstalled GNU gettext() is found,
28635+ dnl use it. But if this macro is used in GNU gettext, and GNU
28636+ dnl gettext is already preinstalled in libintl, we update this
28637+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
28638+ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
28639+ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
28640+ && test "$PACKAGE" != gettext-runtime \
28641+ && test "$PACKAGE" != gettext-tools; }; then
28642+ gt_use_preinstalled_gnugettext=yes
28643+ else
28644+ dnl Reset the values set by searching for libintl.
28645+ LIBINTL=
28646+ LTLIBINTL=
28647+ INCINTL=
28648+ fi
28649+
28650+ ifelse(gt_included_intl, yes, [
28651+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
28652+ dnl GNU gettext is not found in the C library.
28653+ dnl Fall back on included GNU gettext library.
28654+ nls_cv_use_gnu_gettext=yes
28655+ fi
28656+ fi
28657+
28658+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
28659+ dnl Mark actions used to generate GNU NLS library.
28660+ BUILD_INCLUDED_LIBINTL=yes
28661+ USE_INCLUDED_LIBINTL=yes
28662+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
28663+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
28664+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
28665+ fi
28666+
28667+ CATOBJEXT=
28668+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
28669+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
28670+ dnl Mark actions to use GNU gettext tools.
28671+ CATOBJEXT=.gmo
28672+ fi
28673+ ])
28674+
28675+ if test -n "$INTL_MACOSX_LIBS"; then
28676+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
28677+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
28678+ dnl Some extra flags are needed during linking.
28679+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
28680+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
28681+ fi
28682+ fi
28683+
28684+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
28685+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
28686+ AC_DEFINE([ENABLE_NLS], [1],
28687+ [Define to 1 if translation of program messages to the user's native language
28688+ is requested.])
28689+ else
28690+ USE_NLS=no
28691+ fi
28692+ fi
28693+
28694+ AC_MSG_CHECKING([whether to use NLS])
28695+ AC_MSG_RESULT([$USE_NLS])
28696+ if test "$USE_NLS" = "yes"; then
28697+ AC_MSG_CHECKING([where the gettext function comes from])
28698+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
28699+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
28700+ gt_source="external libintl"
28701+ else
28702+ gt_source="libc"
28703+ fi
28704+ else
28705+ gt_source="included intl directory"
28706+ fi
28707+ AC_MSG_RESULT([$gt_source])
28708+ fi
28709+
28710+ if test "$USE_NLS" = "yes"; then
28711+
28712+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
28713+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
28714+ AC_MSG_CHECKING([how to link with libintl])
28715+ AC_MSG_RESULT([$LIBINTL])
28716+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
28717+ fi
28718+
28719+ dnl For backward compatibility. Some packages may be using this.
28720+ AC_DEFINE([HAVE_GETTEXT], [1],
28721+ [Define if the GNU gettext() function is already present or preinstalled.])
28722+ AC_DEFINE([HAVE_DCGETTEXT], [1],
28723+ [Define if the GNU dcgettext() function is already present or preinstalled.])
28724+ fi
28725+
28726+ dnl We need to process the po/ directory.
28727+ POSUB=po
28728+ fi
28729+
28730+ ifelse(gt_included_intl, yes, [
28731+ dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
28732+ dnl because some of the testsuite requires it.
28733+ BUILD_INCLUDED_LIBINTL=yes
28734+
28735+ dnl Make all variables we use known to autoconf.
28736+ AC_SUBST([BUILD_INCLUDED_LIBINTL])
28737+ AC_SUBST([USE_INCLUDED_LIBINTL])
28738+ AC_SUBST([CATOBJEXT])
28739+ ])
28740+
28741+ dnl For backward compatibility. Some Makefiles may be using this.
28742+ INTLLIBS="$LIBINTL"
28743+ AC_SUBST([INTLLIBS])
28744+
28745+ dnl Make all documented variables known to autoconf.
28746+ AC_SUBST([LIBINTL])
28747+ AC_SUBST([LTLIBINTL])
28748+ AC_SUBST([POSUB])
28749+])
28750+
28751+
28752+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
28753+m4_define([gt_NEEDS_INIT],
28754+[
28755+ m4_divert_text([DEFAULTS], [gt_needs=])
28756+ m4_define([gt_NEEDS_INIT], [])
28757+])
28758+
28759+
28760+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
28761+AC_DEFUN([AM_GNU_GETTEXT_NEED],
28762+[
28763+ m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
28764+])
28765+
28766+
28767+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
28768+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
28769+
28770+
28771+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
28772+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
28773diff -uprN clean/lrzsz-0.12.20/m4/host-cpu-c-abi.m4 lrzsz-0.12.20/m4/host-cpu-c-abi.m4
28774--- clean/lrzsz-0.12.20/m4/host-cpu-c-abi.m4 1970-01-01 01:00:00.000000000 +0100
28775+++ lrzsz-0.12.20/m4/host-cpu-c-abi.m4 2019-11-25 18:21:18.000000000 +0000
28776@@ -0,0 +1,644 @@
28777+# host-cpu-c-abi.m4 serial 11
28778+dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
28779+dnl This file is free software; the Free Software Foundation
28780+dnl gives unlimited permission to copy and/or distribute it,
28781+dnl with or without modifications, as long as this notice is preserved.
28782+
28783+dnl From Bruno Haible and Sam Steingold.
28784+
28785+dnl Sets the HOST_CPU variable to the canonical name of the CPU.
28786+dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
28787+dnl C language ABI (application binary interface).
28788+dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
28789+dnl config.h.
28790+dnl
28791+dnl This canonical name can be used to select a particular assembly language
28792+dnl source file that will interoperate with C code on the given host.
28793+dnl
28794+dnl For example:
28795+dnl * 'i386' and 'sparc' are different canonical names, because code for i386
28796+dnl will not run on SPARC CPUs and vice versa. They have different
28797+dnl instruction sets.
28798+dnl * 'sparc' and 'sparc64' are different canonical names, because code for
28799+dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
28800+dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
28801+dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
28802+dnl mode, but not both.
28803+dnl * 'mips' and 'mipsn32' are different canonical names, because they use
28804+dnl different argument passing and return conventions for C functions, and
28805+dnl although the instruction set of 'mips' is a large subset of the
28806+dnl instruction set of 'mipsn32'.
28807+dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
28808+dnl different sizes for the C types like 'int' and 'void *', and although
28809+dnl the instruction sets of 'mipsn32' and 'mips64' are the same.
28810+dnl * The same canonical name is used for different endiannesses. You can
28811+dnl determine the endianness through preprocessor symbols:
28812+dnl - 'arm': test __ARMEL__.
28813+dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
28814+dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
28815+dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
28816+dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
28817+dnl - Instructions that do not exist on all of these CPUs (cmpxchg,
28818+dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
28819+dnl assembly language source files use such instructions, you will
28820+dnl need to make the distinction.
28821+dnl - Speed of execution of the common instruction set is reasonable across
28822+dnl the entire family of CPUs. If you have assembly language source files
28823+dnl that are optimized for particular CPU types (like GNU gmp has), you
28824+dnl will need to make the distinction.
28825+dnl See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
28826+AC_DEFUN([gl_HOST_CPU_C_ABI],
28827+[
28828+ AC_REQUIRE([AC_CANONICAL_HOST])
28829+ AC_REQUIRE([gl_C_ASM])
28830+ AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
28831+ [case "$host_cpu" in
28832+
28833+changequote(,)dnl
28834+ i[4567]86 )
28835+changequote([,])dnl
28836+ gl_cv_host_cpu_c_abi=i386
28837+ ;;
28838+
28839+ x86_64 )
28840+ # On x86_64 systems, the C compiler may be generating code in one of
28841+ # these ABIs:
28842+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
28843+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
28844+ # with native Windows (mingw, MSVC).
28845+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
28846+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
28847+ AC_COMPILE_IFELSE(
28848+ [AC_LANG_SOURCE(
28849+ [[#if (defined __x86_64__ || defined __amd64__ \
28850+ || defined _M_X64 || defined _M_AMD64)
28851+ int ok;
28852+ #else
28853+ error fail
28854+ #endif
28855+ ]])],
28856+ [AC_COMPILE_IFELSE(
28857+ [AC_LANG_SOURCE(
28858+ [[#if defined __ILP32__ || defined _ILP32
28859+ int ok;
28860+ #else
28861+ error fail
28862+ #endif
28863+ ]])],
28864+ [gl_cv_host_cpu_c_abi=x86_64-x32],
28865+ [gl_cv_host_cpu_c_abi=x86_64])],
28866+ [gl_cv_host_cpu_c_abi=i386])
28867+ ;;
28868+
28869+changequote(,)dnl
28870+ alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
28871+changequote([,])dnl
28872+ gl_cv_host_cpu_c_abi=alpha
28873+ ;;
28874+
28875+ arm* | aarch64 )
28876+ # Assume arm with EABI.
28877+ # On arm64 systems, the C compiler may be generating code in one of
28878+ # these ABIs:
28879+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
28880+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
28881+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
28882+ AC_COMPILE_IFELSE(
28883+ [AC_LANG_SOURCE(
28884+ [[#ifdef __aarch64__
28885+ int ok;
28886+ #else
28887+ error fail
28888+ #endif
28889+ ]])],
28890+ [AC_COMPILE_IFELSE(
28891+ [AC_LANG_SOURCE(
28892+ [[#if defined __ILP32__ || defined _ILP32
28893+ int ok;
28894+ #else
28895+ error fail
28896+ #endif
28897+ ]])],
28898+ [gl_cv_host_cpu_c_abi=arm64-ilp32],
28899+ [gl_cv_host_cpu_c_abi=arm64])],
28900+ [# Don't distinguish little-endian and big-endian arm, since they
28901+ # don't require different machine code for simple operations and
28902+ # since the user can distinguish them through the preprocessor
28903+ # defines __ARMEL__ vs. __ARMEB__.
28904+ # But distinguish arm which passes floating-point arguments and
28905+ # return values in integer registers (r0, r1, ...) - this is
28906+ # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
28907+ # passes them in float registers (s0, s1, ...) and double registers
28908+ # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
28909+ # sets the preprocessor defines __ARM_PCS (for the first case) and
28910+ # __ARM_PCS_VFP (for the second case), but older GCC does not.
28911+ echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
28912+ # Look for a reference to the register d0 in the .s file.
28913+ AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
28914+ if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
28915+ gl_cv_host_cpu_c_abi=armhf
28916+ else
28917+ gl_cv_host_cpu_c_abi=arm
28918+ fi
28919+ rm -f conftest*
28920+ ])
28921+ ;;
28922+
28923+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
28924+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
28925+ # code. In the latter case, it defines _LP64 and __LP64__.
28926+ AC_COMPILE_IFELSE(
28927+ [AC_LANG_SOURCE(
28928+ [[#ifdef __LP64__
28929+ int ok;
28930+ #else
28931+ error fail
28932+ #endif
28933+ ]])],
28934+ [gl_cv_host_cpu_c_abi=hppa64],
28935+ [gl_cv_host_cpu_c_abi=hppa])
28936+ ;;
28937+
28938+ ia64* )
28939+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
28940+ # 32-bit code. In the latter case, it defines _ILP32.
28941+ AC_COMPILE_IFELSE(
28942+ [AC_LANG_SOURCE(
28943+ [[#ifdef _ILP32
28944+ int ok;
28945+ #else
28946+ error fail
28947+ #endif
28948+ ]])],
28949+ [gl_cv_host_cpu_c_abi=ia64-ilp32],
28950+ [gl_cv_host_cpu_c_abi=ia64])
28951+ ;;
28952+
28953+ mips* )
28954+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
28955+ # at 32.
28956+ AC_COMPILE_IFELSE(
28957+ [AC_LANG_SOURCE(
28958+ [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
28959+ int ok;
28960+ #else
28961+ error fail
28962+ #endif
28963+ ]])],
28964+ [gl_cv_host_cpu_c_abi=mips64],
28965+ [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
28966+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
28967+ # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
28968+ # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
28969+ AC_COMPILE_IFELSE(
28970+ [AC_LANG_SOURCE(
28971+ [[#if (_MIPS_SIM == _ABIN32)
28972+ int ok;
28973+ #else
28974+ error fail
28975+ #endif
28976+ ]])],
28977+ [gl_cv_host_cpu_c_abi=mipsn32],
28978+ [gl_cv_host_cpu_c_abi=mips])])
28979+ ;;
28980+
28981+ powerpc* )
28982+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
28983+ # No need to distinguish them here; the caller may distinguish
28984+ # them based on the OS.
28985+ # On powerpc64 systems, the C compiler may still be generating
28986+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
28987+ # be generating 64-bit code.
28988+ AC_COMPILE_IFELSE(
28989+ [AC_LANG_SOURCE(
28990+ [[#if defined __powerpc64__ || defined _ARCH_PPC64
28991+ int ok;
28992+ #else
28993+ error fail
28994+ #endif
28995+ ]])],
28996+ [# On powerpc64, there are two ABIs on Linux: The AIX compatible
28997+ # one and the ELFv2 one. The latter defines _CALL_ELF=2.
28998+ AC_COMPILE_IFELSE(
28999+ [AC_LANG_SOURCE(
29000+ [[#if defined _CALL_ELF && _CALL_ELF == 2
29001+ int ok;
29002+ #else
29003+ error fail
29004+ #endif
29005+ ]])],
29006+ [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
29007+ [gl_cv_host_cpu_c_abi=powerpc64])
29008+ ],
29009+ [gl_cv_host_cpu_c_abi=powerpc])
29010+ ;;
29011+
29012+ rs6000 )
29013+ gl_cv_host_cpu_c_abi=powerpc
29014+ ;;
29015+
29016+ riscv32 | riscv64 )
29017+ # There are 2 architectures (with variants): rv32* and rv64*.
29018+ AC_COMPILE_IFELSE(
29019+ [AC_LANG_SOURCE(
29020+ [[#if __riscv_xlen == 64
29021+ int ok;
29022+ #else
29023+ error fail
29024+ #endif
29025+ ]])],
29026+ [cpu=riscv64],
29027+ [cpu=riscv32])
29028+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
29029+ # Size of 'long' and 'void *':
29030+ AC_COMPILE_IFELSE(
29031+ [AC_LANG_SOURCE(
29032+ [[#if defined __LP64__
29033+ int ok;
29034+ #else
29035+ error fail
29036+ #endif
29037+ ]])],
29038+ [main_abi=lp64],
29039+ [main_abi=ilp32])
29040+ # Float ABIs:
29041+ # __riscv_float_abi_double:
29042+ # 'float' and 'double' are passed in floating-point registers.
29043+ # __riscv_float_abi_single:
29044+ # 'float' are passed in floating-point registers.
29045+ # __riscv_float_abi_soft:
29046+ # No values are passed in floating-point registers.
29047+ AC_COMPILE_IFELSE(
29048+ [AC_LANG_SOURCE(
29049+ [[#if defined __riscv_float_abi_double
29050+ int ok;
29051+ #else
29052+ error fail
29053+ #endif
29054+ ]])],
29055+ [float_abi=d],
29056+ [AC_COMPILE_IFELSE(
29057+ [AC_LANG_SOURCE(
29058+ [[#if defined __riscv_float_abi_single
29059+ int ok;
29060+ #else
29061+ error fail
29062+ #endif
29063+ ]])],
29064+ [float_abi=f],
29065+ [float_abi=''])
29066+ ])
29067+ gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
29068+ ;;
29069+
29070+ s390* )
29071+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
29072+ # or 31-bit (= s390) code.
29073+ AC_COMPILE_IFELSE(
29074+ [AC_LANG_SOURCE(
29075+ [[#if defined __LP64__ || defined __s390x__
29076+ int ok;
29077+ #else
29078+ error fail
29079+ #endif
29080+ ]])],
29081+ [gl_cv_host_cpu_c_abi=s390x],
29082+ [gl_cv_host_cpu_c_abi=s390])
29083+ ;;
29084+
29085+ sparc | sparc64 )
29086+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
29087+ # C compiler still generates 32-bit code.
29088+ AC_COMPILE_IFELSE(
29089+ [AC_LANG_SOURCE(
29090+ [[#if defined __sparcv9 || defined __arch64__
29091+ int ok;
29092+ #else
29093+ error fail
29094+ #endif
29095+ ]])],
29096+ [gl_cv_host_cpu_c_abi=sparc64],
29097+ [gl_cv_host_cpu_c_abi=sparc])
29098+ ;;
29099+
29100+ *)
29101+ gl_cv_host_cpu_c_abi="$host_cpu"
29102+ ;;
29103+ esac
29104+ ])
29105+
29106+ dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
29107+ HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
29108+ HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
29109+ AC_SUBST([HOST_CPU])
29110+ AC_SUBST([HOST_CPU_C_ABI])
29111+
29112+ # This was
29113+ # AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
29114+ # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
29115+ # earlier, but KAI C++ 3.2d doesn't like this.
29116+ sed -e 's/-/_/g' >> confdefs.h <<EOF
29117+#ifndef __${HOST_CPU}__
29118+#define __${HOST_CPU}__ 1
29119+#endif
29120+#ifndef __${HOST_CPU_C_ABI}__
29121+#define __${HOST_CPU_C_ABI}__ 1
29122+#endif
29123+EOF
29124+ AH_TOP([/* CPU and C ABI indicator */
29125+#ifndef __i386__
29126+#undef __i386__
29127+#endif
29128+#ifndef __x86_64_x32__
29129+#undef __x86_64_x32__
29130+#endif
29131+#ifndef __x86_64__
29132+#undef __x86_64__
29133+#endif
29134+#ifndef __alpha__
29135+#undef __alpha__
29136+#endif
29137+#ifndef __arm__
29138+#undef __arm__
29139+#endif
29140+#ifndef __armhf__
29141+#undef __armhf__
29142+#endif
29143+#ifndef __arm64_ilp32__
29144+#undef __arm64_ilp32__
29145+#endif
29146+#ifndef __arm64__
29147+#undef __arm64__
29148+#endif
29149+#ifndef __hppa__
29150+#undef __hppa__
29151+#endif
29152+#ifndef __hppa64__
29153+#undef __hppa64__
29154+#endif
29155+#ifndef __ia64_ilp32__
29156+#undef __ia64_ilp32__
29157+#endif
29158+#ifndef __ia64__
29159+#undef __ia64__
29160+#endif
29161+#ifndef __m68k__
29162+#undef __m68k__
29163+#endif
29164+#ifndef __mips__
29165+#undef __mips__
29166+#endif
29167+#ifndef __mipsn32__
29168+#undef __mipsn32__
29169+#endif
29170+#ifndef __mips64__
29171+#undef __mips64__
29172+#endif
29173+#ifndef __powerpc__
29174+#undef __powerpc__
29175+#endif
29176+#ifndef __powerpc64__
29177+#undef __powerpc64__
29178+#endif
29179+#ifndef __powerpc64_elfv2__
29180+#undef __powerpc64_elfv2__
29181+#endif
29182+#ifndef __riscv32__
29183+#undef __riscv32__
29184+#endif
29185+#ifndef __riscv64__
29186+#undef __riscv64__
29187+#endif
29188+#ifndef __riscv32_ilp32__
29189+#undef __riscv32_ilp32__
29190+#endif
29191+#ifndef __riscv32_ilp32f__
29192+#undef __riscv32_ilp32f__
29193+#endif
29194+#ifndef __riscv32_ilp32d__
29195+#undef __riscv32_ilp32d__
29196+#endif
29197+#ifndef __riscv64_ilp32__
29198+#undef __riscv64_ilp32__
29199+#endif
29200+#ifndef __riscv64_ilp32f__
29201+#undef __riscv64_ilp32f__
29202+#endif
29203+#ifndef __riscv64_ilp32d__
29204+#undef __riscv64_ilp32d__
29205+#endif
29206+#ifndef __riscv64_lp64__
29207+#undef __riscv64_lp64__
29208+#endif
29209+#ifndef __riscv64_lp64f__
29210+#undef __riscv64_lp64f__
29211+#endif
29212+#ifndef __riscv64_lp64d__
29213+#undef __riscv64_lp64d__
29214+#endif
29215+#ifndef __s390__
29216+#undef __s390__
29217+#endif
29218+#ifndef __s390x__
29219+#undef __s390x__
29220+#endif
29221+#ifndef __sh__
29222+#undef __sh__
29223+#endif
29224+#ifndef __sparc__
29225+#undef __sparc__
29226+#endif
29227+#ifndef __sparc64__
29228+#undef __sparc64__
29229+#endif
29230+])
29231+
29232+])
29233+
29234+
29235+dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
29236+dnl (application binary interface) is a 32-bit one, or to 'no' otherwise.
29237+dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
29238+AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
29239+[
29240+ AC_REQUIRE([AC_CANONICAL_HOST])
29241+ AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
29242+ [if test -n "$gl_cv_host_cpu_c_abi"; then
29243+ case "$gl_cv_host_cpu_c_abi" in
29244+ i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
29245+ gl_cv_host_cpu_c_abi_32bit=yes ;;
29246+ *)
29247+ gl_cv_host_cpu_c_abi_32bit=no ;;
29248+ esac
29249+ else
29250+ case "$host_cpu" in
29251+
29252+changequote(,)dnl
29253+ i[4567]86 )
29254+changequote([,])dnl
29255+ gl_cv_host_cpu_c_abi_32bit=yes
29256+ ;;
29257+
29258+ x86_64 )
29259+ # On x86_64 systems, the C compiler may be generating code in one of
29260+ # these ABIs:
29261+ # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
29262+ # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
29263+ # with native Windows (mingw, MSVC).
29264+ # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
29265+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
29266+ AC_COMPILE_IFELSE(
29267+ [AC_LANG_SOURCE(
29268+ [[#if (defined __x86_64__ || defined __amd64__ \
29269+ || defined _M_X64 || defined _M_AMD64) \
29270+ && !(defined __ILP32__ || defined _ILP32)
29271+ int ok;
29272+ #else
29273+ error fail
29274+ #endif
29275+ ]])],
29276+ [gl_cv_host_cpu_c_abi_32bit=no],
29277+ [gl_cv_host_cpu_c_abi_32bit=yes])
29278+ ;;
29279+
29280+ arm* | aarch64 )
29281+ # Assume arm with EABI.
29282+ # On arm64 systems, the C compiler may be generating code in one of
29283+ # these ABIs:
29284+ # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
29285+ # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
29286+ # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
29287+ AC_COMPILE_IFELSE(
29288+ [AC_LANG_SOURCE(
29289+ [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
29290+ int ok;
29291+ #else
29292+ error fail
29293+ #endif
29294+ ]])],
29295+ [gl_cv_host_cpu_c_abi_32bit=no],
29296+ [gl_cv_host_cpu_c_abi_32bit=yes])
29297+ ;;
29298+
29299+ hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
29300+ # On hppa, the C compiler may be generating 32-bit code or 64-bit
29301+ # code. In the latter case, it defines _LP64 and __LP64__.
29302+ AC_COMPILE_IFELSE(
29303+ [AC_LANG_SOURCE(
29304+ [[#ifdef __LP64__
29305+ int ok;
29306+ #else
29307+ error fail
29308+ #endif
29309+ ]])],
29310+ [gl_cv_host_cpu_c_abi_32bit=no],
29311+ [gl_cv_host_cpu_c_abi_32bit=yes])
29312+ ;;
29313+
29314+ ia64* )
29315+ # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
29316+ # 32-bit code. In the latter case, it defines _ILP32.
29317+ AC_COMPILE_IFELSE(
29318+ [AC_LANG_SOURCE(
29319+ [[#ifdef _ILP32
29320+ int ok;
29321+ #else
29322+ error fail
29323+ #endif
29324+ ]])],
29325+ [gl_cv_host_cpu_c_abi_32bit=yes],
29326+ [gl_cv_host_cpu_c_abi_32bit=no])
29327+ ;;
29328+
29329+ mips* )
29330+ # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
29331+ # at 32.
29332+ AC_COMPILE_IFELSE(
29333+ [AC_LANG_SOURCE(
29334+ [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
29335+ int ok;
29336+ #else
29337+ error fail
29338+ #endif
29339+ ]])],
29340+ [gl_cv_host_cpu_c_abi_32bit=no],
29341+ [gl_cv_host_cpu_c_abi_32bit=yes])
29342+ ;;
29343+
29344+ powerpc* )
29345+ # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
29346+ # No need to distinguish them here; the caller may distinguish
29347+ # them based on the OS.
29348+ # On powerpc64 systems, the C compiler may still be generating
29349+ # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
29350+ # be generating 64-bit code.
29351+ AC_COMPILE_IFELSE(
29352+ [AC_LANG_SOURCE(
29353+ [[#if defined __powerpc64__ || defined _ARCH_PPC64
29354+ int ok;
29355+ #else
29356+ error fail
29357+ #endif
29358+ ]])],
29359+ [gl_cv_host_cpu_c_abi_32bit=no],
29360+ [gl_cv_host_cpu_c_abi_32bit=yes])
29361+ ;;
29362+
29363+ rs6000 )
29364+ gl_cv_host_cpu_c_abi_32bit=yes
29365+ ;;
29366+
29367+ riscv32 | riscv64 )
29368+ # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
29369+ # Size of 'long' and 'void *':
29370+ AC_COMPILE_IFELSE(
29371+ [AC_LANG_SOURCE(
29372+ [[#if defined __LP64__
29373+ int ok;
29374+ #else
29375+ error fail
29376+ #endif
29377+ ]])],
29378+ [gl_cv_host_cpu_c_abi_32bit=no],
29379+ [gl_cv_host_cpu_c_abi_32bit=yes])
29380+ ;;
29381+
29382+ s390* )
29383+ # On s390x, the C compiler may be generating 64-bit (= s390x) code
29384+ # or 31-bit (= s390) code.
29385+ AC_COMPILE_IFELSE(
29386+ [AC_LANG_SOURCE(
29387+ [[#if defined __LP64__ || defined __s390x__
29388+ int ok;
29389+ #else
29390+ error fail
29391+ #endif
29392+ ]])],
29393+ [gl_cv_host_cpu_c_abi_32bit=no],
29394+ [gl_cv_host_cpu_c_abi_32bit=yes])
29395+ ;;
29396+
29397+ sparc | sparc64 )
29398+ # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
29399+ # C compiler still generates 32-bit code.
29400+ AC_COMPILE_IFELSE(
29401+ [AC_LANG_SOURCE(
29402+ [[#if defined __sparcv9 || defined __arch64__
29403+ int ok;
29404+ #else
29405+ error fail
29406+ #endif
29407+ ]])],
29408+ [gl_cv_host_cpu_c_abi_32bit=no],
29409+ [gl_cv_host_cpu_c_abi_32bit=yes])
29410+ ;;
29411+
29412+ *)
29413+ gl_cv_host_cpu_c_abi_32bit=no
29414+ ;;
29415+ esac
29416+ fi
29417+ ])
29418+
29419+ HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
29420+])
29421diff -uprN clean/lrzsz-0.12.20/m4/iconv.m4 lrzsz-0.12.20/m4/iconv.m4
29422--- clean/lrzsz-0.12.20/m4/iconv.m4 1970-01-01 01:00:00.000000000 +0100
29423+++ lrzsz-0.12.20/m4/iconv.m4 2019-11-25 18:21:18.000000000 +0000
29424@@ -0,0 +1,288 @@
29425+# iconv.m4 serial 21
29426+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 Free Software Foundation,
29427+dnl Inc.
29428+dnl This file is free software; the Free Software Foundation
29429+dnl gives unlimited permission to copy and/or distribute it,
29430+dnl with or without modifications, as long as this notice is preserved.
29431+
29432+dnl From Bruno Haible.
29433+
29434+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
29435+[
29436+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
29437+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
29438+ AC_REQUIRE([AC_LIB_RPATH])
29439+
29440+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
29441+ dnl accordingly.
29442+ AC_LIB_LINKFLAGS_BODY([iconv])
29443+])
29444+
29445+AC_DEFUN([AM_ICONV_LINK],
29446+[
29447+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
29448+ dnl those with the standalone portable GNU libiconv installed).
29449+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
29450+
29451+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
29452+ dnl accordingly.
29453+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
29454+
29455+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
29456+ dnl because if the user has installed libiconv and not disabled its use
29457+ dnl via --without-libiconv-prefix, he wants to use it. The first
29458+ dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
29459+ am_save_CPPFLAGS="$CPPFLAGS"
29460+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
29461+
29462+ AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
29463+ am_cv_func_iconv="no, consider installing GNU libiconv"
29464+ am_cv_lib_iconv=no
29465+ AC_LINK_IFELSE(
29466+ [AC_LANG_PROGRAM(
29467+ [[
29468+#include <stdlib.h>
29469+#include <iconv.h>
29470+ ]],
29471+ [[iconv_t cd = iconv_open("","");
29472+ iconv(cd,NULL,NULL,NULL,NULL);
29473+ iconv_close(cd);]])],
29474+ [am_cv_func_iconv=yes])
29475+ if test "$am_cv_func_iconv" != yes; then
29476+ am_save_LIBS="$LIBS"
29477+ LIBS="$LIBS $LIBICONV"
29478+ AC_LINK_IFELSE(
29479+ [AC_LANG_PROGRAM(
29480+ [[
29481+#include <stdlib.h>
29482+#include <iconv.h>
29483+ ]],
29484+ [[iconv_t cd = iconv_open("","");
29485+ iconv(cd,NULL,NULL,NULL,NULL);
29486+ iconv_close(cd);]])],
29487+ [am_cv_lib_iconv=yes]
29488+ [am_cv_func_iconv=yes])
29489+ LIBS="$am_save_LIBS"
29490+ fi
29491+ ])
29492+ if test "$am_cv_func_iconv" = yes; then
29493+ AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
29494+ dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
29495+ dnl Solaris 10.
29496+ am_save_LIBS="$LIBS"
29497+ if test $am_cv_lib_iconv = yes; then
29498+ LIBS="$LIBS $LIBICONV"
29499+ fi
29500+ am_cv_func_iconv_works=no
29501+ for ac_iconv_const in '' 'const'; do
29502+ AC_RUN_IFELSE(
29503+ [AC_LANG_PROGRAM(
29504+ [[
29505+#include <iconv.h>
29506+#include <string.h>
29507+
29508+#ifndef ICONV_CONST
29509+# define ICONV_CONST $ac_iconv_const
29510+#endif
29511+ ]],
29512+ [[int result = 0;
29513+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
29514+ returns. */
29515+ {
29516+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
29517+ if (cd_utf8_to_88591 != (iconv_t)(-1))
29518+ {
29519+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
29520+ char buf[10];
29521+ ICONV_CONST char *inptr = input;
29522+ size_t inbytesleft = strlen (input);
29523+ char *outptr = buf;
29524+ size_t outbytesleft = sizeof (buf);
29525+ size_t res = iconv (cd_utf8_to_88591,
29526+ &inptr, &inbytesleft,
29527+ &outptr, &outbytesleft);
29528+ if (res == 0)
29529+ result |= 1;
29530+ iconv_close (cd_utf8_to_88591);
29531+ }
29532+ }
29533+ /* Test against Solaris 10 bug: Failures are not distinguishable from
29534+ successful returns. */
29535+ {
29536+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
29537+ if (cd_ascii_to_88591 != (iconv_t)(-1))
29538+ {
29539+ static ICONV_CONST char input[] = "\263";
29540+ char buf[10];
29541+ ICONV_CONST char *inptr = input;
29542+ size_t inbytesleft = strlen (input);
29543+ char *outptr = buf;
29544+ size_t outbytesleft = sizeof (buf);
29545+ size_t res = iconv (cd_ascii_to_88591,
29546+ &inptr, &inbytesleft,
29547+ &outptr, &outbytesleft);
29548+ if (res == 0)
29549+ result |= 2;
29550+ iconv_close (cd_ascii_to_88591);
29551+ }
29552+ }
29553+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
29554+ {
29555+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
29556+ if (cd_88591_to_utf8 != (iconv_t)(-1))
29557+ {
29558+ static ICONV_CONST char input[] = "\304";
29559+ static char buf[2] = { (char)0xDE, (char)0xAD };
29560+ ICONV_CONST char *inptr = input;
29561+ size_t inbytesleft = 1;
29562+ char *outptr = buf;
29563+ size_t outbytesleft = 1;
29564+ size_t res = iconv (cd_88591_to_utf8,
29565+ &inptr, &inbytesleft,
29566+ &outptr, &outbytesleft);
29567+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
29568+ result |= 4;
29569+ iconv_close (cd_88591_to_utf8);
29570+ }
29571+ }
29572+#if 0 /* This bug could be worked around by the caller. */
29573+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
29574+ {
29575+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
29576+ if (cd_88591_to_utf8 != (iconv_t)(-1))
29577+ {
29578+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
29579+ char buf[50];
29580+ ICONV_CONST char *inptr = input;
29581+ size_t inbytesleft = strlen (input);
29582+ char *outptr = buf;
29583+ size_t outbytesleft = sizeof (buf);
29584+ size_t res = iconv (cd_88591_to_utf8,
29585+ &inptr, &inbytesleft,
29586+ &outptr, &outbytesleft);
29587+ if ((int)res > 0)
29588+ result |= 8;
29589+ iconv_close (cd_88591_to_utf8);
29590+ }
29591+ }
29592+#endif
29593+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
29594+ provided. */
29595+ {
29596+ /* Try standardized names. */
29597+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
29598+ /* Try IRIX, OSF/1 names. */
29599+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
29600+ /* Try AIX names. */
29601+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
29602+ /* Try HP-UX names. */
29603+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
29604+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
29605+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
29606+ result |= 16;
29607+ if (cd1 != (iconv_t)(-1))
29608+ iconv_close (cd1);
29609+ if (cd2 != (iconv_t)(-1))
29610+ iconv_close (cd2);
29611+ if (cd3 != (iconv_t)(-1))
29612+ iconv_close (cd3);
29613+ if (cd4 != (iconv_t)(-1))
29614+ iconv_close (cd4);
29615+ }
29616+ return result;
29617+]])],
29618+ [am_cv_func_iconv_works=yes], ,
29619+ [case "$host_os" in
29620+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
29621+ *) am_cv_func_iconv_works="guessing yes" ;;
29622+ esac])
29623+ test "$am_cv_func_iconv_works" = no || break
29624+ done
29625+ LIBS="$am_save_LIBS"
29626+ ])
29627+ case "$am_cv_func_iconv_works" in
29628+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
29629+ *) am_func_iconv=yes ;;
29630+ esac
29631+ else
29632+ am_func_iconv=no am_cv_lib_iconv=no
29633+ fi
29634+ if test "$am_func_iconv" = yes; then
29635+ AC_DEFINE([HAVE_ICONV], [1],
29636+ [Define if you have the iconv() function and it works.])
29637+ fi
29638+ if test "$am_cv_lib_iconv" = yes; then
29639+ AC_MSG_CHECKING([how to link with libiconv])
29640+ AC_MSG_RESULT([$LIBICONV])
29641+ else
29642+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
29643+ dnl either.
29644+ CPPFLAGS="$am_save_CPPFLAGS"
29645+ LIBICONV=
29646+ LTLIBICONV=
29647+ fi
29648+ AC_SUBST([LIBICONV])
29649+ AC_SUBST([LTLIBICONV])
29650+])
29651+
29652+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
29653+dnl avoid warnings like
29654+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
29655+dnl This is tricky because of the way 'aclocal' is implemented:
29656+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
29657+dnl Otherwise aclocal's initial scan pass would miss the macro definition.
29658+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
29659+dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
29660+dnl warnings.
29661+m4_define([gl_iconv_AC_DEFUN],
29662+ m4_version_prereq([2.64],
29663+ [[AC_DEFUN_ONCE(
29664+ [$1], [$2])]],
29665+ [m4_ifdef([gl_00GNULIB],
29666+ [[AC_DEFUN_ONCE(
29667+ [$1], [$2])]],
29668+ [[AC_DEFUN(
29669+ [$1], [$2])]])]))
29670+gl_iconv_AC_DEFUN([AM_ICONV],
29671+[
29672+ AM_ICONV_LINK
29673+ if test "$am_cv_func_iconv" = yes; then
29674+ AC_MSG_CHECKING([for iconv declaration])
29675+ AC_CACHE_VAL([am_cv_proto_iconv], [
29676+ AC_COMPILE_IFELSE(
29677+ [AC_LANG_PROGRAM(
29678+ [[
29679+#include <stdlib.h>
29680+#include <iconv.h>
29681+extern
29682+#ifdef __cplusplus
29683+"C"
29684+#endif
29685+#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
29686+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
29687+#else
29688+size_t iconv();
29689+#endif
29690+ ]],
29691+ [[]])],
29692+ [am_cv_proto_iconv_arg1=""],
29693+ [am_cv_proto_iconv_arg1="const"])
29694+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
29695+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
29696+ AC_MSG_RESULT([
29697+ $am_cv_proto_iconv])
29698+ else
29699+ dnl When compiling GNU libiconv on a system that does not have iconv yet,
29700+ dnl pick the POSIX compliant declaration without 'const'.
29701+ am_cv_proto_iconv_arg1=""
29702+ fi
29703+ AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
29704+ [Define as const if the declaration of iconv() needs const.])
29705+ dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
29706+ m4_ifdef([gl_ICONV_H_DEFAULTS],
29707+ [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
29708+ if test -n "$am_cv_proto_iconv_arg1"; then
29709+ ICONV_CONST="const"
29710+ fi
29711+ ])
29712+])
29713diff -uprN clean/lrzsz-0.12.20/m4/intlmacosx.m4 lrzsz-0.12.20/m4/intlmacosx.m4
29714--- clean/lrzsz-0.12.20/m4/intlmacosx.m4 1970-01-01 01:00:00.000000000 +0100
29715+++ lrzsz-0.12.20/m4/intlmacosx.m4 2019-11-25 18:21:18.000000000 +0000
29716@@ -0,0 +1,72 @@
29717+# intlmacosx.m4 serial 6 (gettext-0.20)
29718+dnl Copyright (C) 2004-2014, 2016, 2019 Free Software Foundation, Inc.
29719+dnl This file is free software; the Free Software Foundation
29720+dnl gives unlimited permission to copy and/or distribute it,
29721+dnl with or without modifications, as long as this notice is preserved.
29722+dnl
29723+dnl This file can be used in projects which are not available under
29724+dnl the GNU General Public License or the GNU Library General Public
29725+dnl License but which still want to provide support for the GNU gettext
29726+dnl functionality.
29727+dnl Please note that the actual code of the GNU gettext library is covered
29728+dnl by the GNU Library General Public License, and the rest of the GNU
29729+dnl gettext package is covered by the GNU General Public License.
29730+dnl They are *not* in the public domain.
29731+
29732+dnl Checks for special options needed on Mac OS X.
29733+dnl Defines INTL_MACOSX_LIBS.
29734+AC_DEFUN([gt_INTL_MACOSX],
29735+[
29736+ dnl Check for API introduced in Mac OS X 10.4.
29737+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
29738+ [gt_cv_func_CFPreferencesCopyAppValue],
29739+ [gt_save_LIBS="$LIBS"
29740+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
29741+ AC_LINK_IFELSE(
29742+ [AC_LANG_PROGRAM(
29743+ [[#include <CoreFoundation/CFPreferences.h>]],
29744+ [[CFPreferencesCopyAppValue(NULL, NULL)]])],
29745+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
29746+ [gt_cv_func_CFPreferencesCopyAppValue=no])
29747+ LIBS="$gt_save_LIBS"])
29748+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
29749+ AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
29750+ [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
29751+ fi
29752+ dnl Check for API introduced in Mac OS X 10.5.
29753+ AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
29754+ [gt_save_LIBS="$LIBS"
29755+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
29756+ AC_LINK_IFELSE(
29757+ [AC_LANG_PROGRAM(
29758+ [[#include <CoreFoundation/CFLocale.h>]],
29759+ [[CFLocaleCopyCurrent();]])],
29760+ [gt_cv_func_CFLocaleCopyCurrent=yes],
29761+ [gt_cv_func_CFLocaleCopyCurrent=no])
29762+ LIBS="$gt_save_LIBS"])
29763+ if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
29764+ AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
29765+ [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
29766+ fi
29767+ AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
29768+ [gt_save_LIBS="$LIBS"
29769+ LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
29770+ AC_LINK_IFELSE(
29771+ [AC_LANG_PROGRAM(
29772+ [[#include <CoreFoundation/CFLocale.h>]],
29773+ [[CFLocaleCopyPreferredLanguages();]])],
29774+ [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
29775+ [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
29776+ LIBS="$gt_save_LIBS"])
29777+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
29778+ AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
29779+ [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
29780+ fi
29781+ INTL_MACOSX_LIBS=
29782+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
29783+ || test $gt_cv_func_CFLocaleCopyCurrent = yes \
29784+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
29785+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
29786+ fi
29787+ AC_SUBST([INTL_MACOSX_LIBS])
29788+])
29789diff -uprN clean/lrzsz-0.12.20/m4/lib-ld.m4 lrzsz-0.12.20/m4/lib-ld.m4
29790--- clean/lrzsz-0.12.20/m4/lib-ld.m4 1970-01-01 01:00:00.000000000 +0100
29791+++ lrzsz-0.12.20/m4/lib-ld.m4 2019-11-25 18:21:18.000000000 +0000
29792@@ -0,0 +1,168 @@
29793+# lib-ld.m4 serial 9
29794+dnl Copyright (C) 1996-2003, 2009-2019 Free Software Foundation, Inc.
29795+dnl This file is free software; the Free Software Foundation
29796+dnl gives unlimited permission to copy and/or distribute it,
29797+dnl with or without modifications, as long as this notice is preserved.
29798+
29799+dnl Subroutines of libtool.m4,
29800+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
29801+dnl collision with libtool.m4.
29802+
29803+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
29804+AC_DEFUN([AC_LIB_PROG_LD_GNU],
29805+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
29806+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
29807+case `$LD -v 2>&1 </dev/null` in
29808+*GNU* | *'with BFD'*)
29809+ acl_cv_prog_gnu_ld=yes
29810+ ;;
29811+*)
29812+ acl_cv_prog_gnu_ld=no
29813+ ;;
29814+esac])
29815+with_gnu_ld=$acl_cv_prog_gnu_ld
29816+])
29817+
29818+dnl From libtool-2.4. Sets the variable LD.
29819+AC_DEFUN([AC_LIB_PROG_LD],
29820+[AC_REQUIRE([AC_PROG_CC])dnl
29821+AC_REQUIRE([AC_CANONICAL_HOST])dnl
29822+
29823+AC_ARG_WITH([gnu-ld],
29824+ [AS_HELP_STRING([--with-gnu-ld],
29825+ [assume the C compiler uses GNU ld [default=no]])],
29826+ [test "$withval" = no || with_gnu_ld=yes],
29827+ [with_gnu_ld=no])dnl
29828+
29829+# Prepare PATH_SEPARATOR.
29830+# The user is always right.
29831+if test "${PATH_SEPARATOR+set}" != set; then
29832+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
29833+ # contains only /bin. Note that ksh looks also at the FPATH variable,
29834+ # so we have to set that as well for the test.
29835+ PATH_SEPARATOR=:
29836+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
29837+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
29838+ || PATH_SEPARATOR=';'
29839+ }
29840+fi
29841+
29842+if test -n "$LD"; then
29843+ AC_MSG_CHECKING([for ld])
29844+elif test "$GCC" = yes; then
29845+ AC_MSG_CHECKING([for ld used by $CC])
29846+elif test "$with_gnu_ld" = yes; then
29847+ AC_MSG_CHECKING([for GNU ld])
29848+else
29849+ AC_MSG_CHECKING([for non-GNU ld])
29850+fi
29851+if test -n "$LD"; then
29852+ # Let the user override the test with a path.
29853+ :
29854+else
29855+ AC_CACHE_VAL([acl_cv_path_LD],
29856+ [
29857+ acl_cv_path_LD= # Final result of this test
29858+ ac_prog=ld # Program to search in $PATH
29859+ if test "$GCC" = yes; then
29860+ # Check if gcc -print-prog-name=ld gives a path.
29861+ case $host in
29862+ *-*-mingw*)
29863+ # gcc leaves a trailing carriage return which upsets mingw
29864+ acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
29865+ *)
29866+ acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
29867+ esac
29868+ case $acl_output in
29869+ # Accept absolute paths.
29870+ [[\\/]]* | ?:[[\\/]]*)
29871+ re_direlt='/[[^/]][[^/]]*/\.\./'
29872+ # Canonicalize the pathname of ld
29873+ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
29874+ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
29875+ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
29876+ done
29877+ # Got the pathname. No search in PATH is needed.
29878+ acl_cv_path_LD="$acl_output"
29879+ ac_prog=
29880+ ;;
29881+ "")
29882+ # If it fails, then pretend we aren't using GCC.
29883+ ;;
29884+ *)
29885+ # If it is relative, then search for the first ld in PATH.
29886+ with_gnu_ld=unknown
29887+ ;;
29888+ esac
29889+ fi
29890+ if test -n "$ac_prog"; then
29891+ # Search for $ac_prog in $PATH.
29892+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
29893+ for ac_dir in $PATH; do
29894+ IFS="$acl_save_ifs"
29895+ test -z "$ac_dir" && ac_dir=.
29896+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
29897+ acl_cv_path_LD="$ac_dir/$ac_prog"
29898+ # Check to see if the program is GNU ld. I'd rather use --version,
29899+ # but apparently some variants of GNU ld only accept -v.
29900+ # Break only if it was the GNU/non-GNU ld that we prefer.
29901+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
29902+ *GNU* | *'with BFD'*)
29903+ test "$with_gnu_ld" != no && break
29904+ ;;
29905+ *)
29906+ test "$with_gnu_ld" != yes && break
29907+ ;;
29908+ esac
29909+ fi
29910+ done
29911+ IFS="$acl_save_ifs"
29912+ fi
29913+ case $host in
29914+ *-*-aix*)
29915+ AC_COMPILE_IFELSE(
29916+ [AC_LANG_SOURCE(
29917+ [[#if defined __powerpc64__ || defined _ARCH_PPC64
29918+ int ok;
29919+ #else
29920+ error fail
29921+ #endif
29922+ ]])],
29923+ [# The compiler produces 64-bit code. Add option '-b64' so that the
29924+ # linker groks 64-bit object files.
29925+ case "$acl_cv_path_LD " in
29926+ *" -b64 "*) ;;
29927+ *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
29928+ esac
29929+ ], [])
29930+ ;;
29931+ sparc64-*-netbsd*)
29932+ AC_COMPILE_IFELSE(
29933+ [AC_LANG_SOURCE(
29934+ [[#if defined __sparcv9 || defined __arch64__
29935+ int ok;
29936+ #else
29937+ error fail
29938+ #endif
29939+ ]])],
29940+ [],
29941+ [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
29942+ # so that the linker groks 32-bit object files.
29943+ case "$acl_cv_path_LD " in
29944+ *" -m elf32_sparc "*) ;;
29945+ *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
29946+ esac
29947+ ])
29948+ ;;
29949+ esac
29950+ ])
29951+ LD="$acl_cv_path_LD"
29952+fi
29953+if test -n "$LD"; then
29954+ AC_MSG_RESULT([$LD])
29955+else
29956+ AC_MSG_RESULT([no])
29957+ AC_MSG_ERROR([no acceptable ld found in \$PATH])
29958+fi
29959+AC_LIB_PROG_LD_GNU
29960+])
29961diff -uprN clean/lrzsz-0.12.20/m4/lib-link.m4 lrzsz-0.12.20/m4/lib-link.m4
29962--- clean/lrzsz-0.12.20/m4/lib-link.m4 1970-01-01 01:00:00.000000000 +0100
29963+++ lrzsz-0.12.20/m4/lib-link.m4 2019-11-25 18:21:18.000000000 +0000
29964@@ -0,0 +1,774 @@
29965+# lib-link.m4 serial 28
29966+dnl Copyright (C) 2001-2019 Free Software Foundation, Inc.
29967+dnl This file is free software; the Free Software Foundation
29968+dnl gives unlimited permission to copy and/or distribute it,
29969+dnl with or without modifications, as long as this notice is preserved.
29970+
29971+dnl From Bruno Haible.
29972+
29973+AC_PREREQ([2.61])
29974+
29975+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
29976+dnl the libraries corresponding to explicit and implicit dependencies.
29977+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
29978+dnl augments the CPPFLAGS variable.
29979+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
29980+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
29981+AC_DEFUN([AC_LIB_LINKFLAGS],
29982+[
29983+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
29984+ AC_REQUIRE([AC_LIB_RPATH])
29985+ pushdef([Name],[m4_translit([$1],[./+-], [____])])
29986+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
29987+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
29988+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
29989+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
29990+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
29991+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
29992+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
29993+ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
29994+ ])
29995+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
29996+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
29997+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
29998+ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
29999+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
30000+ AC_SUBST([LIB]NAME)
30001+ AC_SUBST([LTLIB]NAME)
30002+ AC_SUBST([LIB]NAME[_PREFIX])
30003+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
30004+ dnl results of this search when this library appears as a dependency.
30005+ HAVE_LIB[]NAME=yes
30006+ popdef([NAME])
30007+ popdef([Name])
30008+])
30009+
30010+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
30011+dnl searches for libname and the libraries corresponding to explicit and
30012+dnl implicit dependencies, together with the specified include files and
30013+dnl the ability to compile and link the specified testcode. The missing-message
30014+dnl defaults to 'no' and may contain additional hints for the user.
30015+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
30016+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
30017+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
30018+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
30019+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
30020+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
30021+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
30022+[
30023+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
30024+ AC_REQUIRE([AC_LIB_RPATH])
30025+ pushdef([Name],[m4_translit([$1],[./+-], [____])])
30026+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
30027+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
30028+
30029+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
30030+ dnl accordingly.
30031+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
30032+
30033+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
30034+ dnl because if the user has installed lib[]Name and not disabled its use
30035+ dnl via --without-lib[]Name-prefix, he wants to use it.
30036+ ac_save_CPPFLAGS="$CPPFLAGS"
30037+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
30038+
30039+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
30040+ ac_save_LIBS="$LIBS"
30041+ dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
30042+ dnl because these -l options might require -L options that are present in
30043+ dnl LIBS. -l options benefit only from the -L options listed before it.
30044+ dnl Otherwise, add it to the front of LIBS, because it may be a static
30045+ dnl library that depends on another static library that is present in LIBS.
30046+ dnl Static libraries benefit only from the static libraries listed after
30047+ dnl it.
30048+ case " $LIB[]NAME" in
30049+ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
30050+ *) LIBS="$LIB[]NAME $LIBS" ;;
30051+ esac
30052+ AC_LINK_IFELSE(
30053+ [AC_LANG_PROGRAM([[$3]], [[$4]])],
30054+ [ac_cv_lib[]Name=yes],
30055+ [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
30056+ LIBS="$ac_save_LIBS"
30057+ ])
30058+ if test "$ac_cv_lib[]Name" = yes; then
30059+ HAVE_LIB[]NAME=yes
30060+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
30061+ AC_MSG_CHECKING([how to link with lib[]$1])
30062+ AC_MSG_RESULT([$LIB[]NAME])
30063+ else
30064+ HAVE_LIB[]NAME=no
30065+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
30066+ dnl $INC[]NAME either.
30067+ CPPFLAGS="$ac_save_CPPFLAGS"
30068+ LIB[]NAME=
30069+ LTLIB[]NAME=
30070+ LIB[]NAME[]_PREFIX=
30071+ fi
30072+ AC_SUBST([HAVE_LIB]NAME)
30073+ AC_SUBST([LIB]NAME)
30074+ AC_SUBST([LTLIB]NAME)
30075+ AC_SUBST([LIB]NAME[_PREFIX])
30076+ popdef([NAME])
30077+ popdef([Name])
30078+])
30079+
30080+dnl Determine the platform dependent parameters needed to use rpath:
30081+dnl acl_libext,
30082+dnl acl_shlibext,
30083+dnl acl_libname_spec,
30084+dnl acl_library_names_spec,
30085+dnl acl_hardcode_libdir_flag_spec,
30086+dnl acl_hardcode_libdir_separator,
30087+dnl acl_hardcode_direct,
30088+dnl acl_hardcode_minus_L.
30089+AC_DEFUN([AC_LIB_RPATH],
30090+[
30091+ dnl Complain if config.rpath is missing.
30092+ AC_REQUIRE_AUX_FILE([config.rpath])
30093+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
30094+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
30095+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
30096+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
30097+ AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
30098+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
30099+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
30100+ . ./conftest.sh
30101+ rm -f ./conftest.sh
30102+ acl_cv_rpath=done
30103+ ])
30104+ wl="$acl_cv_wl"
30105+ acl_libext="$acl_cv_libext"
30106+ acl_shlibext="$acl_cv_shlibext"
30107+ acl_libname_spec="$acl_cv_libname_spec"
30108+ acl_library_names_spec="$acl_cv_library_names_spec"
30109+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
30110+ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
30111+ acl_hardcode_direct="$acl_cv_hardcode_direct"
30112+ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
30113+ dnl Determine whether the user wants rpath handling at all.
30114+ AC_ARG_ENABLE([rpath],
30115+ [ --disable-rpath do not hardcode runtime library paths],
30116+ :, enable_rpath=yes)
30117+])
30118+
30119+dnl AC_LIB_FROMPACKAGE(name, package)
30120+dnl declares that libname comes from the given package. The configure file
30121+dnl will then not have a --with-libname-prefix option but a
30122+dnl --with-package-prefix option. Several libraries can come from the same
30123+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
30124+dnl macro call that searches for libname.
30125+AC_DEFUN([AC_LIB_FROMPACKAGE],
30126+[
30127+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
30128+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
30129+ define([acl_frompackage_]NAME, [$2])
30130+ popdef([NAME])
30131+ pushdef([PACK],[$2])
30132+ pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
30133+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
30134+ define([acl_libsinpackage_]PACKUP,
30135+ m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
30136+ popdef([PACKUP])
30137+ popdef([PACK])
30138+])
30139+
30140+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
30141+dnl the libraries corresponding to explicit and implicit dependencies.
30142+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
30143+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
30144+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
30145+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
30146+[
30147+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
30148+ pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
30149+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
30150+ pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
30151+ pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
30152+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
30153+ pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
30154+ dnl By default, look in $includedir and $libdir.
30155+ use_additional=yes
30156+ AC_LIB_WITH_FINAL_PREFIX([
30157+ eval additional_includedir=\"$includedir\"
30158+ eval additional_libdir=\"$libdir\"
30159+ ])
30160+ AC_ARG_WITH(PACK[-prefix],
30161+[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
30162+ --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
30163+[
30164+ if test "X$withval" = "Xno"; then
30165+ use_additional=no
30166+ else
30167+ if test "X$withval" = "X"; then
30168+ AC_LIB_WITH_FINAL_PREFIX([
30169+ eval additional_includedir=\"$includedir\"
30170+ eval additional_libdir=\"$libdir\"
30171+ ])
30172+ else
30173+ additional_includedir="$withval/include"
30174+ additional_libdir="$withval/$acl_libdirstem"
30175+ if test "$acl_libdirstem2" != "$acl_libdirstem" \
30176+ && test ! -d "$withval/$acl_libdirstem"; then
30177+ additional_libdir="$withval/$acl_libdirstem2"
30178+ fi
30179+ fi
30180+ fi
30181+])
30182+ dnl Search the library and its dependencies in $additional_libdir and
30183+ dnl $LDFLAGS. Using breadth-first-seach.
30184+ LIB[]NAME=
30185+ LTLIB[]NAME=
30186+ INC[]NAME=
30187+ LIB[]NAME[]_PREFIX=
30188+ dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
30189+ dnl computed. So it has to be reset here.
30190+ HAVE_LIB[]NAME=
30191+ rpathdirs=
30192+ ltrpathdirs=
30193+ names_already_handled=
30194+ names_next_round='$1 $2'
30195+ while test -n "$names_next_round"; do
30196+ names_this_round="$names_next_round"
30197+ names_next_round=
30198+ for name in $names_this_round; do
30199+ already_handled=
30200+ for n in $names_already_handled; do
30201+ if test "$n" = "$name"; then
30202+ already_handled=yes
30203+ break
30204+ fi
30205+ done
30206+ if test -z "$already_handled"; then
30207+ names_already_handled="$names_already_handled $name"
30208+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
30209+ dnl or AC_LIB_HAVE_LINKFLAGS call.
30210+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
30211+ eval value=\"\$HAVE_LIB$uppername\"
30212+ if test -n "$value"; then
30213+ if test "$value" = yes; then
30214+ eval value=\"\$LIB$uppername\"
30215+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
30216+ eval value=\"\$LTLIB$uppername\"
30217+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
30218+ else
30219+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
30220+ dnl that this library doesn't exist. So just drop it.
30221+ :
30222+ fi
30223+ else
30224+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
30225+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
30226+ found_dir=
30227+ found_la=
30228+ found_so=
30229+ found_a=
30230+ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
30231+ if test -n "$acl_shlibext"; then
30232+ shrext=".$acl_shlibext" # typically: shrext=.so
30233+ else
30234+ shrext=
30235+ fi
30236+ if test $use_additional = yes; then
30237+ dir="$additional_libdir"
30238+ dnl The same code as in the loop below:
30239+ dnl First look for a shared library.
30240+ if test -n "$acl_shlibext"; then
30241+ if test -f "$dir/$libname$shrext"; then
30242+ found_dir="$dir"
30243+ found_so="$dir/$libname$shrext"
30244+ else
30245+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
30246+ ver=`(cd "$dir" && \
30247+ for f in "$libname$shrext".*; do echo "$f"; done \
30248+ | sed -e "s,^$libname$shrext\\\\.,," \
30249+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
30250+ | sed 1q ) 2>/dev/null`
30251+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
30252+ found_dir="$dir"
30253+ found_so="$dir/$libname$shrext.$ver"
30254+ fi
30255+ else
30256+ eval library_names=\"$acl_library_names_spec\"
30257+ for f in $library_names; do
30258+ if test -f "$dir/$f"; then
30259+ found_dir="$dir"
30260+ found_so="$dir/$f"
30261+ break
30262+ fi
30263+ done
30264+ fi
30265+ fi
30266+ fi
30267+ dnl Then look for a static library.
30268+ if test "X$found_dir" = "X"; then
30269+ if test -f "$dir/$libname.$acl_libext"; then
30270+ found_dir="$dir"
30271+ found_a="$dir/$libname.$acl_libext"
30272+ fi
30273+ fi
30274+ if test "X$found_dir" != "X"; then
30275+ if test -f "$dir/$libname.la"; then
30276+ found_la="$dir/$libname.la"
30277+ fi
30278+ fi
30279+ fi
30280+ if test "X$found_dir" = "X"; then
30281+ for x in $LDFLAGS $LTLIB[]NAME; do
30282+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30283+ case "$x" in
30284+ -L*)
30285+ dir=`echo "X$x" | sed -e 's/^X-L//'`
30286+ dnl First look for a shared library.
30287+ if test -n "$acl_shlibext"; then
30288+ if test -f "$dir/$libname$shrext"; then
30289+ found_dir="$dir"
30290+ found_so="$dir/$libname$shrext"
30291+ else
30292+ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
30293+ ver=`(cd "$dir" && \
30294+ for f in "$libname$shrext".*; do echo "$f"; done \
30295+ | sed -e "s,^$libname$shrext\\\\.,," \
30296+ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
30297+ | sed 1q ) 2>/dev/null`
30298+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
30299+ found_dir="$dir"
30300+ found_so="$dir/$libname$shrext.$ver"
30301+ fi
30302+ else
30303+ eval library_names=\"$acl_library_names_spec\"
30304+ for f in $library_names; do
30305+ if test -f "$dir/$f"; then
30306+ found_dir="$dir"
30307+ found_so="$dir/$f"
30308+ break
30309+ fi
30310+ done
30311+ fi
30312+ fi
30313+ fi
30314+ dnl Then look for a static library.
30315+ if test "X$found_dir" = "X"; then
30316+ if test -f "$dir/$libname.$acl_libext"; then
30317+ found_dir="$dir"
30318+ found_a="$dir/$libname.$acl_libext"
30319+ fi
30320+ fi
30321+ if test "X$found_dir" != "X"; then
30322+ if test -f "$dir/$libname.la"; then
30323+ found_la="$dir/$libname.la"
30324+ fi
30325+ fi
30326+ ;;
30327+ esac
30328+ if test "X$found_dir" != "X"; then
30329+ break
30330+ fi
30331+ done
30332+ fi
30333+ if test "X$found_dir" != "X"; then
30334+ dnl Found the library.
30335+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
30336+ if test "X$found_so" != "X"; then
30337+ dnl Linking with a shared library. We attempt to hardcode its
30338+ dnl directory into the executable's runpath, unless it's the
30339+ dnl standard /usr/lib.
30340+ if test "$enable_rpath" = no \
30341+ || test "X$found_dir" = "X/usr/$acl_libdirstem" \
30342+ || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
30343+ dnl No hardcoding is needed.
30344+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
30345+ else
30346+ dnl Use an explicit option to hardcode DIR into the resulting
30347+ dnl binary.
30348+ dnl Potentially add DIR to ltrpathdirs.
30349+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
30350+ haveit=
30351+ for x in $ltrpathdirs; do
30352+ if test "X$x" = "X$found_dir"; then
30353+ haveit=yes
30354+ break
30355+ fi
30356+ done
30357+ if test -z "$haveit"; then
30358+ ltrpathdirs="$ltrpathdirs $found_dir"
30359+ fi
30360+ dnl The hardcoding into $LIBNAME is system dependent.
30361+ if test "$acl_hardcode_direct" = yes; then
30362+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
30363+ dnl resulting binary.
30364+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
30365+ else
30366+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
30367+ dnl Use an explicit option to hardcode DIR into the resulting
30368+ dnl binary.
30369+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
30370+ dnl Potentially add DIR to rpathdirs.
30371+ dnl The rpathdirs will be appended to $LIBNAME at the end.
30372+ haveit=
30373+ for x in $rpathdirs; do
30374+ if test "X$x" = "X$found_dir"; then
30375+ haveit=yes
30376+ break
30377+ fi
30378+ done
30379+ if test -z "$haveit"; then
30380+ rpathdirs="$rpathdirs $found_dir"
30381+ fi
30382+ else
30383+ dnl Rely on "-L$found_dir".
30384+ dnl But don't add it if it's already contained in the LDFLAGS
30385+ dnl or the already constructed $LIBNAME
30386+ haveit=
30387+ for x in $LDFLAGS $LIB[]NAME; do
30388+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30389+ if test "X$x" = "X-L$found_dir"; then
30390+ haveit=yes
30391+ break
30392+ fi
30393+ done
30394+ if test -z "$haveit"; then
30395+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
30396+ fi
30397+ if test "$acl_hardcode_minus_L" != no; then
30398+ dnl FIXME: Not sure whether we should use
30399+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
30400+ dnl here.
30401+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
30402+ else
30403+ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
30404+ dnl here, because this doesn't fit in flags passed to the
30405+ dnl compiler. So give up. No hardcoding. This affects only
30406+ dnl very old systems.
30407+ dnl FIXME: Not sure whether we should use
30408+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
30409+ dnl here.
30410+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
30411+ fi
30412+ fi
30413+ fi
30414+ fi
30415+ else
30416+ if test "X$found_a" != "X"; then
30417+ dnl Linking with a static library.
30418+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
30419+ else
30420+ dnl We shouldn't come here, but anyway it's good to have a
30421+ dnl fallback.
30422+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
30423+ fi
30424+ fi
30425+ dnl Assume the include files are nearby.
30426+ additional_includedir=
30427+ case "$found_dir" in
30428+ */$acl_libdirstem | */$acl_libdirstem/)
30429+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
30430+ if test "$name" = '$1'; then
30431+ LIB[]NAME[]_PREFIX="$basedir"
30432+ fi
30433+ additional_includedir="$basedir/include"
30434+ ;;
30435+ */$acl_libdirstem2 | */$acl_libdirstem2/)
30436+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
30437+ if test "$name" = '$1'; then
30438+ LIB[]NAME[]_PREFIX="$basedir"
30439+ fi
30440+ additional_includedir="$basedir/include"
30441+ ;;
30442+ esac
30443+ if test "X$additional_includedir" != "X"; then
30444+ dnl Potentially add $additional_includedir to $INCNAME.
30445+ dnl But don't add it
30446+ dnl 1. if it's the standard /usr/include,
30447+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
30448+ dnl 3. if it's already present in $CPPFLAGS or the already
30449+ dnl constructed $INCNAME,
30450+ dnl 4. if it doesn't exist as a directory.
30451+ if test "X$additional_includedir" != "X/usr/include"; then
30452+ haveit=
30453+ if test "X$additional_includedir" = "X/usr/local/include"; then
30454+ if test -n "$GCC"; then
30455+ case $host_os in
30456+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
30457+ esac
30458+ fi
30459+ fi
30460+ if test -z "$haveit"; then
30461+ for x in $CPPFLAGS $INC[]NAME; do
30462+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30463+ if test "X$x" = "X-I$additional_includedir"; then
30464+ haveit=yes
30465+ break
30466+ fi
30467+ done
30468+ if test -z "$haveit"; then
30469+ if test -d "$additional_includedir"; then
30470+ dnl Really add $additional_includedir to $INCNAME.
30471+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
30472+ fi
30473+ fi
30474+ fi
30475+ fi
30476+ fi
30477+ dnl Look for dependencies.
30478+ if test -n "$found_la"; then
30479+ dnl Read the .la file. It defines the variables
30480+ dnl dlname, library_names, old_library, dependency_libs, current,
30481+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
30482+ save_libdir="$libdir"
30483+ case "$found_la" in
30484+ */* | *\\*) . "$found_la" ;;
30485+ *) . "./$found_la" ;;
30486+ esac
30487+ libdir="$save_libdir"
30488+ dnl We use only dependency_libs.
30489+ for dep in $dependency_libs; do
30490+ case "$dep" in
30491+ -L*)
30492+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
30493+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
30494+ dnl But don't add it
30495+ dnl 1. if it's the standard /usr/lib,
30496+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
30497+ dnl 3. if it's already present in $LDFLAGS or the already
30498+ dnl constructed $LIBNAME,
30499+ dnl 4. if it doesn't exist as a directory.
30500+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
30501+ && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
30502+ haveit=
30503+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
30504+ || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
30505+ if test -n "$GCC"; then
30506+ case $host_os in
30507+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
30508+ esac
30509+ fi
30510+ fi
30511+ if test -z "$haveit"; then
30512+ haveit=
30513+ for x in $LDFLAGS $LIB[]NAME; do
30514+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30515+ if test "X$x" = "X-L$additional_libdir"; then
30516+ haveit=yes
30517+ break
30518+ fi
30519+ done
30520+ if test -z "$haveit"; then
30521+ if test -d "$additional_libdir"; then
30522+ dnl Really add $additional_libdir to $LIBNAME.
30523+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
30524+ fi
30525+ fi
30526+ haveit=
30527+ for x in $LDFLAGS $LTLIB[]NAME; do
30528+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30529+ if test "X$x" = "X-L$additional_libdir"; then
30530+ haveit=yes
30531+ break
30532+ fi
30533+ done
30534+ if test -z "$haveit"; then
30535+ if test -d "$additional_libdir"; then
30536+ dnl Really add $additional_libdir to $LTLIBNAME.
30537+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
30538+ fi
30539+ fi
30540+ fi
30541+ fi
30542+ ;;
30543+ -R*)
30544+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
30545+ if test "$enable_rpath" != no; then
30546+ dnl Potentially add DIR to rpathdirs.
30547+ dnl The rpathdirs will be appended to $LIBNAME at the end.
30548+ haveit=
30549+ for x in $rpathdirs; do
30550+ if test "X$x" = "X$dir"; then
30551+ haveit=yes
30552+ break
30553+ fi
30554+ done
30555+ if test -z "$haveit"; then
30556+ rpathdirs="$rpathdirs $dir"
30557+ fi
30558+ dnl Potentially add DIR to ltrpathdirs.
30559+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
30560+ haveit=
30561+ for x in $ltrpathdirs; do
30562+ if test "X$x" = "X$dir"; then
30563+ haveit=yes
30564+ break
30565+ fi
30566+ done
30567+ if test -z "$haveit"; then
30568+ ltrpathdirs="$ltrpathdirs $dir"
30569+ fi
30570+ fi
30571+ ;;
30572+ -l*)
30573+ dnl Handle this in the next round.
30574+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
30575+ ;;
30576+ *.la)
30577+ dnl Handle this in the next round. Throw away the .la's
30578+ dnl directory; it is already contained in a preceding -L
30579+ dnl option.
30580+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
30581+ ;;
30582+ *)
30583+ dnl Most likely an immediate library name.
30584+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
30585+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
30586+ ;;
30587+ esac
30588+ done
30589+ fi
30590+ else
30591+ dnl Didn't find the library; assume it is in the system directories
30592+ dnl known to the linker and runtime loader. (All the system
30593+ dnl directories known to the linker should also be known to the
30594+ dnl runtime loader, otherwise the system is severely misconfigured.)
30595+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
30596+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
30597+ fi
30598+ fi
30599+ fi
30600+ done
30601+ done
30602+ if test "X$rpathdirs" != "X"; then
30603+ if test -n "$acl_hardcode_libdir_separator"; then
30604+ dnl Weird platform: only the last -rpath option counts, the user must
30605+ dnl pass all path elements in one option. We can arrange that for a
30606+ dnl single library, but not when more than one $LIBNAMEs are used.
30607+ alldirs=
30608+ for found_dir in $rpathdirs; do
30609+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
30610+ done
30611+ dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
30612+ acl_save_libdir="$libdir"
30613+ libdir="$alldirs"
30614+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
30615+ libdir="$acl_save_libdir"
30616+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
30617+ else
30618+ dnl The -rpath options are cumulative.
30619+ for found_dir in $rpathdirs; do
30620+ acl_save_libdir="$libdir"
30621+ libdir="$found_dir"
30622+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
30623+ libdir="$acl_save_libdir"
30624+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
30625+ done
30626+ fi
30627+ fi
30628+ if test "X$ltrpathdirs" != "X"; then
30629+ dnl When using libtool, the option that works for both libraries and
30630+ dnl executables is -R. The -R options are cumulative.
30631+ for found_dir in $ltrpathdirs; do
30632+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
30633+ done
30634+ fi
30635+ popdef([PACKLIBS])
30636+ popdef([PACKUP])
30637+ popdef([PACK])
30638+ popdef([NAME])
30639+])
30640+
30641+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
30642+dnl unless already present in VAR.
30643+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
30644+dnl contains two or three consecutive elements that belong together.
30645+AC_DEFUN([AC_LIB_APPENDTOVAR],
30646+[
30647+ for element in [$2]; do
30648+ haveit=
30649+ for x in $[$1]; do
30650+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30651+ if test "X$x" = "X$element"; then
30652+ haveit=yes
30653+ break
30654+ fi
30655+ done
30656+ if test -z "$haveit"; then
30657+ [$1]="${[$1]}${[$1]:+ }$element"
30658+ fi
30659+ done
30660+])
30661+
30662+dnl For those cases where a variable contains several -L and -l options
30663+dnl referring to unknown libraries and directories, this macro determines the
30664+dnl necessary additional linker options for the runtime path.
30665+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
30666+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
30667+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
30668+dnl otherwise linking without libtool is assumed.
30669+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
30670+[
30671+ AC_REQUIRE([AC_LIB_RPATH])
30672+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
30673+ $1=
30674+ if test "$enable_rpath" != no; then
30675+ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
30676+ dnl Use an explicit option to hardcode directories into the resulting
30677+ dnl binary.
30678+ rpathdirs=
30679+ next=
30680+ for opt in $2; do
30681+ if test -n "$next"; then
30682+ dir="$next"
30683+ dnl No need to hardcode the standard /usr/lib.
30684+ if test "X$dir" != "X/usr/$acl_libdirstem" \
30685+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
30686+ rpathdirs="$rpathdirs $dir"
30687+ fi
30688+ next=
30689+ else
30690+ case $opt in
30691+ -L) next=yes ;;
30692+ -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
30693+ dnl No need to hardcode the standard /usr/lib.
30694+ if test "X$dir" != "X/usr/$acl_libdirstem" \
30695+ && test "X$dir" != "X/usr/$acl_libdirstem2"; then
30696+ rpathdirs="$rpathdirs $dir"
30697+ fi
30698+ next= ;;
30699+ *) next= ;;
30700+ esac
30701+ fi
30702+ done
30703+ if test "X$rpathdirs" != "X"; then
30704+ if test -n ""$3""; then
30705+ dnl libtool is used for linking. Use -R options.
30706+ for dir in $rpathdirs; do
30707+ $1="${$1}${$1:+ }-R$dir"
30708+ done
30709+ else
30710+ dnl The linker is used for linking directly.
30711+ if test -n "$acl_hardcode_libdir_separator"; then
30712+ dnl Weird platform: only the last -rpath option counts, the user
30713+ dnl must pass all path elements in one option.
30714+ alldirs=
30715+ for dir in $rpathdirs; do
30716+ alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
30717+ done
30718+ acl_save_libdir="$libdir"
30719+ libdir="$alldirs"
30720+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
30721+ libdir="$acl_save_libdir"
30722+ $1="$flag"
30723+ else
30724+ dnl The -rpath options are cumulative.
30725+ for dir in $rpathdirs; do
30726+ acl_save_libdir="$libdir"
30727+ libdir="$dir"
30728+ eval flag=\"$acl_hardcode_libdir_flag_spec\"
30729+ libdir="$acl_save_libdir"
30730+ $1="${$1}${$1:+ }$flag"
30731+ done
30732+ fi
30733+ fi
30734+ fi
30735+ fi
30736+ fi
30737+ AC_SUBST([$1])
30738+])
30739diff -uprN clean/lrzsz-0.12.20/m4/lib-prefix.m4 lrzsz-0.12.20/m4/lib-prefix.m4
30740--- clean/lrzsz-0.12.20/m4/lib-prefix.m4 1970-01-01 01:00:00.000000000 +0100
30741+++ lrzsz-0.12.20/m4/lib-prefix.m4 2019-11-25 18:21:18.000000000 +0000
30742@@ -0,0 +1,249 @@
30743+# lib-prefix.m4 serial 14
30744+dnl Copyright (C) 2001-2005, 2008-2019 Free Software Foundation, Inc.
30745+dnl This file is free software; the Free Software Foundation
30746+dnl gives unlimited permission to copy and/or distribute it,
30747+dnl with or without modifications, as long as this notice is preserved.
30748+
30749+dnl From Bruno Haible.
30750+
30751+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
30752+dnl to access previously installed libraries. The basic assumption is that
30753+dnl a user will want packages to use other packages he previously installed
30754+dnl with the same --prefix option.
30755+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
30756+dnl libraries, but is otherwise very convenient.
30757+AC_DEFUN([AC_LIB_PREFIX],
30758+[
30759+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
30760+ AC_REQUIRE([AC_PROG_CC])
30761+ AC_REQUIRE([AC_CANONICAL_HOST])
30762+ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
30763+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
30764+ dnl By default, look in $includedir and $libdir.
30765+ use_additional=yes
30766+ AC_LIB_WITH_FINAL_PREFIX([
30767+ eval additional_includedir=\"$includedir\"
30768+ eval additional_libdir=\"$libdir\"
30769+ ])
30770+ AC_ARG_WITH([lib-prefix],
30771+[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
30772+ --without-lib-prefix don't search for libraries in includedir and libdir]],
30773+[
30774+ if test "X$withval" = "Xno"; then
30775+ use_additional=no
30776+ else
30777+ if test "X$withval" = "X"; then
30778+ AC_LIB_WITH_FINAL_PREFIX([
30779+ eval additional_includedir=\"$includedir\"
30780+ eval additional_libdir=\"$libdir\"
30781+ ])
30782+ else
30783+ additional_includedir="$withval/include"
30784+ additional_libdir="$withval/$acl_libdirstem"
30785+ fi
30786+ fi
30787+])
30788+ if test $use_additional = yes; then
30789+ dnl Potentially add $additional_includedir to $CPPFLAGS.
30790+ dnl But don't add it
30791+ dnl 1. if it's the standard /usr/include,
30792+ dnl 2. if it's already present in $CPPFLAGS,
30793+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
30794+ dnl 4. if it doesn't exist as a directory.
30795+ if test "X$additional_includedir" != "X/usr/include"; then
30796+ haveit=
30797+ for x in $CPPFLAGS; do
30798+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30799+ if test "X$x" = "X-I$additional_includedir"; then
30800+ haveit=yes
30801+ break
30802+ fi
30803+ done
30804+ if test -z "$haveit"; then
30805+ if test "X$additional_includedir" = "X/usr/local/include"; then
30806+ if test -n "$GCC"; then
30807+ case $host_os in
30808+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
30809+ esac
30810+ fi
30811+ fi
30812+ if test -z "$haveit"; then
30813+ if test -d "$additional_includedir"; then
30814+ dnl Really add $additional_includedir to $CPPFLAGS.
30815+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
30816+ fi
30817+ fi
30818+ fi
30819+ fi
30820+ dnl Potentially add $additional_libdir to $LDFLAGS.
30821+ dnl But don't add it
30822+ dnl 1. if it's the standard /usr/lib,
30823+ dnl 2. if it's already present in $LDFLAGS,
30824+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
30825+ dnl 4. if it doesn't exist as a directory.
30826+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
30827+ haveit=
30828+ for x in $LDFLAGS; do
30829+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
30830+ if test "X$x" = "X-L$additional_libdir"; then
30831+ haveit=yes
30832+ break
30833+ fi
30834+ done
30835+ if test -z "$haveit"; then
30836+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
30837+ if test -n "$GCC"; then
30838+ case $host_os in
30839+ linux*) haveit=yes;;
30840+ esac
30841+ fi
30842+ fi
30843+ if test -z "$haveit"; then
30844+ if test -d "$additional_libdir"; then
30845+ dnl Really add $additional_libdir to $LDFLAGS.
30846+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
30847+ fi
30848+ fi
30849+ fi
30850+ fi
30851+ fi
30852+])
30853+
30854+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
30855+dnl acl_final_exec_prefix, containing the values to which $prefix and
30856+dnl $exec_prefix will expand at the end of the configure script.
30857+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
30858+[
30859+ dnl Unfortunately, prefix and exec_prefix get only finally determined
30860+ dnl at the end of configure.
30861+ if test "X$prefix" = "XNONE"; then
30862+ acl_final_prefix="$ac_default_prefix"
30863+ else
30864+ acl_final_prefix="$prefix"
30865+ fi
30866+ if test "X$exec_prefix" = "XNONE"; then
30867+ acl_final_exec_prefix='${prefix}'
30868+ else
30869+ acl_final_exec_prefix="$exec_prefix"
30870+ fi
30871+ acl_save_prefix="$prefix"
30872+ prefix="$acl_final_prefix"
30873+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
30874+ prefix="$acl_save_prefix"
30875+])
30876+
30877+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
30878+dnl variables prefix and exec_prefix bound to the values they will have
30879+dnl at the end of the configure script.
30880+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
30881+[
30882+ acl_save_prefix="$prefix"
30883+ prefix="$acl_final_prefix"
30884+ acl_save_exec_prefix="$exec_prefix"
30885+ exec_prefix="$acl_final_exec_prefix"
30886+ $1
30887+ exec_prefix="$acl_save_exec_prefix"
30888+ prefix="$acl_save_prefix"
30889+])
30890+
30891+dnl AC_LIB_PREPARE_MULTILIB creates
30892+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
30893+dnl "lib" or "lib64" or "lib/64",
30894+dnl - a variable acl_libdirstem2, as a secondary possible value for
30895+dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
30896+dnl "lib/amd64".
30897+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
30898+[
30899+ dnl There is no formal standard regarding lib and lib64.
30900+ dnl On glibc systems, the current practice is that on a system supporting
30901+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
30902+ dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
30903+ dnl the compiler's default mode by looking at the compiler's library search
30904+ dnl path. If at least one of its elements ends in /lib64 or points to a
30905+ dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
30906+ dnl Otherwise we use the default, namely "lib".
30907+ dnl On Solaris systems, the current practice is that on a system supporting
30908+ dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
30909+ dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
30910+ dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
30911+ AC_REQUIRE([AC_CANONICAL_HOST])
30912+ AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
30913+
30914+ case "$host_os" in
30915+ solaris*)
30916+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
30917+ [AC_COMPILE_IFELSE(
30918+ [AC_LANG_SOURCE(
30919+ [[#ifdef _LP64
30920+ int ok;
30921+ #else
30922+ error fail
30923+ #endif
30924+ ]])],
30925+ [gl_cv_solaris_64bit=yes],
30926+ [gl_cv_solaris_64bit=no])
30927+ ]);;
30928+ esac
30929+
30930+ dnl Allow the user to override the result by setting acl_cv_libdirstems.
30931+ AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
30932+ [acl_cv_libdirstems],
30933+ [acl_libdirstem=lib
30934+ acl_libdirstem2=
30935+ case "$host_os" in
30936+ solaris*)
30937+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
30938+ dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
30939+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
30940+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
30941+ dnl symlink is missing, so we set acl_libdirstem2 too.
30942+ if test $gl_cv_solaris_64bit = yes; then
30943+ acl_libdirstem=lib/64
30944+ case "$host_cpu" in
30945+ sparc*) acl_libdirstem2=lib/sparcv9 ;;
30946+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
30947+ esac
30948+ fi
30949+ ;;
30950+ *)
30951+ dnl If $CC generates code for a 32-bit ABI, the libraries are
30952+ dnl surely under $prefix/lib, not $prefix/lib64.
30953+ if test "$HOST_CPU_C_ABI_32BIT" != yes; then
30954+ dnl The result is a property of the system. However, non-system
30955+ dnl compilers sometimes have odd library search paths. Therefore
30956+ dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
30957+ searchpath=`(if test -f /usr/bin/gcc \
30958+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
30959+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \
30960+ else \
30961+ LC_ALL=C $CC -print-search-dirs; \
30962+ fi) 2>/dev/null \
30963+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
30964+ if test -n "$searchpath"; then
30965+ acl_save_IFS="${IFS= }"; IFS=":"
30966+ for searchdir in $searchpath; do
30967+ if test -d "$searchdir"; then
30968+ case "$searchdir" in
30969+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
30970+ */../ | */.. )
30971+ # Better ignore directories of this form. They are misleading.
30972+ ;;
30973+ *) searchdir=`cd "$searchdir" && pwd`
30974+ case "$searchdir" in
30975+ */lib64 ) acl_libdirstem=lib64 ;;
30976+ esac ;;
30977+ esac
30978+ fi
30979+ done
30980+ IFS="$acl_save_IFS"
30981+ fi
30982+ fi
30983+ ;;
30984+ esac
30985+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
30986+ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
30987+ ])
30988+ # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
30989+ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
30990+ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
30991+])
30992diff -uprN clean/lrzsz-0.12.20/m4/nls.m4 lrzsz-0.12.20/m4/nls.m4
30993--- clean/lrzsz-0.12.20/m4/nls.m4 1970-01-01 01:00:00.000000000 +0100
30994+++ lrzsz-0.12.20/m4/nls.m4 2019-11-25 18:21:18.000000000 +0000
30995@@ -0,0 +1,32 @@
30996+# nls.m4 serial 5 (gettext-0.18)
30997+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
30998+dnl Foundation, Inc.
30999+dnl This file is free software; the Free Software Foundation
31000+dnl gives unlimited permission to copy and/or distribute it,
31001+dnl with or without modifications, as long as this notice is preserved.
31002+dnl
31003+dnl This file can be used in projects which are not available under
31004+dnl the GNU General Public License or the GNU Library General Public
31005+dnl License but which still want to provide support for the GNU gettext
31006+dnl functionality.
31007+dnl Please note that the actual code of the GNU gettext library is covered
31008+dnl by the GNU Library General Public License, and the rest of the GNU
31009+dnl gettext package is covered by the GNU General Public License.
31010+dnl They are *not* in the public domain.
31011+
31012+dnl Authors:
31013+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
31014+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
31015+
31016+AC_PREREQ([2.50])
31017+
31018+AC_DEFUN([AM_NLS],
31019+[
31020+ AC_MSG_CHECKING([whether NLS is requested])
31021+ dnl Default is enabled NLS
31022+ AC_ARG_ENABLE([nls],
31023+ [ --disable-nls do not use Native Language Support],
31024+ USE_NLS=$enableval, USE_NLS=yes)
31025+ AC_MSG_RESULT([$USE_NLS])
31026+ AC_SUBST([USE_NLS])
31027+])
31028diff -uprN clean/lrzsz-0.12.20/m4/po.m4 lrzsz-0.12.20/m4/po.m4
31029--- clean/lrzsz-0.12.20/m4/po.m4 1970-01-01 01:00:00.000000000 +0100
31030+++ lrzsz-0.12.20/m4/po.m4 2019-11-25 18:21:18.000000000 +0000
31031@@ -0,0 +1,450 @@
31032+# po.m4 serial 30 (gettext-0.20)
31033+dnl Copyright (C) 1995-2014, 2016, 2018-2019 Free Software Foundation, Inc.
31034+dnl This file is free software; the Free Software Foundation
31035+dnl gives unlimited permission to copy and/or distribute it,
31036+dnl with or without modifications, as long as this notice is preserved.
31037+dnl
31038+dnl This file can be used in projects which are not available under
31039+dnl the GNU General Public License or the GNU Library General Public
31040+dnl License but which still want to provide support for the GNU gettext
31041+dnl functionality.
31042+dnl Please note that the actual code of the GNU gettext library is covered
31043+dnl by the GNU Library General Public License, and the rest of the GNU
31044+dnl gettext package is covered by the GNU General Public License.
31045+dnl They are *not* in the public domain.
31046+
31047+dnl Authors:
31048+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
31049+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
31050+
31051+AC_PREREQ([2.60])
31052+
31053+dnl Checks for all prerequisites of the po subdirectory.
31054+AC_DEFUN([AM_PO_SUBDIRS],
31055+[
31056+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
31057+ AC_REQUIRE([AC_PROG_INSTALL])dnl
31058+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
31059+ AC_REQUIRE([AC_PROG_SED])dnl
31060+ AC_REQUIRE([AM_NLS])dnl
31061+
31062+ dnl Release version of the gettext macros. This is used to ensure that
31063+ dnl the gettext macros and po/Makefile.in.in are in sync.
31064+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
31065+
31066+ dnl Perform the following tests also if --disable-nls has been given,
31067+ dnl because they are needed for "make dist" to work.
31068+
31069+ dnl Search for GNU msgfmt in the PATH.
31070+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
31071+ dnl The second test excludes FreeBSD msgfmt.
31072+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
31073+ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
31074+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
31075+ :)
31076+ AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
31077+
31078+ dnl Test whether it is GNU msgfmt >= 0.15.
31079+changequote(,)dnl
31080+ case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
31081+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
31082+ *) GMSGFMT_015=$GMSGFMT ;;
31083+ esac
31084+changequote([,])dnl
31085+ AC_SUBST([GMSGFMT_015])
31086+
31087+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
31088+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
31089+ dnl The second test excludes FreeBSD xgettext.
31090+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
31091+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
31092+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
31093+ :)
31094+ dnl Remove leftover from FreeBSD xgettext call.
31095+ rm -f messages.po
31096+
31097+ dnl Test whether it is GNU xgettext >= 0.15.
31098+changequote(,)dnl
31099+ case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
31100+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
31101+ *) XGETTEXT_015=$XGETTEXT ;;
31102+ esac
31103+changequote([,])dnl
31104+ AC_SUBST([XGETTEXT_015])
31105+
31106+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
31107+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
31108+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
31109+
31110+ dnl Test whether it is GNU msgmerge >= 0.20.
31111+ if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
31112+ MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
31113+ else
31114+ dnl Test whether it is GNU msgmerge >= 0.12.
31115+ if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
31116+ MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
31117+ else
31118+ dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
31119+ dnl slow. But this is not a big problem, as such old gettext versions are
31120+ dnl hardly in use any more.
31121+ MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
31122+ fi
31123+ fi
31124+ AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
31125+
31126+ dnl Support for AM_XGETTEXT_OPTION.
31127+ test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
31128+ AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
31129+
31130+ AC_CONFIG_COMMANDS([po-directories], [[
31131+ for ac_file in $CONFIG_FILES; do
31132+ # Support "outfile[:infile[:infile...]]"
31133+ case "$ac_file" in
31134+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
31135+ esac
31136+ # PO directories have a Makefile.in generated from Makefile.in.in.
31137+ case "$ac_file" in */Makefile.in)
31138+ # Adjust a relative srcdir.
31139+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
31140+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
31141+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
31142+ # In autoconf-2.13 it is called $ac_given_srcdir.
31143+ # In autoconf-2.50 it is called $srcdir.
31144+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
31145+ case "$ac_given_srcdir" in
31146+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
31147+ /*) top_srcdir="$ac_given_srcdir" ;;
31148+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
31149+ esac
31150+ # Treat a directory as a PO directory if and only if it has a
31151+ # POTFILES.in file. This allows packages to have multiple PO
31152+ # directories under different names or in different locations.
31153+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
31154+ rm -f "$ac_dir/POTFILES"
31155+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
31156+ gt_tab=`printf '\t'`
31157+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
31158+ POMAKEFILEDEPS="POTFILES.in"
31159+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
31160+ # on $ac_dir but don't depend on user-specified configuration
31161+ # parameters.
31162+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
31163+ # The LINGUAS file contains the set of available languages.
31164+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
31165+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
31166+ fi
31167+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
31168+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
31169+ else
31170+ # The set of available languages was given in configure.in.
31171+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
31172+ fi
31173+ # Compute POFILES
31174+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
31175+ # Compute UPDATEPOFILES
31176+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
31177+ # Compute DUMMYPOFILES
31178+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
31179+ # Compute GMOFILES
31180+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
31181+ case "$ac_given_srcdir" in
31182+ .) srcdirpre= ;;
31183+ *) srcdirpre='$(srcdir)/' ;;
31184+ esac
31185+ POFILES=
31186+ UPDATEPOFILES=
31187+ DUMMYPOFILES=
31188+ GMOFILES=
31189+ for lang in $ALL_LINGUAS; do
31190+ POFILES="$POFILES $srcdirpre$lang.po"
31191+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
31192+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
31193+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
31194+ done
31195+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
31196+ # environment variable.
31197+ INST_LINGUAS=
31198+ if test -n "$ALL_LINGUAS"; then
31199+ for presentlang in $ALL_LINGUAS; do
31200+ useit=no
31201+ if test "%UNSET%" != "$LINGUAS"; then
31202+ desiredlanguages="$LINGUAS"
31203+ else
31204+ desiredlanguages="$ALL_LINGUAS"
31205+ fi
31206+ for desiredlang in $desiredlanguages; do
31207+ # Use the presentlang catalog if desiredlang is
31208+ # a. equal to presentlang, or
31209+ # b. a variant of presentlang (because in this case,
31210+ # presentlang can be used as a fallback for messages
31211+ # which are not translated in the desiredlang catalog).
31212+ case "$desiredlang" in
31213+ "$presentlang"*) useit=yes;;
31214+ esac
31215+ done
31216+ if test $useit = yes; then
31217+ INST_LINGUAS="$INST_LINGUAS $presentlang"
31218+ fi
31219+ done
31220+ fi
31221+ CATALOGS=
31222+ if test -n "$INST_LINGUAS"; then
31223+ for lang in $INST_LINGUAS; do
31224+ CATALOGS="$CATALOGS $lang.gmo"
31225+ done
31226+ fi
31227+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
31228+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
31229+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
31230+ if test -f "$f"; then
31231+ case "$f" in
31232+ *.orig | *.bak | *~) ;;
31233+ *) cat "$f" >> "$ac_dir/Makefile" ;;
31234+ esac
31235+ fi
31236+ done
31237+ fi
31238+ ;;
31239+ esac
31240+ done]],
31241+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
31242+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
31243+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
31244+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
31245+ LINGUAS="${LINGUAS-%UNSET%}"
31246+ ])
31247+])
31248+
31249+dnl Postprocesses a Makefile in a directory containing PO files.
31250+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
31251+[
31252+ # When this code is run, in config.status, two variables have already been
31253+ # set:
31254+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
31255+ # - LINGUAS is the value of the environment variable LINGUAS at configure
31256+ # time.
31257+
31258+changequote(,)dnl
31259+ # Adjust a relative srcdir.
31260+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
31261+ ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
31262+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
31263+ # In autoconf-2.13 it is called $ac_given_srcdir.
31264+ # In autoconf-2.50 it is called $srcdir.
31265+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
31266+ case "$ac_given_srcdir" in
31267+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
31268+ /*) top_srcdir="$ac_given_srcdir" ;;
31269+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
31270+ esac
31271+
31272+ # Find a way to echo strings without interpreting backslash.
31273+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
31274+ gt_echo='echo'
31275+ else
31276+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
31277+ gt_echo='printf %s\n'
31278+ else
31279+ echo_func () {
31280+ cat <<EOT
31281+$*
31282+EOT
31283+ }
31284+ gt_echo='echo_func'
31285+ fi
31286+ fi
31287+
31288+ # A sed script that extracts the value of VARIABLE from a Makefile.
31289+ tab=`printf '\t'`
31290+ sed_x_variable='
31291+# Test if the hold space is empty.
31292+x
31293+s/P/P/
31294+x
31295+ta
31296+# Yes it was empty. Look if we have the expected variable definition.
31297+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
31298+ # Seen the first line of the variable definition.
31299+ s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
31300+ ba
31301+}
31302+bd
31303+:a
31304+# Here we are processing a line from the variable definition.
31305+# Remove comment, more precisely replace it with a space.
31306+s/#.*$/ /
31307+# See if the line ends in a backslash.
31308+tb
31309+:b
31310+s/\\$//
31311+# Print the line, without the trailing backslash.
31312+p
31313+tc
31314+# There was no trailing backslash. The end of the variable definition is
31315+# reached. Clear the hold space.
31316+s/^.*$//
31317+x
31318+bd
31319+:c
31320+# A trailing backslash means that the variable definition continues in the
31321+# next line. Put a nonempty string into the hold space to indicate this.
31322+s/^.*$/P/
31323+x
31324+:d
31325+'
31326+changequote([,])dnl
31327+
31328+ # Set POTFILES to the value of the Makefile variable POTFILES.
31329+ sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
31330+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
31331+ # Compute POTFILES_DEPS as
31332+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
31333+ POTFILES_DEPS=
31334+ for file in $POTFILES; do
31335+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
31336+ done
31337+ POMAKEFILEDEPS=""
31338+
31339+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
31340+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
31341+ fi
31342+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
31343+ # The LINGUAS file contains the set of available languages.
31344+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
31345+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
31346+ else
31347+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
31348+ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
31349+ ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
31350+ fi
31351+ # Compute POFILES
31352+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
31353+ # Compute UPDATEPOFILES
31354+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
31355+ # Compute DUMMYPOFILES
31356+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
31357+ # Compute GMOFILES
31358+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
31359+ # Compute PROPERTIESFILES
31360+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
31361+ # Compute CLASSFILES
31362+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
31363+ # Compute QMFILES
31364+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
31365+ # Compute MSGFILES
31366+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
31367+ # Compute RESOURCESDLLFILES
31368+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
31369+ case "$ac_given_srcdir" in
31370+ .) srcdirpre= ;;
31371+ *) srcdirpre='$(srcdir)/' ;;
31372+ esac
31373+ POFILES=
31374+ UPDATEPOFILES=
31375+ DUMMYPOFILES=
31376+ GMOFILES=
31377+ PROPERTIESFILES=
31378+ CLASSFILES=
31379+ QMFILES=
31380+ MSGFILES=
31381+ RESOURCESDLLFILES=
31382+ for lang in $ALL_LINGUAS; do
31383+ POFILES="$POFILES $srcdirpre$lang.po"
31384+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
31385+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
31386+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
31387+ PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
31388+ CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
31389+ QMFILES="$QMFILES $srcdirpre$lang.qm"
31390+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
31391+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
31392+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
31393+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
31394+ done
31395+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
31396+ # environment variable.
31397+ INST_LINGUAS=
31398+ if test -n "$ALL_LINGUAS"; then
31399+ for presentlang in $ALL_LINGUAS; do
31400+ useit=no
31401+ if test "%UNSET%" != "$LINGUAS"; then
31402+ desiredlanguages="$LINGUAS"
31403+ else
31404+ desiredlanguages="$ALL_LINGUAS"
31405+ fi
31406+ for desiredlang in $desiredlanguages; do
31407+ # Use the presentlang catalog if desiredlang is
31408+ # a. equal to presentlang, or
31409+ # b. a variant of presentlang (because in this case,
31410+ # presentlang can be used as a fallback for messages
31411+ # which are not translated in the desiredlang catalog).
31412+ case "$desiredlang" in
31413+ "$presentlang"*) useit=yes;;
31414+ esac
31415+ done
31416+ if test $useit = yes; then
31417+ INST_LINGUAS="$INST_LINGUAS $presentlang"
31418+ fi
31419+ done
31420+ fi
31421+ CATALOGS=
31422+ JAVACATALOGS=
31423+ QTCATALOGS=
31424+ TCLCATALOGS=
31425+ CSHARPCATALOGS=
31426+ if test -n "$INST_LINGUAS"; then
31427+ for lang in $INST_LINGUAS; do
31428+ CATALOGS="$CATALOGS $lang.gmo"
31429+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
31430+ QTCATALOGS="$QTCATALOGS $lang.qm"
31431+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
31432+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
31433+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
31434+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
31435+ done
31436+ fi
31437+
31438+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
31439+ tab=`printf '\t'`
31440+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
31441+ # Add dependencies that cannot be formulated as a simple suffix rule.
31442+ for lang in $ALL_LINGUAS; do
31443+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
31444+ cat >> "$ac_file.tmp" <<EOF
31445+$frobbedlang.msg: $lang.po
31446+${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
31447+${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
31448+EOF
31449+ done
31450+ fi
31451+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
31452+ # Add dependencies that cannot be formulated as a simple suffix rule.
31453+ for lang in $ALL_LINGUAS; do
31454+ frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
31455+ cat >> "$ac_file.tmp" <<EOF
31456+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
31457+${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
31458+${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
31459+EOF
31460+ done
31461+ fi
31462+ if test -n "$POMAKEFILEDEPS"; then
31463+ cat >> "$ac_file.tmp" <<EOF
31464+Makefile: $POMAKEFILEDEPS
31465+EOF
31466+ fi
31467+ mv "$ac_file.tmp" "$ac_file"
31468+])
31469+
31470+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
31471+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
31472+[
31473+ XGETTEXT_EXTRA_OPTIONS=
31474+])
31475+
31476+dnl Registers an option to be passed to xgettext in the po subdirectory.
31477+AC_DEFUN([AM_XGETTEXT_OPTION],
31478+[
31479+ AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
31480+ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
31481+])
31482diff -uprN clean/lrzsz-0.12.20/m4/progtest.m4 lrzsz-0.12.20/m4/progtest.m4
31483--- clean/lrzsz-0.12.20/m4/progtest.m4 1970-01-01 01:00:00.000000000 +0100
31484+++ lrzsz-0.12.20/m4/progtest.m4 2019-11-25 18:21:18.000000000 +0000
31485@@ -0,0 +1,91 @@
31486+# progtest.m4 serial 7 (gettext-0.18.2)
31487+dnl Copyright (C) 1996-2003, 2005, 2008-2019 Free Software Foundation, Inc.
31488+dnl This file is free software; the Free Software Foundation
31489+dnl gives unlimited permission to copy and/or distribute it,
31490+dnl with or without modifications, as long as this notice is preserved.
31491+dnl
31492+dnl This file can be used in projects which are not available under
31493+dnl the GNU General Public License or the GNU Library General Public
31494+dnl License but which still want to provide support for the GNU gettext
31495+dnl functionality.
31496+dnl Please note that the actual code of the GNU gettext library is covered
31497+dnl by the GNU Library General Public License, and the rest of the GNU
31498+dnl gettext package is covered by the GNU General Public License.
31499+dnl They are *not* in the public domain.
31500+
31501+dnl Authors:
31502+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
31503+
31504+AC_PREREQ([2.50])
31505+
31506+# Search path for a program which passes the given test.
31507+
31508+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
31509+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
31510+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
31511+[
31512+# Prepare PATH_SEPARATOR.
31513+# The user is always right.
31514+if test "${PATH_SEPARATOR+set}" != set; then
31515+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
31516+ # contains only /bin. Note that ksh looks also at the FPATH variable,
31517+ # so we have to set that as well for the test.
31518+ PATH_SEPARATOR=:
31519+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
31520+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
31521+ || PATH_SEPARATOR=';'
31522+ }
31523+fi
31524+
31525+# Find out how to test for executable files. Don't use a zero-byte file,
31526+# as systems may use methods other than mode bits to determine executability.
31527+cat >conf$$.file <<_ASEOF
31528+#! /bin/sh
31529+exit 0
31530+_ASEOF
31531+chmod +x conf$$.file
31532+if test -x conf$$.file >/dev/null 2>&1; then
31533+ ac_executable_p="test -x"
31534+else
31535+ ac_executable_p="test -f"
31536+fi
31537+rm -f conf$$.file
31538+
31539+# Extract the first word of "$2", so it can be a program name with args.
31540+set dummy $2; ac_word=[$]2
31541+AC_MSG_CHECKING([for $ac_word])
31542+AC_CACHE_VAL([ac_cv_path_$1],
31543+[case "[$]$1" in
31544+ [[\\/]]* | ?:[[\\/]]*)
31545+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
31546+ ;;
31547+ *)
31548+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
31549+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
31550+ IFS="$ac_save_IFS"
31551+ test -z "$ac_dir" && ac_dir=.
31552+ for ac_exec_ext in '' $ac_executable_extensions; do
31553+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
31554+ echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
31555+ if [$3]; then
31556+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
31557+ break 2
31558+ fi
31559+ fi
31560+ done
31561+ done
31562+ IFS="$ac_save_IFS"
31563+dnl If no 4th arg is given, leave the cache variable unset,
31564+dnl so AC_PATH_PROGS will keep looking.
31565+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
31566+])dnl
31567+ ;;
31568+esac])dnl
31569+$1="$ac_cv_path_$1"
31570+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
31571+ AC_MSG_RESULT([$][$1])
31572+else
31573+ AC_MSG_RESULT([no])
31574+fi
31575+AC_SUBST([$1])dnl
31576+])
31577diff -uprN clean/lrzsz-0.12.20/Makefile.am lrzsz-0.12.20/Makefile.am
31578--- clean/lrzsz-0.12.20/Makefile.am 1998-12-30 11:19:40.000000000 +0000
31579+++ lrzsz-0.12.20/Makefile.am 2019-11-26 11:47:29.000000000 +0000
31580@@ -1,5 +1,5 @@
31581-SUBDIRS = lib intl src po man testsuite
31582-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
31583+SUBDIRS = lib src po man testsuite
31584+EXTRA_DIST = config.rpath m4/ChangeLog check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
31585 README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \
31586 beos-runpiped.c fastcheck.beos
31587 noinst_SCRIPTS=systype
31588@@ -7,7 +7,6 @@ PR=@PACKAGE@-@VERSION@
31589 CLEAN_FILES=fastcheck.done
31590
31591 dist-hook:
31592- mkdir $(distdir)/debian
31593 cp -fa $(srcdir)/debian/changelog $(distdir)/debian/
31594 cp -fa $(srcdir)/debian/control $(distdir)/debian/
31595 cp -fa $(srcdir)/debian/copyright $(distdir)/debian/
31596@@ -83,3 +82,5 @@ cvs-dist:
31597 rpm: $(PR).tar.gz Specfile
31598 $(srcdir)/buildrpm $(srcdir)
31599
31600+
31601+ACLOCAL_AMFLAGS = -I m4
31602diff -uprN clean/lrzsz-0.12.20/Makefile.in lrzsz-0.12.20/Makefile.in
31603--- clean/lrzsz-0.12.20/Makefile.in 1998-12-30 16:31:40.000000000 +0000
31604+++ lrzsz-0.12.20/Makefile.in 2019-11-26 11:47:49.000000000 +0000
31605@@ -1,6 +1,8 @@
31606-# Makefile.in generated automatically by automake 1.3 from Makefile.am
31607+# Makefile.in generated by automake 1.16.1 from Makefile.am.
31608+# @configure_input@
31609+
31610+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
31611
31612-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
31613 # This Makefile.in is free software; the Free Software Foundation
31614 # gives unlimited permission to copy and/or distribute it,
31615 # with or without modifications, as long as this notice is preserved.
31616@@ -10,345 +12,817 @@
31617 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
31618 # PARTICULAR PURPOSE.
31619
31620+@SET_MAKE@
31621
31622-SHELL = /bin/sh
31623-
31624-srcdir = @srcdir@
31625-top_srcdir = @top_srcdir@
31626 VPATH = @srcdir@
31627-prefix = @prefix@
31628-exec_prefix = @exec_prefix@
31629-
31630-bindir = @bindir@
31631-sbindir = @sbindir@
31632-libexecdir = @libexecdir@
31633-datadir = @datadir@
31634-sysconfdir = @sysconfdir@
31635-sharedstatedir = @sharedstatedir@
31636-localstatedir = @localstatedir@
31637-libdir = @libdir@
31638-infodir = @infodir@
31639-mandir = @mandir@
31640-includedir = @includedir@
31641-oldincludedir = /usr/include
31642-
31643-DISTDIR =
31644-
31645+am__is_gnu_make = { \
31646+ if test -z '$(MAKELEVEL)'; then \
31647+ false; \
31648+ elif test -n '$(MAKE_HOST)'; then \
31649+ true; \
31650+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
31651+ true; \
31652+ else \
31653+ false; \
31654+ fi; \
31655+}
31656+am__make_running_with_option = \
31657+ case $${target_option-} in \
31658+ ?) ;; \
31659+ *) echo "am__make_running_with_option: internal error: invalid" \
31660+ "target option '$${target_option-}' specified" >&2; \
31661+ exit 1;; \
31662+ esac; \
31663+ has_opt=no; \
31664+ sane_makeflags=$$MAKEFLAGS; \
31665+ if $(am__is_gnu_make); then \
31666+ sane_makeflags=$$MFLAGS; \
31667+ else \
31668+ case $$MAKEFLAGS in \
31669+ *\\[\ \ ]*) \
31670+ bs=\\; \
31671+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
31672+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
31673+ esac; \
31674+ fi; \
31675+ skip_next=no; \
31676+ strip_trailopt () \
31677+ { \
31678+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
31679+ }; \
31680+ for flg in $$sane_makeflags; do \
31681+ test $$skip_next = yes && { skip_next=no; continue; }; \
31682+ case $$flg in \
31683+ *=*|--*) continue;; \
31684+ -*I) strip_trailopt 'I'; skip_next=yes;; \
31685+ -*I?*) strip_trailopt 'I';; \
31686+ -*O) strip_trailopt 'O'; skip_next=yes;; \
31687+ -*O?*) strip_trailopt 'O';; \
31688+ -*l) strip_trailopt 'l'; skip_next=yes;; \
31689+ -*l?*) strip_trailopt 'l';; \
31690+ -[dEDm]) skip_next=yes;; \
31691+ -[JT]) skip_next=yes;; \
31692+ esac; \
31693+ case $$flg in \
31694+ *$$target_option*) has_opt=yes; break;; \
31695+ esac; \
31696+ done; \
31697+ test $$has_opt = yes
31698+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
31699+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
31700 pkgdatadir = $(datadir)/@PACKAGE@
31701-pkglibdir = $(libdir)/@PACKAGE@
31702 pkgincludedir = $(includedir)/@PACKAGE@
31703-
31704-top_builddir = .
31705-
31706-ACLOCAL = @ACLOCAL@
31707-AUTOCONF = @AUTOCONF@
31708-AUTOMAKE = @AUTOMAKE@
31709-AUTOHEADER = @AUTOHEADER@
31710-
31711-INSTALL = @INSTALL@
31712-INSTALL_PROGRAM = @INSTALL_PROGRAM@
31713-INSTALL_DATA = @INSTALL_DATA@
31714-INSTALL_SCRIPT = @INSTALL_SCRIPT@
31715-transform = @program_transform_name@
31716-
31717+pkglibdir = $(libdir)/@PACKAGE@
31718+pkglibexecdir = $(libexecdir)/@PACKAGE@
31719+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
31720+install_sh_DATA = $(install_sh) -c -m 644
31721+install_sh_PROGRAM = $(install_sh) -c
31722+install_sh_SCRIPT = $(install_sh) -c
31723+INSTALL_HEADER = $(INSTALL_DATA)
31724+transform = $(program_transform_name)
31725 NORMAL_INSTALL = :
31726 PRE_INSTALL = :
31727 POST_INSTALL = :
31728 NORMAL_UNINSTALL = :
31729 PRE_UNINSTALL = :
31730 POST_UNINSTALL = :
31731-CATALOGS = @CATALOGS@
31732-CATOBJEXT = @CATOBJEXT@
31733+build_triplet = @build@
31734+host_triplet = @host@
31735+subdir = .
31736+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
31737+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
31738+ $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
31739+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
31740+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
31741+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
31742+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
31743+ $(top_srcdir)/configure.in
31744+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
31745+ $(ACLOCAL_M4)
31746+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
31747+ $(am__configure_deps) $(am__DIST_COMMON)
31748+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
31749+ configure.lineno config.status.lineno
31750+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
31751+CONFIG_HEADER = config.h
31752+CONFIG_CLEAN_FILES = debian/rules Specfile systype
31753+CONFIG_CLEAN_VPATH_FILES =
31754+SCRIPTS = $(noinst_SCRIPTS)
31755+AM_V_P = $(am__v_P_@AM_V@)
31756+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
31757+am__v_P_0 = false
31758+am__v_P_1 = :
31759+AM_V_GEN = $(am__v_GEN_@AM_V@)
31760+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
31761+am__v_GEN_0 = @echo " GEN " $@;
31762+am__v_GEN_1 =
31763+AM_V_at = $(am__v_at_@AM_V@)
31764+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
31765+am__v_at_0 = @
31766+am__v_at_1 =
31767+SOURCES =
31768+DIST_SOURCES =
31769+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
31770+ ctags-recursive dvi-recursive html-recursive info-recursive \
31771+ install-data-recursive install-dvi-recursive \
31772+ install-exec-recursive install-html-recursive \
31773+ install-info-recursive install-pdf-recursive \
31774+ install-ps-recursive install-recursive installcheck-recursive \
31775+ installdirs-recursive pdf-recursive ps-recursive \
31776+ tags-recursive uninstall-recursive
31777+am__can_run_installinfo = \
31778+ case $$AM_UPDATE_INFO_DIR in \
31779+ n|no|NO) false;; \
31780+ *) (install-info --version) >/dev/null 2>&1;; \
31781+ esac
31782+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
31783+ distclean-recursive maintainer-clean-recursive
31784+am__recursive_targets = \
31785+ $(RECURSIVE_TARGETS) \
31786+ $(RECURSIVE_CLEAN_TARGETS) \
31787+ $(am__extra_recursive_targets)
31788+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
31789+ cscope distdir distdir-am dist dist-all distcheck
31790+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
31791+ $(LISP)config.h.in
31792+# Read a list of newline-separated strings from the standard input,
31793+# and print each of them once, without duplicates. Input order is
31794+# *not* preserved.
31795+am__uniquify_input = $(AWK) '\
31796+ BEGIN { nonempty = 0; } \
31797+ { items[$$0] = 1; nonempty = 1; } \
31798+ END { if (nonempty) { for (i in items) print i; }; } \
31799+'
31800+# Make sure the list of sources is unique. This is necessary because,
31801+# e.g., the same source file might be shared among _SOURCES variables
31802+# for different programs/libraries.
31803+am__define_uniq_tagged_files = \
31804+ list='$(am__tagged_files)'; \
31805+ unique=`for i in $$list; do \
31806+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
31807+ done | $(am__uniquify_input)`
31808+ETAGS = etags
31809+CTAGS = ctags
31810+CSCOPE = cscope
31811+DIST_SUBDIRS = $(SUBDIRS)
31812+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Specfile.in \
31813+ $(srcdir)/config.h.in $(srcdir)/systype.in \
31814+ $(top_srcdir)/debian/rules.in ABOUT-NLS AUTHORS COPYING \
31815+ ChangeLog INSTALL NEWS README THANKS TODO acconfig.h compile \
31816+ config.guess config.rpath config.sub depcomp install-sh \
31817+ missing mkinstalldirs
31818+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
31819+distdir = $(PACKAGE)-$(VERSION)
31820+top_distdir = $(distdir)
31821+am__remove_distdir = \
31822+ if test -d "$(distdir)"; then \
31823+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
31824+ && rm -rf "$(distdir)" \
31825+ || { sleep 5 && rm -rf "$(distdir)"; }; \
31826+ else :; fi
31827+am__post_remove_distdir = $(am__remove_distdir)
31828+am__relativize = \
31829+ dir0=`pwd`; \
31830+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
31831+ sed_rest='s,^[^/]*/*,,'; \
31832+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
31833+ sed_butlast='s,/*[^/]*$$,,'; \
31834+ while test -n "$$dir1"; do \
31835+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
31836+ if test "$$first" != "."; then \
31837+ if test "$$first" = ".."; then \
31838+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
31839+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
31840+ else \
31841+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
31842+ if test "$$first2" = "$$first"; then \
31843+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
31844+ else \
31845+ dir2="../$$dir2"; \
31846+ fi; \
31847+ dir0="$$dir0"/"$$first"; \
31848+ fi; \
31849+ fi; \
31850+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
31851+ done; \
31852+ reldir="$$dir2"
31853+DIST_ARCHIVES = $(distdir).tar.gz
31854+GZIP_ENV = --best
31855+DIST_TARGETS = dist-gzip
31856+distuninstallcheck_listfiles = find . -type f -print
31857+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
31858+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
31859+distcleancheck_listfiles = find . -type f -print
31860+ACLOCAL = @ACLOCAL@
31861+ALLOCA = @ALLOCA@
31862+AMTAR = @AMTAR@
31863+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
31864+AUTOCONF = @AUTOCONF@
31865+AUTOHEADER = @AUTOHEADER@
31866+AUTOMAKE = @AUTOMAKE@
31867+AWK = @AWK@
31868 CC = @CC@
31869+CCDEPMODE = @CCDEPMODE@
31870 CFLAGS = @CFLAGS@
31871 CPP = @CPP@
31872-DATADIRNAME = @DATADIRNAME@
31873+CPPFLAGS = @CPPFLAGS@
31874+CYGPATH_W = @CYGPATH_W@
31875+DEFS = @DEFS@
31876+DEPDIR = @DEPDIR@
31877+ECHO_C = @ECHO_C@
31878+ECHO_N = @ECHO_N@
31879+ECHO_T = @ECHO_T@
31880+EGREP = @EGREP@
31881 ENABLE_TIMESYNC = @ENABLE_TIMESYNC@
31882-GENCAT = @GENCAT@
31883-GMOFILES = @GMOFILES@
31884+EXEEXT = @EXEEXT@
31885+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
31886 GMSGFMT = @GMSGFMT@
31887-GT_NO = @GT_NO@
31888-GT_YES = @GT_YES@
31889-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
31890-INSTOBJEXT = @INSTOBJEXT@
31891-INTLDEPS = @INTLDEPS@
31892+GMSGFMT_015 = @GMSGFMT_015@
31893+GREP = @GREP@
31894+INSTALL = @INSTALL@
31895+INSTALL_DATA = @INSTALL_DATA@
31896+INSTALL_PROGRAM = @INSTALL_PROGRAM@
31897+INSTALL_SCRIPT = @INSTALL_SCRIPT@
31898+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
31899 INTLLIBS = @INTLLIBS@
31900-INTLOBJS = @INTLOBJS@
31901+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
31902 LDFLAGS = @LDFLAGS@
31903+LIBICONV = @LIBICONV@
31904+LIBINTL = @LIBINTL@
31905 LIBOBJS = @LIBOBJS@
31906 LIBS = @LIBS@
31907+LTLIBICONV = @LTLIBICONV@
31908+LTLIBINTL = @LTLIBINTL@
31909+LTLIBOBJS = @LTLIBOBJS@
31910 MAKEINFO = @MAKEINFO@
31911-MKINSTALLDIRS = @MKINSTALLDIRS@
31912+MKDIR_P = @MKDIR_P@
31913 MSGFMT = @MSGFMT@
31914+MSGMERGE = @MSGMERGE@
31915+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
31916+OBJEXT = @OBJEXT@
31917 PACKAGE = @PACKAGE@
31918+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
31919+PACKAGE_NAME = @PACKAGE_NAME@
31920+PACKAGE_STRING = @PACKAGE_STRING@
31921+PACKAGE_TARNAME = @PACKAGE_TARNAME@
31922+PACKAGE_URL = @PACKAGE_URL@
31923 PACKAGE_VERSION = @PACKAGE_VERSION@
31924-POFILES = @POFILES@
31925+PATH_SEPARATOR = @PATH_SEPARATOR@
31926 POSUB = @POSUB@
31927 RANLIB = @RANLIB@
31928-U = @U@
31929-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
31930+SED = @SED@
31931+SET_MAKE = @SET_MAKE@
31932+SHELL = @SHELL@
31933+STRIP = @STRIP@
31934 USE_NLS = @USE_NLS@
31935 VERSION = @VERSION@
31936-l = @l@
31937-
31938-SUBDIRS = lib intl src po man testsuite
31939-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
31940+XGETTEXT = @XGETTEXT@
31941+XGETTEXT_015 = @XGETTEXT_015@
31942+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
31943+abs_builddir = @abs_builddir@
31944+abs_srcdir = @abs_srcdir@
31945+abs_top_builddir = @abs_top_builddir@
31946+abs_top_srcdir = @abs_top_srcdir@
31947+ac_ct_CC = @ac_ct_CC@
31948+am__include = @am__include@
31949+am__leading_dot = @am__leading_dot@
31950+am__quote = @am__quote@
31951+am__tar = @am__tar@
31952+am__untar = @am__untar@
31953+bindir = @bindir@
31954+build = @build@
31955+build_alias = @build_alias@
31956+build_cpu = @build_cpu@
31957+build_os = @build_os@
31958+build_vendor = @build_vendor@
31959+builddir = @builddir@
31960+datadir = @datadir@
31961+datarootdir = @datarootdir@
31962+docdir = @docdir@
31963+dvidir = @dvidir@
31964+exec_prefix = @exec_prefix@
31965+host = @host@
31966+host_alias = @host_alias@
31967+host_cpu = @host_cpu@
31968+host_os = @host_os@
31969+host_vendor = @host_vendor@
31970+htmldir = @htmldir@
31971+includedir = @includedir@
31972+infodir = @infodir@
31973+install_sh = @install_sh@
31974+libdir = @libdir@
31975+libexecdir = @libexecdir@
31976+localedir = @localedir@
31977+localstatedir = @localstatedir@
31978+mandir = @mandir@
31979+mkdir_p = @mkdir_p@
31980+oldincludedir = @oldincludedir@
31981+pdfdir = @pdfdir@
31982+prefix = @prefix@
31983+program_transform_name = @program_transform_name@
31984+psdir = @psdir@
31985+sbindir = @sbindir@
31986+sharedstatedir = @sharedstatedir@
31987+srcdir = @srcdir@
31988+sysconfdir = @sysconfdir@
31989+target_alias = @target_alias@
31990+top_build_prefix = @top_build_prefix@
31991+top_builddir = @top_builddir@
31992+top_srcdir = @top_srcdir@
31993+SUBDIRS = lib src po man testsuite
31994+EXTRA_DIST = config.rpath m4/ChangeLog check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
31995 README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \
31996 beos-runpiped.c fastcheck.beos
31997-noinst_SCRIPTS=systype
31998-PR=@PACKAGE@-@VERSION@
31999-CLEAN_FILES=fastcheck.done
32000-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
32001-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
32002-CONFIG_HEADER = config.h
32003-CONFIG_CLEAN_FILES = Specfile systype
32004-SCRIPTS = $(noinst_SCRIPTS)
32005-
32006-DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
32007-Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \
32008-acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \
32009-configure.in install-sh missing mkinstalldirs stamp-h.in systype.in
32010
32011-
32012-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
32013-
32014-TAR = tar
32015-GZIP = --best
32016-all: all-recursive-am all-am
32017+noinst_SCRIPTS = systype
32018+PR = @PACKAGE@-@VERSION@
32019+CLEAN_FILES = fastcheck.done
32020+ACLOCAL_AMFLAGS = -I m4
32021+all: config.h
32022+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
32023
32024 .SUFFIXES:
32025-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
32026- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
32027-
32028-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
32029- cd $(top_builddir) \
32030- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
32031-
32032-$(ACLOCAL_M4): configure.in acinclude.m4
32033- cd $(srcdir) && $(ACLOCAL)
32034-
32035-config.status: $(srcdir)/configure
32036- $(SHELL) ./config.status --recheck
32037-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
32038- cd $(srcdir) && $(AUTOCONF)
32039-
32040-config.h: stamp-h
32041+am--refresh: Makefile
32042 @:
32043-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
32044- cd $(top_builddir) \
32045- && CONFIG_FILES= CONFIG_HEADERS=config.h \
32046- $(SHELL) ./config.status
32047- @echo timestamp > stamp-h
32048-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
32049-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
32050- cd $(top_srcdir) && $(AUTOHEADER)
32051- @echo timestamp > $(srcdir)/stamp-h.in
32052+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
32053+ @for dep in $?; do \
32054+ case '$(am__configure_deps)' in \
32055+ *$$dep*) \
32056+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
32057+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
32058+ && exit 0; \
32059+ exit 1;; \
32060+ esac; \
32061+ done; \
32062+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
32063+ $(am__cd) $(top_srcdir) && \
32064+ $(AUTOMAKE) --gnu Makefile
32065+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
32066+ @case '$?' in \
32067+ *config.status*) \
32068+ echo ' $(SHELL) ./config.status'; \
32069+ $(SHELL) ./config.status;; \
32070+ *) \
32071+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
32072+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
32073+ esac;
32074
32075-mostlyclean-hdr:
32076+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
32077+ $(SHELL) ./config.status --recheck
32078
32079-clean-hdr:
32080+$(top_srcdir)/configure: $(am__configure_deps)
32081+ $(am__cd) $(srcdir) && $(AUTOCONF)
32082+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
32083+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
32084+$(am__aclocal_m4_deps):
32085+
32086+config.h: stamp-h1
32087+ @test -f $@ || rm -f stamp-h1
32088+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
32089+
32090+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
32091+ @rm -f stamp-h1
32092+ cd $(top_builddir) && $(SHELL) ./config.status config.h
32093+$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h
32094+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
32095+ rm -f stamp-h1
32096+ touch $@
32097
32098 distclean-hdr:
32099- -rm -f config.h
32100-
32101-maintainer-clean-hdr:
32102-Specfile: $(top_builddir)/config.status Specfile.in
32103- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
32104-systype: $(top_builddir)/config.status systype.in
32105- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
32106+ -rm -f config.h stamp-h1
32107+debian/rules: $(top_builddir)/config.status $(top_srcdir)/debian/rules.in
32108+ cd $(top_builddir) && $(SHELL) ./config.status $@
32109+Specfile: $(top_builddir)/config.status $(srcdir)/Specfile.in
32110+ cd $(top_builddir) && $(SHELL) ./config.status $@
32111+systype: $(top_builddir)/config.status $(srcdir)/systype.in
32112+ cd $(top_builddir) && $(SHELL) ./config.status $@
32113
32114 # This directory's subdirectories are mostly independent; you can cd
32115-# into them and run `make' without going through this Makefile.
32116-# To change the values of `make' variables: instead of editing Makefiles,
32117-# (1) if the variable is set in `config.status', edit `config.status'
32118-# (which will cause the Makefiles to be regenerated when you run `make');
32119-# (2) otherwise, pass the desired values on the `make' command line.
32120-
32121-@SET_MAKE@
32122-
32123-all-recursive install-data-recursive install-exec-recursive \
32124-installdirs-recursive install-recursive uninstall-recursive \
32125-check-recursive installcheck-recursive info-recursive dvi-recursive:
32126- @set fnord $(MAKEFLAGS); amf=$$2; \
32127- list='$(SUBDIRS)'; for subdir in $$list; do \
32128- target=`echo $@ | sed s/-recursive//`; \
32129+# into them and run 'make' without going through this Makefile.
32130+# To change the values of 'make' variables: instead of editing Makefiles,
32131+# (1) if the variable is set in 'config.status', edit 'config.status'
32132+# (which will cause the Makefiles to be regenerated when you run 'make');
32133+# (2) otherwise, pass the desired values on the 'make' command line.
32134+$(am__recursive_targets):
32135+ @fail=; \
32136+ if $(am__make_keepgoing); then \
32137+ failcom='fail=yes'; \
32138+ else \
32139+ failcom='exit 1'; \
32140+ fi; \
32141+ dot_seen=no; \
32142+ target=`echo $@ | sed s/-recursive//`; \
32143+ case "$@" in \
32144+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
32145+ *) list='$(SUBDIRS)' ;; \
32146+ esac; \
32147+ for subdir in $$list; do \
32148 echo "Making $$target in $$subdir"; \
32149- (cd $$subdir && $(MAKE) $$target) \
32150- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
32151- done && test -z "$$fail"
32152-
32153-mostlyclean-recursive clean-recursive distclean-recursive \
32154-maintainer-clean-recursive:
32155- @set fnord $(MAKEFLAGS); amf=$$2; \
32156- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
32157- rev="$$subdir $$rev"; \
32158+ if test "$$subdir" = "."; then \
32159+ dot_seen=yes; \
32160+ local_target="$$target-am"; \
32161+ else \
32162+ local_target="$$target"; \
32163+ fi; \
32164+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
32165+ || eval $$failcom; \
32166 done; \
32167- for subdir in $$rev; do \
32168- target=`echo $@ | sed s/-recursive//`; \
32169- echo "Making $$target in $$subdir"; \
32170- (cd $$subdir && $(MAKE) $$target) \
32171- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
32172- done && test -z "$$fail"
32173-tags-recursive:
32174- list='$(SUBDIRS)'; for subdir in $$list; do \
32175- (cd $$subdir && $(MAKE) tags); \
32176- done
32177-
32178-tags: TAGS
32179+ if test "$$dot_seen" = "no"; then \
32180+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
32181+ fi; test -z "$$fail"
32182+
32183+ID: $(am__tagged_files)
32184+ $(am__define_uniq_tagged_files); mkid -fID $$unique
32185+tags: tags-recursive
32186+TAGS: tags
32187
32188-ID: $(HEADERS) $(SOURCES) $(LISP)
32189- here=`pwd` && cd $(srcdir) \
32190- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
32191-
32192-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
32193- tags=; \
32194+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
32195+ set x; \
32196 here=`pwd`; \
32197+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
32198+ include_option=--etags-include; \
32199+ empty_fix=.; \
32200+ else \
32201+ include_option=--include; \
32202+ empty_fix=; \
32203+ fi; \
32204 list='$(SUBDIRS)'; for subdir in $$list; do \
32205- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
32206+ if test "$$subdir" = .; then :; else \
32207+ test ! -f $$subdir/TAGS || \
32208+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
32209+ fi; \
32210 done; \
32211- list='$(SOURCES) $(HEADERS)'; \
32212- unique=`for i in $$list; do echo $$i; done | \
32213- awk ' { files[$$0] = 1; } \
32214- END { for (i in files) print i; }'`; \
32215- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
32216- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
32217-
32218-mostlyclean-tags:
32219-
32220-clean-tags:
32221+ $(am__define_uniq_tagged_files); \
32222+ shift; \
32223+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
32224+ test -n "$$unique" || unique=$$empty_fix; \
32225+ if test $$# -gt 0; then \
32226+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
32227+ "$$@" $$unique; \
32228+ else \
32229+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
32230+ $$unique; \
32231+ fi; \
32232+ fi
32233+ctags: ctags-recursive
32234+
32235+CTAGS: ctags
32236+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
32237+ $(am__define_uniq_tagged_files); \
32238+ test -z "$(CTAGS_ARGS)$$unique" \
32239+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
32240+ $$unique
32241+
32242+GTAGS:
32243+ here=`$(am__cd) $(top_builddir) && pwd` \
32244+ && $(am__cd) $(top_srcdir) \
32245+ && gtags -i $(GTAGS_ARGS) "$$here"
32246+cscope: cscope.files
32247+ test ! -s cscope.files \
32248+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
32249+clean-cscope:
32250+ -rm -f cscope.files
32251+cscope.files: clean-cscope cscopelist
32252+cscopelist: cscopelist-recursive
32253+
32254+cscopelist-am: $(am__tagged_files)
32255+ list='$(am__tagged_files)'; \
32256+ case "$(srcdir)" in \
32257+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
32258+ *) sdir=$(subdir)/$(srcdir) ;; \
32259+ esac; \
32260+ for i in $$list; do \
32261+ if test -f "$$i"; then \
32262+ echo "$(subdir)/$$i"; \
32263+ else \
32264+ echo "$$sdir/$$i"; \
32265+ fi; \
32266+ done >> $(top_builddir)/cscope.files
32267
32268 distclean-tags:
32269- -rm -f TAGS ID
32270+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
32271+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
32272
32273-maintainer-clean-tags:
32274+distdir: $(BUILT_SOURCES)
32275+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
32276
32277-distdir = $(PACKAGE)-$(VERSION)
32278-top_distdir = $(distdir)
32279+distdir-am: $(DISTFILES)
32280+ $(am__remove_distdir)
32281+ test -d "$(distdir)" || mkdir "$(distdir)"
32282+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32283+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
32284+ list='$(DISTFILES)'; \
32285+ dist_files=`for file in $$list; do echo $$file; done | \
32286+ sed -e "s|^$$srcdirstrip/||;t" \
32287+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
32288+ case $$dist_files in \
32289+ */*) $(MKDIR_P) `echo "$$dist_files" | \
32290+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
32291+ sort -u` ;; \
32292+ esac; \
32293+ for file in $$dist_files; do \
32294+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
32295+ if test -d $$d/$$file; then \
32296+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
32297+ if test -d "$(distdir)/$$file"; then \
32298+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
32299+ fi; \
32300+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
32301+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
32302+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
32303+ fi; \
32304+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
32305+ else \
32306+ test -f "$(distdir)/$$file" \
32307+ || cp -p $$d/$$file "$(distdir)/$$file" \
32308+ || exit 1; \
32309+ fi; \
32310+ done
32311+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
32312+ if test "$$subdir" = .; then :; else \
32313+ $(am__make_dryrun) \
32314+ || test -d "$(distdir)/$$subdir" \
32315+ || $(MKDIR_P) "$(distdir)/$$subdir" \
32316+ || exit 1; \
32317+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
32318+ $(am__relativize); \
32319+ new_distdir=$$reldir; \
32320+ dir1=$$subdir; dir2="$(top_distdir)"; \
32321+ $(am__relativize); \
32322+ new_top_distdir=$$reldir; \
32323+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
32324+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
32325+ ($(am__cd) $$subdir && \
32326+ $(MAKE) $(AM_MAKEFLAGS) \
32327+ top_distdir="$$new_top_distdir" \
32328+ distdir="$$new_distdir" \
32329+ am__remove_distdir=: \
32330+ am__skip_length_check=: \
32331+ am__skip_mode_fix=: \
32332+ distdir) \
32333+ || exit 1; \
32334+ fi; \
32335+ done
32336+ $(MAKE) $(AM_MAKEFLAGS) \
32337+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
32338+ dist-hook
32339+ -test -n "$(am__skip_mode_fix)" \
32340+ || find "$(distdir)" -type d ! -perm -755 \
32341+ -exec chmod u+rwx,go+rx {} \; -o \
32342+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
32343+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
32344+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
32345+ || chmod -R a+r "$(distdir)"
32346+dist-gzip: distdir
32347+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
32348+ $(am__post_remove_distdir)
32349+
32350+dist-bzip2: distdir
32351+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
32352+ $(am__post_remove_distdir)
32353+
32354+dist-lzip: distdir
32355+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
32356+ $(am__post_remove_distdir)
32357+
32358+dist-xz: distdir
32359+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
32360+ $(am__post_remove_distdir)
32361+
32362+dist-tarZ: distdir
32363+ @echo WARNING: "Support for distribution archives compressed with" \
32364+ "legacy program 'compress' is deprecated." >&2
32365+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
32366+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
32367+ $(am__post_remove_distdir)
32368+
32369+dist-shar: distdir
32370+ @echo WARNING: "Support for shar distribution archives is" \
32371+ "deprecated." >&2
32372+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
32373+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
32374+ $(am__post_remove_distdir)
32375+
32376+dist-zip: distdir
32377+ -rm -f $(distdir).zip
32378+ zip -rq $(distdir).zip $(distdir)
32379+ $(am__post_remove_distdir)
32380+
32381+dist dist-all:
32382+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
32383+ $(am__post_remove_distdir)
32384
32385 # This target untars the dist file and tries a VPATH configuration. Then
32386 # it guarantees that the distribution is self-contained by making another
32387 # tarfile.
32388 distcheck: dist
32389- -rm -rf $(distdir)
32390- GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
32391- mkdir $(distdir)/=build
32392- mkdir $(distdir)/=inst
32393- dc_install_base=`cd $(distdir)/=inst && pwd`; \
32394- cd $(distdir)/=build \
32395- && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
32396- && $(MAKE) \
32397- && $(MAKE) dvi \
32398- && $(MAKE) check \
32399- && $(MAKE) install \
32400- && $(MAKE) installcheck \
32401- && $(MAKE) dist
32402- -rm -rf $(distdir)
32403- @echo "========================"; \
32404- echo "$(distdir).tar.gz is ready for distribution"; \
32405- echo "========================"
32406-dist: distdir
32407- -chmod -R a+r $(distdir)
32408- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
32409- -rm -rf $(distdir)
32410-dist-all: distdir
32411- -chmod -R a+r $(distdir)
32412- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
32413- -rm -rf $(distdir)
32414-distdir: $(DISTFILES)
32415- -rm -rf $(distdir)
32416- mkdir $(distdir)
32417- -chmod 777 $(distdir)
32418- @for file in $(DISTFILES); do \
32419- d=$(srcdir); \
32420- test -f $(distdir)/$$file \
32421- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
32422- || cp -p $$d/$$file $(distdir)/$$file; \
32423- done
32424- for subdir in $(SUBDIRS); do \
32425- test -d $(distdir)/$$subdir \
32426- || mkdir $(distdir)/$$subdir \
32427- || exit 1; \
32428- chmod 777 $(distdir)/$$subdir; \
32429- (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
32430- || exit 1; \
32431- done
32432- $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
32433-info: info-recursive
32434-dvi: dvi-recursive
32435-check: all-am
32436- $(MAKE) check-recursive
32437-installcheck: installcheck-recursive
32438-all-recursive-am: config.h
32439- $(MAKE) all-recursive
32440-
32441+ case '$(DIST_ARCHIVES)' in \
32442+ *.tar.gz*) \
32443+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
32444+ *.tar.bz2*) \
32445+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
32446+ *.tar.lz*) \
32447+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
32448+ *.tar.xz*) \
32449+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
32450+ *.tar.Z*) \
32451+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
32452+ *.shar.gz*) \
32453+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
32454+ *.zip*) \
32455+ unzip $(distdir).zip ;;\
32456+ esac
32457+ chmod -R a-w $(distdir)
32458+ chmod u+w $(distdir)
32459+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
32460+ chmod a-w $(distdir)
32461+ test -d $(distdir)/_build || exit 0; \
32462+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
32463+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
32464+ && am__cwd=`pwd` \
32465+ && $(am__cd) $(distdir)/_build/sub \
32466+ && ../../configure \
32467+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
32468+ $(DISTCHECK_CONFIGURE_FLAGS) \
32469+ --srcdir=../.. --prefix="$$dc_install_base" \
32470+ && $(MAKE) $(AM_MAKEFLAGS) \
32471+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
32472+ && $(MAKE) $(AM_MAKEFLAGS) check \
32473+ && $(MAKE) $(AM_MAKEFLAGS) install \
32474+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
32475+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
32476+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
32477+ distuninstallcheck \
32478+ && chmod -R a-w "$$dc_install_base" \
32479+ && ({ \
32480+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
32481+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
32482+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
32483+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
32484+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
32485+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
32486+ && rm -rf "$$dc_destdir" \
32487+ && $(MAKE) $(AM_MAKEFLAGS) dist \
32488+ && rm -rf $(DIST_ARCHIVES) \
32489+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
32490+ && cd "$$am__cwd" \
32491+ || exit 1
32492+ $(am__post_remove_distdir)
32493+ @(echo "$(distdir) archives ready for distribution: "; \
32494+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
32495+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
32496+distuninstallcheck:
32497+ @test -n '$(distuninstallcheck_dir)' || { \
32498+ echo 'ERROR: trying to run $@ with an empty' \
32499+ '$$(distuninstallcheck_dir)' >&2; \
32500+ exit 1; \
32501+ }; \
32502+ $(am__cd) '$(distuninstallcheck_dir)' || { \
32503+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
32504+ exit 1; \
32505+ }; \
32506+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
32507+ || { echo "ERROR: files left after uninstall:" ; \
32508+ if test -n "$(DESTDIR)"; then \
32509+ echo " (check DESTDIR support)"; \
32510+ fi ; \
32511+ $(distuninstallcheck_listfiles) ; \
32512+ exit 1; } >&2
32513+distcleancheck: distclean
32514+ @if test '$(srcdir)' = . ; then \
32515+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
32516+ exit 1 ; \
32517+ fi
32518+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
32519+ || { echo "ERROR: files left in build directory after distclean:" ; \
32520+ $(distcleancheck_listfiles) ; \
32521+ exit 1; } >&2
32522+check-am: all-am
32523+check: check-recursive
32524 all-am: Makefile $(SCRIPTS) config.h
32525-
32526+installdirs: installdirs-recursive
32527+installdirs-am:
32528+install: install-recursive
32529 install-exec: install-exec-recursive
32530- @$(NORMAL_INSTALL)
32531-
32532 install-data: install-data-recursive
32533- @$(NORMAL_INSTALL)
32534-
32535-install: install-recursive
32536- @:
32537-
32538 uninstall: uninstall-recursive
32539
32540-install-strip:
32541- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
32542-installdirs: installdirs-recursive
32543-
32544+install-am: all-am
32545+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
32546
32547+installcheck: installcheck-recursive
32548+install-strip:
32549+ if test -z '$(STRIP)'; then \
32550+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
32551+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
32552+ install; \
32553+ else \
32554+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
32555+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
32556+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
32557+ fi
32558 mostlyclean-generic:
32559- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
32560
32561 clean-generic:
32562- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
32563
32564 distclean-generic:
32565- -rm -f Makefile $(DISTCLEANFILES)
32566- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
32567 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
32568+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
32569
32570 maintainer-clean-generic:
32571- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
32572- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
32573-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
32574+ @echo "This command is intended for maintainers to use"
32575+ @echo "it deletes files that may require special tools to rebuild."
32576+clean: clean-recursive
32577
32578-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
32579+clean-am: clean-generic mostlyclean-am
32580
32581-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
32582+distclean: distclean-recursive
32583+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
32584+ -rm -f Makefile
32585+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
32586
32587-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
32588- maintainer-clean-generic distclean-am
32589+dvi: dvi-recursive
32590
32591-mostlyclean: mostlyclean-recursive mostlyclean-am
32592+dvi-am:
32593
32594-clean: clean-recursive clean-am
32595+html: html-recursive
32596
32597-distclean: distclean-recursive distclean-am
32598- -rm -f config.status
32599+html-am:
32600
32601-maintainer-clean: maintainer-clean-recursive maintainer-clean-am
32602- @echo "This command is intended for maintainers to use;"
32603- @echo "it deletes files that may require special tools to rebuild."
32604- -rm -f config.status
32605+info: info-recursive
32606+
32607+info-am:
32608+
32609+install-data-am:
32610+
32611+install-dvi: install-dvi-recursive
32612+
32613+install-dvi-am:
32614+
32615+install-exec-am:
32616+
32617+install-html: install-html-recursive
32618+
32619+install-html-am:
32620+
32621+install-info: install-info-recursive
32622+
32623+install-info-am:
32624+
32625+install-man:
32626+
32627+install-pdf: install-pdf-recursive
32628+
32629+install-pdf-am:
32630+
32631+install-ps: install-ps-recursive
32632+
32633+install-ps-am:
32634+
32635+installcheck-am:
32636+
32637+maintainer-clean: maintainer-clean-recursive
32638+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
32639+ -rm -rf $(top_srcdir)/autom4te.cache
32640+ -rm -f Makefile
32641+maintainer-clean-am: distclean-am maintainer-clean-generic
32642+
32643+mostlyclean: mostlyclean-recursive
32644+
32645+mostlyclean-am: mostlyclean-generic
32646+
32647+pdf: pdf-recursive
32648+
32649+pdf-am:
32650+
32651+ps: ps-recursive
32652+
32653+ps-am:
32654+
32655+uninstall-am:
32656+
32657+.MAKE: $(am__recursive_targets) all install-am install-strip
32658+
32659+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
32660+ am--refresh check check-am clean clean-cscope clean-generic \
32661+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
32662+ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
32663+ dist-zip distcheck distclean distclean-generic distclean-hdr \
32664+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
32665+ dvi-am html html-am info info-am install install-am \
32666+ install-data install-data-am install-dvi install-dvi-am \
32667+ install-exec install-exec-am install-html install-html-am \
32668+ install-info install-info-am install-man install-pdf \
32669+ install-pdf-am install-ps install-ps-am install-strip \
32670+ installcheck installcheck-am installdirs installdirs-am \
32671+ maintainer-clean maintainer-clean-generic mostlyclean \
32672+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
32673+ uninstall-am
32674
32675-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
32676-install-data-recursive uninstall-data-recursive install-exec-recursive \
32677-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
32678-all-recursive check-recursive installcheck-recursive info-recursive \
32679-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
32680-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
32681-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
32682-installcheck all-recursive-am all-am install-exec install-data install \
32683-uninstall all installdirs mostlyclean-generic distclean-generic \
32684-clean-generic maintainer-clean-generic clean mostlyclean distclean \
32685-maintainer-clean
32686+.PRECIOUS: Makefile
32687
32688
32689 dist-hook:
32690- mkdir $(distdir)/debian
32691 cp -fa $(srcdir)/debian/changelog $(distdir)/debian/
32692 cp -fa $(srcdir)/debian/control $(distdir)/debian/
32693 cp -fa $(srcdir)/debian/copyright $(distdir)/debian/
32694diff -uprN clean/lrzsz-0.12.20/man/Makefile.in lrzsz-0.12.20/man/Makefile.in
32695--- clean/lrzsz-0.12.20/man/Makefile.in 1998-12-30 16:31:48.000000000 +0000
32696+++ lrzsz-0.12.20/man/Makefile.in 2019-11-26 11:37:46.000000000 +0000
32697@@ -1,6 +1,8 @@
32698-# Makefile.in generated automatically by automake 1.3 from Makefile.am
32699+# Makefile.in generated by automake 1.16.1 from Makefile.am.
32700+# @configure_input@
32701+
32702+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
32703
32704-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
32705 # This Makefile.in is free software; the Free Software Foundation
32706 # gives unlimited permission to copy and/or distribute it,
32707 # with or without modifications, as long as this notice is preserved.
32708@@ -10,219 +12,503 @@
32709 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
32710 # PARTICULAR PURPOSE.
32711
32712-
32713-SHELL = /bin/sh
32714-
32715-srcdir = @srcdir@
32716-top_srcdir = @top_srcdir@
32717+@SET_MAKE@
32718 VPATH = @srcdir@
32719-prefix = @prefix@
32720-exec_prefix = @exec_prefix@
32721-
32722-bindir = @bindir@
32723-sbindir = @sbindir@
32724-libexecdir = @libexecdir@
32725-datadir = @datadir@
32726-sysconfdir = @sysconfdir@
32727-sharedstatedir = @sharedstatedir@
32728-localstatedir = @localstatedir@
32729-libdir = @libdir@
32730-infodir = @infodir@
32731-mandir = @mandir@
32732-includedir = @includedir@
32733-oldincludedir = /usr/include
32734-
32735-DISTDIR =
32736-
32737+am__is_gnu_make = { \
32738+ if test -z '$(MAKELEVEL)'; then \
32739+ false; \
32740+ elif test -n '$(MAKE_HOST)'; then \
32741+ true; \
32742+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
32743+ true; \
32744+ else \
32745+ false; \
32746+ fi; \
32747+}
32748+am__make_running_with_option = \
32749+ case $${target_option-} in \
32750+ ?) ;; \
32751+ *) echo "am__make_running_with_option: internal error: invalid" \
32752+ "target option '$${target_option-}' specified" >&2; \
32753+ exit 1;; \
32754+ esac; \
32755+ has_opt=no; \
32756+ sane_makeflags=$$MAKEFLAGS; \
32757+ if $(am__is_gnu_make); then \
32758+ sane_makeflags=$$MFLAGS; \
32759+ else \
32760+ case $$MAKEFLAGS in \
32761+ *\\[\ \ ]*) \
32762+ bs=\\; \
32763+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
32764+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
32765+ esac; \
32766+ fi; \
32767+ skip_next=no; \
32768+ strip_trailopt () \
32769+ { \
32770+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
32771+ }; \
32772+ for flg in $$sane_makeflags; do \
32773+ test $$skip_next = yes && { skip_next=no; continue; }; \
32774+ case $$flg in \
32775+ *=*|--*) continue;; \
32776+ -*I) strip_trailopt 'I'; skip_next=yes;; \
32777+ -*I?*) strip_trailopt 'I';; \
32778+ -*O) strip_trailopt 'O'; skip_next=yes;; \
32779+ -*O?*) strip_trailopt 'O';; \
32780+ -*l) strip_trailopt 'l'; skip_next=yes;; \
32781+ -*l?*) strip_trailopt 'l';; \
32782+ -[dEDm]) skip_next=yes;; \
32783+ -[JT]) skip_next=yes;; \
32784+ esac; \
32785+ case $$flg in \
32786+ *$$target_option*) has_opt=yes; break;; \
32787+ esac; \
32788+ done; \
32789+ test $$has_opt = yes
32790+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
32791+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
32792 pkgdatadir = $(datadir)/@PACKAGE@
32793-pkglibdir = $(libdir)/@PACKAGE@
32794 pkgincludedir = $(includedir)/@PACKAGE@
32795-
32796-top_builddir = ..
32797-
32798-ACLOCAL = @ACLOCAL@
32799-AUTOCONF = @AUTOCONF@
32800-AUTOMAKE = @AUTOMAKE@
32801-AUTOHEADER = @AUTOHEADER@
32802-
32803-INSTALL = @INSTALL@
32804-INSTALL_PROGRAM = @INSTALL_PROGRAM@
32805-INSTALL_DATA = @INSTALL_DATA@
32806-INSTALL_SCRIPT = @INSTALL_SCRIPT@
32807-transform = @program_transform_name@
32808-
32809+pkglibdir = $(libdir)/@PACKAGE@
32810+pkglibexecdir = $(libexecdir)/@PACKAGE@
32811+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32812+install_sh_DATA = $(install_sh) -c -m 644
32813+install_sh_PROGRAM = $(install_sh) -c
32814+install_sh_SCRIPT = $(install_sh) -c
32815+INSTALL_HEADER = $(INSTALL_DATA)
32816+transform = $(program_transform_name)
32817 NORMAL_INSTALL = :
32818 PRE_INSTALL = :
32819 POST_INSTALL = :
32820 NORMAL_UNINSTALL = :
32821 PRE_UNINSTALL = :
32822 POST_UNINSTALL = :
32823-CATALOGS = @CATALOGS@
32824-CATOBJEXT = @CATOBJEXT@
32825+build_triplet = @build@
32826+host_triplet = @host@
32827+subdir = man
32828+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
32829+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
32830+ $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
32831+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
32832+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
32833+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
32834+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
32835+ $(top_srcdir)/configure.in
32836+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
32837+ $(ACLOCAL_M4)
32838+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
32839+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
32840+CONFIG_HEADER = $(top_builddir)/config.h
32841+CONFIG_CLEAN_FILES =
32842+CONFIG_CLEAN_VPATH_FILES =
32843+AM_V_P = $(am__v_P_@AM_V@)
32844+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
32845+am__v_P_0 = false
32846+am__v_P_1 = :
32847+AM_V_GEN = $(am__v_GEN_@AM_V@)
32848+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
32849+am__v_GEN_0 = @echo " GEN " $@;
32850+am__v_GEN_1 =
32851+AM_V_at = $(am__v_at_@AM_V@)
32852+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
32853+am__v_at_0 = @
32854+am__v_at_1 =
32855+SOURCES =
32856+DIST_SOURCES =
32857+am__can_run_installinfo = \
32858+ case $$AM_UPDATE_INFO_DIR in \
32859+ n|no|NO) false;; \
32860+ *) (install-info --version) >/dev/null 2>&1;; \
32861+ esac
32862+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
32863+am__vpath_adj = case $$p in \
32864+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
32865+ *) f=$$p;; \
32866+ esac;
32867+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
32868+am__install_max = 40
32869+am__nobase_strip_setup = \
32870+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
32871+am__nobase_strip = \
32872+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
32873+am__nobase_list = $(am__nobase_strip_setup); \
32874+ for p in $$list; do echo "$$p $$p"; done | \
32875+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
32876+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
32877+ if (++n[$$2] == $(am__install_max)) \
32878+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
32879+ END { for (dir in files) print dir, files[dir] }'
32880+am__base_list = \
32881+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
32882+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
32883+am__uninstall_files_from_dir = { \
32884+ test -z "$$files" \
32885+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
32886+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
32887+ $(am__cd) "$$dir" && rm -f $$files; }; \
32888+ }
32889+man1dir = $(mandir)/man1
32890+am__installdirs = "$(DESTDIR)$(man1dir)"
32891+NROFF = nroff
32892+MANS = $(man_MANS)
32893+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
32894+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
32895+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
32896+ACLOCAL = @ACLOCAL@
32897+ALLOCA = @ALLOCA@
32898+AMTAR = @AMTAR@
32899+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
32900+AUTOCONF = @AUTOCONF@
32901+AUTOHEADER = @AUTOHEADER@
32902+AUTOMAKE = @AUTOMAKE@
32903+AWK = @AWK@
32904 CC = @CC@
32905+CCDEPMODE = @CCDEPMODE@
32906 CFLAGS = @CFLAGS@
32907 CPP = @CPP@
32908-DATADIRNAME = @DATADIRNAME@
32909+CPPFLAGS = @CPPFLAGS@
32910+CYGPATH_W = @CYGPATH_W@
32911+DEFS = @DEFS@
32912+DEPDIR = @DEPDIR@
32913+ECHO_C = @ECHO_C@
32914+ECHO_N = @ECHO_N@
32915+ECHO_T = @ECHO_T@
32916+EGREP = @EGREP@
32917 ENABLE_TIMESYNC = @ENABLE_TIMESYNC@
32918-GENCAT = @GENCAT@
32919-GMOFILES = @GMOFILES@
32920+EXEEXT = @EXEEXT@
32921+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
32922 GMSGFMT = @GMSGFMT@
32923-GT_NO = @GT_NO@
32924-GT_YES = @GT_YES@
32925-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
32926-INSTOBJEXT = @INSTOBJEXT@
32927-INTLDEPS = @INTLDEPS@
32928+GMSGFMT_015 = @GMSGFMT_015@
32929+GREP = @GREP@
32930+INSTALL = @INSTALL@
32931+INSTALL_DATA = @INSTALL_DATA@
32932+INSTALL_PROGRAM = @INSTALL_PROGRAM@
32933+INSTALL_SCRIPT = @INSTALL_SCRIPT@
32934+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
32935 INTLLIBS = @INTLLIBS@
32936-INTLOBJS = @INTLOBJS@
32937+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
32938 LDFLAGS = @LDFLAGS@
32939+LIBICONV = @LIBICONV@
32940+LIBINTL = @LIBINTL@
32941 LIBOBJS = @LIBOBJS@
32942 LIBS = @LIBS@
32943+LTLIBICONV = @LTLIBICONV@
32944+LTLIBINTL = @LTLIBINTL@
32945+LTLIBOBJS = @LTLIBOBJS@
32946 MAKEINFO = @MAKEINFO@
32947-MKINSTALLDIRS = @MKINSTALLDIRS@
32948+MKDIR_P = @MKDIR_P@
32949 MSGFMT = @MSGFMT@
32950+MSGMERGE = @MSGMERGE@
32951+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
32952+OBJEXT = @OBJEXT@
32953 PACKAGE = @PACKAGE@
32954+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
32955+PACKAGE_NAME = @PACKAGE_NAME@
32956+PACKAGE_STRING = @PACKAGE_STRING@
32957+PACKAGE_TARNAME = @PACKAGE_TARNAME@
32958+PACKAGE_URL = @PACKAGE_URL@
32959 PACKAGE_VERSION = @PACKAGE_VERSION@
32960-POFILES = @POFILES@
32961+PATH_SEPARATOR = @PATH_SEPARATOR@
32962 POSUB = @POSUB@
32963 RANLIB = @RANLIB@
32964-U = @U@
32965-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
32966+SED = @SED@
32967+SET_MAKE = @SET_MAKE@
32968+SHELL = @SHELL@
32969+STRIP = @STRIP@
32970 USE_NLS = @USE_NLS@
32971 VERSION = @VERSION@
32972-l = @l@
32973-
32974+XGETTEXT = @XGETTEXT@
32975+XGETTEXT_015 = @XGETTEXT_015@
32976+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
32977+abs_builddir = @abs_builddir@
32978+abs_srcdir = @abs_srcdir@
32979+abs_top_builddir = @abs_top_builddir@
32980+abs_top_srcdir = @abs_top_srcdir@
32981+ac_ct_CC = @ac_ct_CC@
32982+am__include = @am__include@
32983+am__leading_dot = @am__leading_dot@
32984+am__quote = @am__quote@
32985+am__tar = @am__tar@
32986+am__untar = @am__untar@
32987+bindir = @bindir@
32988+build = @build@
32989+build_alias = @build_alias@
32990+build_cpu = @build_cpu@
32991+build_os = @build_os@
32992+build_vendor = @build_vendor@
32993+builddir = @builddir@
32994+datadir = @datadir@
32995+datarootdir = @datarootdir@
32996+docdir = @docdir@
32997+dvidir = @dvidir@
32998+exec_prefix = @exec_prefix@
32999+host = @host@
33000+host_alias = @host_alias@
33001+host_cpu = @host_cpu@
33002+host_os = @host_os@
33003+host_vendor = @host_vendor@
33004+htmldir = @htmldir@
33005+includedir = @includedir@
33006+infodir = @infodir@
33007+install_sh = @install_sh@
33008+libdir = @libdir@
33009+libexecdir = @libexecdir@
33010+localedir = @localedir@
33011+localstatedir = @localstatedir@
33012+mandir = @mandir@
33013+mkdir_p = @mkdir_p@
33014+oldincludedir = @oldincludedir@
33015+pdfdir = @pdfdir@
33016+prefix = @prefix@
33017+program_transform_name = @program_transform_name@
33018+psdir = @psdir@
33019+sbindir = @sbindir@
33020+sharedstatedir = @sharedstatedir@
33021+srcdir = @srcdir@
33022+sysconfdir = @sysconfdir@
33023+target_alias = @target_alias@
33024+top_build_prefix = @top_build_prefix@
33025+top_builddir = @top_builddir@
33026+top_srcdir = @top_srcdir@
33027 man_MANS = lrz.1 lsz.1
33028 EXTRA_DIST = lrz.1 lsz.1
33029-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
33030-CONFIG_HEADER = ../config.h
33031-CONFIG_CLEAN_FILES =
33032-man1dir = $(mandir)/man1
33033-MANS = $(man_MANS)
33034+all: all-am
33035
33036-NROFF = nroff
33037-DIST_COMMON = Makefile.am Makefile.in
33038+.SUFFIXES:
33039+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
33040+ @for dep in $?; do \
33041+ case '$(am__configure_deps)' in \
33042+ *$$dep*) \
33043+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
33044+ && { if test -f $@; then exit 0; else break; fi; }; \
33045+ exit 1;; \
33046+ esac; \
33047+ done; \
33048+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
33049+ $(am__cd) $(top_srcdir) && \
33050+ $(AUTOMAKE) --gnu man/Makefile
33051+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
33052+ @case '$?' in \
33053+ *config.status*) \
33054+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
33055+ *) \
33056+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
33057+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
33058+ esac;
33059+
33060+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
33061+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
33062+
33063+$(top_srcdir)/configure: $(am__configure_deps)
33064+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
33065+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
33066+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
33067+$(am__aclocal_m4_deps):
33068+install-man1: $(man_MANS)
33069+ @$(NORMAL_INSTALL)
33070+ @list1=''; \
33071+ list2='$(man_MANS)'; \
33072+ test -n "$(man1dir)" \
33073+ && test -n "`echo $$list1$$list2`" \
33074+ || exit 0; \
33075+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
33076+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
33077+ { for i in $$list1; do echo "$$i"; done; \
33078+ if test -n "$$list2"; then \
33079+ for i in $$list2; do echo "$$i"; done \
33080+ | sed -n '/\.1[a-z]*$$/p'; \
33081+ fi; \
33082+ } | while read p; do \
33083+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
33084+ echo "$$d$$p"; echo "$$p"; \
33085+ done | \
33086+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
33087+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
33088+ sed 'N;N;s,\n, ,g' | { \
33089+ list=; while read file base inst; do \
33090+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
33091+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
33092+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
33093+ fi; \
33094+ done; \
33095+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
33096+ while read files; do \
33097+ test -z "$$files" || { \
33098+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
33099+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
33100+ done; }
33101
33102+uninstall-man1:
33103+ @$(NORMAL_UNINSTALL)
33104+ @list=''; test -n "$(man1dir)" || exit 0; \
33105+ files=`{ for i in $$list; do echo "$$i"; done; \
33106+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
33107+ sed -n '/\.1[a-z]*$$/p'; \
33108+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
33109+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
33110+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
33111+tags TAGS:
33112+
33113+ctags CTAGS:
33114+
33115+cscope cscopelist:
33116+
33117+
33118+distdir: $(BUILT_SOURCES)
33119+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
33120+
33121+distdir-am: $(DISTFILES)
33122+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33123+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
33124+ list='$(DISTFILES)'; \
33125+ dist_files=`for file in $$list; do echo $$file; done | \
33126+ sed -e "s|^$$srcdirstrip/||;t" \
33127+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
33128+ case $$dist_files in \
33129+ */*) $(MKDIR_P) `echo "$$dist_files" | \
33130+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
33131+ sort -u` ;; \
33132+ esac; \
33133+ for file in $$dist_files; do \
33134+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
33135+ if test -d $$d/$$file; then \
33136+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
33137+ if test -d "$(distdir)/$$file"; then \
33138+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
33139+ fi; \
33140+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
33141+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
33142+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
33143+ fi; \
33144+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
33145+ else \
33146+ test -f "$(distdir)/$$file" \
33147+ || cp -p $$d/$$file "$(distdir)/$$file" \
33148+ || exit 1; \
33149+ fi; \
33150+ done
33151+check-am: all-am
33152+check: check-am
33153+all-am: Makefile $(MANS)
33154+installdirs:
33155+ for dir in "$(DESTDIR)$(man1dir)"; do \
33156+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
33157+ done
33158+install: install-am
33159+install-exec: install-exec-am
33160+install-data: install-data-am
33161+uninstall: uninstall-am
33162
33163-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
33164+install-am: all-am
33165+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
33166
33167-TAR = tar
33168-GZIP = --best
33169-all: Makefile $(MANS)
33170+installcheck: installcheck-am
33171+install-strip:
33172+ if test -z '$(STRIP)'; then \
33173+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
33174+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
33175+ install; \
33176+ else \
33177+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
33178+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
33179+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
33180+ fi
33181+mostlyclean-generic:
33182
33183-.SUFFIXES:
33184-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
33185- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
33186+clean-generic:
33187
33188-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
33189- cd $(top_builddir) \
33190- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
33191+distclean-generic:
33192+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
33193+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
33194
33195+maintainer-clean-generic:
33196+ @echo "This command is intended for maintainers to use"
33197+ @echo "it deletes files that may require special tools to rebuild."
33198+clean: clean-am
33199
33200-install-man1:
33201- $(mkinstalldirs) $(DESTDIR)$(man1dir)
33202- @list='$(man1_MANS)'; \
33203- l2='$(man_MANS)'; for i in $$l2; do \
33204- case "$$i" in \
33205- *.1*) list="$$list $$i" ;; \
33206- esac; \
33207- done; \
33208- for i in $$list; do \
33209- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
33210- else file=$$i; fi; \
33211- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
33212- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
33213- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
33214- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
33215- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
33216- done
33217+clean-am: clean-generic mostlyclean-am
33218
33219-uninstall-man1:
33220- @list='$(man1_MANS)'; \
33221- l2='$(man_MANS)'; for i in $$l2; do \
33222- case "$$i" in \
33223- *.1*) list="$$list $$i" ;; \
33224- esac; \
33225- done; \
33226- for i in $$list; do \
33227- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
33228- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
33229- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
33230- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
33231- rm -f $(DESTDIR)$(man1dir)/$$inst; \
33232- done
33233-install-man: $(MANS)
33234- @$(NORMAL_INSTALL)
33235- $(MAKE) install-man1
33236-uninstall-man:
33237- @$(NORMAL_UNINSTALL)
33238- $(MAKE) uninstall-man1
33239-tags: TAGS
33240-TAGS:
33241+distclean: distclean-am
33242+ -rm -f Makefile
33243+distclean-am: clean-am distclean-generic
33244
33245+dvi: dvi-am
33246
33247-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
33248+dvi-am:
33249
33250-subdir = man
33251+html: html-am
33252
33253-distdir: $(DISTFILES)
33254- @for file in $(DISTFILES); do \
33255- d=$(srcdir); \
33256- test -f $(distdir)/$$file \
33257- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
33258- || cp -p $$d/$$file $(distdir)/$$file; \
33259- done
33260-info:
33261-dvi:
33262-check: all
33263- $(MAKE)
33264-installcheck:
33265-install-exec:
33266- @$(NORMAL_INSTALL)
33267+html-am:
33268
33269-install-data: install-man
33270- @$(NORMAL_INSTALL)
33271+info: info-am
33272
33273-install: install-exec install-data all
33274- @:
33275+info-am:
33276
33277-uninstall: uninstall-man
33278+install-data-am: install-man
33279
33280-install-strip:
33281- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
33282-installdirs:
33283- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
33284+install-dvi: install-dvi-am
33285
33286+install-dvi-am:
33287
33288-mostlyclean-generic:
33289- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
33290+install-exec-am:
33291
33292-clean-generic:
33293- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
33294+install-html: install-html-am
33295
33296-distclean-generic:
33297- -rm -f Makefile $(DISTCLEANFILES)
33298- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
33299- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
33300+install-html-am:
33301
33302-maintainer-clean-generic:
33303- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
33304- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
33305-mostlyclean: mostlyclean-generic
33306+install-info: install-info-am
33307
33308-clean: clean-generic mostlyclean
33309+install-info-am:
33310
33311-distclean: distclean-generic clean
33312- -rm -f config.status
33313+install-man: install-man1
33314
33315-maintainer-clean: maintainer-clean-generic distclean
33316- @echo "This command is intended for maintainers to use;"
33317- @echo "it deletes files that may require special tools to rebuild."
33318+install-pdf: install-pdf-am
33319+
33320+install-pdf-am:
33321+
33322+install-ps: install-ps-am
33323+
33324+install-ps-am:
33325+
33326+installcheck-am:
33327+
33328+maintainer-clean: maintainer-clean-am
33329+ -rm -f Makefile
33330+maintainer-clean-am: distclean-am maintainer-clean-generic
33331+
33332+mostlyclean: mostlyclean-am
33333+
33334+mostlyclean-am: mostlyclean-generic
33335+
33336+pdf: pdf-am
33337+
33338+pdf-am:
33339+
33340+ps: ps-am
33341+
33342+ps-am:
33343+
33344+uninstall-am: uninstall-man
33345+
33346+uninstall-man: uninstall-man1
33347+
33348+.MAKE: install-am install-strip
33349+
33350+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
33351+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
33352+ html-am info info-am install install-am install-data \
33353+ install-data-am install-dvi install-dvi-am install-exec \
33354+ install-exec-am install-html install-html-am install-info \
33355+ install-info-am install-man install-man1 install-pdf \
33356+ install-pdf-am install-ps install-ps-am install-strip \
33357+ installcheck installcheck-am installdirs maintainer-clean \
33358+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
33359+ pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \
33360+ uninstall-man1
33361
33362-.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
33363-distdir info dvi installcheck install-exec install-data install \
33364-uninstall all installdirs mostlyclean-generic distclean-generic \
33365-clean-generic maintainer-clean-generic clean mostlyclean distclean \
33366-maintainer-clean
33367+.PRECIOUS: Makefile
33368
33369
33370 # Tell versions [3.59,3.63) of GNU make to not export all variables.
33371diff -uprN clean/lrzsz-0.12.20/po/boldquot.sed lrzsz-0.12.20/po/boldquot.sed
33372--- clean/lrzsz-0.12.20/po/boldquot.sed 1970-01-01 01:00:00.000000000 +0100
33373+++ lrzsz-0.12.20/po/boldquot.sed 2019-11-25 18:21:17.000000000 +0000
33374@@ -0,0 +1,10 @@
33375+s/"\([^"]*\)"/“\1”/g
33376+s/`\([^`']*\)'/‘\1’/g
33377+s/ '\([^`']*\)' / ‘\1’ /g
33378+s/ '\([^`']*\)'$/ ‘\1’/g
33379+s/^'\([^`']*\)' /‘\1’ /g
33380+s/“”/""/g
33381+s/“/“/g
33382+s/”/”/g
33383+s/‘/‘/g
33384+s/’/’/g
33385diff -uprN clean/lrzsz-0.12.20/po/cat-id-tbl.c lrzsz-0.12.20/po/cat-id-tbl.c
33386--- clean/lrzsz-0.12.20/po/cat-id-tbl.c 1998-12-29 09:24:24.000000000 +0000
33387+++ lrzsz-0.12.20/po/cat-id-tbl.c 1970-01-01 01:00:00.000000000 +0100
33388@@ -1,234 +0,0 @@
33389-/* Automatically generated by po2tbl.sed from lrzsz.pot. */
33390-
33391-#if HAVE_CONFIG_H
33392-# include <config.h>
33393-#endif
33394-
33395-#include "libgettext.h"
33396-
33397-const struct _msg_ent _msg_tbl[] = {
33398- {"", 1},
33399- {"io_mode(,2) in rbsb.c not implemented\n", 2},
33400- {"caught signal %d; exiting", 3},
33401- {"command tries", 4},
33402- {"packetlength", 5},
33403- {"packetlength out of range 24..%ld", 6},
33404- {"framelength", 7},
33405- {"framelength out of range 32..%ld", 8},
33406- {"min_bps", 9},
33407- {"min_bps must be >= 0", 10},
33408- {"min_bps_time", 11},
33409- {"min_bps_time must be > 1", 12},
33410- {"hour to large (0..23)", 13},
33411- {"unparsable stop time\n", 14},
33412- {"minute to large (0..59)", 15},
33413- {"stop time to small", 16},
33414- {"stop-at", 17},
33415- {"timeout", 18},
33416- {"timeout out of range 10..1000", 19},
33417- {"security violation: can't do that under restricted shell\n", 20},
33418- {"window size", 21},
33419- {"cannot turnoff syslog", 22},
33420- {"startup delay", 23},
33421- {"out of memory", 24},
33422- {"this program was never intended to be used setuid\n", 25},
33423- {"need at least one file to send", 26},
33424- {"Can't send command in restricted mode\n", 27},
33425- {"hostname too long\n", 28},
33426- {"illegal server address\n", 29},
33427- {"can read only one file from stdin", 30},
33428- {"Transfer incomplete\n", 31},
33429- {"Transfer complete\n", 32},
33430- {"send_pseudo %s: cannot open tmpfile %s: %s", 33},
33431- {"send_pseudo %s: cannot lstat tmpfile %s: %s", 34},
33432- {"send_pseudo %s: avoiding symlink trap", 35},
33433- {"send_pseudo %s: cannot write to tmpfile %s: %s", 36},
33434- {"send_pseudo %s: failed", 37},
33435- {"send_pseudo %s: ok", 38},
33436- {"tcp protocol init failed\n", 39},
33437- {"Answering TIMESYNC at %s", 40},
33438- {"timezone", 41},
33439- {"timezone unknown", 42},
33440- {"Can't open any requested files.", 43},
33441- {"security violation: not allowed to upload from %s", 44},
33442- {"cannot open %s", 45},
33443- {"is not a file: %s", 46},
33444- {"%s/%s: error occured", 47},
33445- {"skipped: %s", 48},
33446- {"%s/%s: skipped", 49},
33447- {"Bytes Sent:%7ld BPS:%-8ld \n", 50},
33448- {"Sending %s, %ld blocks: ", 51},
33449- {"Give your local XMODEM receive command now.", 52},
33450- {"Sending: %s\n", 53},
33451- {"Timeout on pathname", 54},
33452- {"Receiver Cancelled", 55},
33453- {"No ACK on EOT", 56},
33454- {"Xmodem sectors/kbytes sent: %3d/%2dk", 57},
33455- {"Ymodem sectors/kbytes sent: %3d/%2dk", 58},
33456- {"Cancelled", 59},
33457- {"Timeout on sector ACK", 60},
33458- {"NAK on sector", 61},
33459- {"Got burst for sector ACK", 62},
33460- {"Got %02x for sector ACK", 63},
33461- {"Retry Count Exceeded", 64},
33462- {"Try `%s --help' for more information.\n", 65},
33463- {"%s version %s\n", 66},
33464- {"Usage: %s [options] file ...\n", 67},
33465- {" or: %s [options] -{c|i} COMMAND\n", 68},
33466- {"Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n", 69},
33467- {"\
33468- (X) = option applies to XMODEM only\n\
33469- (Y) = option applies to YMODEM only\n\
33470- (Z) = option applies to ZMODEM only\n", 70},
33471- {"\
33472- -+, --append append to existing destination file (Z)\n\
33473- -2, --twostop use 2 stop bits\n\
33474- -4, --try-4k go up to 4K blocksize\n\
33475- --start-4k start with 4K blocksize (doesn't try 8)\n\
33476- -8, --try-8k go up to 8K blocksize\n\
33477- --start-8k start with 8K blocksize\n\
33478- -a, --ascii ASCII transfer (change CR/LF to LF)\n\
33479- -b, --binary binary transfer\n\
33480- -B, --bufsize N buffer N bytes (N==auto: buffer whole file)\n\
33481- -c, --command COMMAND execute remote command COMMAND (Z)\n\
33482- -C, --command-tries N try N times to execute a command (Z)\n\
33483- -d, --dot-to-slash change '.' to '/' in pathnames (Y/Z)\n\
33484- --delay-startup N sleep N seconds before doing anything\n\
33485- -e, --escape escape all control characters (Z)\n\
33486- -E, --rename force receiver to rename files it already has\n\
33487- -f, --full-path send full pathname (Y/Z)\n\
33488- -i, --immediate-command CMD send remote CMD, return immediately (Z)\n\
33489- -h, --help print this usage message\n\
33490- -k, --1k send 1024 byte packets (X)\n\
33491- -L, --packetlen N limit subpacket length to N bytes (Z)\n\
33492- -l, --framelen N limit frame length to N bytes (l>=L) (Z)\n\
33493- -m, --min-bps N stop transmission if BPS below N\n\
33494- -M, --min-bps-time N for at least N seconds (default: 120)\n", 71},
33495- {"\
33496- -n, --newer send file if source newer (Z)\n\
33497- -N, --newer-or-longer send file if source newer or longer (Z)\n\
33498- -o, --16-bit-crc use 16 bit CRC instead of 32 bit CRC (Z)\n\
33499- -O, --disable-timeouts disable timeout code, wait forever\n\
33500- -p, --protect protect existing destination file (Z)\n\
33501- -r, --resume resume interrupted file transfer (Z)\n\
33502- -R, --restricted restricted, more secure mode\n\
33503- -q, --quiet quiet (no progress reports)\n\
33504- -s, --stop-at {HH:MM|+N} stop transmission at HH:MM or in N seconds\n\
33505- --tcp build a TCP connection to transmit files\n\
33506- --tcp-server open socket, wait for connection\n\
33507- -u, --unlink unlink file after transmission\n\
33508- -U, --unrestrict turn off restricted mode (if allowed to)\n\
33509- -v, --verbose be verbose, provide debugging information\n\
33510- -w, --windowsize N Window is N bytes (Z)\n\
33511- -X, --xmodem use XMODEM protocol\n\
33512- -y, --overwrite overwrite existing files\n\
33513- -Y, --overwrite-or-skip overwrite existing files, else skip\n\
33514- --ymodem use YMODEM protocol\n\
33515- -Z, --zmodem use ZMODEM protocol\n\
33516-\n\
33517-short options use the same arguments as the long ones\n", 72},
33518- {"got ZRQINIT", 73},
33519- {"got ZCAN", 74},
33520- {"blklen now %d\n", 75},
33521- {"zsendfdata: bps rate %ld below min %ld", 76},
33522- {"zsendfdata: reached stop time", 77},
33523- {"Bytes Sent:%7ld/%7ld BPS:%-8ld ETA %02d:%02d ", 78},
33524- {"calc_blklen: reduced to %d due to error\n", 79},
33525- {"calc_blklen: returned old value %d due to low bpe diff\n", 80},
33526- {"calc_blklen: old %ld, new %ld, d %ld\n", 81},
33527- {"calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n", 82},
33528- {"calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n", 83},
33529- {"calc_blklen: returned %d as best\n", 84},
33530- {"\
33531-\n\
33532-countem: Total %d %ld\n", 85},
33533- {"Bad escape sequence %x", 86},
33534- {"Sender Canceled", 87},
33535- {"TIMEOUT", 88},
33536- {"Bad data subpacket", 89},
33537- {"Data subpacket too long", 90},
33538- {"Garbage count exceeded", 91},
33539- {"Got %s", 92},
33540- {"Retry %d: ", 93},
33541- {"don't have settimeofday, will not set time\n", 94},
33542- {"not running as root (this is good!), can not set time\n", 95},
33543- {"bytes_per_error", 96},
33544- {"bytes-per-error should be >100", 97},
33545- {"O_SYNC not supported by the kernel", 98},
33546- {"garbage on commandline", 99},
33547- {"Usage: %s [options] [filename.if.xmodem]\n", 100},
33548- {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101},
33549- {"\
33550- -+, --append append to existing files\n\
33551- -a, --ascii ASCII transfer (change CR/LF to LF)\n\
33552- -b, --binary binary transfer\n\
33553- -B, --bufsize N buffer N bytes (N==auto: buffer whole file)\n\
33554- -c, --with-crc Use 16 bit CRC (X)\n\
33555- -C, --allow-remote-commands allow execution of remote commands (Z)\n\
33556- -D, --null write all received data to /dev/null\n\
33557- --delay-startup N sleep N seconds before doing anything\n\
33558- -e, --escape Escape control characters (Z)\n\
33559- -E, --rename rename any files already existing\n\
33560- --errors N generate CRC error every N bytes (debugging)\n\
33561- -h, --help Help, print this usage message\n\
33562- -m, --min-bps N stop transmission if BPS below N\n\
33563- -M, --min-bps-time N for at least N seconds (default: 120)\n\
33564- -O, --disable-timeouts disable timeout code, wait forever for data\n\
33565- --o-sync open output file(s) in synchronous write mode\n\
33566- -p, --protect protect existing files\n\
33567- -q, --quiet quiet, no progress reports\n\
33568- -r, --resume try to resume interrupted file transfer (Z)\n\
33569- -R, --restricted restricted, more secure mode\n\
33570- -s, --stop-at {HH:MM|+N} stop transmission at HH:MM or in N seconds\n\
33571- -S, --timesync request remote time (twice: set local time)\n\
33572- --syslog[=off] turn syslog on or off, if possible\n\
33573- -t, --timeout N set timeout to N tenths of a second\n\
33574- -u, --keep-uppercase keep upper case filenames\n\
33575- -U, --unrestrict disable restricted mode (if allowed to)\n\
33576- -v, --verbose be verbose, provide debugging information\n\
33577- -w, --windowsize N Window is N bytes (Z)\n\
33578- -X --xmodem use XMODEM protocol\n\
33579- -y, --overwrite Yes, clobber existing file if any\n\
33580- --ymodem use YMODEM protocol\n\
33581- -Z, --zmodem use ZMODEM protocol\n\
33582-\n\
33583-short options use the same arguments as the long ones\n", 102},
33584- {"%s waiting to receive.", 103},
33585- {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 104},
33586- {"%s: ready to receive %s", 105},
33587- {"\rBytes received: %7ld BPS:%-6ld \r\n", 106},
33588- {"\
33589-\r\n\
33590-%s: %s removed.\r\n", 107},
33591- {"Pathname fetch returned EOT", 108},
33592- {"Received dup Sector", 109},
33593- {"Sync Error", 110},
33594- {"CRC", 111},
33595- {"Checksum", 112},
33596- {"Sector number garbled", 113},
33597- {"Sender Cancelled", 114},
33598- {"Got 0%o sector header", 115},
33599- {"file name ends with a /, skipped: %s\n", 116},
33600- {"zmanag=%d, Lzmanag=%d\n", 117},
33601- {"zconv=%d\n", 118},
33602- {"file exists, skipped: %s\n", 119},
33603- {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120},
33604- {"TIMESYNC: cannot set time: %s\n", 121},
33605- {"cannot tmpfile() for tcp protocol synchronization", 122},
33606- {"Topipe", 123},
33607- {"Receiving: %s\n", 124},
33608- {"Blocks received: %d", 125},
33609- {"%s: %s exists\n", 126},
33610- {"%s:\tSecurity Violation", 127},
33611- {"remote command execution requested", 128},
33612- {"not executed", 129},
33613- {"got ZRINIT", 130},
33614- {"Skipped", 131},
33615- {"rzfile: bps rate %ld below min %ld", 132},
33616- {"rzfile: reached stop time", 133},
33617- {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 134},
33618- {"fgets for tcp protocol synchronization failed: ", 135},
33619- {"file close error", 136},
33620-};
33621-
33622-int _msg_tbl_length = 136;
33623diff -uprN clean/lrzsz-0.12.20/po/ChangeLog lrzsz-0.12.20/po/ChangeLog
33624--- clean/lrzsz-0.12.20/po/ChangeLog 1998-04-26 14:20:52.000000000 +0100
33625+++ lrzsz-0.12.20/po/ChangeLog 2019-11-25 18:21:03.000000000 +0000
33626@@ -1,3 +1,25 @@
33627+2019-11-25 gettextize <bug-gnu-gettext@gnu.org>
33628+
33629+ * Makefile.in.in: Upgrade to gettext-0.20.1.
33630+ * en@boldquot.header: Upgrade to gettext-0.20.1.
33631+ * en@quot.header: Upgrade to gettext-0.20.1.
33632+ * insert-header.sin: Upgrade to gettext-0.20.1.
33633+ * remove-potcdate.sin: Upgrade to gettext-0.20.1.
33634+ * Rules-quot: Upgrade to gettext-0.20.1.
33635+
33636+2019-11-25 gettextize <bug-gnu-gettext@gnu.org>
33637+
33638+ * Makefile.in.in: Upgrade to gettext-0.19.8.1.
33639+ * boldquot.sed: New file, from gettext-0.19.8.1.
33640+ * en@boldquot.header: New file, from gettext-0.19.8.1.
33641+ * en@quot.header: New file, from gettext-0.19.8.1.
33642+ * insert-header.sin: New file, from gettext-0.19.8.1.
33643+ * quot.sed: New file, from gettext-0.19.8.1.
33644+ * remove-potcdate.sin: New file, from gettext-0.19.8.1.
33645+ * Rules-quot: New file, from gettext-0.19.8.1.
33646+ * cat-id-tbl.c: Remove file.
33647+ * stamp-cat-id: Remove file.
33648+
33649 /* Automatically generated by po2tbl.sed from lrzsz.pot. */
33650
33651 #if HAVE_CONFIG_H
33652Binary files clean/lrzsz-0.12.20/po/de.gmo and lrzsz-0.12.20/po/de.gmo differ
33653diff -uprN clean/lrzsz-0.12.20/po/de.po lrzsz-0.12.20/po/de.po
33654--- clean/lrzsz-0.12.20/po/de.po 1998-12-30 16:31:46.000000000 +0000
33655+++ lrzsz-0.12.20/po/de.po 2019-11-26 11:42:07.000000000 +0000
33656@@ -6,10 +6,12 @@
33657 msgid ""
33658 msgstr ""
33659 "Project-Id-Version: PACKAGE VERSION\n"
33660-"POT-Creation-Date: 1998-12-30 08:49+0100\n"
33661+"Report-Msgid-Bugs-To: \n"
33662+"POT-Creation-Date: 2019-11-26 11:39+0000\n"
33663 "PO-Revision-Date: 1997-06-01 19:00+0200\n"
33664 "Last-Translator: FULL NAME <uwe@ohse.de>\n"
33665 "Language-Team: none. try <uwe@ohse.de>\n"
33666+"Language: de\n"
33667 "MIME-Version: 1.0\n"
33668 "Content-Type: text/plain; charset=iso-8859-1\n"
33669 "Content-Transfer-Encoding: 8bit\n"
33670@@ -18,7 +20,7 @@ msgstr ""
33671 msgid "io_mode(,2) in rbsb.c not implemented\n"
33672 msgstr "io_mode(2) in rbsb.c nicht implementiert\n"
33673
33674-#: src/lrz.c:201 src/lsz.c:230
33675+#: src/lsz.c:230 src/lrz.c:201
33676 #, c-format
33677 msgid "caught signal %d; exiting"
33678 msgstr "erhielt Signal %d; Programmabbruch"
33679@@ -45,7 +47,7 @@ msgstr "Framelnge"
33680 msgid "framelength out of range 32..%ld"
33681 msgstr "Argument der Option l auerhalb des Bereichs 32..%ld"
33682
33683-#: src/lrz.c:323 src/lsz.c:450
33684+#: src/lsz.c:450 src/lrz.c:323
33685 msgid "min_bps"
33686 msgstr "minimale BPS-Rate"
33687
33688@@ -53,65 +55,65 @@ msgstr "minimale BPS-Rate"
33689 msgid "min_bps must be >= 0"
33690 msgstr "minimale BPS-Rate mu >= 0 sein"
33691
33692-#: src/lrz.c:329 src/lsz.c:458
33693+#: src/lsz.c:458 src/lrz.c:329
33694 msgid "min_bps_time"
33695 msgstr ""
33696
33697-#: src/lrz.c:331 src/lsz.c:460
33698+#: src/lsz.c:460 src/lrz.c:331
33699 msgid "min_bps_time must be > 1"
33700 msgstr "Zeitfenster fr minimale BPS-Rate mu > 1 Sekunde sein"
33701
33702-#: src/lrz.c:347 src/lsz.c:484
33703+#: src/lsz.c:484 src/lrz.c:347
33704 msgid "hour to large (0..23)"
33705 msgstr "Stunde zu gross (0..23)"
33706
33707-#: src/lrz.c:349 src/lsz.c:486
33708+#: src/lsz.c:486 src/lrz.c:349
33709 msgid "unparsable stop time\n"
33710 msgstr "unparsbare Endzeit\n"
33711
33712-#: src/lrz.c:353 src/lsz.c:490
33713+#: src/lsz.c:490 src/lrz.c:353
33714 msgid "minute to large (0..59)"
33715 msgstr "Minute zu gro (0..59)"
33716
33717-#: src/lrz.c:363 src/lrz.c:370 src/lsz.c:500 src/lsz.c:507
33718+#: src/lsz.c:500 src/lsz.c:507 src/lrz.c:363 src/lrz.c:370
33719 msgid "stop time to small"
33720 msgstr "Stopzeit zu kurz"
33721
33722-#: src/lrz.c:368 src/lsz.c:505
33723+#: src/lsz.c:505 src/lrz.c:368
33724 msgid "stop-at"
33725 msgstr ""
33726
33727-#: src/lrz.c:399 src/lsz.c:516
33728+#: src/lsz.c:516 src/lrz.c:399
33729 msgid "timeout"
33730 msgstr "Timeout"
33731
33732-#: src/lrz.c:401 src/lsz.c:518
33733+#: src/lsz.c:518 src/lrz.c:401
33734 msgid "timeout out of range 10..1000"
33735 msgstr "Argument der Option t auerhalb des Bereichs 10..1000"
33736
33737-#: src/lrz.c:417 src/lsz.c:526
33738+#: src/lsz.c:526 src/lrz.c:417
33739 msgid "security violation: can't do that under restricted shell\n"
33740 msgstr "Sicherheitsversto: Ausfhrung unter eingeschrnkter Shell verboten\n"
33741
33742-#: src/lrz.c:407 src/lsz.c:533
33743+#: src/lsz.c:533 src/lrz.c:407
33744 msgid "window size"
33745 msgstr "Fenstergre"
33746
33747-#: src/lrz.c:432 src/lrz.c:439 src/lsz.c:556 src/lsz.c:563
33748+#: src/lsz.c:556 src/lsz.c:563 src/lrz.c:432 src/lrz.c:439
33749 msgid "cannot turnoff syslog"
33750 msgstr "kann syslogging nicht abschalten"
33751
33752-#: src/lrz.c:454 src/lsz.c:571
33753+#: src/lsz.c:571 src/lrz.c:454
33754 msgid "startup delay"
33755 msgstr "Startverzgerung"
33756
33757+#: src/lsz.c:583 src/lsz.c:692 src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
33758 #: src/lrz.c:470 src/lrz.c:755 src/lrz.c:1117 src/lrz.c:1243 src/lrz.c:1300
33759-#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431 src/lsz.c:583 src/lsz.c:692
33760-#: src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
33761+#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431
33762 msgid "out of memory"
33763 msgstr "Kein Speicher mehr frei"
33764
33765-#: src/lrz.c:480 src/lsz.c:595
33766+#: src/lsz.c:595 src/lrz.c:480
33767 msgid "this program was never intended to be used setuid\n"
33768 msgstr "dieses Programm darf nicht setuid laufen\n"
33769
33770@@ -120,14 +122,15 @@ msgid "need at least one file to send"
33771 msgstr "es mu mindestens ein Name einer zu sendenden Datei angegeben werden"
33772
33773 #: src/lsz.c:628
33774+#, c-format
33775 msgid "Can't send command in restricted mode\n"
33776 msgstr "Im eingeschrnkten Modus ist das Senden von Kommandos verboten\n"
33777
33778-#: src/lrz.c:524 src/lsz.c:655
33779+#: src/lsz.c:655 src/lrz.c:524
33780 msgid "hostname too long\n"
33781 msgstr "Hostname zu lang\n"
33782
33783-#: src/lrz.c:539 src/lsz.c:670
33784+#: src/lsz.c:670 src/lrz.c:539
33785 msgid "illegal server address\n"
33786 msgstr "Illegale Serveraddresse\n"
33787
33788@@ -135,11 +138,11 @@ msgstr "Illegale Serveraddresse\n"
33789 msgid "can read only one file from stdin"
33790 msgstr "kann nur eine Datei von der Standardeingabe lesen"
33791
33792-#: src/lrz.c:571 src/lsz.c:806
33793+#: src/lsz.c:806 src/lrz.c:571
33794 msgid "Transfer incomplete\n"
33795 msgstr "bertragung nicht abgeschlossen\n"
33796
33797-#: src/lrz.c:573 src/lsz.c:808
33798+#: src/lsz.c:808 src/lrz.c:573
33799 msgid "Transfer complete\n"
33800 msgstr "bertragung abgeschlossen\n"
33801
33802@@ -197,9 +200,9 @@ msgstr "Kann keine der angeforderten Dat
33803 #: src/lsz.c:1028
33804 #, c-format
33805 msgid "security violation: not allowed to upload from %s"
33806-msgstr "Sicherheitsversto: Ausfhrung unter eingeschrnkter Shell verboten"
33807+msgstr "Sicherheitsversto: Ausfhrung unter %s verboten"
33808
33809-#: src/lrz.c:1392 src/lsz.c:1046
33810+#: src/lsz.c:1046 src/lrz.c:1392
33811 #, c-format
33812 msgid "cannot open %s"
33813 msgstr "kann %s nicht ffnen"
33814@@ -290,12 +293,12 @@ msgstr "Erhielt %02x als Sektorbesttigu
33815 msgid "Retry Count Exceeded"
33816 msgstr "Maximale Wiederholungsanzahl berschritten"
33817
33818-#: src/lrz.c:593 src/lsz.c:1521
33819+#: src/lsz.c:1521 src/lrz.c:593
33820 #, c-format
33821 msgid "Try `%s --help' for more information.\n"
33822 msgstr "`%s --help' gibt weitere Informationen.\n"
33823
33824-#: src/lrz.c:598 src/lsz.c:1526
33825+#: src/lsz.c:1526 src/lrz.c:598
33826 #, c-format
33827 msgid "%s version %s\n"
33828 msgstr "%s Version %s\n"
33829@@ -315,7 +318,7 @@ msgid "Send file(s) with ZMODEM/YMODEM/X
33830 msgstr "Dateien mit ZMODEM/YMODEM/XMODEM bertragen\n"
33831
33832 # src/lrz.c:475 src/lsz.c:1330 xx
33833-#: src/lrz.c:604 src/lsz.c:1534
33834+#: src/lsz.c:1534 src/lrz.c:604
33835 msgid ""
33836 " (X) = option applies to XMODEM only\n"
33837 " (Y) = option applies to YMODEM only\n"
33838@@ -431,7 +434,7 @@ msgstr ""
33839 msgid "got ZRQINIT"
33840 msgstr "erhielt ZRQINIT"
33841
33842-#: src/lrz.c:1074 src/lrz.c:1787 src/lsz.c:1792
33843+#: src/lsz.c:1792 src/lrz.c:1074 src/lrz.c:1787
33844 msgid "got ZCAN"
33845 msgstr "erhielt ZCAN"
33846
33847@@ -472,7 +475,7 @@ msgstr "calc_blklen: alt %ld, neu %ld, D
33848 #: src/lsz.c:2272
33849 #, c-format
33850 msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n"
33851-msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%le, ec=%ld\n"
33852+msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%ld, ec=%ld\n"
33853
33854 #: src/lsz.c:2283
33855 #, c-format
33856@@ -493,6 +496,10 @@ msgstr ""
33857 "\n"
33858 "countem: Gesamt %d %ld\n"
33859
33860+#: src/zm.c:91
33861+msgid "Bad CRC"
33862+msgstr ""
33863+
33864 #: src/zm.c:244
33865 #, c-format
33866 msgid "Bad escape sequence %x"
33867@@ -502,7 +509,7 @@ msgstr "Falsche Escapesequenz %x"
33868 msgid "Sender Canceled"
33869 msgstr "Sender brach ab"
33870
33871-#: src/lrz.c:997 src/zm.c:585 src/zm.c:644
33872+#: src/zm.c:585 src/zm.c:644 src/lrz.c:997
33873 msgid "TIMEOUT"
33874 msgstr "TIMEOUT"
33875
33876@@ -772,13 +779,11 @@ msgstr "Erhielt unerwartetes ZRINIT"
33877 msgid "Skipped"
33878 msgstr "bersprungen"
33879
33880-#. too bad
33881 #: src/lrz.c:2064
33882 #, c-format
33883 msgid "rzfile: bps rate %ld below min %ld"
33884 msgstr "rzfile: BPS-Rate %ld unter Minimum %ld"
33885
33886-#. too bad
33887 #: src/lrz.c:2079
33888 msgid "rzfile: reached stop time"
33889 msgstr "rzfile: Abbruchzeit erreicht"
33890diff -uprN clean/lrzsz-0.12.20/po/en@boldquot.header lrzsz-0.12.20/po/en@boldquot.header
33891--- clean/lrzsz-0.12.20/po/en@boldquot.header 1970-01-01 01:00:00.000000000 +0100
33892+++ lrzsz-0.12.20/po/en@boldquot.header 2019-11-25 18:21:17.000000000 +0000
33893@@ -0,0 +1,25 @@
33894+# All this catalog "translates" are quotation characters.
33895+# The msgids must be ASCII and therefore cannot contain real quotation
33896+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
33897+# and double quote (0x22). These substitutes look strange; see
33898+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
33899+#
33900+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
33901+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
33902+# It also translates pairs of apostrophe (0x27) to
33903+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
33904+# and pairs of quotation mark (0x22) to
33905+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
33906+#
33907+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
33908+# When output to an ISO-8859-1 terminal, the single quotation marks are
33909+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
33910+# grave/acute accent (by libiconv), and the double quotation marks are
33911+# transliterated to 0x22.
33912+# When output to an ASCII terminal, the single quotation marks are
33913+# transliterated to apostrophes, and the double quotation marks are
33914+# transliterated to 0x22.
33915+#
33916+# This catalog furthermore displays the text between the quotation marks in
33917+# bold face, assuming the VT100/XTerm escape sequences.
33918+#
33919diff -uprN clean/lrzsz-0.12.20/po/en@quot.header lrzsz-0.12.20/po/en@quot.header
33920--- clean/lrzsz-0.12.20/po/en@quot.header 1970-01-01 01:00:00.000000000 +0100
33921+++ lrzsz-0.12.20/po/en@quot.header 2019-11-25 18:21:17.000000000 +0000
33922@@ -0,0 +1,22 @@
33923+# All this catalog "translates" are quotation characters.
33924+# The msgids must be ASCII and therefore cannot contain real quotation
33925+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
33926+# and double quote (0x22). These substitutes look strange; see
33927+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
33928+#
33929+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
33930+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
33931+# It also translates pairs of apostrophe (0x27) to
33932+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
33933+# and pairs of quotation mark (0x22) to
33934+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
33935+#
33936+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
33937+# When output to an ISO-8859-1 terminal, the single quotation marks are
33938+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
33939+# grave/acute accent (by libiconv), and the double quotation marks are
33940+# transliterated to 0x22.
33941+# When output to an ASCII terminal, the single quotation marks are
33942+# transliterated to apostrophes, and the double quotation marks are
33943+# transliterated to 0x22.
33944+#
33945diff -uprN clean/lrzsz-0.12.20/po/insert-header.sin lrzsz-0.12.20/po/insert-header.sin
33946--- clean/lrzsz-0.12.20/po/insert-header.sin 1970-01-01 01:00:00.000000000 +0100
33947+++ lrzsz-0.12.20/po/insert-header.sin 2019-11-25 18:21:17.000000000 +0000
33948@@ -0,0 +1,28 @@
33949+# Sed script that inserts the file called HEADER before the header entry.
33950+#
33951+# Copyright (C) 2001 Free Software Foundation, Inc.
33952+# Written by Bruno Haible <bruno@clisp.org>, 2001.
33953+# This file is free software; the Free Software Foundation gives
33954+# unlimited permission to use, copy, distribute, and modify it.
33955+#
33956+# At each occurrence of a line starting with "msgid ", we execute the following
33957+# commands. At the first occurrence, insert the file. At the following
33958+# occurrences, do nothing. The distinction between the first and the following
33959+# occurrences is achieved by looking at the hold space.
33960+/^msgid /{
33961+x
33962+# Test if the hold space is empty.
33963+s/m/m/
33964+ta
33965+# Yes it was empty. First occurrence. Read the file.
33966+r HEADER
33967+# Output the file's contents by reading the next line. But don't lose the
33968+# current line while doing this.
33969+g
33970+N
33971+bb
33972+:a
33973+# The hold space was nonempty. Following occurrences. Do nothing.
33974+x
33975+:b
33976+}
33977diff -uprN clean/lrzsz-0.12.20/po/lrzsz.pot lrzsz-0.12.20/po/lrzsz.pot
33978--- clean/lrzsz-0.12.20/po/lrzsz.pot 1998-12-30 07:50:00.000000000 +0000
33979+++ lrzsz-0.12.20/po/lrzsz.pot 2019-11-26 11:39:12.000000000 +0000
33980@@ -1,24 +1,27 @@
33981 # SOME DESCRIPTIVE TITLE.
33982 # Copyright (C) YEAR Free Software Foundation, Inc.
33983+# This file is distributed under the same license as the lrzsz package.
33984 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
33985 #
33986 #, fuzzy
33987 msgid ""
33988 msgstr ""
33989-"Project-Id-Version: PACKAGE VERSION\n"
33990-"POT-Creation-Date: 1998-12-30 08:49+0100\n"
33991+"Project-Id-Version: lrzsz 0.12.20\n"
33992+"Report-Msgid-Bugs-To: \n"
33993+"POT-Creation-Date: 2019-11-26 11:39+0000\n"
33994 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
33995 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
33996 "Language-Team: LANGUAGE <LL@li.org>\n"
33997+"Language: \n"
33998 "MIME-Version: 1.0\n"
33999 "Content-Type: text/plain; charset=CHARSET\n"
34000-"Content-Transfer-Encoding: ENCODING\n"
34001+"Content-Transfer-Encoding: 8bit\n"
34002
34003 #: src/lsz.c:228
34004 msgid "io_mode(,2) in rbsb.c not implemented\n"
34005 msgstr ""
34006
34007-#: src/lrz.c:201 src/lsz.c:230
34008+#: src/lsz.c:230 src/lrz.c:201
34009 #, c-format
34010 msgid "caught signal %d; exiting"
34011 msgstr ""
34012@@ -45,7 +48,7 @@ msgstr ""
34013 msgid "framelength out of range 32..%ld"
34014 msgstr ""
34015
34016-#: src/lrz.c:323 src/lsz.c:450
34017+#: src/lsz.c:450 src/lrz.c:323
34018 msgid "min_bps"
34019 msgstr ""
34020
34021@@ -53,65 +56,65 @@ msgstr ""
34022 msgid "min_bps must be >= 0"
34023 msgstr ""
34024
34025-#: src/lrz.c:329 src/lsz.c:458
34026+#: src/lsz.c:458 src/lrz.c:329
34027 msgid "min_bps_time"
34028 msgstr ""
34029
34030-#: src/lrz.c:331 src/lsz.c:460
34031+#: src/lsz.c:460 src/lrz.c:331
34032 msgid "min_bps_time must be > 1"
34033 msgstr ""
34034
34035-#: src/lrz.c:347 src/lsz.c:484
34036+#: src/lsz.c:484 src/lrz.c:347
34037 msgid "hour to large (0..23)"
34038 msgstr ""
34039
34040-#: src/lrz.c:349 src/lsz.c:486
34041+#: src/lsz.c:486 src/lrz.c:349
34042 msgid "unparsable stop time\n"
34043 msgstr ""
34044
34045-#: src/lrz.c:353 src/lsz.c:490
34046+#: src/lsz.c:490 src/lrz.c:353
34047 msgid "minute to large (0..59)"
34048 msgstr ""
34049
34050-#: src/lrz.c:363 src/lrz.c:370 src/lsz.c:500 src/lsz.c:507
34051+#: src/lsz.c:500 src/lsz.c:507 src/lrz.c:363 src/lrz.c:370
34052 msgid "stop time to small"
34053 msgstr ""
34054
34055-#: src/lrz.c:368 src/lsz.c:505
34056+#: src/lsz.c:505 src/lrz.c:368
34057 msgid "stop-at"
34058 msgstr ""
34059
34060-#: src/lrz.c:399 src/lsz.c:516
34061+#: src/lsz.c:516 src/lrz.c:399
34062 msgid "timeout"
34063 msgstr ""
34064
34065-#: src/lrz.c:401 src/lsz.c:518
34066+#: src/lsz.c:518 src/lrz.c:401
34067 msgid "timeout out of range 10..1000"
34068 msgstr ""
34069
34070-#: src/lrz.c:417 src/lsz.c:526
34071+#: src/lsz.c:526 src/lrz.c:417
34072 msgid "security violation: can't do that under restricted shell\n"
34073 msgstr ""
34074
34075-#: src/lrz.c:407 src/lsz.c:533
34076+#: src/lsz.c:533 src/lrz.c:407
34077 msgid "window size"
34078 msgstr ""
34079
34080-#: src/lrz.c:432 src/lrz.c:439 src/lsz.c:556 src/lsz.c:563
34081+#: src/lsz.c:556 src/lsz.c:563 src/lrz.c:432 src/lrz.c:439
34082 msgid "cannot turnoff syslog"
34083 msgstr ""
34084
34085-#: src/lrz.c:454 src/lsz.c:571
34086+#: src/lsz.c:571 src/lrz.c:454
34087 msgid "startup delay"
34088 msgstr ""
34089
34090+#: src/lsz.c:583 src/lsz.c:692 src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
34091 #: src/lrz.c:470 src/lrz.c:755 src/lrz.c:1117 src/lrz.c:1243 src/lrz.c:1300
34092-#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431 src/lsz.c:583 src/lsz.c:692
34093-#: src/lsz.c:831 src/lsz.c:1080 src/zreadline.c:127
34094+#: src/lrz.c:1317 src/lrz.c:1332 src/lrz.c:1431
34095 msgid "out of memory"
34096 msgstr ""
34097
34098-#: src/lrz.c:480 src/lsz.c:595
34099+#: src/lsz.c:595 src/lrz.c:480
34100 msgid "this program was never intended to be used setuid\n"
34101 msgstr ""
34102
34103@@ -120,14 +123,15 @@ msgid "need at least one file to send"
34104 msgstr ""
34105
34106 #: src/lsz.c:628
34107+#, c-format
34108 msgid "Can't send command in restricted mode\n"
34109 msgstr ""
34110
34111-#: src/lrz.c:524 src/lsz.c:655
34112+#: src/lsz.c:655 src/lrz.c:524
34113 msgid "hostname too long\n"
34114 msgstr ""
34115
34116-#: src/lrz.c:539 src/lsz.c:670
34117+#: src/lsz.c:670 src/lrz.c:539
34118 msgid "illegal server address\n"
34119 msgstr ""
34120
34121@@ -135,11 +139,11 @@ msgstr ""
34122 msgid "can read only one file from stdin"
34123 msgstr ""
34124
34125-#: src/lrz.c:571 src/lsz.c:806
34126+#: src/lsz.c:806 src/lrz.c:571
34127 msgid "Transfer incomplete\n"
34128 msgstr ""
34129
34130-#: src/lrz.c:573 src/lsz.c:808
34131+#: src/lsz.c:808 src/lrz.c:573
34132 msgid "Transfer complete\n"
34133 msgstr ""
34134
34135@@ -199,7 +203,7 @@ msgstr ""
34136 msgid "security violation: not allowed to upload from %s"
34137 msgstr ""
34138
34139-#: src/lrz.c:1392 src/lsz.c:1046
34140+#: src/lsz.c:1046 src/lrz.c:1392
34141 #, c-format
34142 msgid "cannot open %s"
34143 msgstr ""
34144@@ -290,12 +294,12 @@ msgstr ""
34145 msgid "Retry Count Exceeded"
34146 msgstr ""
34147
34148-#: src/lrz.c:593 src/lsz.c:1521
34149+#: src/lsz.c:1521 src/lrz.c:593
34150 #, c-format
34151 msgid "Try `%s --help' for more information.\n"
34152 msgstr ""
34153
34154-#: src/lrz.c:598 src/lsz.c:1526
34155+#: src/lsz.c:1526 src/lrz.c:598
34156 #, c-format
34157 msgid "%s version %s\n"
34158 msgstr ""
34159@@ -314,7 +318,7 @@ msgstr ""
34160 msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n"
34161 msgstr ""
34162
34163-#: src/lrz.c:604 src/lsz.c:1534
34164+#: src/lsz.c:1534 src/lrz.c:604
34165 msgid ""
34166 " (X) = option applies to XMODEM only\n"
34167 " (Y) = option applies to YMODEM only\n"
34168@@ -378,7 +382,7 @@ msgstr ""
34169 msgid "got ZRQINIT"
34170 msgstr ""
34171
34172-#: src/lrz.c:1074 src/lrz.c:1787 src/lsz.c:1792
34173+#: src/lsz.c:1792 src/lrz.c:1074 src/lrz.c:1787
34174 msgid "got ZCAN"
34175 msgstr ""
34176
34177@@ -438,6 +442,10 @@ msgid ""
34178 "countem: Total %d %ld\n"
34179 msgstr ""
34180
34181+#: src/zm.c:91
34182+msgid "Bad CRC"
34183+msgstr ""
34184+
34185 #: src/zm.c:244
34186 #, c-format
34187 msgid "Bad escape sequence %x"
34188@@ -447,7 +455,7 @@ msgstr ""
34189 msgid "Sender Canceled"
34190 msgstr ""
34191
34192-#: src/lrz.c:997 src/zm.c:585 src/zm.c:644
34193+#: src/zm.c:585 src/zm.c:644 src/lrz.c:997
34194 msgid "TIMEOUT"
34195 msgstr ""
34196
34197@@ -678,13 +686,11 @@ msgstr ""
34198 msgid "Skipped"
34199 msgstr ""
34200
34201-#. too bad
34202 #: src/lrz.c:2064
34203 #, c-format
34204 msgid "rzfile: bps rate %ld below min %ld"
34205 msgstr ""
34206
34207-#. too bad
34208 #: src/lrz.c:2079
34209 msgid "rzfile: reached stop time"
34210 msgstr ""
34211diff -uprN clean/lrzsz-0.12.20/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
34212--- clean/lrzsz-0.12.20/po/Makefile.in.in 1998-04-26 14:22:40.000000000 +0100
34213+++ lrzsz-0.12.20/po/Makefile.in.in 2019-11-25 18:21:17.000000000 +0000
34214@@ -1,14 +1,20 @@
34215-# Makefile for program source directory in GNU NLS utilities package.
34216-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
34217+# Makefile for PO directory in any package using GNU gettext.
34218+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
34219+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
34220 #
34221-# This file file be copied and used freely without restrictions. It can
34222-# be used in projects which are not available under the GNU Public License
34223-# but which still want to provide support for the GNU gettext functionality.
34224-# Please note that the actual code is *not* freely available.
34225+# Copying and distribution of this file, with or without modification,
34226+# are permitted in any medium without royalty provided the copyright
34227+# notice and this notice are preserved. This file is offered as-is,
34228+# without any warranty.
34229+#
34230+# Origin: gettext-0.20
34231+GETTEXT_MACRO_VERSION = 0.20
34232
34233 PACKAGE = @PACKAGE@
34234 VERSION = @VERSION@
34235+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
34236
34237+SED = @SED@
34238 SHELL = /bin/sh
34239 @SET_MAKE@
34240
34241@@ -18,229 +24,479 @@ VPATH = @srcdir@
34242
34243 prefix = @prefix@
34244 exec_prefix = @exec_prefix@
34245-datadir = $(prefix)/@DATADIRNAME@
34246-localedir = $(datadir)/locale
34247-gnulocaledir = $(prefix)/share/locale
34248-gettextsrcdir = $(prefix)/share/gettext/po
34249-subdir = po
34250+datarootdir = @datarootdir@
34251+datadir = @datadir@
34252+localedir = @localedir@
34253+gettextsrcdir = $(datadir)/gettext/po
34254
34255 INSTALL = @INSTALL@
34256 INSTALL_DATA = @INSTALL_DATA@
34257-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
34258-
34259-CC = @CC@
34260-GENCAT = @GENCAT@
34261-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
34262-MSGFMT = @MSGFMT@
34263-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
34264-MSGMERGE = PATH=../src:$$PATH msgmerge
34265-
34266-DEFS = @DEFS@
34267-CFLAGS = @CFLAGS@
34268-CPPFLAGS = @CPPFLAGS@
34269-
34270-INCLUDES = -I.. -I$(top_srcdir)/intl
34271
34272-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
34273+# We use $(mkdir_p).
34274+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
34275+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
34276+# @install_sh@ does not start with $(SHELL), so we add it.
34277+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
34278+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
34279+# versions, $(mkinstalldirs) and $(install_sh) are unused.
34280+mkinstalldirs = $(SHELL) @install_sh@ -d
34281+install_sh = $(SHELL) @install_sh@
34282+MKDIR_P = @MKDIR_P@
34283+mkdir_p = @mkdir_p@
34284+
34285+# When building gettext-tools, we prefer to use the built programs
34286+# rather than installed programs. However, we can't do that when we
34287+# are cross compiling.
34288+CROSS_COMPILING = @CROSS_COMPILING@
34289+
34290+GMSGFMT_ = @GMSGFMT@
34291+GMSGFMT_no = @GMSGFMT@
34292+GMSGFMT_yes = @GMSGFMT_015@
34293+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
34294+XGETTEXT_ = @XGETTEXT@
34295+XGETTEXT_no = @XGETTEXT@
34296+XGETTEXT_yes = @XGETTEXT_015@
34297+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
34298+MSGMERGE = @MSGMERGE@
34299+MSGMERGE_UPDATE = @MSGMERGE@ --update
34300+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
34301+MSGINIT = msginit
34302+MSGCONV = msgconv
34303+MSGFILTER = msgfilter
34304
34305-SOURCES = cat-id-tbl.c
34306 POFILES = @POFILES@
34307 GMOFILES = @GMOFILES@
34308-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
34309-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
34310+UPDATEPOFILES = @UPDATEPOFILES@
34311+DUMMYPOFILES = @DUMMYPOFILES@
34312+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
34313+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
34314+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
34315+$(POFILES) $(GMOFILES) \
34316+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
34317
34318 POTFILES = \
34319
34320 CATALOGS = @CATALOGS@
34321-CATOBJEXT = @CATOBJEXT@
34322-INSTOBJEXT = @INSTOBJEXT@
34323
34324-.SUFFIXES:
34325-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
34326-
34327-.c.o:
34328- $(COMPILE) $<
34329+POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
34330+POFILESDEPS_yes = $(POFILESDEPS_)
34331+POFILESDEPS_no =
34332+POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
34333+
34334+DISTFILESDEPS_ = update-po
34335+DISTFILESDEPS_yes = $(DISTFILESDEPS_)
34336+DISTFILESDEPS_no =
34337+DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
34338
34339-.po.pox:
34340- $(MAKE) $(PACKAGE).pot
34341- $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
34342+# Makevars gets inserted here. (Don't remove this line!)
34343
34344-.po.mo:
34345- $(MSGFMT) -o $@ $<
34346-
34347-.po.gmo:
34348- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
34349- && rm -f $$file && $(GMSGFMT) -o $$file $<
34350+.SUFFIXES:
34351+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
34352
34353-.po.cat:
34354- sed -f ../intl/po2msg.sed < $< > $*.msg \
34355- && rm -f $@ && $(GENCAT) $@ $*.msg
34356+# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
34357+# The GNU Coding Standards say in
34358+# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
34359+# "GNU distributions usually contain some files which are not source files
34360+# ... . Since these files normally appear in the source directory, they
34361+# should always appear in the source directory, not in the build directory.
34362+# So Makefile rules to update them should put the updated files in the
34363+# source directory."
34364+# Therefore we put these files in the source directory, not the build directory.
34365+
34366+# During .po -> .gmo conversion, take into account the most recent changes to
34367+# the .pot file. This eliminates the need to update the .po files when the
34368+# .pot file has changed, which would be troublesome if the .po files are put
34369+# under version control.
34370+.po.gmo: $(srcdir)/$(DOMAIN).pot
34371+ @lang=`echo $* | sed -e 's,.*/,,'`; \
34372+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
34373+ echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
34374+ cd $(srcdir) && \
34375+ rm -f $${lang}.gmo && \
34376+ $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
34377+ $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
34378+ mv t-$${lang}.gmo $${lang}.gmo && \
34379+ rm -f $${lang}.1po
34380+
34381+.sin.sed:
34382+ sed -e '/^#/d' $< > t-$@
34383+ mv t-$@ $@
34384
34385
34386 all: all-@USE_NLS@
34387
34388-all-yes: cat-id-tbl.c $(CATALOGS)
34389+all-yes: $(srcdir)/stamp-po
34390 all-no:
34391
34392-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
34393- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
34394- --add-comments --keyword=_ --keyword=N_ \
34395- --files-from=$(srcdir)/POTFILES.in
34396- rm -f $(srcdir)/$(PACKAGE).pot
34397- mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
34398-
34399-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
34400-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
34401- rm -f cat-id-tbl.tmp
34402- sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
34403- | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
34404- if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
34405- rm cat-id-tbl.tmp; \
34406- else \
34407- echo cat-id-tbl.c changed; \
34408- rm -f $(srcdir)/cat-id-tbl.c; \
34409- mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
34410+# Ensure that the gettext macros and this Makefile.in.in are in sync.
34411+CHECK_MACRO_VERSION = \
34412+ test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
34413+ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
34414+ exit 1; \
34415+ }
34416+
34417+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
34418+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
34419+# we don't want to bother translators with empty POT files). We assume that
34420+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
34421+# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
34422+
34423+# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
34424+# have been loosely updated. Its purpose is that when a developer or translator
34425+# checks out the package from a version control system, and the $(DOMAIN).pot
34426+# file is not under version control, "make" will update the $(DOMAIN).pot and
34427+# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
34428+# timestamp would not be necessary if updating the $(CATALOGS) would always
34429+# touch them; however, the rule for $(POFILES) has been designed to not touch
34430+# files that don't need to be changed.
34431+$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
34432+ @$(CHECK_MACRO_VERSION)
34433+ test ! -f $(srcdir)/$(DOMAIN).pot || \
34434+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
34435+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \
34436+ echo "touch $(srcdir)/stamp-po" && \
34437+ echo timestamp > $(srcdir)/stamp-poT && \
34438+ mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
34439+ }
34440+
34441+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
34442+# otherwise packages like GCC can not be built if only parts of the source
34443+# have been downloaded.
34444+
34445+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
34446+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
34447+# The determination of whether the package xyz is a GNU one is based on the
34448+# heuristic whether some file in the top level directory mentions "GNU xyz".
34449+# If GNU 'find' is available, we avoid grepping through monster files.
34450+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
34451+ package_gnu="$(PACKAGE_GNU)"; \
34452+ test -n "$$package_gnu" || { \
34453+ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
34454+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
34455+ else \
34456+ LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
34457+ fi; \
34458+ } | grep -v 'libtool:' >/dev/null; then \
34459+ package_gnu=yes; \
34460+ else \
34461+ package_gnu=no; \
34462+ fi; \
34463+ }; \
34464+ if test "$$package_gnu" = "yes"; then \
34465+ package_prefix='GNU '; \
34466+ else \
34467+ package_prefix=''; \
34468+ fi; \
34469+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
34470+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
34471+ else \
34472+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
34473+ fi; \
34474+ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
34475+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
34476+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
34477+ --add-comments=TRANSLATORS: \
34478+ --files-from=$(srcdir)/POTFILES.in \
34479+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
34480+ --msgid-bugs-address="$$msgid_bugs_address" \
34481+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
34482+ ;; \
34483+ *) \
34484+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
34485+ --add-comments=TRANSLATORS: \
34486+ --files-from=$(srcdir)/POTFILES.in \
34487+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
34488+ --package-name="$${package_prefix}@PACKAGE@" \
34489+ --package-version='@VERSION@' \
34490+ --msgid-bugs-address="$$msgid_bugs_address" \
34491+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
34492+ ;; \
34493+ esac
34494+ test ! -f $(DOMAIN).po || { \
34495+ if test -f $(srcdir)/$(DOMAIN).pot-header; then \
34496+ sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
34497+ cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
34498+ rm -f $(DOMAIN).1po \
34499+ || exit 1; \
34500+ fi; \
34501+ if test -f $(srcdir)/$(DOMAIN).pot; then \
34502+ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
34503+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
34504+ if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
34505+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
34506+ else \
34507+ rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
34508+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
34509+ fi; \
34510+ else \
34511+ mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
34512+ fi; \
34513+ }
34514+
34515+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
34516+# every "make" invocation, only create it when it is missing.
34517+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
34518+$(srcdir)/$(DOMAIN).pot:
34519+ $(MAKE) $(DOMAIN).pot-update
34520+
34521+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
34522+# Note that a PO file is not touched if it doesn't need to be changed.
34523+$(POFILES): $(POFILESDEPS)
34524+ @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
34525+ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
34526+ if test -f "$(srcdir)/$${lang}.po"; then \
34527+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
34528+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
34529+ cd $(srcdir) \
34530+ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
34531+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
34532+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
34533+ 0.1[6-7] | 0.1[6-7].*) \
34534+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
34535+ *) \
34536+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
34537+ esac; \
34538+ }; \
34539+ else \
34540+ $(MAKE) $${lang}.po-create; \
34541 fi
34542- cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
34543
34544
34545 install: install-exec install-data
34546 install-exec:
34547 install-data: install-data-@USE_NLS@
34548-install-data-no: all
34549-install-data-yes: all
34550- if test -r $(MKINSTALLDIRS); then \
34551- $(MKINSTALLDIRS) $(datadir); \
34552+ if test "$(PACKAGE)" = "gettext-tools"; then \
34553+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
34554+ for file in $(DISTFILES.common) Makevars.template; do \
34555+ $(INSTALL_DATA) $(srcdir)/$$file \
34556+ $(DESTDIR)$(gettextsrcdir)/$$file; \
34557+ done; \
34558+ for file in Makevars; do \
34559+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
34560+ done; \
34561 else \
34562- $(top_srcdir)/mkinstalldirs $(datadir); \
34563+ : ; \
34564 fi
34565+install-data-no: all
34566+install-data-yes: all
34567 @catalogs='$(CATALOGS)'; \
34568 for cat in $$catalogs; do \
34569 cat=`basename $$cat`; \
34570- case "$$cat" in \
34571- *.gmo) destdir=$(gnulocaledir);; \
34572- *) destdir=$(localedir);; \
34573- esac; \
34574- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
34575- dir=$$destdir/$$lang/LC_MESSAGES; \
34576- if test -r $(MKINSTALLDIRS); then \
34577- $(MKINSTALLDIRS) $$dir; \
34578- else \
34579- $(top_srcdir)/mkinstalldirs $$dir; \
34580- fi; \
34581- if test -r $$cat; then \
34582- $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
34583- echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
34584- else \
34585- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
34586- echo "installing $(srcdir)/$$cat as" \
34587- "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
34588- fi; \
34589- if test -r $$cat.m; then \
34590- $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
34591- echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
34592- else \
34593- if test -r $(srcdir)/$$cat.m ; then \
34594- $(INSTALL_DATA) $(srcdir)/$$cat.m \
34595- $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
34596- echo "installing $(srcdir)/$$cat as" \
34597- "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
34598- else \
34599- true; \
34600+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
34601+ dir=$(localedir)/$$lang/LC_MESSAGES; \
34602+ $(mkdir_p) $(DESTDIR)$$dir; \
34603+ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
34604+ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
34605+ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
34606+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
34607+ if test -n "$$lc"; then \
34608+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
34609+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
34610+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
34611+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
34612+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
34613+ for file in *; do \
34614+ if test -f $$file; then \
34615+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
34616+ fi; \
34617+ done); \
34618+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
34619+ else \
34620+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
34621+ :; \
34622+ else \
34623+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
34624+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
34625+ fi; \
34626+ fi; \
34627+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
34628+ ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
34629+ ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
34630+ cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
34631+ echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
34632 fi; \
34633- fi; \
34634+ done; \
34635 done
34636- if test "$(PACKAGE)" = "gettext"; then \
34637- if test -r $(MKINSTALLDIRS); then \
34638- $(MKINSTALLDIRS) $(gettextsrcdir); \
34639- else \
34640- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
34641- fi; \
34642- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
34643- $(gettextsrcdir)/Makefile.in.in; \
34644+
34645+install-strip: install
34646+
34647+installdirs: installdirs-exec installdirs-data
34648+installdirs-exec:
34649+installdirs-data: installdirs-data-@USE_NLS@
34650+ if test "$(PACKAGE)" = "gettext-tools"; then \
34651+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
34652 else \
34653 : ; \
34654 fi
34655+installdirs-data-no:
34656+installdirs-data-yes:
34657+ @catalogs='$(CATALOGS)'; \
34658+ for cat in $$catalogs; do \
34659+ cat=`basename $$cat`; \
34660+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
34661+ dir=$(localedir)/$$lang/LC_MESSAGES; \
34662+ $(mkdir_p) $(DESTDIR)$$dir; \
34663+ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
34664+ if test -n "$$lc"; then \
34665+ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
34666+ link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
34667+ mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
34668+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
34669+ (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
34670+ for file in *; do \
34671+ if test -f $$file; then \
34672+ ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
34673+ fi; \
34674+ done); \
34675+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
34676+ else \
34677+ if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
34678+ :; \
34679+ else \
34680+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
34681+ mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
34682+ fi; \
34683+ fi; \
34684+ fi; \
34685+ done; \
34686+ done
34687
34688 # Define this as empty until I found a useful application.
34689 installcheck:
34690
34691-uninstall:
34692+uninstall: uninstall-exec uninstall-data
34693+uninstall-exec:
34694+uninstall-data: uninstall-data-@USE_NLS@
34695+ if test "$(PACKAGE)" = "gettext-tools"; then \
34696+ for file in $(DISTFILES.common) Makevars.template; do \
34697+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
34698+ done; \
34699+ else \
34700+ : ; \
34701+ fi
34702+uninstall-data-no:
34703+uninstall-data-yes:
34704 catalogs='$(CATALOGS)'; \
34705 for cat in $$catalogs; do \
34706 cat=`basename $$cat`; \
34707- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
34708- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
34709- rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
34710- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
34711- rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
34712+ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
34713+ for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
34714+ rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
34715+ done; \
34716 done
34717- rm -f $(gettextsrcdir)/po-Makefile.in.in
34718
34719 check: all
34720
34721-cat-id-tbl.o: ../intl/libgettext.h
34722+info dvi ps pdf html tags TAGS ctags CTAGS ID:
34723
34724-dvi info tags TAGS ID:
34725+install-dvi install-ps install-pdf install-html:
34726
34727 mostlyclean:
34728- rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
34729+ rm -f remove-potcdate.sed
34730+ rm -f $(srcdir)/stamp-poT
34731+ rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
34732 rm -fr *.o
34733
34734 clean: mostlyclean
34735
34736 distclean: clean
34737- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
34738+ rm -f Makefile Makefile.in POTFILES
34739
34740 maintainer-clean: distclean
34741 @echo "This command is intended for maintainers to use;"
34742 @echo "it deletes files that may require special tools to rebuild."
34743- rm -f $(GMOFILES)
34744+ rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
34745
34746-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
34747-dist distdir: update-po $(DISTFILES)
34748+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
34749+dist distdir:
34750+ test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
34751+ @$(MAKE) dist2
34752+# This is a separate target because 'update-po' must be executed before.
34753+dist2: $(srcdir)/stamp-po $(DISTFILES)
34754 dists="$(DISTFILES)"; \
34755+ if test "$(PACKAGE)" = "gettext-tools"; then \
34756+ dists="$$dists Makevars.template"; \
34757+ fi; \
34758+ if test -f $(srcdir)/$(DOMAIN).pot; then \
34759+ dists="$$dists $(DOMAIN).pot stamp-po"; \
34760+ fi; \
34761+ if test -f $(srcdir)/ChangeLog; then \
34762+ dists="$$dists ChangeLog"; \
34763+ fi; \
34764+ for i in 0 1 2 3 4 5 6 7 8 9; do \
34765+ if test -f $(srcdir)/ChangeLog.$$i; then \
34766+ dists="$$dists ChangeLog.$$i"; \
34767+ fi; \
34768+ done; \
34769+ if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
34770 for file in $$dists; do \
34771- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
34772- || cp -p $(srcdir)/$$file $(distdir); \
34773+ if test -f $$file; then \
34774+ cp -p $$file $(distdir) || exit 1; \
34775+ else \
34776+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \
34777+ fi; \
34778 done
34779
34780 update-po: Makefile
34781- $(MAKE) $(PACKAGE).pot
34782- PATH=`pwd`/../src:$$PATH; \
34783+ $(MAKE) $(DOMAIN).pot-update
34784+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
34785+ $(MAKE) update-gmo
34786+
34787+# General rule for creating PO files.
34788+
34789+.nop.po-create:
34790+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
34791+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
34792+ exit 1
34793+
34794+# General rule for updating PO files.
34795+
34796+.nop.po-update:
34797+ @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
34798+ if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
34799+ tmpdir=`pwd`; \
34800+ echo "$$lang:"; \
34801+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
34802+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
34803 cd $(srcdir); \
34804- catalogs='$(CATALOGS)'; \
34805- for cat in $$catalogs; do \
34806- cat=`basename $$cat`; \
34807- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
34808- mv $$lang.po $$lang.old.po; \
34809- echo "$$lang:"; \
34810- if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
34811- rm -f $$lang.old.po; \
34812+ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
34813+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
34814+ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
34815+ 0.1[6-7] | 0.1[6-7].*) \
34816+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
34817+ *) \
34818+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
34819+ esac; \
34820+ }; then \
34821+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
34822+ rm -f $$tmpdir/$$lang.new.po; \
34823 else \
34824- echo "msgmerge for $$cat failed!"; \
34825- rm -f $$lang.po; \
34826- mv $$lang.old.po $$lang.po; \
34827+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
34828+ :; \
34829+ else \
34830+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
34831+ exit 1; \
34832+ fi; \
34833 fi; \
34834- done
34835+ else \
34836+ echo "msgmerge for $$lang.po failed!" 1>&2; \
34837+ rm -f $$tmpdir/$$lang.new.po; \
34838+ fi
34839
34840-POTFILES: POTFILES.in
34841- ( if test 'x$(srcdir)' != 'x.'; then \
34842- posrcprefix='$(top_srcdir)/'; \
34843- else \
34844- posrcprefix="../"; \
34845- fi; \
34846- rm -f $@-t $@ \
34847- && (sed -e '/^#/d' -e '/^[ ]*$$/d' \
34848- -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
34849- | sed -e '$$s/\\$$//') > $@-t \
34850- && chmod a-w $@-t \
34851- && mv $@-t $@ )
34852-
34853-Makefile: Makefile.in.in ../config.status POTFILES
34854- cd .. \
34855- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
34856- $(SHELL) ./config.status
34857+$(DUMMYPOFILES):
34858+
34859+update-gmo: Makefile $(GMOFILES)
34860+ @:
34861+
34862+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
34863+# because execution permission bits may not work on the current file system.
34864+# Use @SHELL@, which is the shell determined by autoconf for the use by its
34865+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
34866+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
34867+ cd $(top_builddir) \
34868+ && @SHELL@ ./config.status $(subdir)/$@.in po-directories
34869+
34870+force:
34871
34872 # Tell versions [3.59,3.63) of GNU make not to export all variables.
34873 # Otherwise a system limit (for SysV at least) may be exceeded.
34874diff -uprN clean/lrzsz-0.12.20/po/Makevars lrzsz-0.12.20/po/Makevars
34875--- clean/lrzsz-0.12.20/po/Makevars 1970-01-01 01:00:00.000000000 +0100
34876+++ lrzsz-0.12.20/po/Makevars 2019-11-25 18:09:52.000000000 +0000
34877@@ -0,0 +1,78 @@
34878+# Makefile variables for PO directory in any package using GNU gettext.
34879+
34880+# Usually the message domain is the same as the package name.
34881+DOMAIN = $(PACKAGE)
34882+
34883+# These two variables depend on the location of this directory.
34884+subdir = po
34885+top_builddir = ..
34886+
34887+# These options get passed to xgettext.
34888+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
34889+
34890+# This is the copyright holder that gets inserted into the header of the
34891+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
34892+# package. (Note that the msgstr strings, extracted from the package's
34893+# sources, belong to the copyright holder of the package.) Translators are
34894+# expected to transfer the copyright for their translations to this person
34895+# or entity, or to disclaim their copyright. The empty string stands for
34896+# the public domain; in this case the translators are expected to disclaim
34897+# their copyright.
34898+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
34899+
34900+# This tells whether or not to prepend "GNU " prefix to the package
34901+# name that gets inserted into the header of the $(DOMAIN).pot file.
34902+# Possible values are "yes", "no", or empty. If it is empty, try to
34903+# detect it automatically by scanning the files in $(top_srcdir) for
34904+# "GNU packagename" string.
34905+PACKAGE_GNU =
34906+
34907+# This is the email address or URL to which the translators shall report
34908+# bugs in the untranslated strings:
34909+# - Strings which are not entire sentences, see the maintainer guidelines
34910+# in the GNU gettext documentation, section 'Preparing Strings'.
34911+# - Strings which use unclear terms or require additional context to be
34912+# understood.
34913+# - Strings which make invalid assumptions about notation of date, time or
34914+# money.
34915+# - Pluralisation problems.
34916+# - Incorrect English spelling.
34917+# - Incorrect formatting.
34918+# It can be your email address, or a mailing list address where translators
34919+# can write to without being subscribed, or the URL of a web page through
34920+# which the translators can contact you.
34921+MSGID_BUGS_ADDRESS =
34922+
34923+# This is the list of locale categories, beyond LC_MESSAGES, for which the
34924+# message catalogs shall be used. It is usually empty.
34925+EXTRA_LOCALE_CATEGORIES =
34926+
34927+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
34928+# context. Possible values are "yes" and "no". Set this to yes if the
34929+# package uses functions taking also a message context, like pgettext(), or
34930+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
34931+USE_MSGCTXT = no
34932+
34933+# These options get passed to msgmerge.
34934+# Useful options are in particular:
34935+# --previous to keep previous msgids of translated messages,
34936+# --quiet to reduce the verbosity.
34937+MSGMERGE_OPTIONS =
34938+
34939+# These options get passed to msginit.
34940+# If you want to disable line wrapping when writing PO files, add
34941+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
34942+# MSGINIT_OPTIONS.
34943+MSGINIT_OPTIONS =
34944+
34945+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
34946+# has changed. Possible values are "yes" and "no". Set this to no if
34947+# the POT file is checked in the repository and the version control
34948+# program ignores timestamps.
34949+PO_DEPENDS_ON_POT = yes
34950+
34951+# This tells whether or not to forcibly update $(DOMAIN).pot and
34952+# regenerate PO files on "make dist". Possible values are "yes" and
34953+# "no". Set this to no if the POT file and PO files are maintained
34954+# externally.
34955+DIST_DEPENDS_ON_UPDATE_PO = yes
34956diff -uprN clean/lrzsz-0.12.20/po/quot.sed lrzsz-0.12.20/po/quot.sed
34957--- clean/lrzsz-0.12.20/po/quot.sed 1970-01-01 01:00:00.000000000 +0100
34958+++ lrzsz-0.12.20/po/quot.sed 2019-11-25 18:21:17.000000000 +0000
34959@@ -0,0 +1,6 @@
34960+s/"\([^"]*\)"/“\1”/g
34961+s/`\([^`']*\)'/‘\1’/g
34962+s/ '\([^`']*\)' / ‘\1’ /g
34963+s/ '\([^`']*\)'$/ ‘\1’/g
34964+s/^'\([^`']*\)' /‘\1’ /g
34965+s/“”/""/g
34966diff -uprN clean/lrzsz-0.12.20/po/remove-potcdate.sin lrzsz-0.12.20/po/remove-potcdate.sin
34967--- clean/lrzsz-0.12.20/po/remove-potcdate.sin 1970-01-01 01:00:00.000000000 +0100
34968+++ lrzsz-0.12.20/po/remove-potcdate.sin 2019-11-25 18:21:17.000000000 +0000
34969@@ -0,0 +1,25 @@
34970+# Sed script that removes the POT-Creation-Date line in the header entry
34971+# from a POT file.
34972+#
34973+# Copyright (C) 2002 Free Software Foundation, Inc.
34974+# Copying and distribution of this file, with or without modification,
34975+# are permitted in any medium without royalty provided the copyright
34976+# notice and this notice are preserved. This file is offered as-is,
34977+# without any warranty.
34978+#
34979+# The distinction between the first and the following occurrences of the
34980+# pattern is achieved by looking at the hold space.
34981+/^"POT-Creation-Date: .*"$/{
34982+x
34983+# Test if the hold space is empty.
34984+s/P/P/
34985+ta
34986+# Yes it was empty. First occurrence. Remove the line.
34987+g
34988+d
34989+bb
34990+:a
34991+# The hold space was nonempty. Following occurrences. Do nothing.
34992+x
34993+:b
34994+}
34995diff -uprN clean/lrzsz-0.12.20/po/Rules-quot lrzsz-0.12.20/po/Rules-quot
34996--- clean/lrzsz-0.12.20/po/Rules-quot 1970-01-01 01:00:00.000000000 +0100
34997+++ lrzsz-0.12.20/po/Rules-quot 2019-11-25 18:21:17.000000000 +0000
34998@@ -0,0 +1,62 @@
34999+# Special Makefile rules for English message catalogs with quotation marks.
35000+#
35001+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
35002+# This file, Rules-quot, and its auxiliary files (listed under
35003+# DISTFILES.common.extra1) are free software; the Free Software Foundation
35004+# gives unlimited permission to use, copy, distribute, and modify them.
35005+
35006+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
35007+
35008+.SUFFIXES: .insert-header .po-update-en
35009+
35010+en@quot.po-create:
35011+ $(MAKE) en@quot.po-update
35012+en@boldquot.po-create:
35013+ $(MAKE) en@boldquot.po-update
35014+
35015+en@quot.po-update: en@quot.po-update-en
35016+en@boldquot.po-update: en@boldquot.po-update-en
35017+
35018+.insert-header.po-update-en:
35019+ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
35020+ if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
35021+ tmpdir=`pwd`; \
35022+ echo "$$lang:"; \
35023+ ll=`echo $$lang | sed -e 's/@.*//'`; \
35024+ LC_ALL=C; export LC_ALL; \
35025+ cd $(srcdir); \
35026+ if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \
35027+ | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \
35028+ { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
35029+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \
35030+ $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \
35031+ ;; \
35032+ *) \
35033+ $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \
35034+ ;; \
35035+ esac } 2>/dev/null > $$tmpdir/$$lang.new.po \
35036+ ; then \
35037+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
35038+ rm -f $$tmpdir/$$lang.new.po; \
35039+ else \
35040+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
35041+ :; \
35042+ else \
35043+ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
35044+ exit 1; \
35045+ fi; \
35046+ fi; \
35047+ else \
35048+ echo "creation of $$lang.po failed!" 1>&2; \
35049+ rm -f $$tmpdir/$$lang.new.po; \
35050+ fi
35051+
35052+en@quot.insert-header: insert-header.sin
35053+ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
35054+
35055+en@boldquot.insert-header: insert-header.sin
35056+ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
35057+
35058+mostlyclean: mostlyclean-quot
35059+mostlyclean-quot:
35060+ rm -f *.insert-header
35061diff -uprN clean/lrzsz-0.12.20/po/stamp-cat-id lrzsz-0.12.20/po/stamp-cat-id
35062--- clean/lrzsz-0.12.20/po/stamp-cat-id 1998-12-30 07:50:01.000000000 +0000
35063+++ lrzsz-0.12.20/po/stamp-cat-id 1970-01-01 01:00:00.000000000 +0100
35064@@ -1 +0,0 @@
35065-timestamp
35066diff -uprN clean/lrzsz-0.12.20/po/stamp-po lrzsz-0.12.20/po/stamp-po
35067--- clean/lrzsz-0.12.20/po/stamp-po 1970-01-01 01:00:00.000000000 +0100
35068+++ lrzsz-0.12.20/po/stamp-po 2019-11-26 11:42:09.000000000 +0000
35069@@ -0,0 +1 @@
35070+timestamp
35071diff -uprN clean/lrzsz-0.12.20/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
35072--- clean/lrzsz-0.12.20/src/Makefile.am 1998-12-28 08:38:47.000000000 +0000
35073+++ lrzsz-0.12.20/src/Makefile.am 2019-11-25 16:22:49.000000000 +0000
35074@@ -2,13 +2,11 @@ bin_PROGRAMS=lrz lsz
35075 lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35076 lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35077 noinst_HEADERS = timing.h zglobal.h zmodem.h
35078-datadir = $(prefix)/@DATADIRNAME@
35079+datadir = $(prefix)/share
35080 localedir = $(datadir)/locale
35081-CFLAGS=@CFLAGS@
35082 DISTCLEAN_FILES=lrzszbug
35083
35084-LDADD = ../lib/libzmodem.a @INTLLIBS@
35085-AUTOMAKE_OPTIONS=ansi2knr
35086+LDADD = ../lib/libzmodem.a @LIBINTL@
35087 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
35088 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
35089 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
35090diff -uprN clean/lrzsz-0.12.20/src/Makefile.in lrzsz-0.12.20/src/Makefile.in
35091--- clean/lrzsz-0.12.20/src/Makefile.in 1998-12-30 16:31:46.000000000 +0000
35092+++ lrzsz-0.12.20/src/Makefile.in 2019-11-26 11:37:46.000000000 +0000
35093@@ -1,6 +1,8 @@
35094-# Makefile.in generated automatically by automake 1.3 from Makefile.am
35095+# Makefile.in generated by automake 1.16.1 from Makefile.am.
35096+# @configure_input@
35097+
35098+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
35099
35100-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
35101 # This Makefile.in is free software; the Free Software Foundation
35102 # gives unlimited permission to copy and/or distribute it,
35103 # with or without modifications, as long as this notice is preserved.
35104@@ -10,362 +12,659 @@
35105 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
35106 # PARTICULAR PURPOSE.
35107
35108+@SET_MAKE@
35109
35110-SHELL = /bin/sh
35111
35112-srcdir = @srcdir@
35113-top_srcdir = @top_srcdir@
35114 VPATH = @srcdir@
35115-prefix = @prefix@
35116-exec_prefix = @exec_prefix@
35117-
35118-bindir = @bindir@
35119-sbindir = @sbindir@
35120-libexecdir = @libexecdir@
35121-sysconfdir = @sysconfdir@
35122-sharedstatedir = @sharedstatedir@
35123-localstatedir = @localstatedir@
35124-libdir = @libdir@
35125-infodir = @infodir@
35126-mandir = @mandir@
35127-includedir = @includedir@
35128-oldincludedir = /usr/include
35129-
35130-DISTDIR =
35131-
35132+am__is_gnu_make = { \
35133+ if test -z '$(MAKELEVEL)'; then \
35134+ false; \
35135+ elif test -n '$(MAKE_HOST)'; then \
35136+ true; \
35137+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
35138+ true; \
35139+ else \
35140+ false; \
35141+ fi; \
35142+}
35143+am__make_running_with_option = \
35144+ case $${target_option-} in \
35145+ ?) ;; \
35146+ *) echo "am__make_running_with_option: internal error: invalid" \
35147+ "target option '$${target_option-}' specified" >&2; \
35148+ exit 1;; \
35149+ esac; \
35150+ has_opt=no; \
35151+ sane_makeflags=$$MAKEFLAGS; \
35152+ if $(am__is_gnu_make); then \
35153+ sane_makeflags=$$MFLAGS; \
35154+ else \
35155+ case $$MAKEFLAGS in \
35156+ *\\[\ \ ]*) \
35157+ bs=\\; \
35158+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35159+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
35160+ esac; \
35161+ fi; \
35162+ skip_next=no; \
35163+ strip_trailopt () \
35164+ { \
35165+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
35166+ }; \
35167+ for flg in $$sane_makeflags; do \
35168+ test $$skip_next = yes && { skip_next=no; continue; }; \
35169+ case $$flg in \
35170+ *=*|--*) continue;; \
35171+ -*I) strip_trailopt 'I'; skip_next=yes;; \
35172+ -*I?*) strip_trailopt 'I';; \
35173+ -*O) strip_trailopt 'O'; skip_next=yes;; \
35174+ -*O?*) strip_trailopt 'O';; \
35175+ -*l) strip_trailopt 'l'; skip_next=yes;; \
35176+ -*l?*) strip_trailopt 'l';; \
35177+ -[dEDm]) skip_next=yes;; \
35178+ -[JT]) skip_next=yes;; \
35179+ esac; \
35180+ case $$flg in \
35181+ *$$target_option*) has_opt=yes; break;; \
35182+ esac; \
35183+ done; \
35184+ test $$has_opt = yes
35185+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
35186+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
35187 pkgdatadir = $(datadir)/@PACKAGE@
35188-pkglibdir = $(libdir)/@PACKAGE@
35189 pkgincludedir = $(includedir)/@PACKAGE@
35190-
35191-top_builddir = ..
35192-
35193-ACLOCAL = @ACLOCAL@
35194-AUTOCONF = @AUTOCONF@
35195-AUTOMAKE = @AUTOMAKE@
35196-AUTOHEADER = @AUTOHEADER@
35197-
35198-INSTALL = @INSTALL@
35199-INSTALL_PROGRAM = @INSTALL_PROGRAM@
35200-INSTALL_DATA = @INSTALL_DATA@
35201-INSTALL_SCRIPT = @INSTALL_SCRIPT@
35202-transform = @program_transform_name@
35203-
35204+pkglibdir = $(libdir)/@PACKAGE@
35205+pkglibexecdir = $(libexecdir)/@PACKAGE@
35206+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
35207+install_sh_DATA = $(install_sh) -c -m 644
35208+install_sh_PROGRAM = $(install_sh) -c
35209+install_sh_SCRIPT = $(install_sh) -c
35210+INSTALL_HEADER = $(INSTALL_DATA)
35211+transform = $(program_transform_name)
35212 NORMAL_INSTALL = :
35213 PRE_INSTALL = :
35214 POST_INSTALL = :
35215 NORMAL_UNINSTALL = :
35216 PRE_UNINSTALL = :
35217 POST_UNINSTALL = :
35218-CATALOGS = @CATALOGS@
35219-CATOBJEXT = @CATOBJEXT@
35220+build_triplet = @build@
35221+host_triplet = @host@
35222+bin_PROGRAMS = lrz$(EXEEXT) lsz$(EXEEXT)
35223+subdir = src
35224+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
35225+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
35226+ $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
35227+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
35228+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
35229+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
35230+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
35231+ $(top_srcdir)/configure.in
35232+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
35233+ $(ACLOCAL_M4)
35234+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
35235+ $(am__DIST_COMMON)
35236+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
35237+CONFIG_HEADER = $(top_builddir)/config.h
35238+CONFIG_CLEAN_FILES = lrzszbug
35239+CONFIG_CLEAN_VPATH_FILES =
35240+am__installdirs = "$(DESTDIR)$(bindir)"
35241+PROGRAMS = $(bin_PROGRAMS)
35242+am_lrz_OBJECTS = lrz.$(OBJEXT) timing.$(OBJEXT) zperr.$(OBJEXT) \
35243+ zreadline.$(OBJEXT) crctab.$(OBJEXT) rbsb.$(OBJEXT) \
35244+ zm.$(OBJEXT) protname.$(OBJEXT) tcp.$(OBJEXT) \
35245+ lsyslog.$(OBJEXT) canit.$(OBJEXT)
35246+lrz_OBJECTS = $(am_lrz_OBJECTS)
35247+lrz_LDADD = $(LDADD)
35248+lrz_DEPENDENCIES = ../lib/libzmodem.a
35249+am_lsz_OBJECTS = lsz.$(OBJEXT) timing.$(OBJEXT) zperr.$(OBJEXT) \
35250+ zreadline.$(OBJEXT) crctab.$(OBJEXT) rbsb.$(OBJEXT) \
35251+ zm.$(OBJEXT) protname.$(OBJEXT) tcp.$(OBJEXT) \
35252+ lsyslog.$(OBJEXT) canit.$(OBJEXT)
35253+lsz_OBJECTS = $(am_lsz_OBJECTS)
35254+lsz_LDADD = $(LDADD)
35255+lsz_DEPENDENCIES = ../lib/libzmodem.a
35256+AM_V_P = $(am__v_P_@AM_V@)
35257+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
35258+am__v_P_0 = false
35259+am__v_P_1 = :
35260+AM_V_GEN = $(am__v_GEN_@AM_V@)
35261+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
35262+am__v_GEN_0 = @echo " GEN " $@;
35263+am__v_GEN_1 =
35264+AM_V_at = $(am__v_at_@AM_V@)
35265+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
35266+am__v_at_0 = @
35267+am__v_at_1 =
35268+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
35269+depcomp = $(SHELL) $(top_srcdir)/depcomp
35270+am__maybe_remake_depfiles = depfiles
35271+am__depfiles_remade = ./$(DEPDIR)/canit.Po ./$(DEPDIR)/crctab.Po \
35272+ ./$(DEPDIR)/lrz.Po ./$(DEPDIR)/lsyslog.Po ./$(DEPDIR)/lsz.Po \
35273+ ./$(DEPDIR)/protname.Po ./$(DEPDIR)/rbsb.Po ./$(DEPDIR)/tcp.Po \
35274+ ./$(DEPDIR)/timing.Po ./$(DEPDIR)/zm.Po ./$(DEPDIR)/zperr.Po \
35275+ ./$(DEPDIR)/zreadline.Po
35276+am__mv = mv -f
35277+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
35278+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
35279+AM_V_CC = $(am__v_CC_@AM_V@)
35280+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
35281+am__v_CC_0 = @echo " CC " $@;
35282+am__v_CC_1 =
35283+CCLD = $(CC)
35284+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
35285+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
35286+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
35287+am__v_CCLD_0 = @echo " CCLD " $@;
35288+am__v_CCLD_1 =
35289+SOURCES = $(lrz_SOURCES) $(lsz_SOURCES)
35290+DIST_SOURCES = $(lrz_SOURCES) $(lsz_SOURCES)
35291+am__can_run_installinfo = \
35292+ case $$AM_UPDATE_INFO_DIR in \
35293+ n|no|NO) false;; \
35294+ *) (install-info --version) >/dev/null 2>&1;; \
35295+ esac
35296+HEADERS = $(noinst_HEADERS)
35297+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
35298+# Read a list of newline-separated strings from the standard input,
35299+# and print each of them once, without duplicates. Input order is
35300+# *not* preserved.
35301+am__uniquify_input = $(AWK) '\
35302+ BEGIN { nonempty = 0; } \
35303+ { items[$$0] = 1; nonempty = 1; } \
35304+ END { if (nonempty) { for (i in items) print i; }; } \
35305+'
35306+# Make sure the list of sources is unique. This is necessary because,
35307+# e.g., the same source file might be shared among _SOURCES variables
35308+# for different programs/libraries.
35309+am__define_uniq_tagged_files = \
35310+ list='$(am__tagged_files)'; \
35311+ unique=`for i in $$list; do \
35312+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
35313+ done | $(am__uniquify_input)`
35314+ETAGS = etags
35315+CTAGS = ctags
35316+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/lrzszbug.in \
35317+ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs
35318+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
35319+ACLOCAL = @ACLOCAL@
35320+ALLOCA = @ALLOCA@
35321+AMTAR = @AMTAR@
35322+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
35323+AUTOCONF = @AUTOCONF@
35324+AUTOHEADER = @AUTOHEADER@
35325+AUTOMAKE = @AUTOMAKE@
35326+AWK = @AWK@
35327 CC = @CC@
35328+CCDEPMODE = @CCDEPMODE@
35329+CFLAGS = @CFLAGS@
35330 CPP = @CPP@
35331-DATADIRNAME = @DATADIRNAME@
35332+CPPFLAGS = @CPPFLAGS@
35333+CYGPATH_W = @CYGPATH_W@
35334+#DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
35335+DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
35336+DEPDIR = @DEPDIR@
35337+ECHO_C = @ECHO_C@
35338+ECHO_N = @ECHO_N@
35339+ECHO_T = @ECHO_T@
35340+EGREP = @EGREP@
35341 ENABLE_TIMESYNC = @ENABLE_TIMESYNC@
35342-GENCAT = @GENCAT@
35343-GMOFILES = @GMOFILES@
35344+EXEEXT = @EXEEXT@
35345+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
35346 GMSGFMT = @GMSGFMT@
35347-GT_NO = @GT_NO@
35348-GT_YES = @GT_YES@
35349-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
35350-INSTOBJEXT = @INSTOBJEXT@
35351-INTLDEPS = @INTLDEPS@
35352+GMSGFMT_015 = @GMSGFMT_015@
35353+GREP = @GREP@
35354+INSTALL = @INSTALL@
35355+INSTALL_DATA = @INSTALL_DATA@
35356+INSTALL_PROGRAM = @INSTALL_PROGRAM@
35357+INSTALL_SCRIPT = @INSTALL_SCRIPT@
35358+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
35359 INTLLIBS = @INTLLIBS@
35360-INTLOBJS = @INTLOBJS@
35361+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
35362 LDFLAGS = @LDFLAGS@
35363+LIBICONV = @LIBICONV@
35364+LIBINTL = @LIBINTL@
35365 LIBOBJS = @LIBOBJS@
35366 LIBS = @LIBS@
35367+LTLIBICONV = @LTLIBICONV@
35368+LTLIBINTL = @LTLIBINTL@
35369+LTLIBOBJS = @LTLIBOBJS@
35370 MAKEINFO = @MAKEINFO@
35371-MKINSTALLDIRS = @MKINSTALLDIRS@
35372+MKDIR_P = @MKDIR_P@
35373 MSGFMT = @MSGFMT@
35374+MSGMERGE = @MSGMERGE@
35375+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
35376+OBJEXT = @OBJEXT@
35377 PACKAGE = @PACKAGE@
35378+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
35379+PACKAGE_NAME = @PACKAGE_NAME@
35380+PACKAGE_STRING = @PACKAGE_STRING@
35381+PACKAGE_TARNAME = @PACKAGE_TARNAME@
35382+PACKAGE_URL = @PACKAGE_URL@
35383 PACKAGE_VERSION = @PACKAGE_VERSION@
35384-POFILES = @POFILES@
35385+PATH_SEPARATOR = @PATH_SEPARATOR@
35386 POSUB = @POSUB@
35387 RANLIB = @RANLIB@
35388-U = @U@
35389-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
35390+SED = @SED@
35391+SET_MAKE = @SET_MAKE@
35392+SHELL = @SHELL@
35393+STRIP = @STRIP@
35394 USE_NLS = @USE_NLS@
35395 VERSION = @VERSION@
35396-l = @l@
35397-
35398-bin_PROGRAMS=lrz lsz
35399-lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35400-lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35401-noinst_HEADERS = timing.h zglobal.h zmodem.h
35402-datadir = $(prefix)/@DATADIRNAME@
35403+XGETTEXT = @XGETTEXT@
35404+XGETTEXT_015 = @XGETTEXT_015@
35405+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
35406+abs_builddir = @abs_builddir@
35407+abs_srcdir = @abs_srcdir@
35408+abs_top_builddir = @abs_top_builddir@
35409+abs_top_srcdir = @abs_top_srcdir@
35410+ac_ct_CC = @ac_ct_CC@
35411+am__include = @am__include@
35412+am__leading_dot = @am__leading_dot@
35413+am__quote = @am__quote@
35414+am__tar = @am__tar@
35415+am__untar = @am__untar@
35416+bindir = @bindir@
35417+build = @build@
35418+build_alias = @build_alias@
35419+build_cpu = @build_cpu@
35420+build_os = @build_os@
35421+build_vendor = @build_vendor@
35422+builddir = @builddir@
35423+datadir = $(prefix)/share
35424+datarootdir = @datarootdir@
35425+docdir = @docdir@
35426+dvidir = @dvidir@
35427+exec_prefix = @exec_prefix@
35428+host = @host@
35429+host_alias = @host_alias@
35430+host_cpu = @host_cpu@
35431+host_os = @host_os@
35432+host_vendor = @host_vendor@
35433+htmldir = @htmldir@
35434+includedir = @includedir@
35435+infodir = @infodir@
35436+install_sh = @install_sh@
35437+libdir = @libdir@
35438+libexecdir = @libexecdir@
35439 localedir = $(datadir)/locale
35440-CFLAGS=@CFLAGS@
35441-DISTCLEAN_FILES=lrzszbug
35442-
35443-LDADD = ../lib/libzmodem.a @INTLLIBS@
35444-AUTOMAKE_OPTIONS=ansi2knr
35445+localstatedir = @localstatedir@
35446+mandir = @mandir@
35447+mkdir_p = @mkdir_p@
35448+oldincludedir = @oldincludedir@
35449+pdfdir = @pdfdir@
35450+prefix = @prefix@
35451+program_transform_name = @program_transform_name@
35452+psdir = @psdir@
35453+sbindir = @sbindir@
35454+sharedstatedir = @sharedstatedir@
35455+srcdir = @srcdir@
35456+sysconfdir = @sysconfdir@
35457+target_alias = @target_alias@
35458+top_build_prefix = @top_build_prefix@
35459+top_builddir = @top_builddir@
35460+top_srcdir = @top_srcdir@
35461+lrz_SOURCES = lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35462+lsz_SOURCES = lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
35463+noinst_HEADERS = timing.h zglobal.h zmodem.h
35464+DISTCLEAN_FILES = lrzszbug
35465+LDADD = ../lib/libzmodem.a @LIBINTL@
35466 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
35467 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
35468-#DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
35469-DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
35470-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
35471-CONFIG_HEADER = ../config.h
35472-CONFIG_CLEAN_FILES = lrzszbug
35473-PROGRAMS = $(bin_PROGRAMS)
35474+all: all-am
35475
35476-CPPFLAGS = @CPPFLAGS@
35477-ANSI2KNR = @ANSI2KNR@
35478-lrz_OBJECTS = lrz$U.o timing$U.o zperr$U.o zreadline$U.o crctab$U.o \
35479-rbsb$U.o zm$U.o protname$U.o tcp$U.o lsyslog$U.o canit$U.o
35480-lrz_LDADD = $(LDADD)
35481-lrz_DEPENDENCIES = ../lib/libzmodem.a
35482-lrz_LDFLAGS =
35483-lsz_OBJECTS = lsz$U.o timing$U.o zperr$U.o zreadline$U.o crctab$U.o \
35484-rbsb$U.o zm$U.o protname$U.o tcp$U.o lsyslog$U.o canit$U.o
35485-lsz_LDADD = $(LDADD)
35486-lsz_DEPENDENCIES = ../lib/libzmodem.a
35487-lsz_LDFLAGS =
35488-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
35489-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
35490-HEADERS = $(noinst_HEADERS)
35491+.SUFFIXES:
35492+.SUFFIXES: .c .o .obj
35493+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
35494+ @for dep in $?; do \
35495+ case '$(am__configure_deps)' in \
35496+ *$$dep*) \
35497+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
35498+ && { if test -f $@; then exit 0; else break; fi; }; \
35499+ exit 1;; \
35500+ esac; \
35501+ done; \
35502+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
35503+ $(am__cd) $(top_srcdir) && \
35504+ $(AUTOMAKE) --gnu src/Makefile
35505+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
35506+ @case '$?' in \
35507+ *config.status*) \
35508+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
35509+ *) \
35510+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
35511+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
35512+ esac;
35513+
35514+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
35515+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
35516+
35517+$(top_srcdir)/configure: $(am__configure_deps)
35518+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
35519+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
35520+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
35521+$(am__aclocal_m4_deps):
35522+lrzszbug: $(top_builddir)/config.status $(srcdir)/lrzszbug.in
35523+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
35524+install-binPROGRAMS: $(bin_PROGRAMS)
35525+ @$(NORMAL_INSTALL)
35526+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
35527+ if test -n "$$list"; then \
35528+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
35529+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
35530+ fi; \
35531+ for p in $$list; do echo "$$p $$p"; done | \
35532+ sed 's/$(EXEEXT)$$//' | \
35533+ while read p p1; do if test -f $$p \
35534+ ; then echo "$$p"; echo "$$p"; else :; fi; \
35535+ done | \
35536+ sed -e 'p;s,.*/,,;n;h' \
35537+ -e 's|.*|.|' \
35538+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
35539+ sed 'N;N;N;s,\n, ,g' | \
35540+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
35541+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
35542+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
35543+ else { print "f", $$3 "/" $$4, $$1; } } \
35544+ END { for (d in files) print "f", d, files[d] }' | \
35545+ while read type dir files; do \
35546+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
35547+ test -z "$$files" || { \
35548+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
35549+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
35550+ } \
35551+ ; done
35552
35553-DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c lrzszbug.in
35554+uninstall-binPROGRAMS:
35555+ @$(NORMAL_UNINSTALL)
35556+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
35557+ files=`for p in $$list; do echo "$$p"; done | \
35558+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
35559+ -e 's/$$/$(EXEEXT)/' \
35560+ `; \
35561+ test -n "$$list" || exit 0; \
35562+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
35563+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
35564
35565+clean-binPROGRAMS:
35566+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
35567
35568-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
35569+lrz$(EXEEXT): $(lrz_OBJECTS) $(lrz_DEPENDENCIES) $(EXTRA_lrz_DEPENDENCIES)
35570+ @rm -f lrz$(EXEEXT)
35571+ $(AM_V_CCLD)$(LINK) $(lrz_OBJECTS) $(lrz_LDADD) $(LIBS)
35572+
35573+lsz$(EXEEXT): $(lsz_OBJECTS) $(lsz_DEPENDENCIES) $(EXTRA_lsz_DEPENDENCIES)
35574+ @rm -f lsz$(EXEEXT)
35575+ $(AM_V_CCLD)$(LINK) $(lsz_OBJECTS) $(lsz_LDADD) $(LIBS)
35576
35577-TAR = tar
35578-GZIP = --best
35579-SOURCES = $(lrz_SOURCES) $(lsz_SOURCES)
35580-OBJECTS = $(lrz_OBJECTS) $(lsz_OBJECTS)
35581+mostlyclean-compile:
35582+ -rm -f *.$(OBJEXT)
35583
35584-all: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS)
35585+distclean-compile:
35586+ -rm -f *.tab.c
35587
35588-.SUFFIXES:
35589-.SUFFIXES: .S .c .o .s
35590-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
35591- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
35592-
35593-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
35594- cd $(top_builddir) \
35595- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
35596+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canit.Po@am__quote@ # am--include-marker
35597+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crctab.Po@am__quote@ # am--include-marker
35598+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lrz.Po@am__quote@ # am--include-marker
35599+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsyslog.Po@am__quote@ # am--include-marker
35600+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsz.Po@am__quote@ # am--include-marker
35601+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protname.Po@am__quote@ # am--include-marker
35602+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rbsb.Po@am__quote@ # am--include-marker
35603+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcp.Po@am__quote@ # am--include-marker
35604+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timing.Po@am__quote@ # am--include-marker
35605+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zm.Po@am__quote@ # am--include-marker
35606+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zperr.Po@am__quote@ # am--include-marker
35607+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zreadline.Po@am__quote@ # am--include-marker
35608+
35609+$(am__depfiles_remade):
35610+ @$(MKDIR_P) $(@D)
35611+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
35612
35613-lrzszbug: $(top_builddir)/config.status lrzszbug.in
35614- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
35615+am--depfiles: $(am__depfiles_remade)
35616
35617-mostlyclean-binPROGRAMS:
35618+.c.o:
35619+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
35620+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
35621+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
35622+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
35623+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
35624+
35625+.c.obj:
35626+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
35627+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
35628+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
35629+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
35630+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
35631+
35632+ID: $(am__tagged_files)
35633+ $(am__define_uniq_tagged_files); mkid -fID $$unique
35634+tags: tags-am
35635+TAGS: tags
35636
35637-clean-binPROGRAMS:
35638- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
35639+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
35640+ set x; \
35641+ here=`pwd`; \
35642+ $(am__define_uniq_tagged_files); \
35643+ shift; \
35644+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
35645+ test -n "$$unique" || unique=$$empty_fix; \
35646+ if test $$# -gt 0; then \
35647+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
35648+ "$$@" $$unique; \
35649+ else \
35650+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
35651+ $$unique; \
35652+ fi; \
35653+ fi
35654+ctags: ctags-am
35655+
35656+CTAGS: ctags
35657+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
35658+ $(am__define_uniq_tagged_files); \
35659+ test -z "$(CTAGS_ARGS)$$unique" \
35660+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
35661+ $$unique
35662+
35663+GTAGS:
35664+ here=`$(am__cd) $(top_builddir) && pwd` \
35665+ && $(am__cd) $(top_srcdir) \
35666+ && gtags -i $(GTAGS_ARGS) "$$here"
35667+cscopelist: cscopelist-am
35668+
35669+cscopelist-am: $(am__tagged_files)
35670+ list='$(am__tagged_files)'; \
35671+ case "$(srcdir)" in \
35672+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
35673+ *) sdir=$(subdir)/$(srcdir) ;; \
35674+ esac; \
35675+ for i in $$list; do \
35676+ if test -f "$$i"; then \
35677+ echo "$(subdir)/$$i"; \
35678+ else \
35679+ echo "$$sdir/$$i"; \
35680+ fi; \
35681+ done >> $(top_builddir)/cscope.files
35682
35683-distclean-binPROGRAMS:
35684+distclean-tags:
35685+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
35686
35687-maintainer-clean-binPROGRAMS:
35688+distdir: $(BUILT_SOURCES)
35689+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
35690
35691-install-binPROGRAMS: $(bin_PROGRAMS)
35692- @$(NORMAL_INSTALL)
35693- $(mkinstalldirs) $(DESTDIR)$(bindir)
35694- @list='$(bin_PROGRAMS)'; for p in $$list; do \
35695- if test -f $$p; then \
35696- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
35697- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
35698- else :; fi; \
35699+distdir-am: $(DISTFILES)
35700+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35701+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
35702+ list='$(DISTFILES)'; \
35703+ dist_files=`for file in $$list; do echo $$file; done | \
35704+ sed -e "s|^$$srcdirstrip/||;t" \
35705+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
35706+ case $$dist_files in \
35707+ */*) $(MKDIR_P) `echo "$$dist_files" | \
35708+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
35709+ sort -u` ;; \
35710+ esac; \
35711+ for file in $$dist_files; do \
35712+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
35713+ if test -d $$d/$$file; then \
35714+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
35715+ if test -d "$(distdir)/$$file"; then \
35716+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
35717+ fi; \
35718+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
35719+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
35720+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
35721+ fi; \
35722+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
35723+ else \
35724+ test -f "$(distdir)/$$file" \
35725+ || cp -p $$d/$$file "$(distdir)/$$file" \
35726+ || exit 1; \
35727+ fi; \
35728 done
35729-
35730-uninstall-binPROGRAMS:
35731- @$(NORMAL_UNINSTALL)
35732- list='$(bin_PROGRAMS)'; for p in $$list; do \
35733- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
35734+check-am: all-am
35735+check: check-am
35736+all-am: Makefile $(PROGRAMS) $(HEADERS)
35737+installdirs:
35738+ for dir in "$(DESTDIR)$(bindir)"; do \
35739+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
35740 done
35741+install: install-am
35742+install-exec: install-exec-am
35743+install-data: install-data-am
35744+uninstall: uninstall-am
35745
35746-.c.o:
35747- $(COMPILE) -c $<
35748+install-am: all-am
35749+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
35750+
35751+installcheck: installcheck-am
35752+install-strip:
35753+ if test -z '$(STRIP)'; then \
35754+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
35755+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
35756+ install; \
35757+ else \
35758+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
35759+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
35760+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
35761+ fi
35762+mostlyclean-generic:
35763
35764-.s.o:
35765- $(COMPILE) -c $<
35766+clean-generic:
35767
35768-.S.o:
35769- $(COMPILE) -c $<
35770+distclean-generic:
35771+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
35772+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
35773
35774-mostlyclean-compile:
35775- -rm -f *.o core *.core
35776+maintainer-clean-generic:
35777+ @echo "This command is intended for maintainers to use"
35778+ @echo "it deletes files that may require special tools to rebuild."
35779+clean: clean-am
35780
35781-clean-compile:
35782+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
35783
35784-distclean-compile:
35785- -rm -f *.tab.c
35786+distclean: distclean-am
35787+ -rm -f ./$(DEPDIR)/canit.Po
35788+ -rm -f ./$(DEPDIR)/crctab.Po
35789+ -rm -f ./$(DEPDIR)/lrz.Po
35790+ -rm -f ./$(DEPDIR)/lsyslog.Po
35791+ -rm -f ./$(DEPDIR)/lsz.Po
35792+ -rm -f ./$(DEPDIR)/protname.Po
35793+ -rm -f ./$(DEPDIR)/rbsb.Po
35794+ -rm -f ./$(DEPDIR)/tcp.Po
35795+ -rm -f ./$(DEPDIR)/timing.Po
35796+ -rm -f ./$(DEPDIR)/zm.Po
35797+ -rm -f ./$(DEPDIR)/zperr.Po
35798+ -rm -f ./$(DEPDIR)/zreadline.Po
35799+ -rm -f Makefile
35800+distclean-am: clean-am distclean-compile distclean-generic \
35801+ distclean-tags
35802
35803-maintainer-clean-compile:
35804+dvi: dvi-am
35805
35806-mostlyclean-krextra:
35807+dvi-am:
35808
35809-clean-krextra:
35810- -rm -f ansi2knr
35811+html: html-am
35812
35813-distclean-krextra:
35814+html-am:
35815
35816-maintainer-clean-krextra:
35817-ansi2knr: ansi2knr.o
35818- $(LINK) ansi2knr.o $(LIBS)
35819-ansi2knr.o: $(CONFIG_HEADER)
35820-
35821-
35822-mostlyclean-kr:
35823- -rm -f *_.c
35824-
35825-clean-kr:
35826-
35827-distclean-kr:
35828-
35829-maintainer-clean-kr:
35830-
35831-lrz: $(lrz_OBJECTS) $(lrz_DEPENDENCIES)
35832- @rm -f lrz
35833- $(LINK) $(lrz_LDFLAGS) $(lrz_OBJECTS) $(lrz_LDADD) $(LIBS)
35834-
35835-lsz: $(lsz_OBJECTS) $(lsz_DEPENDENCIES)
35836- @rm -f lsz
35837- $(LINK) $(lsz_LDFLAGS) $(lsz_OBJECTS) $(lsz_LDADD) $(LIBS)
35838-canit_.c: canit.c $(ANSI2KNR)
35839- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/canit.c; then echo $(srcdir)/canit.c; else echo canit.c; fi` | $(ANSI2KNR) canit_.c
35840-crctab_.c: crctab.c $(ANSI2KNR)
35841- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/crctab.c; then echo $(srcdir)/crctab.c; else echo crctab.c; fi` | $(ANSI2KNR) crctab_.c
35842-lrz_.c: lrz.c $(ANSI2KNR)
35843- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lrz.c; then echo $(srcdir)/lrz.c; else echo lrz.c; fi` | $(ANSI2KNR) lrz_.c
35844-lsyslog_.c: lsyslog.c $(ANSI2KNR)
35845- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lsyslog.c; then echo $(srcdir)/lsyslog.c; else echo lsyslog.c; fi` | $(ANSI2KNR) lsyslog_.c
35846-lsz_.c: lsz.c $(ANSI2KNR)
35847- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/lsz.c; then echo $(srcdir)/lsz.c; else echo lsz.c; fi` | $(ANSI2KNR) lsz_.c
35848-protname_.c: protname.c $(ANSI2KNR)
35849- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/protname.c; then echo $(srcdir)/protname.c; else echo protname.c; fi` | $(ANSI2KNR) protname_.c
35850-rbsb_.c: rbsb.c $(ANSI2KNR)
35851- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/rbsb.c; then echo $(srcdir)/rbsb.c; else echo rbsb.c; fi` | $(ANSI2KNR) rbsb_.c
35852-tcp_.c: tcp.c $(ANSI2KNR)
35853- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/tcp.c; then echo $(srcdir)/tcp.c; else echo tcp.c; fi` | $(ANSI2KNR) tcp_.c
35854-timing_.c: timing.c $(ANSI2KNR)
35855- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/timing.c; then echo $(srcdir)/timing.c; else echo timing.c; fi` | $(ANSI2KNR) timing_.c
35856-zm_.c: zm.c $(ANSI2KNR)
35857- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zm.c; then echo $(srcdir)/zm.c; else echo zm.c; fi` | $(ANSI2KNR) zm_.c
35858-zperr_.c: zperr.c $(ANSI2KNR)
35859- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zperr.c; then echo $(srcdir)/zperr.c; else echo zperr.c; fi` | $(ANSI2KNR) zperr_.c
35860-zreadline_.c: zreadline.c $(ANSI2KNR)
35861- $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) `if test -f $(srcdir)/zreadline.c; then echo $(srcdir)/zreadline.c; else echo zreadline.c; fi` | $(ANSI2KNR) zreadline_.c
35862-canit_.o crctab_.o lrz_.o lsyslog_.o lsz_.o protname_.o rbsb_.o tcp_.o \
35863-timing_.o zm_.o zperr_.o zreadline_.o : $(ANSI2KNR)
35864-
35865-tags: TAGS
35866-
35867-ID: $(HEADERS) $(SOURCES) $(LISP)
35868- here=`pwd` && cd $(srcdir) \
35869- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
35870+info: info-am
35871
35872-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
35873- tags=; \
35874- here=`pwd`; \
35875- list='$(SOURCES) $(HEADERS)'; \
35876- unique=`for i in $$list; do echo $$i; done | \
35877- awk ' { files[$$0] = 1; } \
35878- END { for (i in files) print i; }'`; \
35879- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
35880- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
35881+info-am:
35882
35883-mostlyclean-tags:
35884+install-data-am:
35885
35886-clean-tags:
35887+install-dvi: install-dvi-am
35888
35889-distclean-tags:
35890- -rm -f TAGS ID
35891+install-dvi-am:
35892
35893-maintainer-clean-tags:
35894+install-exec-am: install-binPROGRAMS install-exec-local
35895
35896-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
35897+install-html: install-html-am
35898
35899-subdir = src
35900+install-html-am:
35901
35902-distdir: $(DISTFILES)
35903- @for file in $(DISTFILES); do \
35904- d=$(srcdir); \
35905- test -f $(distdir)/$$file \
35906- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
35907- || cp -p $$d/$$file $(distdir)/$$file; \
35908- done
35909-canit.o: canit.c zglobal.h ../config.h zmodem.h ../lib/getopt.h
35910-crctab.o: crctab.c
35911-lrz.o: lrz.c zglobal.h ../config.h zmodem.h ../lib/getopt.h timing.h \
35912- ../lib/long-options.h ../lib/xstrtoul.h ../lib/xstrtol.h \
35913- ../lib/error.h
35914-lsyslog.o: lsyslog.c ../config.h zglobal.h zmodem.h
35915-lsz.o: lsz.c zglobal.h ../config.h zmodem.h ../lib/getopt.h timing.h \
35916- ../lib/long-options.h ../lib/xstrtoul.h ../lib/xstrtol.h \
35917- ../lib/error.h
35918-protname.o: protname.c zglobal.h ../config.h zmodem.h
35919-rbsb.o: rbsb.c zglobal.h ../config.h zmodem.h
35920-tcp.o: tcp.c ../config.h zglobal.h zmodem.h ../lib/error.h
35921-timing.o: timing.c zglobal.h ../config.h zmodem.h timing.h
35922-zm.o: zm.c zglobal.h ../config.h zmodem.h
35923-zperr.o: zperr.c zglobal.h ../config.h zmodem.h
35924-zreadline.o: zreadline.c zglobal.h ../config.h zmodem.h ../lib/error.h
35925-
35926-info:
35927-dvi:
35928-check: all
35929- $(MAKE)
35930-installcheck:
35931-install-exec: install-binPROGRAMS install-exec-local
35932- @$(NORMAL_INSTALL)
35933+install-info: install-info-am
35934
35935-install-data:
35936- @$(NORMAL_INSTALL)
35937+install-info-am:
35938
35939-install: install-exec install-data all
35940- @:
35941+install-man:
35942
35943-uninstall: uninstall-binPROGRAMS uninstall-local
35944+install-pdf: install-pdf-am
35945
35946-install-strip:
35947- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
35948-installdirs:
35949- $(mkinstalldirs) $(DATADIR)$(bindir)
35950+install-pdf-am:
35951
35952+install-ps: install-ps-am
35953
35954-mostlyclean-generic:
35955- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
35956+install-ps-am:
35957
35958-clean-generic:
35959- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
35960+installcheck-am:
35961
35962-distclean-generic:
35963- -rm -f Makefile $(DISTCLEANFILES)
35964- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
35965- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
35966+maintainer-clean: maintainer-clean-am
35967+ -rm -f ./$(DEPDIR)/canit.Po
35968+ -rm -f ./$(DEPDIR)/crctab.Po
35969+ -rm -f ./$(DEPDIR)/lrz.Po
35970+ -rm -f ./$(DEPDIR)/lsyslog.Po
35971+ -rm -f ./$(DEPDIR)/lsz.Po
35972+ -rm -f ./$(DEPDIR)/protname.Po
35973+ -rm -f ./$(DEPDIR)/rbsb.Po
35974+ -rm -f ./$(DEPDIR)/tcp.Po
35975+ -rm -f ./$(DEPDIR)/timing.Po
35976+ -rm -f ./$(DEPDIR)/zm.Po
35977+ -rm -f ./$(DEPDIR)/zperr.Po
35978+ -rm -f ./$(DEPDIR)/zreadline.Po
35979+ -rm -f Makefile
35980+maintainer-clean-am: distclean-am maintainer-clean-generic
35981
35982-maintainer-clean-generic:
35983- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
35984- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
35985-mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \
35986- mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
35987- mostlyclean-generic
35988-
35989-clean: clean-binPROGRAMS clean-compile clean-krextra clean-kr \
35990- clean-tags clean-generic mostlyclean
35991-
35992-distclean: distclean-binPROGRAMS distclean-compile distclean-krextra \
35993- distclean-kr distclean-tags distclean-generic clean
35994- -rm -f config.status
35995-
35996-maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \
35997- maintainer-clean-krextra maintainer-clean-kr \
35998- maintainer-clean-tags maintainer-clean-generic \
35999- distclean
36000- @echo "This command is intended for maintainers to use;"
36001- @echo "it deletes files that may require special tools to rebuild."
36002+mostlyclean: mostlyclean-am
36003+
36004+mostlyclean-am: mostlyclean-compile mostlyclean-generic
36005+
36006+pdf: pdf-am
36007+
36008+pdf-am:
36009+
36010+ps: ps-am
36011+
36012+ps-am:
36013+
36014+uninstall-am: uninstall-binPROGRAMS uninstall-local
36015+
36016+.MAKE: install-am install-strip
36017+
36018+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
36019+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
36020+ distclean distclean-compile distclean-generic distclean-tags \
36021+ distdir dvi dvi-am html html-am info info-am install \
36022+ install-am install-binPROGRAMS install-data install-data-am \
36023+ install-dvi install-dvi-am install-exec install-exec-am \
36024+ install-exec-local install-html install-html-am install-info \
36025+ install-info-am install-man install-pdf install-pdf-am \
36026+ install-ps install-ps-am install-strip installcheck \
36027+ installcheck-am installdirs maintainer-clean \
36028+ maintainer-clean-generic mostlyclean mostlyclean-compile \
36029+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
36030+ uninstall-am uninstall-binPROGRAMS uninstall-local
36031
36032-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
36033-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
36034-mostlyclean-compile distclean-compile clean-compile \
36035-maintainer-clean-compile mostlyclean-krextra distclean-krextra \
36036-clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
36037-clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
36038-clean-tags maintainer-clean-tags distdir info dvi installcheck \
36039-install-exec install-data install uninstall all installdirs \
36040-mostlyclean-generic distclean-generic clean-generic \
36041-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
36042+.PRECIOUS: Makefile
36043
36044
36045 install-exec-local:
36046diff -uprN clean/lrzsz-0.12.20/src/zglobal.h lrzsz-0.12.20/src/zglobal.h
36047--- clean/lrzsz-0.12.20/src/zglobal.h 1998-12-29 12:34:59.000000000 +0000
36048+++ lrzsz-0.12.20/src/zglobal.h 2019-11-25 16:32:42.000000000 +0000
36049@@ -180,9 +180,6 @@ struct termios;
36050 #if HAVE_LOCALE_H
36051 # include <locale.h>
36052 #endif
36053-#if !HAVE_SETLOCALE
36054-# define setlocale(Category, Locale) /* empty */
36055-#endif
36056
36057 #if ENABLE_NLS
36058 # include <libintl.h>
36059diff -uprN clean/lrzsz-0.12.20/stamp-h.in lrzsz-0.12.20/stamp-h.in
36060--- clean/lrzsz-0.12.20/stamp-h.in 1998-12-30 07:51:07.000000000 +0000
36061+++ lrzsz-0.12.20/stamp-h.in 1970-01-01 01:00:00.000000000 +0100
36062@@ -1 +0,0 @@
36063-timestamp
36064diff -uprN clean/lrzsz-0.12.20/testsuite/Makefile.in lrzsz-0.12.20/testsuite/Makefile.in
36065--- clean/lrzsz-0.12.20/testsuite/Makefile.in 1998-12-30 16:31:50.000000000 +0000
36066+++ lrzsz-0.12.20/testsuite/Makefile.in 2019-11-26 11:37:46.000000000 +0000
36067@@ -1,6 +1,8 @@
36068-# Makefile.in generated automatically by automake 1.3 from Makefile.am
36069+# Makefile.in generated by automake 1.16.1 from Makefile.am.
36070+# @configure_input@
36071+
36072+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
36073
36074-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
36075 # This Makefile.in is free software; the Free Software Foundation
36076 # gives unlimited permission to copy and/or distribute it,
36077 # with or without modifications, as long as this notice is preserved.
36078@@ -10,206 +12,477 @@
36079 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
36080 # PARTICULAR PURPOSE.
36081
36082-
36083-SHELL = /bin/sh
36084-
36085-srcdir = @srcdir@
36086-top_srcdir = @top_srcdir@
36087+@SET_MAKE@
36088 VPATH = @srcdir@
36089-prefix = @prefix@
36090-exec_prefix = @exec_prefix@
36091-
36092-bindir = @bindir@
36093-sbindir = @sbindir@
36094-libexecdir = @libexecdir@
36095-datadir = @datadir@
36096-sysconfdir = @sysconfdir@
36097-sharedstatedir = @sharedstatedir@
36098-localstatedir = @localstatedir@
36099-libdir = @libdir@
36100-infodir = @infodir@
36101-mandir = @mandir@
36102-includedir = @includedir@
36103-oldincludedir = /usr/include
36104-
36105-DISTDIR =
36106-
36107+am__is_gnu_make = { \
36108+ if test -z '$(MAKELEVEL)'; then \
36109+ false; \
36110+ elif test -n '$(MAKE_HOST)'; then \
36111+ true; \
36112+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
36113+ true; \
36114+ else \
36115+ false; \
36116+ fi; \
36117+}
36118+am__make_running_with_option = \
36119+ case $${target_option-} in \
36120+ ?) ;; \
36121+ *) echo "am__make_running_with_option: internal error: invalid" \
36122+ "target option '$${target_option-}' specified" >&2; \
36123+ exit 1;; \
36124+ esac; \
36125+ has_opt=no; \
36126+ sane_makeflags=$$MAKEFLAGS; \
36127+ if $(am__is_gnu_make); then \
36128+ sane_makeflags=$$MFLAGS; \
36129+ else \
36130+ case $$MAKEFLAGS in \
36131+ *\\[\ \ ]*) \
36132+ bs=\\; \
36133+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
36134+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
36135+ esac; \
36136+ fi; \
36137+ skip_next=no; \
36138+ strip_trailopt () \
36139+ { \
36140+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
36141+ }; \
36142+ for flg in $$sane_makeflags; do \
36143+ test $$skip_next = yes && { skip_next=no; continue; }; \
36144+ case $$flg in \
36145+ *=*|--*) continue;; \
36146+ -*I) strip_trailopt 'I'; skip_next=yes;; \
36147+ -*I?*) strip_trailopt 'I';; \
36148+ -*O) strip_trailopt 'O'; skip_next=yes;; \
36149+ -*O?*) strip_trailopt 'O';; \
36150+ -*l) strip_trailopt 'l'; skip_next=yes;; \
36151+ -*l?*) strip_trailopt 'l';; \
36152+ -[dEDm]) skip_next=yes;; \
36153+ -[JT]) skip_next=yes;; \
36154+ esac; \
36155+ case $$flg in \
36156+ *$$target_option*) has_opt=yes; break;; \
36157+ esac; \
36158+ done; \
36159+ test $$has_opt = yes
36160+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
36161+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
36162 pkgdatadir = $(datadir)/@PACKAGE@
36163-pkglibdir = $(libdir)/@PACKAGE@
36164 pkgincludedir = $(includedir)/@PACKAGE@
36165-
36166-top_builddir = ..
36167-
36168-ACLOCAL = @ACLOCAL@
36169-AUTOCONF = @AUTOCONF@
36170-AUTOMAKE = @AUTOMAKE@
36171-AUTOHEADER = @AUTOHEADER@
36172-
36173-INSTALL = @INSTALL@
36174-INSTALL_PROGRAM = @INSTALL_PROGRAM@
36175-INSTALL_DATA = @INSTALL_DATA@
36176-INSTALL_SCRIPT = @INSTALL_SCRIPT@
36177-transform = @program_transform_name@
36178-
36179+pkglibdir = $(libdir)/@PACKAGE@
36180+pkglibexecdir = $(libexecdir)/@PACKAGE@
36181+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
36182+install_sh_DATA = $(install_sh) -c -m 644
36183+install_sh_PROGRAM = $(install_sh) -c
36184+install_sh_SCRIPT = $(install_sh) -c
36185+INSTALL_HEADER = $(INSTALL_DATA)
36186+transform = $(program_transform_name)
36187 NORMAL_INSTALL = :
36188 PRE_INSTALL = :
36189 POST_INSTALL = :
36190 NORMAL_UNINSTALL = :
36191 PRE_UNINSTALL = :
36192 POST_UNINSTALL = :
36193-CATALOGS = @CATALOGS@
36194-CATOBJEXT = @CATOBJEXT@
36195+build_triplet = @build@
36196+host_triplet = @host@
36197+subdir = testsuite
36198+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
36199+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
36200+ $(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/iconv.m4 \
36201+ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \
36202+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
36203+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
36204+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
36205+ $(top_srcdir)/configure.in
36206+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
36207+ $(ACLOCAL_M4)
36208+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
36209+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
36210+CONFIG_HEADER = $(top_builddir)/config.h
36211+CONFIG_CLEAN_FILES =
36212+CONFIG_CLEAN_VPATH_FILES =
36213+AM_V_P = $(am__v_P_@AM_V@)
36214+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
36215+am__v_P_0 = false
36216+am__v_P_1 = :
36217+AM_V_GEN = $(am__v_GEN_@AM_V@)
36218+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
36219+am__v_GEN_0 = @echo " GEN " $@;
36220+am__v_GEN_1 =
36221+AM_V_at = $(am__v_at_@AM_V@)
36222+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
36223+am__v_at_0 = @
36224+am__v_at_1 =
36225+SOURCES =
36226+DIST_SOURCES =
36227+am__can_run_installinfo = \
36228+ case $$AM_UPDATE_INFO_DIR in \
36229+ n|no|NO) false;; \
36230+ *) (install-info --version) >/dev/null 2>&1;; \
36231+ esac
36232+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
36233+DEJATOOL = $(PACKAGE)
36234+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
36235+EXPECT = expect
36236+RUNTEST = runtest
36237+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs
36238+ACLOCAL = @ACLOCAL@
36239+ALLOCA = @ALLOCA@
36240+AMTAR = @AMTAR@
36241+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
36242+AUTOCONF = @AUTOCONF@
36243+AUTOHEADER = @AUTOHEADER@
36244+AUTOMAKE = @AUTOMAKE@
36245+AWK = @AWK@
36246 CC = @CC@
36247+CCDEPMODE = @CCDEPMODE@
36248 CFLAGS = @CFLAGS@
36249 CPP = @CPP@
36250-DATADIRNAME = @DATADIRNAME@
36251+CPPFLAGS = @CPPFLAGS@
36252+CYGPATH_W = @CYGPATH_W@
36253+DEFS = @DEFS@
36254+DEPDIR = @DEPDIR@
36255+ECHO_C = @ECHO_C@
36256+ECHO_N = @ECHO_N@
36257+ECHO_T = @ECHO_T@
36258+EGREP = @EGREP@
36259 ENABLE_TIMESYNC = @ENABLE_TIMESYNC@
36260-GENCAT = @GENCAT@
36261-GMOFILES = @GMOFILES@
36262+EXEEXT = @EXEEXT@
36263+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
36264 GMSGFMT = @GMSGFMT@
36265-GT_NO = @GT_NO@
36266-GT_YES = @GT_YES@
36267-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
36268-INSTOBJEXT = @INSTOBJEXT@
36269-INTLDEPS = @INTLDEPS@
36270+GMSGFMT_015 = @GMSGFMT_015@
36271+GREP = @GREP@
36272+INSTALL = @INSTALL@
36273+INSTALL_DATA = @INSTALL_DATA@
36274+INSTALL_PROGRAM = @INSTALL_PROGRAM@
36275+INSTALL_SCRIPT = @INSTALL_SCRIPT@
36276+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
36277 INTLLIBS = @INTLLIBS@
36278-INTLOBJS = @INTLOBJS@
36279+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
36280 LDFLAGS = @LDFLAGS@
36281+LIBICONV = @LIBICONV@
36282+LIBINTL = @LIBINTL@
36283 LIBOBJS = @LIBOBJS@
36284 LIBS = @LIBS@
36285+LTLIBICONV = @LTLIBICONV@
36286+LTLIBINTL = @LTLIBINTL@
36287+LTLIBOBJS = @LTLIBOBJS@
36288 MAKEINFO = @MAKEINFO@
36289-MKINSTALLDIRS = @MKINSTALLDIRS@
36290+MKDIR_P = @MKDIR_P@
36291 MSGFMT = @MSGFMT@
36292+MSGMERGE = @MSGMERGE@
36293+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
36294+OBJEXT = @OBJEXT@
36295 PACKAGE = @PACKAGE@
36296+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
36297+PACKAGE_NAME = @PACKAGE_NAME@
36298+PACKAGE_STRING = @PACKAGE_STRING@
36299+PACKAGE_TARNAME = @PACKAGE_TARNAME@
36300+PACKAGE_URL = @PACKAGE_URL@
36301 PACKAGE_VERSION = @PACKAGE_VERSION@
36302-POFILES = @POFILES@
36303+PATH_SEPARATOR = @PATH_SEPARATOR@
36304 POSUB = @POSUB@
36305 RANLIB = @RANLIB@
36306-U = @U@
36307-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
36308+SED = @SED@
36309+SET_MAKE = @SET_MAKE@
36310+SHELL = @SHELL@
36311+STRIP = @STRIP@
36312 USE_NLS = @USE_NLS@
36313 VERSION = @VERSION@
36314-l = @l@
36315+XGETTEXT = @XGETTEXT@
36316+XGETTEXT_015 = @XGETTEXT_015@
36317+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
36318+abs_builddir = @abs_builddir@
36319+abs_srcdir = @abs_srcdir@
36320+abs_top_builddir = @abs_top_builddir@
36321+abs_top_srcdir = @abs_top_srcdir@
36322+ac_ct_CC = @ac_ct_CC@
36323+am__include = @am__include@
36324+am__leading_dot = @am__leading_dot@
36325+am__quote = @am__quote@
36326+am__tar = @am__tar@
36327+am__untar = @am__untar@
36328+bindir = @bindir@
36329+build = @build@
36330+build_alias = @build_alias@
36331+build_cpu = @build_cpu@
36332+build_os = @build_os@
36333+build_vendor = @build_vendor@
36334+builddir = @builddir@
36335+datadir = @datadir@
36336+datarootdir = @datarootdir@
36337+docdir = @docdir@
36338+dvidir = @dvidir@
36339+exec_prefix = @exec_prefix@
36340+host = @host@
36341+host_alias = @host_alias@
36342+host_cpu = @host_cpu@
36343+host_os = @host_os@
36344+host_vendor = @host_vendor@
36345+htmldir = @htmldir@
36346+includedir = @includedir@
36347+infodir = @infodir@
36348+install_sh = @install_sh@
36349+libdir = @libdir@
36350+libexecdir = @libexecdir@
36351+localedir = @localedir@
36352+localstatedir = @localstatedir@
36353+mandir = @mandir@
36354+mkdir_p = @mkdir_p@
36355+oldincludedir = @oldincludedir@
36356+pdfdir = @pdfdir@
36357+prefix = @prefix@
36358+program_transform_name = @program_transform_name@
36359+psdir = @psdir@
36360+sbindir = @sbindir@
36361+sharedstatedir = @sharedstatedir@
36362+srcdir = @srcdir@
36363+sysconfdir = @sysconfdir@
36364+target_alias = @target_alias@
36365+top_build_prefix = @top_build_prefix@
36366+top_builddir = @top_builddir@
36367+top_srcdir = @top_srcdir@
36368+AUTOMAKE_OPTIONS = dejagnu
36369+DISTFILES = Makefile.am Makefile.in
36370+CLEANFILES = lrzsz.log lrzsz.sum site.bak
36371+DISTCLEANFILES = site.exp
36372+all: all-am
36373
36374-AUTOMAKE_OPTIONS=dejagnu
36375+.SUFFIXES:
36376+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
36377+ @for dep in $?; do \
36378+ case '$(am__configure_deps)' in \
36379+ *$$dep*) \
36380+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
36381+ && { if test -f $@; then exit 0; else break; fi; }; \
36382+ exit 1;; \
36383+ esac; \
36384+ done; \
36385+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \
36386+ $(am__cd) $(top_srcdir) && \
36387+ $(AUTOMAKE) --gnu testsuite/Makefile
36388+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
36389+ @case '$?' in \
36390+ *config.status*) \
36391+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
36392+ *) \
36393+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
36394+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
36395+ esac;
36396+
36397+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
36398+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
36399+
36400+$(top_srcdir)/configure: $(am__configure_deps)
36401+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
36402+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
36403+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
36404+$(am__aclocal_m4_deps):
36405+tags TAGS:
36406
36407-DISTFILES=Makefile.am Makefile.in
36408-CLEANFILES=lrzsz.log lrzsz.sum site.bak
36409-DISTCLEANFILES=site.exp
36410-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
36411-CONFIG_HEADER = ../config.h
36412-CONFIG_CLEAN_FILES =
36413-DIST_COMMON = Makefile.am Makefile.in
36414+ctags CTAGS:
36415
36416+cscope cscopelist:
36417
36418-TAR = tar
36419-GZIP = --best
36420-EXPECT = expect
36421-RUNTEST = runtest
36422-all: Makefile
36423
36424-.SUFFIXES:
36425-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
36426- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps testsuite/Makefile
36427+check-DEJAGNU: site.exp
36428+ srcdir='$(srcdir)'; export srcdir; \
36429+ EXPECT=$(EXPECT); export EXPECT; \
36430+ if $(SHELL) -c "$(RUNTEST) --version" > /dev/null 2>&1; then \
36431+ exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
36432+ if $(RUNTEST) $(RUNTESTDEFAULTFLAGS) $(AM_RUNTESTFLAGS) $(RUNTESTFLAGS); \
36433+ then :; else exit_status=1; fi; \
36434+ done; \
36435+ else echo "WARNING: could not find '$(RUNTEST)'" 1>&2; :;\
36436+ fi; \
36437+ exit $$exit_status
36438+site.exp: Makefile $(EXTRA_DEJAGNU_SITE_CONFIG)
36439+ @echo 'Making a new site.exp file ...'
36440+ @echo '## these variables are automatically generated by make ##' >site.tmp
36441+ @echo '# Do not edit here. If you wish to override these values' >>site.tmp
36442+ @echo '# edit the last section' >>site.tmp
36443+ @echo 'set srcdir "$(srcdir)"' >>site.tmp
36444+ @echo "set objdir `pwd`" >>site.tmp
36445+ @echo 'set build_alias "$(build_alias)"' >>site.tmp
36446+ @echo 'set build_triplet $(build_triplet)' >>site.tmp
36447+ @echo 'set host_alias "$(host_alias)"' >>site.tmp
36448+ @echo 'set host_triplet $(host_triplet)' >>site.tmp
36449+ @list='$(EXTRA_DEJAGNU_SITE_CONFIG)'; for f in $$list; do \
36450+ echo "## Begin content included from file $$f. Do not modify. ##" \
36451+ && cat `test -f "$$f" || echo '$(srcdir)/'`$$f \
36452+ && echo "## End content included from file $$f. ##" \
36453+ || exit 1; \
36454+ done >> site.tmp
36455+ @echo "## End of auto-generated content; you can edit from here. ##" >> site.tmp
36456+ @if test -f site.exp; then \
36457+ sed -e '1,/^## End of auto-generated content.*##/d' site.exp >> site.tmp; \
36458+ fi
36459+ @-rm -f site.bak
36460+ @test ! -f site.exp || mv site.exp site.bak
36461+ @mv site.tmp site.exp
36462+
36463+distclean-DEJAGNU:
36464+ -rm -f site.exp site.bak
36465+ -l='$(DEJATOOL)'; for tool in $$l; do \
36466+ rm -f $$tool.sum $$tool.log; \
36467+ done
36468
36469-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
36470- cd $(top_builddir) \
36471- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
36472+distdir: $(BUILT_SOURCES)
36473+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
36474
36475-tags: TAGS
36476-TAGS:
36477+distdir-am: $(DISTFILES)
36478+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
36479+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
36480+ list='$(DISTFILES)'; \
36481+ dist_files=`for file in $$list; do echo $$file; done | \
36482+ sed -e "s|^$$srcdirstrip/||;t" \
36483+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
36484+ case $$dist_files in \
36485+ */*) $(MKDIR_P) `echo "$$dist_files" | \
36486+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
36487+ sort -u` ;; \
36488+ esac; \
36489+ for file in $$dist_files; do \
36490+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
36491+ if test -d $$d/$$file; then \
36492+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
36493+ if test -d "$(distdir)/$$file"; then \
36494+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
36495+ fi; \
36496+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
36497+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
36498+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
36499+ fi; \
36500+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
36501+ else \
36502+ test -f "$(distdir)/$$file" \
36503+ || cp -p $$d/$$file "$(distdir)/$$file" \
36504+ || exit 1; \
36505+ fi; \
36506+ done
36507+ $(MAKE) $(AM_MAKEFLAGS) \
36508+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
36509+ dist-hook
36510+check-am: all-am
36511+ $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
36512+check: check-am
36513+all-am: Makefile
36514+installdirs:
36515+install: install-am
36516+install-exec: install-exec-am
36517+install-data: install-data-am
36518+uninstall: uninstall-am
36519
36520+install-am: all-am
36521+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
36522
36523-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
36524+installcheck: installcheck-am
36525+install-strip:
36526+ if test -z '$(STRIP)'; then \
36527+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
36528+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
36529+ install; \
36530+ else \
36531+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
36532+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
36533+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
36534+ fi
36535+mostlyclean-generic:
36536
36537-subdir = testsuite
36538+clean-generic:
36539+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
36540
36541-distdir: $(DISTFILES)
36542- @for file in $(DISTFILES); do \
36543- d=$(srcdir); \
36544- test -f $(distdir)/$$file \
36545- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
36546- || cp -p $$d/$$file $(distdir)/$$file; \
36547- done
36548- $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
36549+distclean-generic:
36550+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
36551+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
36552+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
36553
36554-RUNTESTFLAGS =
36555+maintainer-clean-generic:
36556+ @echo "This command is intended for maintainers to use"
36557+ @echo "it deletes files that may require special tools to rebuild."
36558+clean: clean-am
36559
36560-DEJATOOL = $(PACKAGE)
36561+clean-am: clean-generic mostlyclean-am
36562
36563-RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
36564+distclean: distclean-am
36565+ -rm -f Makefile
36566+distclean-am: clean-am distclean-DEJAGNU distclean-generic
36567
36568-check-DEJAGNU: site.exp
36569- srcdir=`cd $(srcdir) && pwd`; export srcdir; \
36570- EXPECT=$(EXPECT); export EXPECT; \
36571- runtest=$(RUNTEST); \
36572- if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
36573- $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
36574- else echo "WARNING: could not find \`runtest'" 1>&2; :;\
36575- fi
36576-site.exp: Makefile
36577- @echo 'Making a new site.exp file...'
36578- -@rm -f site.bak
36579- @echo '## these variables are automatically generated by make ##' > $@-t
36580- @echo '# Do not edit here. If you wish to override these values' >> $@-t
36581- @echo '# edit the last section' >> $@-t
36582- @echo 'set tool $(DEJATOOL)' >> $@-t
36583- @echo 'set srcdir $(srcdir)' >> $@-t
36584- @echo 'set objdir' `pwd` >> $@-t
36585- @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
36586- -@sed '1,/^## All variables above are.*##/ d' site.bak >> $@-t
36587- -@mv site.exp site.bak
36588- @mv $@-t site.exp
36589-info:
36590-dvi:
36591-check: all
36592- $(MAKE) check-DEJAGNU
36593-installcheck:
36594-install-exec:
36595- @$(NORMAL_INSTALL)
36596+dvi: dvi-am
36597
36598-install-data:
36599- @$(NORMAL_INSTALL)
36600+dvi-am:
36601
36602-install: install-exec install-data all
36603- @:
36604+html: html-am
36605
36606-uninstall:
36607+html-am:
36608
36609-install-strip:
36610- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
36611-installdirs:
36612+info: info-am
36613
36614+info-am:
36615
36616-mostlyclean-generic:
36617- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
36618+install-data-am:
36619
36620-clean-generic:
36621- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
36622+install-dvi: install-dvi-am
36623
36624-distclean-generic:
36625- -rm -f Makefile $(DISTCLEANFILES)
36626- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
36627- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
36628+install-dvi-am:
36629
36630-maintainer-clean-generic:
36631- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
36632- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
36633-mostlyclean: mostlyclean-generic
36634+install-exec-am:
36635
36636-clean: clean-generic mostlyclean
36637+install-html: install-html-am
36638
36639-distclean: distclean-generic clean
36640- -rm -f config.status
36641+install-html-am:
36642
36643-maintainer-clean: maintainer-clean-generic distclean
36644- @echo "This command is intended for maintainers to use;"
36645- @echo "it deletes files that may require special tools to rebuild."
36646+install-info: install-info-am
36647+
36648+install-info-am:
36649+
36650+install-man:
36651+
36652+install-pdf: install-pdf-am
36653+
36654+install-pdf-am:
36655+
36656+install-ps: install-ps-am
36657+
36658+install-ps-am:
36659+
36660+installcheck-am:
36661+
36662+maintainer-clean: maintainer-clean-am
36663+ -rm -f Makefile
36664+maintainer-clean-am: distclean-am maintainer-clean-generic
36665+
36666+mostlyclean: mostlyclean-am
36667+
36668+mostlyclean-am: mostlyclean-generic
36669+
36670+pdf: pdf-am
36671+
36672+pdf-am:
36673+
36674+ps: ps-am
36675+
36676+ps-am:
36677+
36678+uninstall-am:
36679+
36680+.MAKE: check-am install-am install-strip
36681+
36682+.PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \
36683+ cscopelist-am ctags-am dist-hook distclean distclean-DEJAGNU \
36684+ distclean-generic distdir dvi dvi-am html html-am info info-am \
36685+ install install-am install-data install-data-am install-dvi \
36686+ install-dvi-am install-exec install-exec-am install-html \
36687+ install-html-am install-info install-info-am install-man \
36688+ install-pdf install-pdf-am install-ps install-ps-am \
36689+ install-strip installcheck installcheck-am installdirs \
36690+ maintainer-clean maintainer-clean-generic mostlyclean \
36691+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
36692+ uninstall-am
36693
36694-.PHONY: tags distdir check-DEJAGNU info dvi installcheck install-exec \
36695-install-data install uninstall all installdirs mostlyclean-generic \
36696-distclean-generic clean-generic maintainer-clean-generic clean \
36697-mostlyclean distclean maintainer-clean
36698+.PRECIOUS: Makefile
36699
36700
36701 dist-hook:
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
deleted file mode 100644
index 1a24a1f05e..0000000000
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
+++ /dev/null
@@ -1,21884 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- lrzsz-0.12.20.safe/ABOUT-NLS 1998-04-26 09:22:30.000000000 -0400
4+++ lrzsz-0.12.20/ABOUT-NLS 2004-09-12 14:40:34.323752952 -0400
5@@ -1,14 +1,14 @@
6 Notes on the Free Translation Project
7 *************************************
8
9- Free software is going international! The Free Translation Project
10-is a way to get maintainers of free software, translators, and users all
11+Free software is going international! The Free Translation Project is
12+a way to get maintainers of free software, translators, and users all
13 together, so that will gradually become able to speak many languages.
14 A few packages already provide translations for their messages.
15
16 If you found this `ABOUT-NLS' file inside a distribution, you may
17 assume that the distributed package does use GNU `gettext' internally,
18-itself available at your nearest GNU archive site. But you do *not*
19+itself available at your nearest GNU archive site. But you do _not_
20 need to install GNU `gettext' prior to configuring, installing or using
21 this package with messages translated.
22
23@@ -22,10 +22,10 @@
24 `gettext' which is used. The information can be found in the
25 `intl/VERSION' file, in internationalized packages.
26
27-One advise in advance
28-=====================
29+Quick configuration advice
30+==========================
31
32- If you want to exploit the full power of internationalization, you
33+If you want to exploit the full power of internationalization, you
34 should configure it using
35
36 ./configure --with-included-gettext
37@@ -34,42 +34,40 @@
38 package, despite the existence of internationalizing capabilities in the
39 operating system where this package is being installed. So far, only
40 the `gettext' implementation in the GNU C library version 2 provides as
41-many features (such as locale alias or message inheritance) as the
42-implementation here. It is also not possible to offer this additional
43-functionality on top of a `catgets' implementation. Future versions of
44-GNU `gettext' will very likely convey even more functionality. So it
45-might be a good idea to change to GNU `gettext' as soon as possible.
46+many features (such as locale alias, message inheritance, automatic
47+charset conversion or plural form handling) as the implementation here.
48+It is also not possible to offer this additional functionality on top
49+of a `catgets' implementation. Future versions of GNU `gettext' will
50+very likely convey even more functionality. So it might be a good idea
51+to change to GNU `gettext' as soon as possible.
52
53- So you need not provide this option if you are using GNU libc 2 or
54+ So you need _not_ provide this option if you are using GNU libc 2 or
55 you have installed a recent copy of the GNU gettext package with the
56 included `libintl'.
57
58 INSTALL Matters
59 ===============
60
61- Some packages are "localizable" when properly installed; the
62-programs they contain can be made to speak your own native language.
63-Most such packages use GNU `gettext'. Other packages have their own
64-ways to internationalization, predating GNU `gettext'.
65+Some packages are "localizable" when properly installed; the programs
66+they contain can be made to speak your own native language. Most such
67+packages use GNU `gettext'. Other packages have their own ways to
68+internationalization, predating GNU `gettext'.
69
70 By default, this package will be installed to allow translation of
71-messages. It will automatically detect whether the system provides
72-usable `catgets' (if using this is selected by the installer) or
73-`gettext' functions. If neither is available, the GNU `gettext' own
74+messages. It will automatically detect whether the system already
75+provides the GNU `gettext' functions. If not, the GNU `gettext' own
76 library will be used. This library is wholly contained within this
77 package, usually in the `intl/' subdirectory, so prior installation of
78-the GNU `gettext' package is *not* required. Installers may use
79+the GNU `gettext' package is _not_ required. Installers may use
80 special options at configuration time for changing the default
81 behaviour. The commands:
82
83 ./configure --with-included-gettext
84- ./configure --with-catgets
85 ./configure --disable-nls
86
87-will respectively bypass any pre-existing `catgets' or `gettext' to use
88-the internationalizing routines provided within this package, enable
89-the use of the `catgets' functions (if found on the locale system), or
90-else, *totally* disable translation of messages.
91+will respectively bypass any pre-existing `gettext' to use the
92+internationalizing routines provided within this package, or else,
93+_totally_ disable translation of messages.
94
95 When you already have GNU `gettext' installed on your system and run
96 configure without an option for your new package, `configure' will
97@@ -83,18 +81,10 @@
98
99 to prevent auto-detection.
100
101- By default the configuration process will not test for the `catgets'
102-function and therefore they will not be used. The reasons are already
103-given above: the emulation on top of `catgets' cannot provide all the
104-extensions provided by the GNU `gettext' library. If you nevertheless
105-want to use the `catgets' functions use
106-
107- ./configure --with-catgets
108-
109-to enable the test for `catgets' (this causes no harm if `catgets' is
110-not available on your system). If you really select this option we
111-would like to hear about the reasons because we cannot think of any
112-good one ourself.
113+ The configuration process will not test for the `catgets' function
114+and therefore it will not be used. The reason is that even an
115+emulation of `gettext' on top of `catgets' could not provide all the
116+extensions of the GNU `gettext' library.
117
118 Internationalized packages have usually many `po/LL.po' files, where
119 LL gives an ISO 639 two-letter code identifying the language. Unless
120@@ -108,57 +98,73 @@
121 Using This Package
122 ==================
123
124- As a user, if your language has been installed for this package, you
125+As a user, if your language has been installed for this package, you
126 only have to set the `LANG' environment variable to the appropriate
127-ISO 639 `LL' two-letter code prior to using the programs in the
128-package. For example, let's suppose that you speak German. At the
129-shell prompt, merely execute `setenv LANG de' (in `csh'),
130-`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This
131-can be done from your `.login' or `.profile' file, once and for all.
132+`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
133+and `CC' is an ISO 3166 two-letter country code. For example, let's
134+suppose that you speak German and live in Germany. At the shell
135+prompt, merely execute `setenv LANG de_DE' (in `csh'),
136+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
137+This can be done from your `.login' or `.profile' file, once and for
138+all.
139
140- An operating system might already offer message localization for
141-many of its programs, while other programs have been installed locally
142-with the full capabilities of GNU `gettext'. Just using `gettext'
143-extended syntax for `LANG' would break proper localization of already
144-available operating system programs. In this case, users should set
145-both `LANGUAGE' and `LANG' variables in their environment, as programs
146-using GNU `gettext' give preference to `LANGUAGE'. For example, some
147-Swedish users would rather read translations in German than English for
148-when Swedish is not available. This is easily accomplished by setting
149-`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
150+ You might think that the country code specification is redundant.
151+But in fact, some languages have dialects in different countries. For
152+example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
153+country code serves to distinguish the dialects.
154+
155+ The locale naming convention of `LL_CC', with `LL' denoting the
156+language and `CC' denoting the country, is the one use on systems based
157+on GNU libc. On other systems, some variations of this scheme are
158+used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
159+locales supported by your system for your country by running the command
160+`locale -a | grep '^LL''.
161+
162+ Not all programs have translations for all languages. By default, an
163+English message is shown in place of a nonexistent translation. If you
164+understand other languages, you can set up a priority list of languages.
165+This is done through a different environment variable, called
166+`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
167+for the purpose of message handling, but you still need to have `LANG'
168+set to the primary language; this is required by other parts of the
169+system libraries. For example, some Swedish users who would rather
170+read translations in German than English for when Swedish is not
171+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
172+
173+ Special advice for Norwegian users: The language code for Norwegian
174+bokma*l changed from `no' to `nb' recently (in 2003). During the
175+transition period, while some message catalogs for this language are
176+installed under `nb' and some older ones under `no', it's recommended
177+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
178+older translations are used.
179+
180+ In the `LANGUAGE' environment variable, but not in the `LANG'
181+environment variable, `LL_CC' combinations can be abbreviated as `LL'
182+to denote the language's main dialect. For example, `de' is equivalent
183+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
184+(Portuguese as spoken in Portugal) in this context.
185
186 Translating Teams
187 =================
188
189- For the Free Translation Project to be a success, we need interested
190+For the Free Translation Project to be a success, we need interested
191 people who like their own language and write it well, and who are also
192 able to synergize with other translators speaking the same language.
193-Each translation team has its own mailing list, courtesy of Linux
194-International. You may reach your translation team at the address
195-`LL@li.org', replacing LL by the two-letter ISO 639 code for your
196-language. Language codes are *not* the same as the country codes given
197-in ISO 3166. The following translation teams exist, as of August 1997:
198-
199- Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
200- Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
201- `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
202- Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
203- `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
204- Swedish `sv', and Turkish `tr'.
205-
206-For example, you may reach the Chinese translation team by writing to
207-`zh@li.org'.
208+Each translation team has its own mailing list. The up-to-date list of
209+teams can be found at the Free Translation Project's homepage,
210+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
211+area.
212
213- If you'd like to volunteer to *work* at translating messages, you
214+ If you'd like to volunteer to _work_ at translating messages, you
215 should become a member of the translating team for your own language.
216-The subscribing address is *not* the same as the list itself, it has
217+The subscribing address is _not_ the same as the list itself, it has
218 `-request' appended. For example, speakers of Swedish can send a
219 message to `sv-request@li.org', having this message body:
220
221 subscribe
222
223 Keep in mind that team members are expected to participate
224-*actively* in translations, or at solving translational difficulties,
225+_actively_ in translations, or at solving translational difficulties,
226 rather than merely lurking around. If your team does not exist yet and
227 you want to start one, or if you are unsure about what to do or how to
228 get started, please write to `translation@iro.umontreal.ca' to reach the
229@@ -171,43 +177,559 @@
230 Available Packages
231 ==================
232
233- Languages are not equally supported in all packages. The following
234-matrix shows the current state of internationalization, as of August
235-1997. The matrix shows, in regard of each package, for which languages
236-PO files have been submitted to translation coordination.
237+Languages are not equally supported in all packages. The following
238+matrix shows the current state of internationalization, as of January
239+2004. The matrix shows, in regard of each package, for which languages
240+PO files have been submitted to translation coordination, with a
241+translation percentage of at least 50%.
242
243- Ready PO files cs da de en es fi fr it ja ko nl no pl pt sl sv
244- .-------------------------------------------------.
245- bash | [] [] [] | 3
246- bison | [] [] [] | 3
247- clisp | [] [] [] [] | 4
248- cpio | [] [] [] [] [] | 5
249- diffutils | [] [] [] [] [] | 5
250- enscript | [] [] [] [] [] [] | 6
251- fileutils | [] [] [] [] [] [] [] [] [] [] | 10
252- findutils | [] [] [] [] [] [] [] [] | 8
253- flex | [] [] [] [] | 4
254- gcal | [] [] [] [] [] | 5
255- gettext | [] [] [] [] [] [] [] [] [] [] | 11
256- grep | [] [] [] [] [] [] [] [] [] | 9
257- hello | [] [] [] [] [] [] [] [] [] [] | 10
258- id-utils | [] [] [] | 3
259- indent | [] [] [] [] | 4
260- libc | [] [] [] [] [] [] [] | 7
261- m4 | [] [] [] [] [] | 5
262- make | [] [] [] [] [] [] | 6
263- music | [] [] | 2
264- ptx | [] [] [] [] [] [] [] [] | 8
265- recode | [] [] [] [] [] [] [] [] [] | 9
266- sh-utils | [] [] [] [] [] [] [] | 7
267- sharutils | [] [] [] [] [] | 5
268- tar | [] [] [] [] [] [] [] [] [] [] | 10
269- texinfo | [] | 1
270- textutils | [] [] [] [] [] [] [] [] [] | 9
271- wdiff | [] [] [] [] [] [] [] [] | 8
272- `-------------------------------------------------'
273- 16 languages cs da de en es fi fr it ja ko nl no pl pt sl sv
274- 27 packages 3 2 24 1 17 1 26 2 1 11 20 9 19 7 7 17 167
275+ Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es
276+ +----------------------------------------------------+
277+ a2ps | [] [] [] [] |
278+ aegis | () |
279+ ant-phone | () |
280+ anubis | |
281+ ap-utils | |
282+ aspell | [] |
283+ bash | [] [] [] [] |
284+ batchelor | |
285+ bfd | [] [] |
286+ binutils | [] [] |
287+ bison | [] [] [] |
288+ bluez-pin | [] [] [] |
289+ clisp | |
290+ clisp | [] [] [] |
291+ console-tools | [] [] |
292+ coreutils | [] [] [] [] |
293+ cpio | [] [] [] |
294+ darkstat | [] () [] |
295+ diffutils | [] [] [] [] [] [] [] |
296+ e2fsprogs | [] [] [] |
297+ enscript | [] [] [] [] |
298+ error | [] [] [] [] [] |
299+ fetchmail | [] () [] [] [] [] |
300+ fileutils | [] [] [] |
301+ findutils | [] [] [] [] [] [] [] |
302+ flex | [] [] [] [] |
303+ fslint | |
304+ gas | [] |
305+ gawk | [] [] [] [] |
306+ gbiff | [] |
307+ gcal | [] |
308+ gcc | [] [] |
309+ gettext | [] [] [] [] [] |
310+ gettext-examples | [] [] [] [] |
311+ gettext-runtime | [] [] [] [] [] |
312+ gettext-tools | [] [] [] |
313+ gimp-print | [] [] [] [] [] |
314+ gliv | |
315+ glunarclock | [] [] |
316+ gnubiff | [] |
317+ gnucash | [] () [] [] |
318+ gnucash-glossary | [] () [] |
319+ gnupg | [] () [] [] [] [] |
320+ gpe-aerial | [] |
321+ gpe-beam | [] [] |
322+ gpe-calendar | [] [] |
323+ gpe-clock | [] [] |
324+ gpe-conf | [] [] |
325+ gpe-contacts | [] [] |
326+ gpe-edit | [] |
327+ gpe-go | [] |
328+ gpe-login | [] [] |
329+ gpe-ownerinfo | [] [] |
330+ gpe-sketchbook | [] [] |
331+ gpe-su | [] [] |
332+ gpe-taskmanager | [] [] |
333+ gpe-timesheet | [] |
334+ gpe-today | [] [] |
335+ gpe-todo | [] [] |
336+ gphoto2 | [] [] [] [] |
337+ gprof | [] [] [] |
338+ gpsdrive | () () () |
339+ gramadoir | [] |
340+ grep | [] [] [] [] [] [] |
341+ gretl | [] |
342+ gtick | [] () |
343+ hello | [] [] [] [] [] [] |
344+ id-utils | [] [] |
345+ indent | [] [] [] [] |
346+ iso_3166 | [] [] [] [] [] [] [] [] [] [] |
347+ iso_3166_1 | [] [] [] [] [] [] |
348+ iso_3166_2 | |
349+ iso_3166_3 | [] |
350+ iso_4217 | [] [] [] [] |
351+ iso_639 | |
352+ jpilot | [] [] [] |
353+ jtag | |
354+ jwhois | [] |
355+ kbd | [] [] [] [] [] |
356+ latrine | () |
357+ ld | [] [] |
358+ libc | [] [] [] [] [] [] |
359+ libgpewidget | [] [] |
360+ libiconv | [] [] [] [] [] |
361+ lifelines | [] () |
362+ lilypond | [] |
363+ lingoteach | |
364+ lingoteach_lessons | () () |
365+ lynx | [] [] [] [] |
366+ m4 | [] [] [] [] |
367+ mailutils | [] [] |
368+ make | [] [] [] |
369+ man-db | [] () [] [] () |
370+ minicom | [] [] [] |
371+ mysecretdiary | [] [] [] |
372+ nano | [] () [] [] [] |
373+ nano_1_0 | [] () [] [] [] |
374+ opcodes | [] |
375+ parted | [] [] [] [] [] |
376+ ptx | [] [] [] [] [] |
377+ python | |
378+ radius | [] |
379+ recode | [] [] [] [] [] [] [] |
380+ rpm | [] [] |
381+ screem | |
382+ scrollkeeper | [] [] [] [] [] [] |
383+ sed | [] [] [] [] [] [] |
384+ sh-utils | [] [] [] |
385+ shared-mime-info | |
386+ sharutils | [] [] [] [] [] [] |
387+ silky | () |
388+ skencil | [] () [] |
389+ sketch | [] () [] |
390+ soundtracker | [] [] [] |
391+ sp | [] |
392+ tar | [] [] [] [] |
393+ texinfo | [] [] [] |
394+ textutils | [] [] [] [] |
395+ tin | () () |
396+ tp-robot | |
397+ tuxpaint | [] [] [] [] [] [] [] |
398+ unicode-han-tra... | |
399+ unicode-transla... | |
400+ util-linux | [] [] [] [] [] |
401+ vorbis-tools | [] [] [] [] |
402+ wastesedge | () |
403+ wdiff | [] [] [] [] |
404+ wget | [] [] [] [] [] [] |
405+ xchat | [] [] [] [] |
406+ xfree86_xkb_xml | [] [] |
407+ xpad | [] |
408+ +----------------------------------------------------+
409+ af am ar az be bg bs ca cs da de el en en_GB eo es
410+ 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68
411+
412+ et eu fa fi fr ga gl he hr hu id is it ja ko lg
413+ +-------------------------------------------------+
414+ a2ps | [] [] [] () () |
415+ aegis | |
416+ ant-phone | [] |
417+ anubis | [] |
418+ ap-utils | [] |
419+ aspell | [] [] |
420+ bash | [] [] |
421+ batchelor | [] [] |
422+ bfd | [] |
423+ binutils | [] [] |
424+ bison | [] [] [] [] |
425+ bluez-pin | [] [] [] [] [] |
426+ clisp | |
427+ clisp | [] |
428+ console-tools | |
429+ coreutils | [] [] [] [] [] [] |
430+ cpio | [] [] [] [] |
431+ darkstat | () [] [] [] |
432+ diffutils | [] [] [] [] [] [] [] |
433+ e2fsprogs | |
434+ enscript | [] [] |
435+ error | [] [] [] [] |
436+ fetchmail | [] |
437+ fileutils | [] [] [] [] [] [] |
438+ findutils | [] [] [] [] [] [] [] [] [] [] [] |
439+ flex | [] [] [] |
440+ fslint | [] |
441+ gas | [] |
442+ gawk | [] [] [] |
443+ gbiff | [] |
444+ gcal | [] |
445+ gcc | [] |
446+ gettext | [] [] [] |
447+ gettext-examples | [] [] |
448+ gettext-runtime | [] [] [] [] [] |
449+ gettext-tools | [] [] [] |
450+ gimp-print | [] [] |
451+ gliv | () |
452+ glunarclock | [] [] [] [] |
453+ gnubiff | [] |
454+ gnucash | () [] |
455+ gnucash-glossary | [] |
456+ gnupg | [] [] [] [] [] [] [] |
457+ gpe-aerial | [] |
458+ gpe-beam | [] |
459+ gpe-calendar | [] [] [] |
460+ gpe-clock | [] |
461+ gpe-conf | [] |
462+ gpe-contacts | [] [] |
463+ gpe-edit | [] [] |
464+ gpe-go | [] |
465+ gpe-login | [] [] |
466+ gpe-ownerinfo | [] [] [] |
467+ gpe-sketchbook | [] |
468+ gpe-su | [] |
469+ gpe-taskmanager | [] |
470+ gpe-timesheet | [] [] [] |
471+ gpe-today | [] [] |
472+ gpe-todo | [] [] |
473+ gphoto2 | [] [] [] |
474+ gprof | [] [] |
475+ gpsdrive | () () () |
476+ gramadoir | [] [] |
477+ grep | [] [] [] [] [] [] [] [] [] [] [] |
478+ gretl | [] [] |
479+ gtick | [] [] [] |
480+ hello | [] [] [] [] [] [] [] [] [] [] [] [] [] |
481+ id-utils | [] [] [] [] |
482+ indent | [] [] [] [] [] [] [] [] [] |
483+ iso_3166 | [] [] [] [] [] [] [] |
484+ iso_3166_1 | [] [] [] [] [] |
485+ iso_3166_2 | |
486+ iso_3166_3 | |
487+ iso_4217 | [] [] [] [] [] [] |
488+ iso_639 | |
489+ jpilot | [] () |
490+ jtag | [] |
491+ jwhois | [] [] [] [] |
492+ kbd | [] |
493+ latrine | [] |
494+ ld | [] |
495+ libc | [] [] [] [] [] [] |
496+ libgpewidget | [] [] [] [] |
497+ libiconv | [] [] [] [] [] [] [] [] [] |
498+ lifelines | () |
499+ lilypond | [] |
500+ lingoteach | [] [] |
501+ lingoteach_lessons | |
502+ lynx | [] [] [] [] |
503+ m4 | [] [] [] [] |
504+ mailutils | |
505+ make | [] [] [] [] [] [] |
506+ man-db | () () |
507+ minicom | [] [] [] [] |
508+ mysecretdiary | [] [] |
509+ nano | [] [] [] [] |
510+ nano_1_0 | [] [] [] [] |
511+ opcodes | [] |
512+ parted | [] [] [] |
513+ ptx | [] [] [] [] [] [] [] |
514+ python | |
515+ radius | [] |
516+ recode | [] [] [] [] [] [] |
517+ rpm | [] [] |
518+ screem | |
519+ scrollkeeper | [] |
520+ sed | [] [] [] [] [] [] [] [] [] |
521+ sh-utils | [] [] [] [] [] [] [] |
522+ shared-mime-info | [] [] [] |
523+ sharutils | [] [] [] [] [] |
524+ silky | () [] () () |
525+ skencil | [] |
526+ sketch | [] |
527+ soundtracker | [] [] |
528+ sp | [] () |
529+ tar | [] [] [] [] [] [] [] [] [] |
530+ texinfo | [] [] [] [] |
531+ textutils | [] [] [] [] [] [] |
532+ tin | [] () |
533+ tp-robot | [] |
534+ tuxpaint | [] [] [] [] [] [] [] [] [] |
535+ unicode-han-tra... | |
536+ unicode-transla... | [] [] |
537+ util-linux | [] [] [] [] () [] |
538+ vorbis-tools | [] |
539+ wastesedge | () |
540+ wdiff | [] [] [] [] [] [] |
541+ wget | [] [] [] [] [] [] [] |
542+ xchat | [] [] [] |
543+ xfree86_xkb_xml | [] [] |
544+ xpad | [] [] |
545+ +-------------------------------------------------+
546+ et eu fa fi fr ga gl he hr hu id is it ja ko lg
547+ 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0
548+
549+ lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
550+ +-----------------------------------------------------+
551+ a2ps | [] [] () () [] [] [] |
552+ aegis | () () () |
553+ ant-phone | [] [] |
554+ anubis | [] [] [] [] [] [] |
555+ ap-utils | [] () [] |
556+ aspell | [] |
557+ bash | [] [] [] |
558+ batchelor | [] |
559+ bfd | [] |
560+ binutils | [] |
561+ bison | [] [] [] [] [] |
562+ bluez-pin | [] [] [] |
563+ clisp | |
564+ clisp | [] |
565+ console-tools | [] |
566+ coreutils | [] [] |
567+ cpio | [] [] [] [] [] |
568+ darkstat | [] [] [] [] |
569+ diffutils | [] [] [] [] [] [] |
570+ e2fsprogs | [] |
571+ enscript | [] [] [] [] |
572+ error | [] [] [] |
573+ fetchmail | [] [] () [] |
574+ fileutils | [] [] [] |
575+ findutils | [] [] [] [] [] |
576+ flex | [] [] [] [] |
577+ fslint | [] [] |
578+ gas | |
579+ gawk | [] [] [] |
580+ gbiff | [] [] |
581+ gcal | |
582+ gcc | |
583+ gettext | [] [] [] |
584+ gettext-examples | [] [] [] |
585+ gettext-runtime | [] [] [] [] |
586+ gettext-tools | [] [] |
587+ gimp-print | [] |
588+ gliv | [] [] [] |
589+ glunarclock | [] [] [] [] |
590+ gnubiff | [] |
591+ gnucash | [] [] () [] |
592+ gnucash-glossary | [] [] |
593+ gnupg | [] |
594+ gpe-aerial | [] [] [] [] |
595+ gpe-beam | [] [] [] [] |
596+ gpe-calendar | [] [] [] [] |
597+ gpe-clock | [] [] [] [] |
598+ gpe-conf | [] [] [] [] |
599+ gpe-contacts | [] [] [] [] |
600+ gpe-edit | [] [] [] [] |
601+ gpe-go | [] [] [] |
602+ gpe-login | [] [] [] [] |
603+ gpe-ownerinfo | [] [] [] [] |
604+ gpe-sketchbook | [] [] [] [] |
605+ gpe-su | [] [] [] [] |
606+ gpe-taskmanager | [] [] [] [] |
607+ gpe-timesheet | [] [] [] [] |
608+ gpe-today | [] [] [] [] |
609+ gpe-todo | [] [] [] [] |
610+ gphoto2 | [] |
611+ gprof | [] [] |
612+ gpsdrive | () () [] |
613+ gramadoir | () [] |
614+ grep | [] [] [] [] [] |
615+ gretl | |
616+ gtick | [] [] [] |
617+ hello | [] [] [] [] [] [] [] [] [] [] |
618+ id-utils | [] [] [] [] |
619+ indent | [] [] [] [] |
620+ iso_3166 | [] [] [] |
621+ iso_3166_1 | [] [] |
622+ iso_3166_2 | |
623+ iso_3166_3 | [] |
624+ iso_4217 | [] [] [] [] [] [] [] [] |
625+ iso_639 | [] |
626+ jpilot | () () |
627+ jtag | |
628+ jwhois | [] [] [] [] () |
629+ kbd | [] [] [] |
630+ latrine | [] |
631+ ld | |
632+ libc | [] [] [] [] |
633+ libgpewidget | [] [] [] |
634+ libiconv | [] [] [] [] [] |
635+ lifelines | |
636+ lilypond | |
637+ lingoteach | |
638+ lingoteach_lessons | |
639+ lynx | [] [] [] |
640+ m4 | [] [] [] [] [] |
641+ mailutils | [] [] [] |
642+ make | [] [] [] [] |
643+ man-db | [] |
644+ minicom | [] [] [] [] |
645+ mysecretdiary | [] [] [] |
646+ nano | [] [] [] [] [] |
647+ nano_1_0 | [] [] [] [] [] [] |
648+ opcodes | [] [] |
649+ parted | [] [] [] [] |
650+ ptx | [] [] [] [] [] [] [] [] |
651+ python | |
652+ radius | [] [] |
653+ recode | [] [] [] [] |
654+ rpm | [] [] [] |
655+ screem | |
656+ scrollkeeper | [] [] [] [] [] |
657+ sed | [] [] [] |
658+ sh-utils | [] [] |
659+ shared-mime-info | [] [] |
660+ sharutils | [] [] |
661+ silky | () |
662+ skencil | [] [] |
663+ sketch | [] [] |
664+ soundtracker | |
665+ sp | |
666+ tar | [] [] [] [] [] [] |
667+ texinfo | [] [] [] [] |
668+ textutils | [] [] |
669+ tin | |
670+ tp-robot | [] |
671+ tuxpaint | [] [] [] [] [] [] [] [] |
672+ unicode-han-tra... | |
673+ unicode-transla... | |
674+ util-linux | [] [] [] |
675+ vorbis-tools | [] [] [] |
676+ wastesedge | |
677+ wdiff | [] [] [] [] [] |
678+ wget | [] [] [] |
679+ xchat | [] [] [] |
680+ xfree86_xkb_xml | [] [] |
681+ xpad | [] [] |
682+ +-----------------------------------------------------+
683+ lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
684+ 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63
685+
686+ sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
687+ +-----------------------------------------------------+
688+ a2ps | [] [] [] [] | 16
689+ aegis | | 0
690+ ant-phone | | 3
691+ anubis | [] [] | 9
692+ ap-utils | () | 3
693+ aspell | | 4
694+ bash | | 9
695+ batchelor | | 3
696+ bfd | [] [] | 6
697+ binutils | [] [] [] | 8
698+ bison | [] [] | 14
699+ bluez-pin | [] [] [] | 14
700+ clisp | | 0
701+ clisp | | 5
702+ console-tools | | 3
703+ coreutils | [] [] [] [] | 16
704+ cpio | [] [] | 14
705+ darkstat | [] [] [] () () | 12
706+ diffutils | [] [] [] | 23
707+ e2fsprogs | [] [] | 6
708+ enscript | [] [] | 12
709+ error | [] [] [] | 15
710+ fetchmail | [] [] | 11
711+ fileutils | [] [] [] [] [] | 17
712+ findutils | [] [] [] [] [] [] | 29
713+ flex | [] [] | 13
714+ fslint | | 3
715+ gas | [] | 3
716+ gawk | [] [] | 12
717+ gbiff | | 4
718+ gcal | [] [] | 4
719+ gcc | [] | 4
720+ gettext | [] [] [] [] [] | 16
721+ gettext-examples | [] [] [] [] [] | 14
722+ gettext-runtime | [] [] [] [] [] [] [] [] | 22
723+ gettext-tools | [] [] [] [] [] [] | 14
724+ gimp-print | [] [] | 10
725+ gliv | | 3
726+ glunarclock | [] [] [] | 13
727+ gnubiff | | 3
728+ gnucash | [] [] | 9
729+ gnucash-glossary | [] [] [] | 8
730+ gnupg | [] [] [] [] | 17
731+ gpe-aerial | [] | 7
732+ gpe-beam | [] | 8
733+ gpe-calendar | [] [] [] [] | 13
734+ gpe-clock | [] [] [] | 10
735+ gpe-conf | [] [] | 9
736+ gpe-contacts | [] [] [] | 11
737+ gpe-edit | [] [] [] [] [] | 12
738+ gpe-go | | 5
739+ gpe-login | [] [] [] [] [] | 13
740+ gpe-ownerinfo | [] [] [] [] | 13
741+ gpe-sketchbook | [] [] | 9
742+ gpe-su | [] [] [] | 10
743+ gpe-taskmanager | [] [] [] | 10
744+ gpe-timesheet | [] [] [] [] | 12
745+ gpe-today | [] [] [] [] [] | 13
746+ gpe-todo | [] [] [] [] | 12
747+ gphoto2 | [] [] [] | 11
748+ gprof | [] [] | 9
749+ gpsdrive | [] [] | 3
750+ gramadoir | [] | 5
751+ grep | [] [] [] [] | 26
752+ gretl | | 3
753+ gtick | | 7
754+ hello | [] [] [] [] [] | 34
755+ id-utils | [] [] | 12
756+ indent | [] [] [] [] | 21
757+ iso_3166 | [] [] [] [] [] [] [] | 27
758+ iso_3166_1 | [] [] [] | 16
759+ iso_3166_2 | | 0
760+ iso_3166_3 | | 2
761+ iso_4217 | [] [] [] [] [] [] | 24
762+ iso_639 | | 1
763+ jpilot | [] [] [] [] [] | 9
764+ jtag | [] | 2
765+ jwhois | () [] [] | 11
766+ kbd | [] [] | 11
767+ latrine | | 2
768+ ld | [] [] | 5
769+ libc | [] [] [] [] | 20
770+ libgpewidget | [] [] [] [] | 13
771+ libiconv | [] [] [] [] [] [] [] [] | 27
772+ lifelines | [] | 2
773+ lilypond | [] | 3
774+ lingoteach | | 2
775+ lingoteach_lessons | () | 0
776+ lynx | [] [] [] | 14
777+ m4 | [] [] | 15
778+ mailutils | | 5
779+ make | [] [] [] | 16
780+ man-db | [] | 5
781+ minicom | | 11
782+ mysecretdiary | [] [] | 10
783+ nano | [] [] [] [] | 17
784+ nano_1_0 | [] [] [] | 17
785+ opcodes | [] [] | 6
786+ parted | [] [] [] | 15
787+ ptx | [] [] | 22
788+ python | | 0
789+ radius | | 4
790+ recode | [] [] [] | 20
791+ rpm | [] [] | 9
792+ screem | [] [] | 2
793+ scrollkeeper | [] [] [] | 15
794+ sed | [] [] [] [] [] [] | 24
795+ sh-utils | [] [] | 14
796+ shared-mime-info | [] [] | 7
797+ sharutils | [] [] [] [] | 17
798+ silky | () | 3
799+ skencil | [] | 6
800+ sketch | [] | 6
801+ soundtracker | [] [] | 7
802+ sp | [] | 3
803+ tar | [] [] [] [] [] | 24
804+ texinfo | [] [] [] | 14
805+ textutils | [] [] [] [] | 16
806+ tin | | 1
807+ tp-robot | | 2
808+ tuxpaint | [] [] [] [] [] | 29
809+ unicode-han-tra... | | 0
810+ unicode-transla... | | 2
811+ util-linux | [] [] | 15
812+ vorbis-tools | | 8
813+ wastesedge | | 0
814+ wdiff | [] [] [] | 18
815+ wget | [] [] [] [] [] [] [] [] | 24
816+ xchat | [] [] [] [] [] | 15
817+ xfree86_xkb_xml | [] [] [] [] [] | 11
818+ xpad | | 5
819+ +-----------------------------------------------------+
820+ 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
821+ 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373
822
823 Some counters in the preceding matrix are higher than the number of
824 visible blocks let us expect. This is because a few extra PO files are
825@@ -220,6 +742,27 @@
826 lag between the mere existence a PO file and its wide availability in a
827 distribution.
828
829- If August 1997 seems to be old, you may fetch a more recent copy of
830-this `ABOUT-NLS' file on most GNU archive sites.
831+ If January 2004 seems to be old, you may fetch a more recent copy of
832+this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
833+matrix with full percentage details can be found at
834+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
835+
836+Using `gettext' in new packages
837+===============================
838+
839+If you are writing a freely available program and want to
840+internationalize it you are welcome to use GNU `gettext' in your
841+package. Of course you have to respect the GNU Library General Public
842+License which covers the use of the GNU `gettext' library. This means
843+in particular that even non-free programs can use `libintl' as a shared
844+library, whereas only free software can use `libintl' as a static
845+library or use modified versions of `libintl'.
846+
847+ Once the sources are changed appropriately and the setup can handle
848+the use of `gettext' the only thing missing are the translations. The
849+Free Translation Project is also available for packages which are not
850+developed inside the GNU project. Therefore the information given above
851+applies also for every other Free Software Project. Contact
852+`translation@iro.umontreal.ca' to make the `.pot' files available to
853+the translation teams.
854
855--- lrzsz-0.12.20.safe/ChangeLog 1998-12-29 17:49:56.000000000 -0500
856+++ lrzsz-0.12.20/ChangeLog 2004-09-12 14:40:35.846521456 -0400
857@@ -1,3 +1,11 @@
858+2004-09-12 gettextize <bug-gnu-gettext@gnu.org>
859+
860+ * Makefile.am (ACLOCAL_AMFLAGS): New variable.
861+ (EXTRA_DIST): Add config.rpath.
862+ * configure.in (AC_OUTPUT): Add m4/Makefile.
863+ (AC_OUTPUT): Remove command that created po/Makefile.
864+ (AC_LINK_FILES): Remove invocation.
865+
866 1998-12-29 Uwe Ohse <uwe@ohse.de>
867
868 * src/lrz.c: removed stpcpy call.
869--- lrzsz-0.12.20.safe/config.rpath 1969-12-31 19:00:00.000000000 -0500
870+++ lrzsz-0.12.20/config.rpath 2004-09-12 14:40:34.329752040 -0400
871@@ -0,0 +1,548 @@
872+#! /bin/sh
873+# Output a system dependent set of variables, describing how to set the
874+# run time search path of shared libraries in an executable.
875+#
876+# Copyright 1996-2003 Free Software Foundation, Inc.
877+# Taken from GNU libtool, 2001
878+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
879+#
880+# This program is free software; you can redistribute it and/or modify
881+# it under the terms of the GNU General Public License as published by
882+# the Free Software Foundation; either version 2 of the License, or
883+# (at your option) any later version.
884+#
885+# This program is distributed in the hope that it will be useful, but
886+# WITHOUT ANY WARRANTY; without even the implied warranty of
887+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
888+# General Public License for more details.
889+#
890+# You should have received a copy of the GNU General Public License
891+# along with this program; if not, write to the Free Software
892+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
893+#
894+# As a special exception to the GNU General Public License, if you
895+# distribute this file as part of a program that contains a
896+# configuration script generated by Autoconf, you may include it under
897+# the same distribution terms that you use for the rest of that program.
898+#
899+# The first argument passed to this file is the canonical host specification,
900+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
901+# or
902+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
903+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
904+# should be set by the caller.
905+#
906+# The set of defined variables is at the end of this script.
907+
908+# Known limitations:
909+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
910+# than 256 bytes, otherwise the compiler driver will dump core. The only
911+# known workaround is to choose shorter directory names for the build
912+# directory and/or the installation directory.
913+
914+# All known linkers require a `.a' archive for static linking (except M$VC,
915+# which needs '.lib').
916+libext=a
917+shrext=.so
918+
919+host="$1"
920+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
921+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
922+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
923+
924+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
925+
926+wl=
927+if test "$GCC" = yes; then
928+ wl='-Wl,'
929+else
930+ case "$host_os" in
931+ aix*)
932+ wl='-Wl,'
933+ ;;
934+ mingw* | pw32* | os2*)
935+ ;;
936+ hpux9* | hpux10* | hpux11*)
937+ wl='-Wl,'
938+ ;;
939+ irix5* | irix6* | nonstopux*)
940+ wl='-Wl,'
941+ ;;
942+ newsos6)
943+ ;;
944+ linux*)
945+ case $CC in
946+ icc|ecc)
947+ wl='-Wl,'
948+ ;;
949+ ccc)
950+ wl='-Wl,'
951+ ;;
952+ esac
953+ ;;
954+ osf3* | osf4* | osf5*)
955+ wl='-Wl,'
956+ ;;
957+ sco3.2v5*)
958+ ;;
959+ solaris*)
960+ wl='-Wl,'
961+ ;;
962+ sunos4*)
963+ wl='-Qoption ld '
964+ ;;
965+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
966+ wl='-Wl,'
967+ ;;
968+ sysv4*MP*)
969+ ;;
970+ uts4*)
971+ ;;
972+ esac
973+fi
974+
975+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
976+
977+hardcode_libdir_flag_spec=
978+hardcode_libdir_separator=
979+hardcode_direct=no
980+hardcode_minus_L=no
981+
982+case "$host_os" in
983+ cygwin* | mingw* | pw32*)
984+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
985+ # When not using gcc, we currently assume that we are using
986+ # Microsoft Visual C++.
987+ if test "$GCC" != yes; then
988+ with_gnu_ld=no
989+ fi
990+ ;;
991+ openbsd*)
992+ with_gnu_ld=no
993+ ;;
994+esac
995+
996+ld_shlibs=yes
997+if test "$with_gnu_ld" = yes; then
998+ case "$host_os" in
999+ aix3* | aix4* | aix5*)
1000+ # On AIX/PPC, the GNU linker is very broken
1001+ if test "$host_cpu" != ia64; then
1002+ ld_shlibs=no
1003+ fi
1004+ ;;
1005+ amigaos*)
1006+ hardcode_libdir_flag_spec='-L$libdir'
1007+ hardcode_minus_L=yes
1008+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
1009+ # that the semantics of dynamic libraries on AmigaOS, at least up
1010+ # to version 4, is to share data among multiple programs linked
1011+ # with the same dynamic library. Since this doesn't match the
1012+ # behavior of shared libraries on other platforms, we can use
1013+ # them.
1014+ ld_shlibs=no
1015+ ;;
1016+ beos*)
1017+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1018+ :
1019+ else
1020+ ld_shlibs=no
1021+ fi
1022+ ;;
1023+ cygwin* | mingw* | pw32*)
1024+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1025+ # no search path for DLLs.
1026+ hardcode_libdir_flag_spec='-L$libdir'
1027+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
1028+ :
1029+ else
1030+ ld_shlibs=no
1031+ fi
1032+ ;;
1033+ netbsd*)
1034+ ;;
1035+ solaris* | sysv5*)
1036+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
1037+ ld_shlibs=no
1038+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1039+ :
1040+ else
1041+ ld_shlibs=no
1042+ fi
1043+ ;;
1044+ sunos4*)
1045+ hardcode_direct=yes
1046+ ;;
1047+ *)
1048+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
1049+ :
1050+ else
1051+ ld_shlibs=no
1052+ fi
1053+ ;;
1054+ esac
1055+ if test "$ld_shlibs" = yes; then
1056+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
1057+ # option of GNU ld is called -rpath, not --rpath.
1058+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1059+ fi
1060+else
1061+ case "$host_os" in
1062+ aix3*)
1063+ # Note: this linker hardcodes the directories in LIBPATH if there
1064+ # are no directories specified by -L.
1065+ hardcode_minus_L=yes
1066+ if test "$GCC" = yes; then
1067+ # Neither direct hardcoding nor static linking is supported with a
1068+ # broken collect2.
1069+ hardcode_direct=unsupported
1070+ fi
1071+ ;;
1072+ aix4* | aix5*)
1073+ if test "$host_cpu" = ia64; then
1074+ # On IA64, the linker does run time linking by default, so we don't
1075+ # have to do anything special.
1076+ aix_use_runtimelinking=no
1077+ else
1078+ aix_use_runtimelinking=no
1079+ # Test if we are trying to use run time linking or normal
1080+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
1081+ # need to do runtime linking.
1082+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
1083+ for ld_flag in $LDFLAGS; do
1084+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
1085+ aix_use_runtimelinking=yes
1086+ break
1087+ fi
1088+ done
1089+ esac
1090+ fi
1091+ hardcode_direct=yes
1092+ hardcode_libdir_separator=':'
1093+ if test "$GCC" = yes; then
1094+ case $host_os in aix4.[012]|aix4.[012].*)
1095+ collect2name=`${CC} -print-prog-name=collect2`
1096+ if test -f "$collect2name" && \
1097+ strings "$collect2name" | grep resolve_lib_name >/dev/null
1098+ then
1099+ # We have reworked collect2
1100+ hardcode_direct=yes
1101+ else
1102+ # We have old collect2
1103+ hardcode_direct=unsupported
1104+ hardcode_minus_L=yes
1105+ hardcode_libdir_flag_spec='-L$libdir'
1106+ hardcode_libdir_separator=
1107+ fi
1108+ esac
1109+ fi
1110+ # Begin _LT_AC_SYS_LIBPATH_AIX.
1111+ echo 'int main () { return 0; }' > conftest.c
1112+ ${CC} ${LDFLAGS} conftest.c -o conftest
1113+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
1114+}'`
1115+ if test -z "$aix_libpath"; then
1116+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
1117+}'`
1118+ fi
1119+ if test -z "$aix_libpath"; then
1120+ aix_libpath="/usr/lib:/lib"
1121+ fi
1122+ rm -f conftest.c conftest
1123+ # End _LT_AC_SYS_LIBPATH_AIX.
1124+ if test "$aix_use_runtimelinking" = yes; then
1125+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1126+ else
1127+ if test "$host_cpu" = ia64; then
1128+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
1129+ else
1130+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
1131+ fi
1132+ fi
1133+ ;;
1134+ amigaos*)
1135+ hardcode_libdir_flag_spec='-L$libdir'
1136+ hardcode_minus_L=yes
1137+ # see comment about different semantics on the GNU ld section
1138+ ld_shlibs=no
1139+ ;;
1140+ bsdi4*)
1141+ ;;
1142+ cygwin* | mingw* | pw32*)
1143+ # When not using gcc, we currently assume that we are using
1144+ # Microsoft Visual C++.
1145+ # hardcode_libdir_flag_spec is actually meaningless, as there is
1146+ # no search path for DLLs.
1147+ hardcode_libdir_flag_spec=' '
1148+ libext=lib
1149+ ;;
1150+ darwin* | rhapsody*)
1151+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
1152+ hardcode_direct=no
1153+ fi
1154+ ;;
1155+ dgux*)
1156+ hardcode_libdir_flag_spec='-L$libdir'
1157+ ;;
1158+ freebsd1*)
1159+ ld_shlibs=no
1160+ ;;
1161+ freebsd2.2*)
1162+ hardcode_libdir_flag_spec='-R$libdir'
1163+ hardcode_direct=yes
1164+ ;;
1165+ freebsd2*)
1166+ hardcode_direct=yes
1167+ hardcode_minus_L=yes
1168+ ;;
1169+ freebsd*)
1170+ hardcode_libdir_flag_spec='-R$libdir'
1171+ hardcode_direct=yes
1172+ ;;
1173+ hpux9*)
1174+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
1175+ hardcode_libdir_separator=:
1176+ hardcode_direct=yes
1177+ # hardcode_minus_L: Not really in the search PATH,
1178+ # but as the default location of the library.
1179+ hardcode_minus_L=yes
1180+ ;;
1181+ hpux10* | hpux11*)
1182+ if test "$with_gnu_ld" = no; then
1183+ case "$host_cpu" in
1184+ hppa*64*)
1185+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
1186+ hardcode_libdir_separator=:
1187+ hardcode_direct=no
1188+ ;;
1189+ ia64*)
1190+ hardcode_libdir_flag_spec='-L$libdir'
1191+ hardcode_direct=no
1192+ # hardcode_minus_L: Not really in the search PATH,
1193+ # but as the default location of the library.
1194+ hardcode_minus_L=yes
1195+ ;;
1196+ *)
1197+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
1198+ hardcode_libdir_separator=:
1199+ hardcode_direct=yes
1200+ # hardcode_minus_L: Not really in the search PATH,
1201+ # but as the default location of the library.
1202+ hardcode_minus_L=yes
1203+ ;;
1204+ esac
1205+ fi
1206+ ;;
1207+ irix5* | irix6* | nonstopux*)
1208+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1209+ hardcode_libdir_separator=:
1210+ ;;
1211+ netbsd*)
1212+ hardcode_libdir_flag_spec='-R$libdir'
1213+ hardcode_direct=yes
1214+ ;;
1215+ newsos6)
1216+ hardcode_direct=yes
1217+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1218+ hardcode_libdir_separator=:
1219+ ;;
1220+ openbsd*)
1221+ hardcode_direct=yes
1222+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1223+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
1224+ else
1225+ case "$host_os" in
1226+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
1227+ hardcode_libdir_flag_spec='-R$libdir'
1228+ ;;
1229+ *)
1230+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
1231+ ;;
1232+ esac
1233+ fi
1234+ ;;
1235+ os2*)
1236+ hardcode_libdir_flag_spec='-L$libdir'
1237+ hardcode_minus_L=yes
1238+ ;;
1239+ osf3*)
1240+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1241+ hardcode_libdir_separator=:
1242+ ;;
1243+ osf4* | osf5*)
1244+ if test "$GCC" = yes; then
1245+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
1246+ else
1247+ # Both cc and cxx compiler support -rpath directly
1248+ hardcode_libdir_flag_spec='-rpath $libdir'
1249+ fi
1250+ hardcode_libdir_separator=:
1251+ ;;
1252+ sco3.2v5*)
1253+ ;;
1254+ solaris*)
1255+ hardcode_libdir_flag_spec='-R$libdir'
1256+ ;;
1257+ sunos4*)
1258+ hardcode_libdir_flag_spec='-L$libdir'
1259+ hardcode_direct=yes
1260+ hardcode_minus_L=yes
1261+ ;;
1262+ sysv4)
1263+ case $host_vendor in
1264+ sni)
1265+ hardcode_direct=yes # is this really true???
1266+ ;;
1267+ siemens)
1268+ hardcode_direct=no
1269+ ;;
1270+ motorola)
1271+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
1272+ ;;
1273+ esac
1274+ ;;
1275+ sysv4.3*)
1276+ ;;
1277+ sysv4*MP*)
1278+ if test -d /usr/nec; then
1279+ ld_shlibs=yes
1280+ fi
1281+ ;;
1282+ sysv4.2uw2*)
1283+ hardcode_direct=yes
1284+ hardcode_minus_L=no
1285+ ;;
1286+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
1287+ ;;
1288+ sysv5*)
1289+ hardcode_libdir_flag_spec=
1290+ ;;
1291+ uts4*)
1292+ hardcode_libdir_flag_spec='-L$libdir'
1293+ ;;
1294+ *)
1295+ ld_shlibs=no
1296+ ;;
1297+ esac
1298+fi
1299+
1300+# Check dynamic linker characteristics
1301+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
1302+libname_spec='lib$name'
1303+case "$host_os" in
1304+ aix3*)
1305+ ;;
1306+ aix4* | aix5*)
1307+ ;;
1308+ amigaos*)
1309+ ;;
1310+ beos*)
1311+ ;;
1312+ bsdi4*)
1313+ ;;
1314+ cygwin* | mingw* | pw32*)
1315+ shrext=.dll
1316+ ;;
1317+ darwin* | rhapsody*)
1318+ shrext=.dylib
1319+ ;;
1320+ dgux*)
1321+ ;;
1322+ freebsd1*)
1323+ ;;
1324+ freebsd*)
1325+ ;;
1326+ gnu*)
1327+ ;;
1328+ hpux9* | hpux10* | hpux11*)
1329+ case "$host_cpu" in
1330+ ia64*)
1331+ shrext=.so
1332+ ;;
1333+ hppa*64*)
1334+ shrext=.sl
1335+ ;;
1336+ *)
1337+ shrext=.sl
1338+ ;;
1339+ esac
1340+ ;;
1341+ irix5* | irix6* | nonstopux*)
1342+ case "$host_os" in
1343+ irix5* | nonstopux*)
1344+ libsuff= shlibsuff=
1345+ ;;
1346+ *)
1347+ case $LD in
1348+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
1349+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
1350+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
1351+ *) libsuff= shlibsuff= ;;
1352+ esac
1353+ ;;
1354+ esac
1355+ ;;
1356+ linux*oldld* | linux*aout* | linux*coff*)
1357+ ;;
1358+ linux*)
1359+ ;;
1360+ netbsd*)
1361+ ;;
1362+ newsos6)
1363+ ;;
1364+ nto-qnx)
1365+ ;;
1366+ openbsd*)
1367+ ;;
1368+ os2*)
1369+ libname_spec='$name'
1370+ shrext=.dll
1371+ ;;
1372+ osf3* | osf4* | osf5*)
1373+ ;;
1374+ sco3.2v5*)
1375+ ;;
1376+ solaris*)
1377+ ;;
1378+ sunos4*)
1379+ ;;
1380+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1381+ ;;
1382+ sysv4*MP*)
1383+ ;;
1384+ uts4*)
1385+ ;;
1386+esac
1387+
1388+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
1389+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
1390+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
1391+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
1392+
1393+sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
1394+
1395+# How to pass a linker flag through the compiler.
1396+wl="$escaped_wl"
1397+
1398+# Static library suffix (normally "a").
1399+libext="$libext"
1400+
1401+# Shared library suffix (normally "so").
1402+shlibext="$shlibext"
1403+
1404+# Flag to hardcode \$libdir into a binary during linking.
1405+# This must work even if \$libdir does not exist.
1406+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
1407+
1408+# Whether we need a single -rpath flag with a separated argument.
1409+hardcode_libdir_separator="$hardcode_libdir_separator"
1410+
1411+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
1412+# resulting binary.
1413+hardcode_direct="$hardcode_direct"
1414+
1415+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
1416+# resulting binary.
1417+hardcode_minus_L="$hardcode_minus_L"
1418+
1419+EOF
1420--- lrzsz-0.12.20.safe/configure.in 2004-09-12 14:39:55.161706488 -0400
1421+++ lrzsz-0.12.20/configure.in 2004-09-12 14:40:35.816526016 -0400
1422@@ -260,11 +260,10 @@
1423 AM_GNU_GETTEXT
1424
1425 AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
1426-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
1427
1428-AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
1429+AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile m4/Makefile \
1430 man/Makefile po/Makefile.in src/Makefile debian/rules Specfile systype \
1431 src/lrzszbug],
1432-[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile;
1433+[
1434 chmod +x debian/rules;
1435 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
1436--- lrzsz-0.12.20.safe/intl/bindtextdom.c 1998-04-26 09:22:36.000000000 -0400
1437+++ lrzsz-0.12.20/intl/bindtextdom.c 2004-09-12 14:40:34.343749912 -0400
1438@@ -1,59 +1,75 @@
1439 /* Implementation of the bindtextdomain(3) function
1440- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
1441+ Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
1442
1443- This program is free software; you can redistribute it and/or modify
1444- it under the terms of the GNU General Public License as published by
1445- the Free Software Foundation; either version 2, or (at your option)
1446+ This program is free software; you can redistribute it and/or modify it
1447+ under the terms of the GNU Library General Public License as published
1448+ by the Free Software Foundation; either version 2, or (at your option)
1449 any later version.
1450
1451 This program is distributed in the hope that it will be useful,
1452 but WITHOUT ANY WARRANTY; without even the implied warranty of
1453- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1454- GNU General Public License for more details.
1455+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1456+ Library General Public License for more details.
1457
1458- You should have received a copy of the GNU General Public License
1459- along with this program; if not, write to the Free Software Foundation,
1460- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
1461+ You should have received a copy of the GNU Library General Public
1462+ License along with this program; if not, write to the Free Software
1463+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1464+ USA. */
1465
1466 #ifdef HAVE_CONFIG_H
1467 # include <config.h>
1468 #endif
1469
1470-#if defined STDC_HEADERS || defined _LIBC
1471-# include <stdlib.h>
1472-#else
1473-# ifdef HAVE_MALLOC_H
1474-# include <malloc.h>
1475-# else
1476-void free ();
1477-# endif
1478-#endif
1479+#include <stddef.h>
1480+#include <stdlib.h>
1481+#include <string.h>
1482
1483-#if defined HAVE_STRING_H || defined _LIBC
1484-# include <string.h>
1485+#ifdef _LIBC
1486+# include <libintl.h>
1487 #else
1488-# include <strings.h>
1489-# ifndef memcpy
1490-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
1491-# endif
1492+# include "libgnuintl.h"
1493 #endif
1494+#include "gettextP.h"
1495
1496 #ifdef _LIBC
1497-# include <libintl.h>
1498+/* We have to handle multi-threaded applications. */
1499+# include <bits/libc-lock.h>
1500 #else
1501-# include "libgettext.h"
1502+/* Provide dummy implementation if this is outside glibc. */
1503+# define __libc_rwlock_define(CLASS, NAME)
1504+# define __libc_rwlock_wrlock(NAME)
1505+# define __libc_rwlock_unlock(NAME)
1506+#endif
1507+
1508+/* The internal variables in the standalone libintl.a must have different
1509+ names than the internal variables in GNU libc, otherwise programs
1510+ using libintl.a cannot be linked statically. */
1511+#if !defined _LIBC
1512+# define _nl_default_dirname libintl_nl_default_dirname
1513+# define _nl_domain_bindings libintl_nl_domain_bindings
1514+#endif
1515+
1516+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
1517+#ifndef offsetof
1518+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
1519 #endif
1520-#include "gettext.h"
1521-#include "gettextP.h"
1522
1523 /* @@ end of prolog @@ */
1524
1525 /* Contains the default location of the message catalogs. */
1526 extern const char _nl_default_dirname[];
1527+#ifdef _LIBC
1528+extern const char _nl_default_dirname_internal[] attribute_hidden;
1529+#else
1530+# define INTUSE(name) name
1531+#endif
1532
1533 /* List with bindings of specific domains. */
1534 extern struct binding *_nl_domain_bindings;
1535
1536+/* Lock variable to protect the global data in the gettext implementation. */
1537+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
1538+
1539
1540 /* Names for the libintl functions are a problem. They must not clash
1541 with existing names and they should follow ANSI C. But this source
1542@@ -61,23 +77,41 @@
1543 prefix. So we have to make a difference here. */
1544 #ifdef _LIBC
1545 # define BINDTEXTDOMAIN __bindtextdomain
1546-# define strdup(str) __strdup (str)
1547+# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
1548+# ifndef strdup
1549+# define strdup(str) __strdup (str)
1550+# endif
1551 #else
1552-# define BINDTEXTDOMAIN bindtextdomain__
1553+# define BINDTEXTDOMAIN libintl_bindtextdomain
1554+# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
1555 #endif
1556
1557-/* Specify that the DOMAINNAME message catalog will be found
1558- in DIRNAME rather than in the system locale data base. */
1559-char *
1560-BINDTEXTDOMAIN (domainname, dirname)
1561- const char *domainname;
1562- const char *dirname;
1563+/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
1564+ to be used for the DOMAINNAME message catalog.
1565+ If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
1566+ modified, only the current value is returned.
1567+ If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
1568+ modified nor returned. */
1569+static void
1570+set_binding_values (const char *domainname,
1571+ const char **dirnamep, const char **codesetp)
1572 {
1573 struct binding *binding;
1574+ int modified;
1575
1576 /* Some sanity checks. */
1577 if (domainname == NULL || domainname[0] == '\0')
1578- return NULL;
1579+ {
1580+ if (dirnamep)
1581+ *dirnamep = NULL;
1582+ if (codesetp)
1583+ *codesetp = NULL;
1584+ return;
1585+ }
1586+
1587+ __libc_rwlock_wrlock (_nl_state_lock);
1588+
1589+ modified = 0;
1590
1591 for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
1592 {
1593@@ -93,81 +127,173 @@
1594 }
1595 }
1596
1597- if (dirname == NULL)
1598- /* The current binding has be to returned. */
1599- return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
1600-
1601 if (binding != NULL)
1602 {
1603- /* The domain is already bound. If the new value and the old
1604- one are equal we simply do nothing. Otherwise replace the
1605- old binding. */
1606- if (strcmp (dirname, binding->dirname) != 0)
1607+ if (dirnamep)
1608 {
1609- char *new_dirname;
1610+ const char *dirname = *dirnamep;
1611
1612- if (strcmp (dirname, _nl_default_dirname) == 0)
1613- new_dirname = (char *) _nl_default_dirname;
1614+ if (dirname == NULL)
1615+ /* The current binding has be to returned. */
1616+ *dirnamep = binding->dirname;
1617 else
1618 {
1619+ /* The domain is already bound. If the new value and the old
1620+ one are equal we simply do nothing. Otherwise replace the
1621+ old binding. */
1622+ char *result = binding->dirname;
1623+ if (strcmp (dirname, result) != 0)
1624+ {
1625+ if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
1626+ result = (char *) INTUSE(_nl_default_dirname);
1627+ else
1628+ {
1629 #if defined _LIBC || defined HAVE_STRDUP
1630- new_dirname = strdup (dirname);
1631- if (new_dirname == NULL)
1632- return NULL;
1633+ result = strdup (dirname);
1634 #else
1635- size_t len = strlen (dirname) + 1;
1636- new_dirname = (char *) malloc (len);
1637- if (new_dirname == NULL)
1638- return NULL;
1639-
1640- memcpy (new_dirname, dirname, len);
1641+ size_t len = strlen (dirname) + 1;
1642+ result = (char *) malloc (len);
1643+ if (__builtin_expect (result != NULL, 1))
1644+ memcpy (result, dirname, len);
1645 #endif
1646+ }
1647+
1648+ if (__builtin_expect (result != NULL, 1))
1649+ {
1650+ if (binding->dirname != INTUSE(_nl_default_dirname))
1651+ free (binding->dirname);
1652+
1653+ binding->dirname = result;
1654+ modified = 1;
1655+ }
1656+ }
1657+ *dirnamep = result;
1658 }
1659+ }
1660
1661- if (binding->dirname != _nl_default_dirname)
1662- free (binding->dirname);
1663+ if (codesetp)
1664+ {
1665+ const char *codeset = *codesetp;
1666
1667- binding->dirname = new_dirname;
1668+ if (codeset == NULL)
1669+ /* The current binding has be to returned. */
1670+ *codesetp = binding->codeset;
1671+ else
1672+ {
1673+ /* The domain is already bound. If the new value and the old
1674+ one are equal we simply do nothing. Otherwise replace the
1675+ old binding. */
1676+ char *result = binding->codeset;
1677+ if (result == NULL || strcmp (codeset, result) != 0)
1678+ {
1679+#if defined _LIBC || defined HAVE_STRDUP
1680+ result = strdup (codeset);
1681+#else
1682+ size_t len = strlen (codeset) + 1;
1683+ result = (char *) malloc (len);
1684+ if (__builtin_expect (result != NULL, 1))
1685+ memcpy (result, codeset, len);
1686+#endif
1687+
1688+ if (__builtin_expect (result != NULL, 1))
1689+ {
1690+ if (binding->codeset != NULL)
1691+ free (binding->codeset);
1692+
1693+ binding->codeset = result;
1694+ binding->codeset_cntr++;
1695+ modified = 1;
1696+ }
1697+ }
1698+ *codesetp = result;
1699+ }
1700 }
1701 }
1702+ else if ((dirnamep == NULL || *dirnamep == NULL)
1703+ && (codesetp == NULL || *codesetp == NULL))
1704+ {
1705+ /* Simply return the default values. */
1706+ if (dirnamep)
1707+ *dirnamep = INTUSE(_nl_default_dirname);
1708+ if (codesetp)
1709+ *codesetp = NULL;
1710+ }
1711 else
1712 {
1713 /* We have to create a new binding. */
1714- size_t len;
1715+ size_t len = strlen (domainname) + 1;
1716 struct binding *new_binding =
1717- (struct binding *) malloc (sizeof (*new_binding));
1718+ (struct binding *) malloc (offsetof (struct binding, domainname) + len);
1719
1720- if (new_binding == NULL)
1721- return NULL;
1722+ if (__builtin_expect (new_binding == NULL, 0))
1723+ goto failed;
1724
1725+ memcpy (new_binding->domainname, domainname, len);
1726+
1727+ if (dirnamep)
1728+ {
1729+ const char *dirname = *dirnamep;
1730+
1731+ if (dirname == NULL)
1732+ /* The default value. */
1733+ dirname = INTUSE(_nl_default_dirname);
1734+ else
1735+ {
1736+ if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
1737+ dirname = INTUSE(_nl_default_dirname);
1738+ else
1739+ {
1740+ char *result;
1741 #if defined _LIBC || defined HAVE_STRDUP
1742- new_binding->domainname = strdup (domainname);
1743- if (new_binding->domainname == NULL)
1744- return NULL;
1745+ result = strdup (dirname);
1746+ if (__builtin_expect (result == NULL, 0))
1747+ goto failed_dirname;
1748 #else
1749- len = strlen (domainname) + 1;
1750- new_binding->domainname = (char *) malloc (len);
1751- if (new_binding->domainname == NULL)
1752- return NULL;
1753- memcpy (new_binding->domainname, domainname, len);
1754+ size_t len = strlen (dirname) + 1;
1755+ result = (char *) malloc (len);
1756+ if (__builtin_expect (result == NULL, 0))
1757+ goto failed_dirname;
1758+ memcpy (result, dirname, len);
1759 #endif
1760-
1761- if (strcmp (dirname, _nl_default_dirname) == 0)
1762- new_binding->dirname = (char *) _nl_default_dirname;
1763+ dirname = result;
1764+ }
1765+ }
1766+ *dirnamep = dirname;
1767+ new_binding->dirname = (char *) dirname;
1768+ }
1769 else
1770+ /* The default value. */
1771+ new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
1772+
1773+ new_binding->codeset_cntr = 0;
1774+
1775+ if (codesetp)
1776 {
1777+ const char *codeset = *codesetp;
1778+
1779+ if (codeset != NULL)
1780+ {
1781+ char *result;
1782+
1783 #if defined _LIBC || defined HAVE_STRDUP
1784- new_binding->dirname = strdup (dirname);
1785- if (new_binding->dirname == NULL)
1786- return NULL;
1787+ result = strdup (codeset);
1788+ if (__builtin_expect (result == NULL, 0))
1789+ goto failed_codeset;
1790 #else
1791- len = strlen (dirname) + 1;
1792- new_binding->dirname = (char *) malloc (len);
1793- if (new_binding->dirname == NULL)
1794- return NULL;
1795- memcpy (new_binding->dirname, dirname, len);
1796+ size_t len = strlen (codeset) + 1;
1797+ result = (char *) malloc (len);
1798+ if (__builtin_expect (result == NULL, 0))
1799+ goto failed_codeset;
1800+ memcpy (result, codeset, len);
1801 #endif
1802+ codeset = result;
1803+ new_binding->codeset_cntr++;
1804+ }
1805+ *codesetp = codeset;
1806+ new_binding->codeset = (char *) codeset;
1807 }
1808+ else
1809+ new_binding->codeset = NULL;
1810
1811 /* Now enqueue it. */
1812 if (_nl_domain_bindings == NULL
1813@@ -187,13 +313,51 @@
1814 binding->next = new_binding;
1815 }
1816
1817- binding = new_binding;
1818+ modified = 1;
1819+
1820+ /* Here we deal with memory allocation failures. */
1821+ if (0)
1822+ {
1823+ failed_codeset:
1824+ if (new_binding->dirname != INTUSE(_nl_default_dirname))
1825+ free (new_binding->dirname);
1826+ failed_dirname:
1827+ free (new_binding);
1828+ failed:
1829+ if (dirnamep)
1830+ *dirnamep = NULL;
1831+ if (codesetp)
1832+ *codesetp = NULL;
1833+ }
1834 }
1835
1836- return binding->dirname;
1837+ /* If we modified any binding, we flush the caches. */
1838+ if (modified)
1839+ ++_nl_msg_cat_cntr;
1840+
1841+ __libc_rwlock_unlock (_nl_state_lock);
1842+}
1843+
1844+/* Specify that the DOMAINNAME message catalog will be found
1845+ in DIRNAME rather than in the system locale data base. */
1846+char *
1847+BINDTEXTDOMAIN (const char *domainname, const char *dirname)
1848+{
1849+ set_binding_values (domainname, &dirname, NULL);
1850+ return (char *) dirname;
1851+}
1852+
1853+/* Specify the character encoding in which the messages from the
1854+ DOMAINNAME message catalog will be returned. */
1855+char *
1856+BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
1857+{
1858+ set_binding_values (domainname, NULL, &codeset);
1859+ return (char *) codeset;
1860 }
1861
1862 #ifdef _LIBC
1863-/* Alias for function name in GNU C Library. */
1864+/* Aliases for function names in GNU C Library. */
1865 weak_alias (__bindtextdomain, bindtextdomain);
1866+weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
1867 #endif
1868--- lrzsz-0.12.20.safe/intl/cat-compat.c 1998-04-26 09:22:37.000000000 -0400
1869+++ lrzsz-0.12.20/intl/cat-compat.c 1969-12-31 19:00:00.000000000 -0500
1870@@ -1,262 +0,0 @@
1871-/* Compatibility code for gettext-using-catgets interface.
1872- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
1873-
1874- This program is free software; you can redistribute it and/or modify
1875- it under the terms of the GNU General Public License as published by
1876- the Free Software Foundation; either version 2, or (at your option)
1877- any later version.
1878-
1879- This program is distributed in the hope that it will be useful,
1880- but WITHOUT ANY WARRANTY; without even the implied warranty of
1881- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1882- GNU General Public License for more details.
1883-
1884- You should have received a copy of the GNU General Public License
1885- along with this program; if not, write to the Free Software Foundation,
1886- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
1887-
1888-#ifdef HAVE_CONFIG_H
1889-# include <config.h>
1890-#endif
1891-
1892-#include <stdio.h>
1893-
1894-#ifdef STDC_HEADERS
1895-# include <stdlib.h>
1896-# include <string.h>
1897-#else
1898-char *getenv ();
1899-# ifdef HAVE_MALLOC_H
1900-# include <malloc.h>
1901-# endif
1902-#endif
1903-
1904-#ifdef HAVE_NL_TYPES_H
1905-# include <nl_types.h>
1906-#endif
1907-
1908-#include "libgettext.h"
1909-
1910-/* @@ end of prolog @@ */
1911-
1912-/* XPG3 defines the result of `setlocale (category, NULL)' as:
1913- ``Directs `setlocale()' to query `category' and return the current
1914- setting of `local'.''
1915- However it does not specify the exact format. And even worse: POSIX
1916- defines this not at all. So we can use this feature only on selected
1917- system (e.g. those using GNU C Library). */
1918-#ifdef _LIBC
1919-# define HAVE_LOCALE_NULL
1920-#endif
1921-
1922-/* The catalog descriptor. */
1923-static nl_catd catalog = (nl_catd) -1;
1924-
1925-/* Name of the default catalog. */
1926-static const char default_catalog_name[] = "messages";
1927-
1928-/* Name of currently used catalog. */
1929-static const char *catalog_name = default_catalog_name;
1930-
1931-/* Get ID for given string. If not found return -1. */
1932-static int msg_to_cat_id PARAMS ((const char *msg));
1933-
1934-/* Substitution for systems lacking this function in their C library. */
1935-#if !_LIBC && !HAVE_STPCPY
1936-static char *stpcpy PARAMS ((char *dest, const char *src));
1937-#endif
1938-
1939-
1940-/* Set currently used domain/catalog. */
1941-char *
1942-textdomain (domainname)
1943- const char *domainname;
1944-{
1945- nl_catd new_catalog;
1946- char *new_name;
1947- size_t new_name_len;
1948- char *lang;
1949-
1950-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
1951- && defined HAVE_LOCALE_NULL
1952- lang = setlocale (LC_MESSAGES, NULL);
1953-#else
1954- lang = getenv ("LC_ALL");
1955- if (lang == NULL || lang[0] == '\0')
1956- {
1957- lang = getenv ("LC_MESSAGES");
1958- if (lang == NULL || lang[0] == '\0')
1959- lang = getenv ("LANG");
1960- }
1961-#endif
1962- if (lang == NULL || lang[0] == '\0')
1963- lang = "C";
1964-
1965- /* See whether name of currently used domain is asked. */
1966- if (domainname == NULL)
1967- return (char *) catalog_name;
1968-
1969- if (domainname[0] == '\0')
1970- domainname = default_catalog_name;
1971-
1972- /* Compute length of added path element. */
1973- new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
1974- + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
1975- + sizeof (".cat");
1976-
1977- new_name = (char *) malloc (new_name_len);
1978- if (new_name == NULL)
1979- return NULL;
1980-
1981- strcpy (new_name, PACKAGE);
1982- new_catalog = catopen (new_name, 0);
1983-
1984- if (new_catalog == (nl_catd) -1)
1985- {
1986- /* NLSPATH search didn't work, try absolute path */
1987- sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
1988- PACKAGE);
1989- new_catalog = catopen (new_name, 0);
1990-
1991- if (new_catalog == (nl_catd) -1)
1992- {
1993- free (new_name);
1994- return (char *) catalog_name;
1995- }
1996- }
1997-
1998- /* Close old catalog. */
1999- if (catalog != (nl_catd) -1)
2000- catclose (catalog);
2001- if (catalog_name != default_catalog_name)
2002- free ((char *) catalog_name);
2003-
2004- catalog = new_catalog;
2005- catalog_name = new_name;
2006-
2007- return (char *) catalog_name;
2008-}
2009-
2010-char *
2011-bindtextdomain (domainname, dirname)
2012- const char *domainname;
2013- const char *dirname;
2014-{
2015-#if HAVE_SETENV || HAVE_PUTENV
2016- char *old_val, *new_val, *cp;
2017- size_t new_val_len;
2018-
2019- /* This does not make much sense here but to be compatible do it. */
2020- if (domainname == NULL)
2021- return NULL;
2022-
2023- /* Compute length of added path element. If we use setenv we don't need
2024- the first byts for NLSPATH=, but why complicate the code for this
2025- peanuts. */
2026- new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
2027- + sizeof ("/%L/LC_MESSAGES/%N.cat");
2028-
2029- old_val = getenv ("NLSPATH");
2030- if (old_val == NULL || old_val[0] == '\0')
2031- {
2032- old_val = NULL;
2033- new_val_len += 1 + sizeof (LOCALEDIR) - 1
2034- + sizeof ("/%L/LC_MESSAGES/%N.cat");
2035- }
2036- else
2037- new_val_len += strlen (old_val);
2038-
2039- new_val = (char *) malloc (new_val_len);
2040- if (new_val == NULL)
2041- return NULL;
2042-
2043-# if HAVE_SETENV
2044- cp = new_val;
2045-# else
2046- cp = stpcpy (new_val, "NLSPATH=");
2047-# endif
2048-
2049- cp = stpcpy (cp, dirname);
2050- cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
2051-
2052- if (old_val == NULL)
2053- {
2054-# if __STDC__
2055- stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
2056-# else
2057-
2058- cp = stpcpy (cp, LOCALEDIR);
2059- stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
2060-# endif
2061- }
2062- else
2063- stpcpy (cp, old_val);
2064-
2065-# if HAVE_SETENV
2066- setenv ("NLSPATH", new_val, 1);
2067- free (new_val);
2068-# else
2069- putenv (new_val);
2070- /* Do *not* free the environment entry we just entered. It is used
2071- from now on. */
2072-# endif
2073-
2074-#endif
2075-
2076- return (char *) domainname;
2077-}
2078-
2079-#undef gettext
2080-char *
2081-gettext (msg)
2082- const char *msg;
2083-{
2084- int msgid;
2085-
2086- if (msg == NULL || catalog == (nl_catd) -1)
2087- return (char *) msg;
2088-
2089- /* Get the message from the catalog. We always use set number 1.
2090- The message ID is computed by the function `msg_to_cat_id'
2091- which works on the table generated by `po-to-tbl'. */
2092- msgid = msg_to_cat_id (msg);
2093- if (msgid == -1)
2094- return (char *) msg;
2095-
2096- return catgets (catalog, 1, msgid, (char *) msg);
2097-}
2098-
2099-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
2100- for the one equal to msg. If it is found return the ID. In case when
2101- the string is not found return -1. */
2102-static int
2103-msg_to_cat_id (msg)
2104- const char *msg;
2105-{
2106- int cnt;
2107-
2108- for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
2109- if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
2110- return _msg_tbl[cnt]._msg_number;
2111-
2112- return -1;
2113-}
2114-
2115-
2116-/* @@ begin of epilog @@ */
2117-
2118-/* We don't want libintl.a to depend on any other library. So we
2119- avoid the non-standard function stpcpy. In GNU C Library this
2120- function is available, though. Also allow the symbol HAVE_STPCPY
2121- to be defined. */
2122-#if !_LIBC && !HAVE_STPCPY
2123-static char *
2124-stpcpy (dest, src)
2125- char *dest;
2126- const char *src;
2127-{
2128- while ((*dest++ = *src++) != '\0')
2129- /* Do nothing. */ ;
2130- return dest - 1;
2131-}
2132-#endif
2133--- lrzsz-0.12.20.safe/intl/ChangeLog 1998-04-26 09:22:35.000000000 -0400
2134+++ lrzsz-0.12.20/intl/ChangeLog 2004-09-12 14:40:34.349749000 -0400
2135@@ -1,1022 +1,4 @@
2136-1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com>
2137-
2138- * intlh.inst.in: Reformat copyright.
2139-
2140-1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com>
2141-
2142- * dcgettext.c (DCGETTEXT): Remove wrong comment.
2143-
2144-1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com>
2145-
2146- * Makefile.in (install-data): Don't change directory to install.
2147-
2148-1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com>
2149-
2150- * cat-compat.c: Fix copyright.
2151-
2152- * localealias.c: Don't define strchr unless !HAVE_STRCHR.
2153-
2154- * loadmsgcat.c: Update copyright. Fix typos.
2155-
2156- * l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
2157- (_nl_make_l10nflist): Handle sponsor and revision correctly.
2158-
2159- * gettext.c: Update copyright.
2160- * gettext.h: Likewise.
2161- * hash-string.h: Likewise.
2162-
2163- * finddomain.c: Remoave dead code. Define strchr only if
2164- !HAVE_STRCHR.
2165-
2166- * explodename.c: Include <sys/types.h>.
2167-
2168- * explodename.c: Reformat copyright text.
2169- (_nl_explode_name): Fix typo.
2170-
2171- * dcgettext.c: Define and use __set_errno.
2172- (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
2173- not defined.
2174-
2175- * bindtextdom.c: Pretty printing.
2176-
2177-1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com>
2178-
2179- * dcgettext.c (guess_category_value): Don't depend on
2180- HAVE_LC_MESSAGES. We don't need the macro here.
2181- Patch by Bruno Haible <haible@ilog.fr>.
2182-
2183- * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
2184- macro. Instead use HAVE_LOCALE_NULL and define it when using
2185- glibc, as in dcgettext.c.
2186- Patch by Bruno Haible <haible@ilog.fr>.
2187-
2188- * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois
2189- Pinard.
2190-
2191-Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com>
2192-
2193- * Makefile.in: Implement handling of libtool.
2194-
2195- * gettextP.h: Change data structures for use of generic lowlevel
2196- i18n file handling.
2197-
2198-Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com>
2199-
2200- * textdomain.c: Put parentheses around arguments of memcpy macro
2201- definition.
2202- * localealias.c: Likewise.
2203- * l10nflist.c: Likewise.
2204- * finddomain.c: Likewise.
2205- * bindtextdom.c: Likewise.
2206- Reported by Thomas Esken.
2207-
2208-Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com>
2209-
2210- * textdomain.c: Move definition of `memcpy` macro to right
2211- position.
2212-
2213-Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com>
2214-
2215- * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
2216- bcopy if not already defined. Reported by Thomas Esken.
2217- * bindtextdom.c: Likewise.
2218- * l10nflist.c: Likewise.
2219- * localealias.c: Likewise.
2220- * textdomain.c: Likewise.
2221-
2222-Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com>
2223-
2224- * Makefile.in (libdir): Change to use exec_prefix instead of
2225- prefix. Reported by Knut-HvardAksnes <etokna@eto.ericsson.se>.
2226-
2227-Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com>
2228-
2229- * l10nflist.c (_nl_normalize_codeset): We convert to lower case,
2230- so don't prepend uppercase `ISO' for only numeric arg.
2231-
2232-Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com>
2233-
2234- * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
2235- definition of _GNU_SOURCE. Patch by Roland McGrath.
2236-
2237- * Makefile.in (uninstall): Fix another bug with `for' loop and
2238- empty arguments. Patch by Jim Meyering. Correct name os
2239- uninstalled files: no intl- prefix anymore.
2240-
2241- * Makefile.in (install-data): Again work around shells which
2242- cannot handle mpty for list. Reported by Jim Meyering.
2243-
2244-Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com>
2245-
2246- * Makefile.in (install): Split goal. Now depend on install-exec
2247- and install-data.
2248- (install-exec, install-data): New goals. Created from former
2249- install goal.
2250- Reported by Karl Berry.
2251-
2252-Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com>
2253-
2254- * Makefile.in (MKINSTALLDIRS): New variable. Path to
2255- mkinstalldirs script.
2256- (install): use MKINSTALLDIRS variable or if the script is not present
2257- try to find it in the $top_scrdir).
2258-
2259-Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com>
2260-
2261- * l10nflist.c: Linux libc *partly* includes the argz_* functions.
2262- Grr. Work around by renaming the static version and use macros
2263- for renaming.
2264-
2265-Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com>
2266-
2267- * l10nflist.c: Correct presence test macros of __argz_* functions.
2268-
2269- * l10nflist.c: Include <argz.h> based on test of it instead when
2270- __argz_* functions are available.
2271- Reported by Andreas Schwab.
2272-
2273-Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com>
2274-
2275- * explodename.c, l10nflist.c: Define NULL for dumb systems.
2276-
2277-Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com>
2278-
2279- * intlh.inst.in, libgettext.h (dcgettext): Rename local variable
2280- result to __result to prevent name clash.
2281-
2282- * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
2283- get prototype for stpcpy and strcasecmp.
2284-
2285- * intlh.inst.in, libgettext.h: Move declaration of
2286- `_nl_msg_cat_cntr' outside __extension__ block to prevent warning
2287- from gcc's -Wnested-extern option.
2288-
2289-Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com>
2290-
2291- * Makefile.in (install): Remove comment.
2292-
2293-Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com>
2294-
2295- * Makefile.in (install): Work around for another Buglix stupidity.
2296- Always use an `else' close for `if's. Reported by Nelson Beebe.
2297-
2298- * Makefile.in (intlh.inst): Correct typo in phony rule.
2299- Reported by Nelson Beebe.
2300-
2301-Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com>
2302-
2303- * dcgettext.c (read_alias_file): Rename variable alloca_list to
2304- block_list as the macro calls assume.
2305- Patch by Eric Backus.
2306-
2307- * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
2308- malloc.
2309- (read_alias_file): Rename varriabe alloca_list to block_list as the
2310- macro calls assume.
2311- Patch by Eric Backus.
2312-
2313- * l10nflist.c: Correct conditional for <argz.h> inclusion.
2314- Reported by Roland McGrath.
2315-
2316- * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
2317- all-@USE_NLS@.
2318-
2319- * Makefile.in (install): intlh.inst comes from local dir, not
2320- $(srcdir).
2321-
2322- * Makefile.in (intlh.inst): Special handling of this goal. If
2323- used in gettext, this is really a rul to construct this file. If
2324- used in any other package it is defined as a .PHONY rule with
2325- empty body.
2326-
2327- * finddomain.c: Extract locale file information handling into
2328- l10nfile.c. Rename local stpcpy__ function to stpcpy.
2329-
2330- * dcgettext.c (stpcpy): Add local definition.
2331-
2332- * l10nflist.c: Solve some portability problems. Patches partly by
2333- Thomas Esken. Add local definition of stpcpy.
2334-
2335-Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com>
2336-
2337- * intlh.inst.in: Don't depend including <locale.h> on
2338- HAVE_LOCALE_H. Instead configure must rewrite this fiile
2339- depending on the result of the configure run.
2340-
2341- * Makefile.in (install): libintl.inst is now called intlh.inst.
2342- Add rules for updating intlh.inst from intlh.inst.in.
2343-
2344- * libintl.inst: Renamed to intlh.inst.in.
2345-
2346- * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
2347- because gcc has __buitlin_alloca.
2348- Reported by Roland McGrath.
2349-
2350-Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com>
2351-
2352- * Makefile.in (installcheck): New goal to fulfill needs of
2353- automake's distcheck.
2354-
2355- * Makefile.in (install): Reorder commands so that VERSION is
2356- found.
2357-
2358- * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
2359- @datadir@/gettext.
2360- (COMSRCS): Add l10nfile.c.
2361- (OBJECTS): Add l10nfile.o.
2362- (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common).
2363- (DISTFILE.gettext): Remove $(DISTFILES.common).
2364- (all-gettext): Remove goal.
2365- (install): If $(PACKAGE) = gettext install, otherwose do nothing. No
2366- package but gettext itself should install libintl.h + headers.
2367- (dist): Extend goal to work for gettext, too.
2368- (dist-gettext): Remove goal.
2369-
2370- * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
2371-
2372-Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com>
2373-
2374- * loadmsgcat.c (_nl_load_domain): Parameter is now comes from
2375- find_l10nfile.
2376-
2377-Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com>
2378-
2379- * l10nflist.c (__argz_next): Add definition.
2380-
2381- * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
2382- code. Use new l10nfile handling.
2383-
2384- * localealias.c [!HAVE_ALLOCA]: Add code for handling missing
2385- alloca code.
2386-
2387- * l10nflist.c: Initial revision.
2388-
2389-Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware>
2390-
2391- * Makefile.in (all-gettext): New goal. Same as all-yes.
2392-
2393-Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de>
2394-
2395- * Makefile.in (gettextsrcdir): Define using @datadir@.
2396-
2397-Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware>
2398-
2399- * finddomain.c: Include <ctype.h>. Reported by Roland McGrath.
2400-
2401-Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware>
2402-
2403- * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
2404- with external declaration.
2405-
2406-Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware>
2407-
2408- * Makefile.in (all-no): Rename from all_no.
2409-
2410-Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware>
2411-
2412- * gettextP.h [loaded_domain]: Array `successor' must now contain up
2413- to 63 elements (because of codeset name normalization).
2414-
2415- * finddomain.c: Implement codeset name normalization.
2416-
2417-Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware>
2418-
2419- * Makefile.in (all): Define to `all-@USE_NLS@'.
2420- (all-yes, all_no): New goals. `all-no' is noop, `all-yes'
2421- is former all.
2422-
2423-Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com>
2424-
2425- * localealias.c (alias_compare): Increment string pointers in loop
2426- of strcasecmp replacement.
2427-
2428-Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware>
2429-
2430- * Makefile.in (install-src): Who commented this goal out ? :-)
2431-
2432-Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware>
2433-
2434- * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls
2435- should not effect it because a missing catalog is no error.
2436- Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
2437-
2438-Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware>
2439-
2440- * Makefile.in (Makefile): Explicitly use $(SHELL) for running
2441- shell scripts.
2442-
2443-Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
2444-
2445- * Makefile.in (install-src): Only install library and header when
2446- we use the own implementation. Don't do it when using the
2447- system's gettext or catgets functions.
2448-
2449- * dcgettext.c (find_msg): Must not swap domain->hash_size here.
2450-
2451-Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware>
2452-
2453- * localealias.c, libintl.inst, libgettext.h, hash-string.h,
2454- gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
2455- Use PARAMS instead of __P. Suggested by Roland McGrath.
2456-
2457-Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu>
2458-
2459- * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
2460- !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
2461-
2462-Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware>
2463-
2464- * Makefile.in (install-src):
2465- Install libintl.inst instead of libintl.h.install.
2466-
2467-Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu>
2468-
2469- * cat-compat.c (textdomain):
2470- Reverse order in which files are tried you load. First
2471- try local file, when this failed absolute path.
2472-
2473-Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
2474-
2475- * cat-compat.c (bindtextdomain): Add missing { }.
2476-
2477-Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware>
2478-
2479- * libintl.inst: Add missing __P definition. Reported by Nelson Beebe.
2480-
2481- * Makefile.in:
2482- Add dummy `all' and `dvi' goals. Reported by Tom Tromey.
2483-
2484-Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca>
2485-
2486- * hash-string.h: Capitalize arguments of macros.
2487-
2488-Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware>
2489-
2490- * Makefile.in (DISTFILES): Prevent files names longer than 13
2491- characters. libintl.h.glibc->libintl.glibc,
2492- libintl.h.install->libintl.inst. Reported by Joshua R. Poulson.
2493-
2494-Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com>
2495-
2496- * dcgettext.c: Fix bug in preprocessor conditionals.
2497-
2498-Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu>
2499-
2500- * libgettext.h: Solaris cc does not understand
2501- #if !SYMBOL1 && !SYMBOL2. Sad but true.
2502-
2503-Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware>
2504-
2505- * hash-string.h (hash_string):
2506- Fix for machine with >32 bit `unsigned long's.
2507-
2508- * dcgettext.c (DCGETTEXT):
2509- Fix horrible bug in loop for alternative translation.
2510-
2511-Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware>
2512-
2513- * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
2514- Some further simplifications in message number generation.
2515-
2516-Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware>
2517-
2518- * libintl.h.glibc: Use __const instead of const in prototypes.
2519-
2520- * Makefile.in (install-src):
2521- Install libintl.h.install instead of libintl.h. This
2522- is a stripped-down version. Suggested by Peter Miller.
2523-
2524- * libintl.h.install, libintl.h.glibc: Initial revision.
2525-
2526- * localealias.c (_nl_expand_alias, read_alias_file):
2527- Protect prototypes in type casts by __P.
2528-
2529-Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware>
2530-
2531- * hash-string.h: Correct prototype for hash_string.
2532-
2533-Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware>
2534-
2535- * hash-string.h (hash_string): Add prototype.
2536-
2537- * gettextP.h: Fix copyright.
2538- (SWAP): Add prototype.
2539-
2540-Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware>
2541-
2542- * localealias.c (read_alias_file): Forgot sizeof.
2543- Avoid calling *printf function. This introduces a big overhead.
2544- Patch by Roland McGrath.
2545-
2546-Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware>
2547-
2548- * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
2549-
2550- * finddomain.c (stpcpy):
2551- Define substitution function local. The macro was to flaky.
2552-
2553- * cat-compat.c: Fix typo.
2554-
2555- * xopen-msg.sed, linux-msg.sed:
2556- While bringing message number to right place only accept digits.
2557-
2558- * linux-msg.sed, xopen-msg.sed: Now that the counter does not have
2559- leading 0s we don't need to remove them. Reported by Marcus
2560- Daniels.
2561-
2562- * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
2563- dependency. Reported by Marcus Daniels.
2564-
2565- * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
2566- Generally cleanup using #if instead of #ifndef.
2567-
2568- * Makefile.in: Correct typos in comment. By Franc,ois Pinard.
2569-
2570-Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware>
2571-
2572- * Makefile.in (install-src): Don't install libintl.h and libintl.a
2573- if we use an available gettext implementation.
2574-
2575-Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware>
2576-
2577- * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported
2578- by Franc,ois Pinard.
2579-
2580- * libgettext.h: Use #if instead of #ifdef/#ifndef.
2581-
2582- * finddomain.c:
2583- Comments describing what has to be done should start with FIXME.
2584-
2585-Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware>
2586-
2587- * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning.
2588- DISTFILES.common names the files common to both dist goals.
2589- DISTFILES.gettext are the files only distributed in GNU gettext.
2590-
2591-Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware>
2592-
2593- * dcgettext.c (DCGETTEXT): Correct searching in derived locales.
2594- This was necessary since a change in _nl_find_msg several weeks
2595- ago. I really don't know this is still not fixed.
2596-
2597-Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware>
2598-
2599- * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This
2600- might mark a special condition.
2601-
2602- * finddomain.c (make_entry_rec): Don't make illegal entry as decided.
2603-
2604- * Makefile.in (dist): Suppress error message when ln failed.
2605- Get files from $(srcdir) explicitly.
2606-
2607- * libgettext.h (gettext_const): Rename to gettext_noop.
2608-
2609-Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware>
2610-
2611- * finddomain.c (make_entry_rec):
2612- Protect against wrong locale names by testing mask.
2613-
2614- * libgettext.h (gettext_const): Add macro definition.
2615- Capitalize macro arguments.
2616-
2617-Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware>
2618-
2619- * finddomain.c (_nl_find_domain):
2620- Test for pointer != NULL before accessing value.
2621- Reported by Tom Tromey.
2622-
2623- * gettext.c (NULL):
2624- Define as (void*)0 instad of 0. Reported by Franc,ois Pinard.
2625-
2626-Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware>
2627-
2628- * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
2629-
2630-Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware>
2631-
2632- * libgettext.h: Disable dcgettext optimization for Solaris 2.3.
2633-
2634- * localealias.c (alias_compare):
2635- Peter Miller reported that tolower in some systems is
2636- even dumber than I thought. Protect call by `isupper'.
2637-
2638-Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware>
2639-
2640- * Makefile.in (libdir, includedir): New variables.
2641- (install-src): Install libintl.a and libintl.h in correct dirs.
2642-
2643-Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware>
2644-
2645- * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
2646-
2647- * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
2648-
2649- * localealias.c:
2650- Fix typo and superflous test. Reported by Christian von Roques.
2651-
2652-Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware>
2653-
2654- * finddomain.c (_nl_find_domain):
2655- Correct some remainder from the pre-CEN syntax. Now
2656- we don't have a constant number of successors anymore.
2657-
2658-Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware>
2659-
2660- * Makefile.in (DISTFILES): Add libintl.h.glibc.
2661-
2662- * Makefile.in (dist-libc): Add goal for packing sources for glibc.
2663- (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
2664-
2665- * loadmsgcat.c: Forget to continue #if line.
2666-
2667- * localealias.c:
2668- [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
2669- space clean.
2670-
2671- * dcgettext.c, finddomain.c: Better comment to last change.
2672-
2673- * loadmsgcat.c:
2674- [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
2675- __fstat, __open, __close, __read, __mmap, and __munmap resp
2676- to keep ANSI C name space clean.
2677-
2678- * finddomain.c:
2679- [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
2680-
2681- * dcgettext.c:
2682- [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
2683- keep ANSI C name space clean.
2684-
2685- * libgettext.h:
2686- Include sys/types.h for those old SysV systems out there.
2687- Reported by Francesco Potorti`.
2688-
2689- * loadmsgcat.c (use_mmap): Define if compiled for glibc.
2690-
2691- * bindtextdom.c: Include all those standard headers
2692- unconditionally if _LIBC is defined.
2693-
2694- * finddomain.c: Fix 2 times defiend -> defined.
2695-
2696- * textdomain.c: Include libintl.h instead of libgettext.h when
2697- compiling for glibc. Include all those standard headers
2698- unconditionally if _LIBC is defined.
2699-
2700- * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
2701-
2702- * gettext.c:
2703- Include libintl.h instead of libgettext.h when compiling for glibc.
2704- Get NULL from stddef.h if we compile for glibc.
2705-
2706- * finddomain.c: Include libintl.h instead of libgettext.h when
2707- compiling for glibc. Include all those standard headers
2708- unconditionally if _LIBC is defined.
2709-
2710- * dcgettext.c: Include all those standard headers unconditionally
2711- if _LIBC is defined.
2712-
2713- * dgettext.c: If compiled in glibc include libintl.h instead of
2714- libgettext.h.
2715- (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
2716-
2717- * dcgettext.c: If compiled in glibc include libintl.h instead of
2718- libgettext.h.
2719- (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
2720-
2721- * bindtextdom.c:
2722- If compiled in glibc include libintl.h instead of libgettext.h.
2723-
2724-Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware>
2725-
2726- * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
2727- Reported by Marcus Daniels.
2728-
2729- * cat-compat.c (bindtextdomain):
2730- String used in putenv must not be recycled.
2731- Reported by Marcus Daniels.
2732-
2733- * libgettext.h (__USE_GNU_GETTEXT):
2734- Additional symbol to signal that we use GNU gettext
2735- library.
2736-
2737- * cat-compat.c (bindtextdomain):
2738- Fix bug with the strange stpcpy replacement.
2739- Reported by Nelson Beebe.
2740-
2741-Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware>
2742-
2743- * cat-compat.c: Include <string.h> for stpcpy prototype.
2744-
2745- * localealias.c (read_alias_file):
2746- While expand strdup code temporary variable `cp' hided
2747- higher level variable with same name. Rename to `tp'.
2748-
2749- * textdomain.c (textdomain):
2750- Avoid warning by using temporary variable in strdup code.
2751-
2752- * finddomain.c (_nl_find_domain): Remove unused variable `application'.
2753-
2754-Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware>
2755-
2756- * localealias.c (alias_compare):
2757- Use strcasecmp() only if available. Else use
2758- implementation in place.
2759-
2760- * intl-compat.c:
2761- Wrapper functions now call *__ functions instead of __*.
2762-
2763- * libgettext.h: Declare prototypes for *__ functions instead for __*.
2764-
2765- * cat-compat.c, loadmsgcat.c:
2766- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
2767- of the standard libc and so prevent libintl.a from being used
2768- standalone.
2769-
2770- * bindtextdom.c:
2771- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
2772- of the standard libc and so prevent libintl.a from being used
2773- standalone.
2774- Rename to bindtextdomain__ if not used in GNU C Library.
2775-
2776- * dgettext.c:
2777- Rename function to dgettext__ if not used in GNU C Library.
2778-
2779- * gettext.c:
2780- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
2781- of the standard libc and so prevent libintl.a from being used
2782- standalone.
2783- Functions now called gettext__ if not used in GNU C Library.
2784-
2785- * dcgettext.c, localealias.c, textdomain.c, finddomain.c:
2786- Don't use xmalloc, xstrdup, and stpcpy. These functions are not part
2787- of the standard libc and so prevent libintl.a from being used
2788- standalone.
2789-
2790-Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware>
2791-
2792- * finddomain.c: Correct some bugs in handling of CEN standard
2793- locale definitions.
2794-
2795-Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware>
2796-
2797- * finddomain.c: Implement CEN syntax.
2798-
2799- * gettextP.h (loaded_domain): Extend number of successors to 31.
2800-
2801-Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware>
2802-
2803- * Makefile.in (aliaspath): Remove path to X11 locale dir.
2804-
2805- * Makefile.in: Make install-src depend on install. This helps
2806- gettext to install the sources and other packages can use the
2807- install goal.
2808-
2809-Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware>
2810-
2811- * Makefile.in (uninstall): Remove stuff installed by install-src.
2812-
2813-Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware>
2814-
2815- * VERSION.in: Initial revision.
2816-
2817- * Makefile.in (DISTFILES):
2818- Add VERSION file. This is not necessary for gettext, but
2819- for other packages using this library.
2820-
2821-Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware>
2822-
2823- * gettextP.h (_nl_find_domain):
2824- New prototype after changing search strategy.
2825-
2826- * finddomain.c (_nl_find_domain):
2827- We now try only to find a specified catalog. Fall back to other
2828- catalogs listed in the locale list is now done in __dcgettext.
2829-
2830- * dcgettext.c (__dcgettext):
2831- Now we provide message fall back even to different languages.
2832- I.e. if a message is not available in one language all the other
2833- in the locale list a tried. Formerly fall back was only possible
2834- within one language. Implemented by moving one loop from
2835- _nl_find_domain to here.
2836-
2837-Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware>
2838-
2839- * Makefile.in (gettextsrcdir):
2840- Directory where source of GNU gettext library are made
2841- available.
2842- (INSTALL, INSTALL_DATA): Programs used for installing sources.
2843- (gettext-src): New. Rule to install GNU gettext sources for use in
2844- gettextize shell script.
2845-
2846-Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware>
2847-
2848- * loadmsgcat.c (_nl_load_domain):
2849- Use mmap for loading only when munmap function is
2850- also available.
2851-
2852- * Makefile.in (install): Depend on `all' goal.
2853-
2854-Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware>
2855-
2856- * localealias.c (read_alias_file):
2857- Do not overwrite '\n' when terminating alias value string.
2858-
2859- * localealias.c (read_alias_file):
2860- Handle long lines. Ignore the rest not fitting in
2861- the buffer after the initial `fgets' call.
2862-
2863-Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware>
2864-
2865- * gettextP.h (_nl_load_domain):
2866- Add prototype, replacing prototype for _nl_load_msg_cat.
2867-
2868- * finddomain.c (_nl_find_domain):
2869- Remove unneeded variable filename and filename_len.
2870- (expand_alias): Remove prototype because functions does not
2871- exist anymore.
2872-
2873- * localealias.c (read_alias_file):
2874- Change type of fname_len parameter to int.
2875- (xmalloc): Add prototype.
2876-
2877- * loadmsgcat.c: Better prototypes for xmalloc.
2878-
2879-Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware>
2880-
2881- * finddomain.c (_nl_find_domain):
2882- Allow alias name to be constructed from the four components.
2883-
2884- * Makefile.in (aliaspath): New variable. Set to preliminary value.
2885- (SOURCES): Add localealias.c.
2886- (OBJECTS): Add localealias.o.
2887-
2888- * gettextP.h: Add prototype for _nl_expand_alias.
2889-
2890- * finddomain.c: Aliasing handled in intl/localealias.c.
2891-
2892- * localealias.c: Aliasing for locale names.
2893-
2894- * bindtextdom.c: Better prototypes for xmalloc and xstrdup.
2895-
2896-Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware>
2897-
2898- * Makefile.in (DISTFILES): gettext.perl is now found in misc/.
2899-
2900- * cat-compat.c (bindtextdomain):
2901- Correct implementation. dirname parameter was not used.
2902- Reported by Marcus Daniels.
2903-
2904- * gettextP.h (loaded_domain):
2905- New fields `successor' and `decided' for oo, lazy
2906- message handling implementation.
2907-
2908- * dcgettext.c:
2909- Adopt for oo, lazy message handliing.
2910- Now we can inherit translations from less specific locales.
2911- (find_msg): New function.
2912-
2913- * loadmsgcat.c, finddomain.c:
2914- Complete rewrite. Implement oo, lazy message handling :-).
2915- We now have an additional environment variable `LANGUAGE' with
2916- a higher priority than LC_ALL for the LC_MESSAGE locale.
2917- Here we can set a colon separated list of specifications each
2918- of the form `language[_territory[.codeset]][@modifier]'.
2919-
2920-Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware>
2921-
2922- * finddomain.c (unistd.h):
2923- Include to get _PC_PATH_MAX defined on system having it.
2924-
2925-Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware>
2926-
2927- * finddomain.c (stpcpy): Include prototype.
2928-
2929- * Makefile.in (dist): Remove `copying instead' message.
2930-
2931-Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware>
2932-
2933- * Makefile.in (ID, TAGS): Do not use $^.
2934-
2935-Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware>
2936-
2937- * Makefile.in (TAGS, ID): Use $^ as command argument.
2938- (TAGS): Give etags -o option t write to current directory,
2939- not $(srcdir).
2940- (ID): Use $(srcdir) instead os $(top_srcdir)/src.
2941- (distclean): Remove ID.
2942-
2943-Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware>
2944-
2945- * Makefile.in (gnulocaledir):
2946- New variable, always using share/ for data directory.
2947- (DEFS): Add GNULOCALEDIR, used in finddomain.c.
2948-
2949- * finddomain.c (_nl_default_dirname):
2950- Set to GNULOCALEDIR, because it always has to point
2951- to the directory where GNU gettext Library writes it to.
2952-
2953- * intl-compat.c (textdomain, bindtextdomain):
2954- Undefine macros before function definition.
2955-
2956-Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware>
2957-
2958- * libgettext.h (_LIBINTL_H):
2959- Protect definition in case where this file is included as
2960- libgettext.h on Solaris machines. Add comment about this.
2961-
2962-Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware>
2963-
2964- * intl-compat.c (textdomain): Correct typo.
2965-
2966-Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware>
2967-
2968- * dcgettext.c (dcgettext): Function now called __dcgettext.
2969-
2970- * dgettext.c (dgettext): Now called __dgettext and calls
2971- __dcgettext.
2972-
2973- * gettext.c (gettext):
2974- Function now called __gettext and calls __dgettext.
2975-
2976- * textdomain.c (textdomain): Function now called __textdomain.
2977-
2978- * bindtextdom.c (bindtextdomain): Function now called
2979- __bindtextdomain.
2980-
2981- * intl-compat.c: Initial revision.
2982-
2983- * Makefile.in (SOURCES): Add intl-compat.c.
2984- (OBJECTS): We always compile the GNU gettext library functions.
2985- OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
2986- and intl-compat.o.
2987- (GETTOBJS): Contains now only intl-compat.o.
2988-
2989- * libgettext.h:
2990- Re-include protection matches dualistic character of libgettext.h.
2991- For all functions in GNU gettext library define __ counter part.
2992-
2993- * finddomain.c (strchr): Define as index if not found in C library.
2994- (_nl_find_domain): For relative paths paste / in between.
2995-
2996-Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware>
2997-
2998- * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
2999-
3000- * xopen-msg.sed: Fix bug with `msgstr ""' lines.
3001- A little bit better comments.
3002-
3003-Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware>
3004-
3005- * Makefile.in:
3006- po-mode.el, makelinks, combine-sh are now found in ../misc.
3007-
3008- * po-mode.el, makelinks, combine-sh, elisp-comp:
3009- Moved to ../misc/.
3010-
3011- * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
3012-
3013-Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware>
3014-
3015- * Makefile.in (INSTALL, INSTALL_DATA): New variables.
3016- (install-data, uninstall): Install/uninstall .elc file.
3017-
3018- * po-mode.el (Installation comment):
3019- Add .pox as possible extension of .po files.
3020-
3021-Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware>
3022-
3023- * elisp-comp: Complete new version by Franc,ois: This does not
3024- fail when not compiling in the source directory.
3025-
3026-Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware>
3027-
3028- * Makefile.in (../po/cat-id-tbl.o):
3029- Use $(MAKE) instead of make for recursive make.
3030-
3031- * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
3032- (install-exec): Add missing dummy goal.
3033- (install-data, uninstall): @ in multi-line shell command at
3034- beginning, not in front of echo. Reported by Eric Backus.
3035-
3036-Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware>
3037-
3038- * Makefile.in (DISTFILES):
3039- Rename libgettext.perl to gettext.perl to fit in 14 chars
3040- file systems.
3041-
3042- * gettext.perl:
3043- Rename to gettext.perl to fit in 14 chars file systems.
3044-
3045-Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware>
3046-
3047- * cat-compat.c: If !STDC_HEADERS try to include malloc.h.
3048-
3049-Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware>
3050-
3051- * po2tbl.sed.in: Pretty printing.
3052-
3053- * linux-msg.sed, xopen-msg.sed:
3054- Correct bugs with handling substitute flags in branches.
3055-
3056- * hash-string.h (hash_string):
3057- Old K&R compilers don't under stand `unsigned char'.
3058-
3059- * gettext.h (nls_uint32):
3060- Some old K&R compilers (eg HP) don't understand `unsigned int'.
3061-
3062- * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
3063-
3064-Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware>
3065-
3066- * Makefile.in (ELCFILES): New variable.
3067- (DISTFILES): Add elisp-comp.
3068- Add implicit rule for .el -> .elc compilation.
3069- (install-data): install $ELCFILES
3070- (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
3071-
3072- * elisp-comp: Initial revision
3073-
3074-Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware>
3075-
3076- * Makefile.in:
3077- cat-id-tbl.c is now found in po/. This enables us to use an identical
3078- intl/ directory in all packages.
3079-
3080- * dcgettext.c (dcgettext): hashing does not work for table size <= 2.
3081-
3082- * textdomain.c: fix typo (#if def -> #if defined)
3083-
3084-Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware>
3085-
3086- * Makefile.in (stamp-cat-id): use top_srcdir to address source files
3087- (DISTFILES,distclean): move tupdate.perl to src/
3088-
3089- * po-to-tbl.sed.in:
3090- add additional jump to clear change flag to recognize multiline strings
3091-
3092-Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware>
3093-
3094- * textdomain.c: Protect inclusion of stdlib.h and string.h.
3095-
3096- * loadmsgcat.c: Protect inclusion of stdlib.h.
3097-
3098- * libgettext.h: Protect inclusion of locale.h.
3099- Allow use in C++ programs.
3100- Define NULL is not happened already.
3101-
3102- * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
3103- po-to-tbl.sed.
3104- (distclean): remove po-to-tbl.sed and tupdate.perl.
3105-
3106- * tupdate.perl.in: Substitute Perl path even in exec line.
3107- Don't include entries without translation from old .po file.
3108-
3109-Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware>
3110-
3111- * tupdate.perl.in: use "Updated: " in msgid "".
3112-
3113- * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
3114- Define getenv if !__STDC__.
3115-
3116- * bindtextdom.c: Protect stdlib.h and string.h inclusion.
3117- Define free if !__STDC__.
3118-
3119- * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
3120- Define free if !__STDC__.
3121-
3122- * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
3123-
3124-Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware>
3125-
3126- * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
3127- Remove unneeded $(srcdir) from Makefile.in dependency.
3128-
3129- * makelinks: Add copyright and short description.
3130-
3131- * po-mode.el: Last version for 0.7.
3132-
3133- * tupdate.perl.in: Fix die message.
3134-
3135- * dcgettext.c: Protect include of string.h.
3136-
3137- * gettext.c: Protect include of stdlib.h and further tries to get NULL.
3138-
3139- * finddomain.c: Some corrections in includes.
3140-
3141- * Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
3142-
3143- * po-to-tbl.sed: Adopt for new .po file format.
3144-
3145- * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
3146-
3147-Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware>
3148-
3149- * tupdate.perl.in: Complete rewrite for new .po file format.
3150+2004-01-29 GNU <bug-gnu-gettext@gnu.org>
3151
3152-Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware>
3153+ * Version 0.14.1 released.
3154
3155- * First official release. This directory contains all the code
3156- needed to internationalize own packages. It provides functions
3157- which allow to use the X/Open catgets function with an interface
3158- like the Uniforum gettext function. For system which does not
3159- have neither of those a complete implementation is provided.
3160--- lrzsz-0.12.20.safe/intl/config.charset 1969-12-31 19:00:00.000000000 -0500
3161+++ lrzsz-0.12.20/intl/config.charset 2004-09-12 14:40:34.354748240 -0400
3162@@ -0,0 +1,608 @@
3163+#! /bin/sh
3164+# Output a system dependent table of character encoding aliases.
3165+#
3166+# Copyright (C) 2000-2004 Free Software Foundation, Inc.
3167+#
3168+# This program is free software; you can redistribute it and/or modify it
3169+# under the terms of the GNU Library General Public License as published
3170+# by the Free Software Foundation; either version 2, or (at your option)
3171+# any later version.
3172+#
3173+# This program is distributed in the hope that it will be useful,
3174+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3175+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3176+# Library General Public License for more details.
3177+#
3178+# You should have received a copy of the GNU Library General Public
3179+# License along with this program; if not, write to the Free Software
3180+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
3181+# USA.
3182+#
3183+# The table consists of lines of the form
3184+# ALIAS CANONICAL
3185+#
3186+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
3187+# ALIAS is compared in a case sensitive way.
3188+#
3189+# CANONICAL is the GNU canonical name for this character encoding.
3190+# It must be an encoding supported by libiconv. Support by GNU libc is
3191+# also desirable. CANONICAL is case insensitive. Usually an upper case
3192+# MIME charset name is preferred.
3193+# The current list of GNU canonical charset names is as follows.
3194+#
3195+# name MIME? used by which systems
3196+# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
3197+# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
3198+# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
3199+# ISO-8859-3 Y glibc solaris
3200+# ISO-8859-4 Y osf solaris freebsd darwin
3201+# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
3202+# ISO-8859-6 Y glibc aix hpux solaris
3203+# ISO-8859-7 Y glibc aix hpux irix osf solaris
3204+# ISO-8859-8 Y glibc aix hpux osf solaris
3205+# ISO-8859-9 Y glibc aix hpux irix osf solaris
3206+# ISO-8859-13 glibc
3207+# ISO-8859-14 glibc
3208+# ISO-8859-15 glibc aix osf solaris freebsd
3209+# KOI8-R Y glibc solaris freebsd darwin
3210+# KOI8-U Y glibc freebsd darwin
3211+# KOI8-T glibc
3212+# CP437 dos
3213+# CP775 dos
3214+# CP850 aix osf dos
3215+# CP852 dos
3216+# CP855 dos
3217+# CP856 aix
3218+# CP857 dos
3219+# CP861 dos
3220+# CP862 dos
3221+# CP864 dos
3222+# CP865 dos
3223+# CP866 freebsd darwin dos
3224+# CP869 dos
3225+# CP874 woe32 dos
3226+# CP922 aix
3227+# CP932 aix woe32 dos
3228+# CP943 aix
3229+# CP949 osf woe32 dos
3230+# CP950 woe32 dos
3231+# CP1046 aix
3232+# CP1124 aix
3233+# CP1125 dos
3234+# CP1129 aix
3235+# CP1250 woe32
3236+# CP1251 glibc solaris darwin woe32
3237+# CP1252 aix woe32
3238+# CP1253 woe32
3239+# CP1254 woe32
3240+# CP1255 glibc woe32
3241+# CP1256 woe32
3242+# CP1257 woe32
3243+# GB2312 Y glibc aix hpux irix solaris freebsd darwin
3244+# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
3245+# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
3246+# EUC-TW glibc aix hpux irix osf solaris
3247+# BIG5 Y glibc aix hpux osf solaris freebsd darwin
3248+# BIG5-HKSCS glibc solaris
3249+# GBK glibc aix osf solaris woe32 dos
3250+# GB18030 glibc solaris
3251+# SHIFT_JIS Y hpux osf solaris freebsd darwin
3252+# JOHAB glibc solaris woe32
3253+# TIS-620 glibc aix hpux osf solaris
3254+# VISCII Y glibc
3255+# TCVN5712-1 glibc
3256+# GEORGIAN-PS glibc
3257+# HP-ROMAN8 hpux
3258+# HP-ARABIC8 hpux
3259+# HP-GREEK8 hpux
3260+# HP-HEBREW8 hpux
3261+# HP-TURKISH8 hpux
3262+# HP-KANA8 hpux
3263+# DEC-KANJI osf
3264+# DEC-HANYU osf
3265+# UTF-8 Y glibc aix hpux osf solaris
3266+#
3267+# Note: Names which are not marked as being a MIME name should not be used in
3268+# Internet protocols for information interchange (mail, news, etc.).
3269+#
3270+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
3271+# must understand both names and treat them as equivalent.
3272+#
3273+# The first argument passed to this file is the canonical host specification,
3274+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
3275+# or
3276+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
3277+
3278+host="$1"
3279+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
3280+echo "# This file contains a table of character encoding aliases,"
3281+echo "# suitable for operating system '${os}'."
3282+echo "# It was automatically generated from config.charset."
3283+# List of references, updated during installation:
3284+echo "# Packages using this file: "
3285+case "$os" in
3286+ linux-gnulibc1*)
3287+ # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
3288+ # localcharset.c falls back to using the full locale name
3289+ # from the environment variables.
3290+ echo "C ASCII"
3291+ echo "POSIX ASCII"
3292+ for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
3293+ en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
3294+ en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
3295+ es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
3296+ et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
3297+ fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
3298+ it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
3299+ sv_FI sv_SE; do
3300+ echo "$l ISO-8859-1"
3301+ echo "$l.iso-8859-1 ISO-8859-1"
3302+ echo "$l.iso-8859-15 ISO-8859-15"
3303+ echo "$l.iso-8859-15@euro ISO-8859-15"
3304+ echo "$l@euro ISO-8859-15"
3305+ echo "$l.cp-437 CP437"
3306+ echo "$l.cp-850 CP850"
3307+ echo "$l.cp-1252 CP1252"
3308+ echo "$l.cp-1252@euro CP1252"
3309+ #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
3310+ echo "$l.utf-8 UTF-8"
3311+ echo "$l.utf-8@euro UTF-8"
3312+ done
3313+ for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
3314+ sl_SI sr sr_CS sr_YU; do
3315+ echo "$l ISO-8859-2"
3316+ echo "$l.iso-8859-2 ISO-8859-2"
3317+ echo "$l.cp-852 CP852"
3318+ echo "$l.cp-1250 CP1250"
3319+ echo "$l.utf-8 UTF-8"
3320+ done
3321+ for l in mk mk_MK ru ru_RU; do
3322+ echo "$l ISO-8859-5"
3323+ echo "$l.iso-8859-5 ISO-8859-5"
3324+ echo "$l.koi8-r KOI8-R"
3325+ echo "$l.cp-866 CP866"
3326+ echo "$l.cp-1251 CP1251"
3327+ echo "$l.utf-8 UTF-8"
3328+ done
3329+ for l in ar ar_SA; do
3330+ echo "$l ISO-8859-6"
3331+ echo "$l.iso-8859-6 ISO-8859-6"
3332+ echo "$l.cp-864 CP864"
3333+ #echo "$l.cp-868 CP868" # not a commonly used encoding
3334+ echo "$l.cp-1256 CP1256"
3335+ echo "$l.utf-8 UTF-8"
3336+ done
3337+ for l in el el_GR gr gr_GR; do
3338+ echo "$l ISO-8859-7"
3339+ echo "$l.iso-8859-7 ISO-8859-7"
3340+ echo "$l.cp-869 CP869"
3341+ echo "$l.cp-1253 CP1253"
3342+ echo "$l.cp-1253@euro CP1253"
3343+ echo "$l.utf-8 UTF-8"
3344+ echo "$l.utf-8@euro UTF-8"
3345+ done
3346+ for l in he he_IL iw iw_IL; do
3347+ echo "$l ISO-8859-8"
3348+ echo "$l.iso-8859-8 ISO-8859-8"
3349+ echo "$l.cp-862 CP862"
3350+ echo "$l.cp-1255 CP1255"
3351+ echo "$l.utf-8 UTF-8"
3352+ done
3353+ for l in tr tr_TR; do
3354+ echo "$l ISO-8859-9"
3355+ echo "$l.iso-8859-9 ISO-8859-9"
3356+ echo "$l.cp-857 CP857"
3357+ echo "$l.cp-1254 CP1254"
3358+ echo "$l.utf-8 UTF-8"
3359+ done
3360+ for l in lt lt_LT lv lv_LV; do
3361+ #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
3362+ echo "$l ISO-8859-13"
3363+ done
3364+ for l in ru_UA uk uk_UA; do
3365+ echo "$l KOI8-U"
3366+ done
3367+ for l in zh zh_CN; do
3368+ #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
3369+ echo "$l GB2312"
3370+ done
3371+ for l in ja ja_JP ja_JP.EUC; do
3372+ echo "$l EUC-JP"
3373+ done
3374+ for l in ko ko_KR; do
3375+ echo "$l EUC-KR"
3376+ done
3377+ for l in th th_TH; do
3378+ echo "$l TIS-620"
3379+ done
3380+ for l in fa fa_IR; do
3381+ #echo "$l ISIRI-3342" # a broken encoding
3382+ echo "$l.utf-8 UTF-8"
3383+ done
3384+ ;;
3385+ linux* | *-gnu*)
3386+ # With glibc-2.1 or newer, we don't need any canonicalization,
3387+ # because glibc has iconv and both glibc and libiconv support all
3388+ # GNU canonical names directly. Therefore, the Makefile does not
3389+ # need to install the alias file at all.
3390+ # The following applies only to glibc-2.0.x and older libcs.
3391+ echo "ISO_646.IRV:1983 ASCII"
3392+ ;;
3393+ aix*)
3394+ echo "ISO8859-1 ISO-8859-1"
3395+ echo "ISO8859-2 ISO-8859-2"
3396+ echo "ISO8859-5 ISO-8859-5"
3397+ echo "ISO8859-6 ISO-8859-6"
3398+ echo "ISO8859-7 ISO-8859-7"
3399+ echo "ISO8859-8 ISO-8859-8"
3400+ echo "ISO8859-9 ISO-8859-9"
3401+ echo "ISO8859-15 ISO-8859-15"
3402+ echo "IBM-850 CP850"
3403+ echo "IBM-856 CP856"
3404+ echo "IBM-921 ISO-8859-13"
3405+ echo "IBM-922 CP922"
3406+ echo "IBM-932 CP932"
3407+ echo "IBM-943 CP943"
3408+ echo "IBM-1046 CP1046"
3409+ echo "IBM-1124 CP1124"
3410+ echo "IBM-1129 CP1129"
3411+ echo "IBM-1252 CP1252"
3412+ echo "IBM-eucCN GB2312"
3413+ echo "IBM-eucJP EUC-JP"
3414+ echo "IBM-eucKR EUC-KR"
3415+ echo "IBM-eucTW EUC-TW"
3416+ echo "big5 BIG5"
3417+ echo "GBK GBK"
3418+ echo "TIS-620 TIS-620"
3419+ echo "UTF-8 UTF-8"
3420+ ;;
3421+ hpux*)
3422+ echo "iso88591 ISO-8859-1"
3423+ echo "iso88592 ISO-8859-2"
3424+ echo "iso88595 ISO-8859-5"
3425+ echo "iso88596 ISO-8859-6"
3426+ echo "iso88597 ISO-8859-7"
3427+ echo "iso88598 ISO-8859-8"
3428+ echo "iso88599 ISO-8859-9"
3429+ echo "iso885915 ISO-8859-15"
3430+ echo "roman8 HP-ROMAN8"
3431+ echo "arabic8 HP-ARABIC8"
3432+ echo "greek8 HP-GREEK8"
3433+ echo "hebrew8 HP-HEBREW8"
3434+ echo "turkish8 HP-TURKISH8"
3435+ echo "kana8 HP-KANA8"
3436+ echo "tis620 TIS-620"
3437+ echo "big5 BIG5"
3438+ echo "eucJP EUC-JP"
3439+ echo "eucKR EUC-KR"
3440+ echo "eucTW EUC-TW"
3441+ echo "hp15CN GB2312"
3442+ #echo "ccdc ?" # what is this?
3443+ echo "SJIS SHIFT_JIS"
3444+ echo "utf8 UTF-8"
3445+ ;;
3446+ irix*)
3447+ echo "ISO8859-1 ISO-8859-1"
3448+ echo "ISO8859-2 ISO-8859-2"
3449+ echo "ISO8859-5 ISO-8859-5"
3450+ echo "ISO8859-7 ISO-8859-7"
3451+ echo "ISO8859-9 ISO-8859-9"
3452+ echo "eucCN GB2312"
3453+ echo "eucJP EUC-JP"
3454+ echo "eucKR EUC-KR"
3455+ echo "eucTW EUC-TW"
3456+ ;;
3457+ osf*)
3458+ echo "ISO8859-1 ISO-8859-1"
3459+ echo "ISO8859-2 ISO-8859-2"
3460+ echo "ISO8859-4 ISO-8859-4"
3461+ echo "ISO8859-5 ISO-8859-5"
3462+ echo "ISO8859-7 ISO-8859-7"
3463+ echo "ISO8859-8 ISO-8859-8"
3464+ echo "ISO8859-9 ISO-8859-9"
3465+ echo "ISO8859-15 ISO-8859-15"
3466+ echo "cp850 CP850"
3467+ echo "big5 BIG5"
3468+ echo "dechanyu DEC-HANYU"
3469+ echo "dechanzi GB2312"
3470+ echo "deckanji DEC-KANJI"
3471+ echo "deckorean EUC-KR"
3472+ echo "eucJP EUC-JP"
3473+ echo "eucKR EUC-KR"
3474+ echo "eucTW EUC-TW"
3475+ echo "GBK GBK"
3476+ echo "KSC5601 CP949"
3477+ echo "sdeckanji EUC-JP"
3478+ echo "SJIS SHIFT_JIS"
3479+ echo "TACTIS TIS-620"
3480+ echo "UTF-8 UTF-8"
3481+ ;;
3482+ solaris*)
3483+ echo "646 ASCII"
3484+ echo "ISO8859-1 ISO-8859-1"
3485+ echo "ISO8859-2 ISO-8859-2"
3486+ echo "ISO8859-3 ISO-8859-3"
3487+ echo "ISO8859-4 ISO-8859-4"
3488+ echo "ISO8859-5 ISO-8859-5"
3489+ echo "ISO8859-6 ISO-8859-6"
3490+ echo "ISO8859-7 ISO-8859-7"
3491+ echo "ISO8859-8 ISO-8859-8"
3492+ echo "ISO8859-9 ISO-8859-9"
3493+ echo "ISO8859-15 ISO-8859-15"
3494+ echo "koi8-r KOI8-R"
3495+ echo "ansi-1251 CP1251"
3496+ echo "BIG5 BIG5"
3497+ echo "Big5-HKSCS BIG5-HKSCS"
3498+ echo "gb2312 GB2312"
3499+ echo "GBK GBK"
3500+ echo "GB18030 GB18030"
3501+ echo "cns11643 EUC-TW"
3502+ echo "5601 EUC-KR"
3503+ echo "ko_KR.johap92 JOHAB"
3504+ echo "eucJP EUC-JP"
3505+ echo "PCK SHIFT_JIS"
3506+ echo "TIS620.2533 TIS-620"
3507+ #echo "sun_eu_greek ?" # what is this?
3508+ echo "UTF-8 UTF-8"
3509+ ;;
3510+ freebsd* | os2*)
3511+ # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
3512+ # localcharset.c falls back to using the full locale name
3513+ # from the environment variables.
3514+ # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
3515+ # reuse FreeBSD's locale data for OS/2.
3516+ echo "C ASCII"
3517+ echo "US-ASCII ASCII"
3518+ for l in la_LN lt_LN; do
3519+ echo "$l.ASCII ASCII"
3520+ done
3521+ for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
3522+ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
3523+ lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
3524+ echo "$l.ISO_8859-1 ISO-8859-1"
3525+ echo "$l.DIS_8859-15 ISO-8859-15"
3526+ done
3527+ for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
3528+ echo "$l.ISO_8859-2 ISO-8859-2"
3529+ done
3530+ for l in la_LN lt_LT; do
3531+ echo "$l.ISO_8859-4 ISO-8859-4"
3532+ done
3533+ for l in ru_RU ru_SU; do
3534+ echo "$l.KOI8-R KOI8-R"
3535+ echo "$l.ISO_8859-5 ISO-8859-5"
3536+ echo "$l.CP866 CP866"
3537+ done
3538+ echo "uk_UA.KOI8-U KOI8-U"
3539+ echo "zh_TW.BIG5 BIG5"
3540+ echo "zh_TW.Big5 BIG5"
3541+ echo "zh_CN.EUC GB2312"
3542+ echo "ja_JP.EUC EUC-JP"
3543+ echo "ja_JP.SJIS SHIFT_JIS"
3544+ echo "ja_JP.Shift_JIS SHIFT_JIS"
3545+ echo "ko_KR.EUC EUC-KR"
3546+ ;;
3547+ netbsd*)
3548+ echo "646 ASCII"
3549+ echo "ISO8859-1 ISO-8859-1"
3550+ echo "ISO8859-2 ISO-8859-2"
3551+ echo "ISO8859-4 ISO-8859-4"
3552+ echo "ISO8859-5 ISO-8859-5"
3553+ echo "ISO8859-15 ISO-8859-15"
3554+ echo "eucCN GB2312"
3555+ echo "eucJP EUC-JP"
3556+ echo "eucKR EUC-KR"
3557+ echo "eucTW EUC-TW"
3558+ echo "BIG5 BIG5"
3559+ echo "SJIS SHIFT_JIS"
3560+ ;;
3561+ darwin*)
3562+ # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
3563+ # localcharset.c falls back to using the full locale name
3564+ # from the environment variables.
3565+ echo "C ASCII"
3566+ for l in en_AU en_CA en_GB en_US la_LN; do
3567+ echo "$l.US-ASCII ASCII"
3568+ done
3569+ for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
3570+ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
3571+ nl_NL no_NO pt_PT sv_SE; do
3572+ echo "$l ISO-8859-1"
3573+ echo "$l.ISO8859-1 ISO-8859-1"
3574+ echo "$l.ISO8859-15 ISO-8859-15"
3575+ done
3576+ for l in la_LN; do
3577+ echo "$l.ISO8859-1 ISO-8859-1"
3578+ echo "$l.ISO8859-15 ISO-8859-15"
3579+ done
3580+ for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
3581+ echo "$l.ISO8859-2 ISO-8859-2"
3582+ done
3583+ for l in la_LN lt_LT; do
3584+ echo "$l.ISO8859-4 ISO-8859-4"
3585+ done
3586+ for l in ru_RU; do
3587+ echo "$l.KOI8-R KOI8-R"
3588+ echo "$l.ISO8859-5 ISO-8859-5"
3589+ echo "$l.CP866 CP866"
3590+ done
3591+ for l in bg_BG; do
3592+ echo "$l.CP1251 CP1251"
3593+ done
3594+ echo "uk_UA.KOI8-U KOI8-U"
3595+ echo "zh_TW.BIG5 BIG5"
3596+ echo "zh_TW.Big5 BIG5"
3597+ echo "zh_CN.EUC GB2312"
3598+ echo "ja_JP.EUC EUC-JP"
3599+ echo "ja_JP.SJIS SHIFT_JIS"
3600+ echo "ko_KR.EUC EUC-KR"
3601+ ;;
3602+ beos*)
3603+ # BeOS has a single locale, and it has UTF-8 encoding.
3604+ echo "* UTF-8"
3605+ ;;
3606+ msdosdjgpp*)
3607+ # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
3608+ # localcharset.c falls back to using the full locale name
3609+ # from the environment variables.
3610+ echo "#"
3611+ echo "# The encodings given here may not all be correct."
3612+ echo "# If you find that the encoding given for your language and"
3613+ echo "# country is not the one your DOS machine actually uses, just"
3614+ echo "# correct it in this file, and send a mail to"
3615+ echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
3616+ echo "# and Bruno Haible <bruno@clisp.org>."
3617+ echo "#"
3618+ echo "C ASCII"
3619+ # ISO-8859-1 languages
3620+ echo "ca CP850"
3621+ echo "ca_ES CP850"
3622+ echo "da CP865" # not CP850 ??
3623+ echo "da_DK CP865" # not CP850 ??
3624+ echo "de CP850"
3625+ echo "de_AT CP850"
3626+ echo "de_CH CP850"
3627+ echo "de_DE CP850"
3628+ echo "en CP850"
3629+ echo "en_AU CP850" # not CP437 ??
3630+ echo "en_CA CP850"
3631+ echo "en_GB CP850"
3632+ echo "en_NZ CP437"
3633+ echo "en_US CP437"
3634+ echo "en_ZA CP850" # not CP437 ??
3635+ echo "es CP850"
3636+ echo "es_AR CP850"
3637+ echo "es_BO CP850"
3638+ echo "es_CL CP850"
3639+ echo "es_CO CP850"
3640+ echo "es_CR CP850"
3641+ echo "es_CU CP850"
3642+ echo "es_DO CP850"
3643+ echo "es_EC CP850"
3644+ echo "es_ES CP850"
3645+ echo "es_GT CP850"
3646+ echo "es_HN CP850"
3647+ echo "es_MX CP850"
3648+ echo "es_NI CP850"
3649+ echo "es_PA CP850"
3650+ echo "es_PY CP850"
3651+ echo "es_PE CP850"
3652+ echo "es_SV CP850"
3653+ echo "es_UY CP850"
3654+ echo "es_VE CP850"
3655+ echo "et CP850"
3656+ echo "et_EE CP850"
3657+ echo "eu CP850"
3658+ echo "eu_ES CP850"
3659+ echo "fi CP850"
3660+ echo "fi_FI CP850"
3661+ echo "fr CP850"
3662+ echo "fr_BE CP850"
3663+ echo "fr_CA CP850"
3664+ echo "fr_CH CP850"
3665+ echo "fr_FR CP850"
3666+ echo "ga CP850"
3667+ echo "ga_IE CP850"
3668+ echo "gd CP850"
3669+ echo "gd_GB CP850"
3670+ echo "gl CP850"
3671+ echo "gl_ES CP850"
3672+ echo "id CP850" # not CP437 ??
3673+ echo "id_ID CP850" # not CP437 ??
3674+ echo "is CP861" # not CP850 ??
3675+ echo "is_IS CP861" # not CP850 ??
3676+ echo "it CP850"
3677+ echo "it_CH CP850"
3678+ echo "it_IT CP850"
3679+ echo "lt CP775"
3680+ echo "lt_LT CP775"
3681+ echo "lv CP775"
3682+ echo "lv_LV CP775"
3683+ echo "nb CP865" # not CP850 ??
3684+ echo "nb_NO CP865" # not CP850 ??
3685+ echo "nl CP850"
3686+ echo "nl_BE CP850"
3687+ echo "nl_NL CP850"
3688+ echo "nn CP865" # not CP850 ??
3689+ echo "nn_NO CP865" # not CP850 ??
3690+ echo "no CP865" # not CP850 ??
3691+ echo "no_NO CP865" # not CP850 ??
3692+ echo "pt CP850"
3693+ echo "pt_BR CP850"
3694+ echo "pt_PT CP850"
3695+ echo "sv CP850"
3696+ echo "sv_SE CP850"
3697+ # ISO-8859-2 languages
3698+ echo "cs CP852"
3699+ echo "cs_CZ CP852"
3700+ echo "hr CP852"
3701+ echo "hr_HR CP852"
3702+ echo "hu CP852"
3703+ echo "hu_HU CP852"
3704+ echo "pl CP852"
3705+ echo "pl_PL CP852"
3706+ echo "ro CP852"
3707+ echo "ro_RO CP852"
3708+ echo "sk CP852"
3709+ echo "sk_SK CP852"
3710+ echo "sl CP852"
3711+ echo "sl_SI CP852"
3712+ echo "sq CP852"
3713+ echo "sq_AL CP852"
3714+ echo "sr CP852" # CP852 or CP866 or CP855 ??
3715+ echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
3716+ echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
3717+ # ISO-8859-3 languages
3718+ echo "mt CP850"
3719+ echo "mt_MT CP850"
3720+ # ISO-8859-5 languages
3721+ echo "be CP866"
3722+ echo "be_BE CP866"
3723+ echo "bg CP866" # not CP855 ??
3724+ echo "bg_BG CP866" # not CP855 ??
3725+ echo "mk CP866" # not CP855 ??
3726+ echo "mk_MK CP866" # not CP855 ??
3727+ echo "ru CP866"
3728+ echo "ru_RU CP866"
3729+ echo "uk CP1125"
3730+ echo "uk_UA CP1125"
3731+ # ISO-8859-6 languages
3732+ echo "ar CP864"
3733+ echo "ar_AE CP864"
3734+ echo "ar_DZ CP864"
3735+ echo "ar_EG CP864"
3736+ echo "ar_IQ CP864"
3737+ echo "ar_IR CP864"
3738+ echo "ar_JO CP864"
3739+ echo "ar_KW CP864"
3740+ echo "ar_MA CP864"
3741+ echo "ar_OM CP864"
3742+ echo "ar_QA CP864"
3743+ echo "ar_SA CP864"
3744+ echo "ar_SY CP864"
3745+ # ISO-8859-7 languages
3746+ echo "el CP869"
3747+ echo "el_GR CP869"
3748+ # ISO-8859-8 languages
3749+ echo "he CP862"
3750+ echo "he_IL CP862"
3751+ # ISO-8859-9 languages
3752+ echo "tr CP857"
3753+ echo "tr_TR CP857"
3754+ # Japanese
3755+ echo "ja CP932"
3756+ echo "ja_JP CP932"
3757+ # Chinese
3758+ echo "zh_CN GBK"
3759+ echo "zh_TW CP950" # not CP938 ??
3760+ # Korean
3761+ echo "kr CP949" # not CP934 ??
3762+ echo "kr_KR CP949" # not CP934 ??
3763+ # Thai
3764+ echo "th CP874"
3765+ echo "th_TH CP874"
3766+ # Other
3767+ echo "eo CP850"
3768+ echo "eo_EO CP850"
3769+ ;;
3770+esac
3771--- lrzsz-0.12.20.safe/intl/dcgettext.c 1998-04-26 09:22:36.000000000 -0400
3772+++ lrzsz-0.12.20/intl/dcgettext.c 2004-09-12 14:40:34.359747480 -0400
3773@@ -1,593 +1,56 @@
3774-/* Implementation of the dcgettext(3) function
3775- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
3776+/* Implementation of the dcgettext(3) function.
3777+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
3778
3779- This program is free software; you can redistribute it and/or modify
3780- it under the terms of the GNU General Public License as published by
3781- the Free Software Foundation; either version 2, or (at your option)
3782+ This program is free software; you can redistribute it and/or modify it
3783+ under the terms of the GNU Library General Public License as published
3784+ by the Free Software Foundation; either version 2, or (at your option)
3785 any later version.
3786
3787 This program is distributed in the hope that it will be useful,
3788 but WITHOUT ANY WARRANTY; without even the implied warranty of
3789- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3790- GNU General Public License for more details.
3791+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3792+ Library General Public License for more details.
3793
3794- You should have received a copy of the GNU General Public License
3795- along with this program; if not, write to the Free Software Foundation,
3796- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
3797+ You should have received a copy of the GNU Library General Public
3798+ License along with this program; if not, write to the Free Software
3799+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
3800+ USA. */
3801
3802 #ifdef HAVE_CONFIG_H
3803 # include <config.h>
3804 #endif
3805
3806-#include <sys/types.h>
3807-
3808-#ifdef __GNUC__
3809-# define alloca __builtin_alloca
3810-# define HAVE_ALLOCA 1
3811-#else
3812-# if defined HAVE_ALLOCA_H || defined _LIBC
3813-# include <alloca.h>
3814-# else
3815-# ifdef _AIX
3816- #pragma alloca
3817-# else
3818-# ifndef alloca
3819-char *alloca ();
3820-# endif
3821-# endif
3822-# endif
3823-#endif
3824-
3825-#include <errno.h>
3826-#ifndef errno
3827-extern int errno;
3828-#endif
3829-#ifndef __set_errno
3830-# define __set_errno(val) errno = (val)
3831-#endif
3832-
3833-#if defined STDC_HEADERS || defined _LIBC
3834-# include <stdlib.h>
3835-#else
3836-char *getenv ();
3837-# ifdef HAVE_MALLOC_H
3838-# include <malloc.h>
3839-# else
3840-void free ();
3841-# endif
3842-#endif
3843-
3844-#if defined HAVE_STRING_H || defined _LIBC
3845-# ifndef _GNU_SOURCE
3846-# define _GNU_SOURCE 1
3847-# endif
3848-# include <string.h>
3849-#else
3850-# include <strings.h>
3851-#endif
3852-#if !HAVE_STRCHR && !defined _LIBC
3853-# ifndef strchr
3854-# define strchr index
3855-# endif
3856-#endif
3857-
3858-#if defined HAVE_UNISTD_H || defined _LIBC
3859-# include <unistd.h>
3860-#endif
3861-
3862-#include "gettext.h"
3863 #include "gettextP.h"
3864 #ifdef _LIBC
3865 # include <libintl.h>
3866 #else
3867-# include "libgettext.h"
3868+# include "libgnuintl.h"
3869 #endif
3870-#include "hash-string.h"
3871
3872 /* @@ end of prolog @@ */
3873
3874-#ifdef _LIBC
3875-/* Rename the non ANSI C functions. This is required by the standard
3876- because some ANSI C functions will require linking with this object
3877- file and the name space must not be polluted. */
3878-# define getcwd __getcwd
3879-# define stpcpy __stpcpy
3880-#else
3881-# if !defined HAVE_GETCWD
3882-char *getwd ();
3883-# define getcwd(buf, max) getwd (buf)
3884-# else
3885-char *getcwd ();
3886-# endif
3887-# ifndef HAVE_STPCPY
3888-static char *stpcpy PARAMS ((char *dest, const char *src));
3889-# endif
3890-#endif
3891-
3892-/* Amount to increase buffer size by in each try. */
3893-#define PATH_INCR 32
3894-
3895-/* The following is from pathmax.h. */
3896-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
3897- PATH_MAX but might cause redefinition warnings when sys/param.h is
3898- later included (as on MORE/BSD 4.3). */
3899-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
3900-# include <limits.h>
3901-#endif
3902-
3903-#ifndef _POSIX_PATH_MAX
3904-# define _POSIX_PATH_MAX 255
3905-#endif
3906-
3907-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
3908-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
3909-#endif
3910-
3911-/* Don't include sys/param.h if it already has been. */
3912-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
3913-# include <sys/param.h>
3914-#endif
3915-
3916-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
3917-# define PATH_MAX MAXPATHLEN
3918-#endif
3919-
3920-#ifndef PATH_MAX
3921-# define PATH_MAX _POSIX_PATH_MAX
3922-#endif
3923-
3924-/* XPG3 defines the result of `setlocale (category, NULL)' as:
3925- ``Directs `setlocale()' to query `category' and return the current
3926- setting of `local'.''
3927- However it does not specify the exact format. And even worse: POSIX
3928- defines this not at all. So we can use this feature only on selected
3929- system (e.g. those using GNU C Library). */
3930-#ifdef _LIBC
3931-# define HAVE_LOCALE_NULL
3932-#endif
3933-
3934-/* Name of the default domain used for gettext(3) prior any call to
3935- textdomain(3). The default value for this is "messages". */
3936-const char _nl_default_default_domain[] = "messages";
3937-
3938-/* Value used as the default domain for gettext(3). */
3939-const char *_nl_current_default_domain = _nl_default_default_domain;
3940-
3941-/* Contains the default location of the message catalogs. */
3942-const char _nl_default_dirname[] = GNULOCALEDIR;
3943-
3944-/* List with bindings of specific domains created by bindtextdomain()
3945- calls. */
3946-struct binding *_nl_domain_bindings;
3947-
3948-/* Prototypes for local functions. */
3949-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
3950- const char *msgid));
3951-static const char *category_to_name PARAMS ((int category));
3952-static const char *guess_category_value PARAMS ((int category,
3953- const char *categoryname));
3954-
3955-
3956-/* For those loosing systems which don't have `alloca' we have to add
3957- some additional code emulating it. */
3958-#ifdef HAVE_ALLOCA
3959-/* Nothing has to be done. */
3960-# define ADD_BLOCK(list, address) /* nothing */
3961-# define FREE_BLOCKS(list) /* nothing */
3962-#else
3963-struct block_list
3964-{
3965- void *address;
3966- struct block_list *next;
3967-};
3968-# define ADD_BLOCK(list, addr) \
3969- do { \
3970- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
3971- /* If we cannot get a free block we cannot add the new element to \
3972- the list. */ \
3973- if (newp != NULL) { \
3974- newp->address = (addr); \
3975- newp->next = (list); \
3976- (list) = newp; \
3977- } \
3978- } while (0)
3979-# define FREE_BLOCKS(list) \
3980- do { \
3981- while (list != NULL) { \
3982- struct block_list *old = list; \
3983- list = list->next; \
3984- free (old); \
3985- } \
3986- } while (0)
3987-# undef alloca
3988-# define alloca(size) (malloc (size))
3989-#endif /* have alloca */
3990-
3991-
3992 /* Names for the libintl functions are a problem. They must not clash
3993 with existing names and they should follow ANSI C. But this source
3994 code is also used in GNU C Library where the names have a __
3995 prefix. So we have to make a difference here. */
3996 #ifdef _LIBC
3997 # define DCGETTEXT __dcgettext
3998+# define DCIGETTEXT __dcigettext
3999 #else
4000-# define DCGETTEXT dcgettext__
4001+# define DCGETTEXT libintl_dcgettext
4002+# define DCIGETTEXT libintl_dcigettext
4003 #endif
4004
4005 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
4006 locale. */
4007 char *
4008-DCGETTEXT (domainname, msgid, category)
4009- const char *domainname;
4010- const char *msgid;
4011- int category;
4012+DCGETTEXT (const char *domainname, const char *msgid, int category)
4013 {
4014-#ifndef HAVE_ALLOCA
4015- struct block_list *block_list = NULL;
4016-#endif
4017- struct loaded_l10nfile *domain;
4018- struct binding *binding;
4019- const char *categoryname;
4020- const char *categoryvalue;
4021- char *dirname, *xdomainname;
4022- char *single_locale;
4023- char *retval;
4024- int saved_errno = errno;
4025-
4026- /* If no real MSGID is given return NULL. */
4027- if (msgid == NULL)
4028- return NULL;
4029-
4030- /* If DOMAINNAME is NULL, we are interested in the default domain. If
4031- CATEGORY is not LC_MESSAGES this might not make much sense but the
4032- defintion left this undefined. */
4033- if (domainname == NULL)
4034- domainname = _nl_current_default_domain;
4035-
4036- /* First find matching binding. */
4037- for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
4038- {
4039- int compare = strcmp (domainname, binding->domainname);
4040- if (compare == 0)
4041- /* We found it! */
4042- break;
4043- if (compare < 0)
4044- {
4045- /* It is not in the list. */
4046- binding = NULL;
4047- break;
4048- }
4049- }
4050-
4051- if (binding == NULL)
4052- dirname = (char *) _nl_default_dirname;
4053- else if (binding->dirname[0] == '/')
4054- dirname = binding->dirname;
4055- else
4056- {
4057- /* We have a relative path. Make it absolute now. */
4058- size_t dirname_len = strlen (binding->dirname) + 1;
4059- size_t path_max;
4060- char *ret;
4061-
4062- path_max = (unsigned) PATH_MAX;
4063- path_max += 2; /* The getcwd docs say to do this. */
4064-
4065- dirname = (char *) alloca (path_max + dirname_len);
4066- ADD_BLOCK (block_list, dirname);
4067-
4068- __set_errno (0);
4069- while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
4070- {
4071- path_max += PATH_INCR;
4072- dirname = (char *) alloca (path_max + dirname_len);
4073- ADD_BLOCK (block_list, dirname);
4074- __set_errno (0);
4075- }
4076-
4077- if (ret == NULL)
4078- {
4079- /* We cannot get the current working directory. Don't signal an
4080- error but simply return the default string. */
4081- FREE_BLOCKS (block_list);
4082- __set_errno (saved_errno);
4083- return (char *) msgid;
4084- }
4085-
4086- stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
4087- }
4088-
4089- /* Now determine the symbolic name of CATEGORY and its value. */
4090- categoryname = category_to_name (category);
4091- categoryvalue = guess_category_value (category, categoryname);
4092-
4093- xdomainname = (char *) alloca (strlen (categoryname)
4094- + strlen (domainname) + 5);
4095- ADD_BLOCK (block_list, xdomainname);
4096-
4097- stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
4098- domainname),
4099- ".mo");
4100-
4101- /* Creating working area. */
4102- single_locale = (char *) alloca (strlen (categoryvalue) + 1);
4103- ADD_BLOCK (block_list, single_locale);
4104-
4105-
4106- /* Search for the given string. This is a loop because we perhaps
4107- got an ordered list of languages to consider for th translation. */
4108- while (1)
4109- {
4110- /* Make CATEGORYVALUE point to the next element of the list. */
4111- while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
4112- ++categoryvalue;
4113- if (categoryvalue[0] == '\0')
4114- {
4115- /* The whole contents of CATEGORYVALUE has been searched but
4116- no valid entry has been found. We solve this situation
4117- by implicitly appending a "C" entry, i.e. no translation
4118- will take place. */
4119- single_locale[0] = 'C';
4120- single_locale[1] = '\0';
4121- }
4122- else
4123- {
4124- char *cp = single_locale;
4125- while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
4126- *cp++ = *categoryvalue++;
4127- *cp = '\0';
4128- }
4129-
4130- /* If the current locale value is C (or POSIX) we don't load a
4131- domain. Return the MSGID. */
4132- if (strcmp (single_locale, "C") == 0
4133- || strcmp (single_locale, "POSIX") == 0)
4134- {
4135- FREE_BLOCKS (block_list);
4136- __set_errno (saved_errno);
4137- return (char *) msgid;
4138- }
4139-
4140-
4141- /* Find structure describing the message catalog matching the
4142- DOMAINNAME and CATEGORY. */
4143- domain = _nl_find_domain (dirname, single_locale, xdomainname);
4144-
4145- if (domain != NULL)
4146- {
4147- retval = find_msg (domain, msgid);
4148-
4149- if (retval == NULL)
4150- {
4151- int cnt;
4152-
4153- for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
4154- {
4155- retval = find_msg (domain->successor[cnt], msgid);
4156-
4157- if (retval != NULL)
4158- break;
4159- }
4160- }
4161-
4162- if (retval != NULL)
4163- {
4164- FREE_BLOCKS (block_list);
4165- __set_errno (saved_errno);
4166- return retval;
4167- }
4168- }
4169- }
4170- /* NOTREACHED */
4171+ return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
4172 }
4173
4174 #ifdef _LIBC
4175 /* Alias for function name in GNU C Library. */
4176+INTDEF(__dcgettext)
4177 weak_alias (__dcgettext, dcgettext);
4178 #endif
4179-
4180-
4181-static char *
4182-find_msg (domain_file, msgid)
4183- struct loaded_l10nfile *domain_file;
4184- const char *msgid;
4185-{
4186- size_t top, act, bottom;
4187- struct loaded_domain *domain;
4188-
4189- if (domain_file->decided == 0)
4190- _nl_load_domain (domain_file);
4191-
4192- if (domain_file->data == NULL)
4193- return NULL;
4194-
4195- domain = (struct loaded_domain *) domain_file->data;
4196-
4197- /* Locate the MSGID and its translation. */
4198- if (domain->hash_size > 2 && domain->hash_tab != NULL)
4199- {
4200- /* Use the hashing table. */
4201- nls_uint32 len = strlen (msgid);
4202- nls_uint32 hash_val = hash_string (msgid);
4203- nls_uint32 idx = hash_val % domain->hash_size;
4204- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
4205- nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
4206-
4207- if (nstr == 0)
4208- /* Hash table entry is empty. */
4209- return NULL;
4210-
4211- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
4212- && strcmp (msgid,
4213- domain->data + W (domain->must_swap,
4214- domain->orig_tab[nstr - 1].offset)) == 0)
4215- return (char *) domain->data + W (domain->must_swap,
4216- domain->trans_tab[nstr - 1].offset);
4217-
4218- while (1)
4219- {
4220- if (idx >= domain->hash_size - incr)
4221- idx -= domain->hash_size - incr;
4222- else
4223- idx += incr;
4224-
4225- nstr = W (domain->must_swap, domain->hash_tab[idx]);
4226- if (nstr == 0)
4227- /* Hash table entry is empty. */
4228- return NULL;
4229-
4230- if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
4231- && strcmp (msgid,
4232- domain->data + W (domain->must_swap,
4233- domain->orig_tab[nstr - 1].offset))
4234- == 0)
4235- return (char *) domain->data
4236- + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
4237- }
4238- /* NOTREACHED */
4239- }
4240-
4241- /* Now we try the default method: binary search in the sorted
4242- array of messages. */
4243- bottom = 0;
4244- top = domain->nstrings;
4245- while (bottom < top)
4246- {
4247- int cmp_val;
4248-
4249- act = (bottom + top) / 2;
4250- cmp_val = strcmp (msgid, domain->data
4251- + W (domain->must_swap,
4252- domain->orig_tab[act].offset));
4253- if (cmp_val < 0)
4254- top = act;
4255- else if (cmp_val > 0)
4256- bottom = act + 1;
4257- else
4258- break;
4259- }
4260-
4261- /* If an translation is found return this. */
4262- return bottom >= top ? NULL : (char *) domain->data
4263- + W (domain->must_swap,
4264- domain->trans_tab[act].offset);
4265-}
4266-
4267-
4268-/* Return string representation of locale CATEGORY. */
4269-static const char *
4270-category_to_name (category)
4271- int category;
4272-{
4273- const char *retval;
4274-
4275- switch (category)
4276- {
4277-#ifdef LC_COLLATE
4278- case LC_COLLATE:
4279- retval = "LC_COLLATE";
4280- break;
4281-#endif
4282-#ifdef LC_CTYPE
4283- case LC_CTYPE:
4284- retval = "LC_CTYPE";
4285- break;
4286-#endif
4287-#ifdef LC_MONETARY
4288- case LC_MONETARY:
4289- retval = "LC_MONETARY";
4290- break;
4291-#endif
4292-#ifdef LC_NUMERIC
4293- case LC_NUMERIC:
4294- retval = "LC_NUMERIC";
4295- break;
4296-#endif
4297-#ifdef LC_TIME
4298- case LC_TIME:
4299- retval = "LC_TIME";
4300- break;
4301-#endif
4302-#ifdef LC_MESSAGES
4303- case LC_MESSAGES:
4304- retval = "LC_MESSAGES";
4305- break;
4306-#endif
4307-#ifdef LC_RESPONSE
4308- case LC_RESPONSE:
4309- retval = "LC_RESPONSE";
4310- break;
4311-#endif
4312-#ifdef LC_ALL
4313- case LC_ALL:
4314- /* This might not make sense but is perhaps better than any other
4315- value. */
4316- retval = "LC_ALL";
4317- break;
4318-#endif
4319- default:
4320- /* If you have a better idea for a default value let me know. */
4321- retval = "LC_XXX";
4322- }
4323-
4324- return retval;
4325-}
4326-
4327-/* Guess value of current locale from value of the environment variables. */
4328-static const char *
4329-guess_category_value (category, categoryname)
4330- int category;
4331- const char *categoryname;
4332-{
4333- const char *retval;
4334-
4335- /* The highest priority value is the `LANGUAGE' environment
4336- variable. This is a GNU extension. */
4337- retval = getenv ("LANGUAGE");
4338- if (retval != NULL && retval[0] != '\0')
4339- return retval;
4340-
4341- /* `LANGUAGE' is not set. So we have to proceed with the POSIX
4342- methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some
4343- systems this can be done by the `setlocale' function itself. */
4344-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
4345- return setlocale (category, NULL);
4346-#else
4347- /* Setting of LC_ALL overwrites all other. */
4348- retval = getenv ("LC_ALL");
4349- if (retval != NULL && retval[0] != '\0')
4350- return retval;
4351-
4352- /* Next comes the name of the desired category. */
4353- retval = getenv (categoryname);
4354- if (retval != NULL && retval[0] != '\0')
4355- return retval;
4356-
4357- /* Last possibility is the LANG environment variable. */
4358- retval = getenv ("LANG");
4359- if (retval != NULL && retval[0] != '\0')
4360- return retval;
4361-
4362- /* We use C as the default domain. POSIX says this is implementation
4363- defined. */
4364- return "C";
4365-#endif
4366-}
4367-
4368-/* @@ begin of epilog @@ */
4369-
4370-/* We don't want libintl.a to depend on any other library. So we
4371- avoid the non-standard function stpcpy. In GNU C Library this
4372- function is available, though. Also allow the symbol HAVE_STPCPY
4373- to be defined. */
4374-#if !_LIBC && !HAVE_STPCPY
4375-static char *
4376-stpcpy (dest, src)
4377- char *dest;
4378- const char *src;
4379-{
4380- while ((*dest++ = *src++) != '\0')
4381- /* Do nothing. */ ;
4382- return dest - 1;
4383-}
4384-#endif
4385--- lrzsz-0.12.20.safe/intl/dcigettext.c 1969-12-31 19:00:00.000000000 -0500
4386+++ lrzsz-0.12.20/intl/dcigettext.c 2004-09-12 14:40:34.369745960 -0400
4387@@ -0,0 +1,1219 @@
4388+/* Implementation of the internal dcigettext function.
4389+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
4390+
4391+ This program is free software; you can redistribute it and/or modify it
4392+ under the terms of the GNU Library General Public License as published
4393+ by the Free Software Foundation; either version 2, or (at your option)
4394+ any later version.
4395+
4396+ This program is distributed in the hope that it will be useful,
4397+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4398+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4399+ Library General Public License for more details.
4400+
4401+ You should have received a copy of the GNU Library General Public
4402+ License along with this program; if not, write to the Free Software
4403+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
4404+ USA. */
4405+
4406+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
4407+ This must come before <config.h> because <config.h> may include
4408+ <features.h>, and once <features.h> has been included, it's too late. */
4409+#ifndef _GNU_SOURCE
4410+# define _GNU_SOURCE 1
4411+#endif
4412+
4413+#ifdef HAVE_CONFIG_H
4414+# include <config.h>
4415+#endif
4416+
4417+#include <sys/types.h>
4418+
4419+#ifdef __GNUC__
4420+# define alloca __builtin_alloca
4421+# define HAVE_ALLOCA 1
4422+#else
4423+# ifdef _MSC_VER
4424+# include <malloc.h>
4425+# define alloca _alloca
4426+# else
4427+# if defined HAVE_ALLOCA_H || defined _LIBC
4428+# include <alloca.h>
4429+# else
4430+# ifdef _AIX
4431+ #pragma alloca
4432+# else
4433+# ifndef alloca
4434+char *alloca ();
4435+# endif
4436+# endif
4437+# endif
4438+# endif
4439+#endif
4440+
4441+#include <errno.h>
4442+#ifndef errno
4443+extern int errno;
4444+#endif
4445+#ifndef __set_errno
4446+# define __set_errno(val) errno = (val)
4447+#endif
4448+
4449+#include <stddef.h>
4450+#include <stdlib.h>
4451+#include <string.h>
4452+
4453+#if defined HAVE_UNISTD_H || defined _LIBC
4454+# include <unistd.h>
4455+#endif
4456+
4457+#include <locale.h>
4458+
4459+#ifdef _LIBC
4460+ /* Guess whether integer division by zero raises signal SIGFPE.
4461+ Set to 1 only if you know for sure. In case of doubt, set to 0. */
4462+# if defined __alpha__ || defined __arm__ || defined __i386__ \
4463+ || defined __m68k__ || defined __s390__
4464+# define INTDIV0_RAISES_SIGFPE 1
4465+# else
4466+# define INTDIV0_RAISES_SIGFPE 0
4467+# endif
4468+#endif
4469+#if !INTDIV0_RAISES_SIGFPE
4470+# include <signal.h>
4471+#endif
4472+
4473+#if defined HAVE_SYS_PARAM_H || defined _LIBC
4474+# include <sys/param.h>
4475+#endif
4476+
4477+#include "gettextP.h"
4478+#include "plural-exp.h"
4479+#ifdef _LIBC
4480+# include <libintl.h>
4481+#else
4482+# include "libgnuintl.h"
4483+#endif
4484+#include "hash-string.h"
4485+
4486+/* Thread safetyness. */
4487+#ifdef _LIBC
4488+# include <bits/libc-lock.h>
4489+#else
4490+/* Provide dummy implementation if this is outside glibc. */
4491+# define __libc_lock_define_initialized(CLASS, NAME)
4492+# define __libc_lock_lock(NAME)
4493+# define __libc_lock_unlock(NAME)
4494+# define __libc_rwlock_define_initialized(CLASS, NAME)
4495+# define __libc_rwlock_rdlock(NAME)
4496+# define __libc_rwlock_unlock(NAME)
4497+#endif
4498+
4499+/* Alignment of types. */
4500+#if defined __GNUC__ && __GNUC__ >= 2
4501+# define alignof(TYPE) __alignof__ (TYPE)
4502+#else
4503+# define alignof(TYPE) \
4504+ ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
4505+#endif
4506+
4507+/* The internal variables in the standalone libintl.a must have different
4508+ names than the internal variables in GNU libc, otherwise programs
4509+ using libintl.a cannot be linked statically. */
4510+#if !defined _LIBC
4511+# define _nl_default_default_domain libintl_nl_default_default_domain
4512+# define _nl_current_default_domain libintl_nl_current_default_domain
4513+# define _nl_default_dirname libintl_nl_default_dirname
4514+# define _nl_domain_bindings libintl_nl_domain_bindings
4515+#endif
4516+
4517+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */
4518+#ifndef offsetof
4519+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
4520+#endif
4521+
4522+/* @@ end of prolog @@ */
4523+
4524+#ifdef _LIBC
4525+/* Rename the non ANSI C functions. This is required by the standard
4526+ because some ANSI C functions will require linking with this object
4527+ file and the name space must not be polluted. */
4528+# define getcwd __getcwd
4529+# ifndef stpcpy
4530+# define stpcpy __stpcpy
4531+# endif
4532+# define tfind __tfind
4533+#else
4534+# if !defined HAVE_GETCWD
4535+char *getwd ();
4536+# define getcwd(buf, max) getwd (buf)
4537+# else
4538+# if VMS
4539+# define getcwd(buf, max) (getcwd) (buf, max, 0)
4540+# else
4541+char *getcwd ();
4542+# endif
4543+# endif
4544+# ifndef HAVE_STPCPY
4545+static char *stpcpy (char *dest, const char *src);
4546+# endif
4547+# ifndef HAVE_MEMPCPY
4548+static void *mempcpy (void *dest, const void *src, size_t n);
4549+# endif
4550+#endif
4551+
4552+/* Amount to increase buffer size by in each try. */
4553+#define PATH_INCR 32
4554+
4555+/* The following is from pathmax.h. */
4556+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
4557+ PATH_MAX but might cause redefinition warnings when sys/param.h is
4558+ later included (as on MORE/BSD 4.3). */
4559+#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
4560+# include <limits.h>
4561+#endif
4562+
4563+#ifndef _POSIX_PATH_MAX
4564+# define _POSIX_PATH_MAX 255
4565+#endif
4566+
4567+#if !defined PATH_MAX && defined _PC_PATH_MAX
4568+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
4569+#endif
4570+
4571+/* Don't include sys/param.h if it already has been. */
4572+#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
4573+# include <sys/param.h>
4574+#endif
4575+
4576+#if !defined PATH_MAX && defined MAXPATHLEN
4577+# define PATH_MAX MAXPATHLEN
4578+#endif
4579+
4580+#ifndef PATH_MAX
4581+# define PATH_MAX _POSIX_PATH_MAX
4582+#endif
4583+
4584+/* Pathname support.
4585+ ISSLASH(C) tests whether C is a directory separator character.
4586+ IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
4587+ it may be concatenated to a directory pathname.
4588+ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
4589+ */
4590+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
4591+ /* Win32, OS/2, DOS */
4592+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
4593+# define HAS_DEVICE(P) \
4594+ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
4595+ && (P)[1] == ':')
4596+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
4597+# define IS_PATH_WITH_DIR(P) \
4598+ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
4599+#else
4600+ /* Unix */
4601+# define ISSLASH(C) ((C) == '/')
4602+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
4603+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
4604+#endif
4605+
4606+/* This is the type used for the search tree where known translations
4607+ are stored. */
4608+struct known_translation_t
4609+{
4610+ /* Domain in which to search. */
4611+ char *domainname;
4612+
4613+ /* The category. */
4614+ int category;
4615+
4616+ /* State of the catalog counter at the point the string was found. */
4617+ int counter;
4618+
4619+ /* Catalog where the string was found. */
4620+ struct loaded_l10nfile *domain;
4621+
4622+ /* And finally the translation. */
4623+ const char *translation;
4624+ size_t translation_length;
4625+
4626+ /* Pointer to the string in question. */
4627+ char msgid[ZERO];
4628+};
4629+
4630+/* Root of the search tree with known translations. We can use this
4631+ only if the system provides the `tsearch' function family. */
4632+#if defined HAVE_TSEARCH || defined _LIBC
4633+# include <search.h>
4634+
4635+static void *root;
4636+
4637+# ifdef _LIBC
4638+# define tsearch __tsearch
4639+# endif
4640+
4641+/* Function to compare two entries in the table of known translations. */
4642+static int
4643+transcmp (const void *p1, const void *p2)
4644+{
4645+ const struct known_translation_t *s1;
4646+ const struct known_translation_t *s2;
4647+ int result;
4648+
4649+ s1 = (const struct known_translation_t *) p1;
4650+ s2 = (const struct known_translation_t *) p2;
4651+
4652+ result = strcmp (s1->msgid, s2->msgid);
4653+ if (result == 0)
4654+ {
4655+ result = strcmp (s1->domainname, s2->domainname);
4656+ if (result == 0)
4657+ /* We compare the category last (though this is the cheapest
4658+ operation) since it is hopefully always the same (namely
4659+ LC_MESSAGES). */
4660+ result = s1->category - s2->category;
4661+ }
4662+
4663+ return result;
4664+}
4665+#endif
4666+
4667+#ifndef INTVARDEF
4668+# define INTVARDEF(name)
4669+#endif
4670+#ifndef INTUSE
4671+# define INTUSE(name) name
4672+#endif
4673+
4674+/* Name of the default domain used for gettext(3) prior any call to
4675+ textdomain(3). The default value for this is "messages". */
4676+const char _nl_default_default_domain[] attribute_hidden = "messages";
4677+
4678+/* Value used as the default domain for gettext(3). */
4679+const char *_nl_current_default_domain attribute_hidden
4680+ = _nl_default_default_domain;
4681+
4682+/* Contains the default location of the message catalogs. */
4683+#if defined __EMX__
4684+extern const char _nl_default_dirname[];
4685+#else
4686+const char _nl_default_dirname[] = LOCALEDIR;
4687+INTVARDEF (_nl_default_dirname)
4688+#endif
4689+
4690+/* List with bindings of specific domains created by bindtextdomain()
4691+ calls. */
4692+struct binding *_nl_domain_bindings;
4693+
4694+/* Prototypes for local functions. */
4695+static char *plural_lookup (struct loaded_l10nfile *domain,
4696+ unsigned long int n,
4697+ const char *translation, size_t translation_len)
4698+ internal_function;
4699+static const char *guess_category_value (int category,
4700+ const char *categoryname)
4701+ internal_function;
4702+#ifdef _LIBC
4703+# include "../locale/localeinfo.h"
4704+# define category_to_name(category) _nl_category_names[category]
4705+#else
4706+static const char *category_to_name (int category) internal_function;
4707+#endif
4708+
4709+
4710+/* For those loosing systems which don't have `alloca' we have to add
4711+ some additional code emulating it. */
4712+#ifdef HAVE_ALLOCA
4713+/* Nothing has to be done. */
4714+# define freea(p) /* nothing */
4715+# define ADD_BLOCK(list, address) /* nothing */
4716+# define FREE_BLOCKS(list) /* nothing */
4717+#else
4718+struct block_list
4719+{
4720+ void *address;
4721+ struct block_list *next;
4722+};
4723+# define ADD_BLOCK(list, addr) \
4724+ do { \
4725+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
4726+ /* If we cannot get a free block we cannot add the new element to \
4727+ the list. */ \
4728+ if (newp != NULL) { \
4729+ newp->address = (addr); \
4730+ newp->next = (list); \
4731+ (list) = newp; \
4732+ } \
4733+ } while (0)
4734+# define FREE_BLOCKS(list) \
4735+ do { \
4736+ while (list != NULL) { \
4737+ struct block_list *old = list; \
4738+ list = list->next; \
4739+ free (old->address); \
4740+ free (old); \
4741+ } \
4742+ } while (0)
4743+# undef alloca
4744+# define alloca(size) (malloc (size))
4745+# define freea(p) free (p)
4746+#endif /* have alloca */
4747+
4748+
4749+#ifdef _LIBC
4750+/* List of blocks allocated for translations. */
4751+typedef struct transmem_list
4752+{
4753+ struct transmem_list *next;
4754+ char data[ZERO];
4755+} transmem_block_t;
4756+static struct transmem_list *transmem_list;
4757+#else
4758+typedef unsigned char transmem_block_t;
4759+#endif
4760+
4761+
4762+/* Names for the libintl functions are a problem. They must not clash
4763+ with existing names and they should follow ANSI C. But this source
4764+ code is also used in GNU C Library where the names have a __
4765+ prefix. So we have to make a difference here. */
4766+#ifdef _LIBC
4767+# define DCIGETTEXT __dcigettext
4768+#else
4769+# define DCIGETTEXT libintl_dcigettext
4770+#endif
4771+
4772+/* Lock variable to protect the global data in the gettext implementation. */
4773+#ifdef _LIBC
4774+__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
4775+#endif
4776+
4777+/* Checking whether the binaries runs SUID must be done and glibc provides
4778+ easier methods therefore we make a difference here. */
4779+#ifdef _LIBC
4780+# define ENABLE_SECURE __libc_enable_secure
4781+# define DETERMINE_SECURE
4782+#else
4783+# ifndef HAVE_GETUID
4784+# define getuid() 0
4785+# endif
4786+# ifndef HAVE_GETGID
4787+# define getgid() 0
4788+# endif
4789+# ifndef HAVE_GETEUID
4790+# define geteuid() getuid()
4791+# endif
4792+# ifndef HAVE_GETEGID
4793+# define getegid() getgid()
4794+# endif
4795+static int enable_secure;
4796+# define ENABLE_SECURE (enable_secure == 1)
4797+# define DETERMINE_SECURE \
4798+ if (enable_secure == 0) \
4799+ { \
4800+ if (getuid () != geteuid () || getgid () != getegid ()) \
4801+ enable_secure = 1; \
4802+ else \
4803+ enable_secure = -1; \
4804+ }
4805+#endif
4806+
4807+/* Get the function to evaluate the plural expression. */
4808+#include "eval-plural.h"
4809+
4810+/* Look up MSGID in the DOMAINNAME message catalog for the current
4811+ CATEGORY locale and, if PLURAL is nonzero, search over string
4812+ depending on the plural form determined by N. */
4813+char *
4814+DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
4815+ int plural, unsigned long int n, int category)
4816+{
4817+#ifndef HAVE_ALLOCA
4818+ struct block_list *block_list = NULL;
4819+#endif
4820+ struct loaded_l10nfile *domain;
4821+ struct binding *binding;
4822+ const char *categoryname;
4823+ const char *categoryvalue;
4824+ char *dirname, *xdomainname;
4825+ char *single_locale;
4826+ char *retval;
4827+ size_t retlen;
4828+ int saved_errno;
4829+#if defined HAVE_TSEARCH || defined _LIBC
4830+ struct known_translation_t *search;
4831+ struct known_translation_t **foundp = NULL;
4832+ size_t msgid_len;
4833+#endif
4834+ size_t domainname_len;
4835+
4836+ /* If no real MSGID is given return NULL. */
4837+ if (msgid1 == NULL)
4838+ return NULL;
4839+
4840+#ifdef _LIBC
4841+ if (category < 0 || category >= __LC_LAST || category == LC_ALL)
4842+ /* Bogus. */
4843+ return (plural == 0
4844+ ? (char *) msgid1
4845+ /* Use the Germanic plural rule. */
4846+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
4847+#endif
4848+
4849+ __libc_rwlock_rdlock (_nl_state_lock);
4850+
4851+ /* If DOMAINNAME is NULL, we are interested in the default domain. If
4852+ CATEGORY is not LC_MESSAGES this might not make much sense but the
4853+ definition left this undefined. */
4854+ if (domainname == NULL)
4855+ domainname = _nl_current_default_domain;
4856+
4857+ /* OS/2 specific: backward compatibility with older libintl versions */
4858+#ifdef LC_MESSAGES_COMPAT
4859+ if (category == LC_MESSAGES_COMPAT)
4860+ category = LC_MESSAGES;
4861+#endif
4862+
4863+#if defined HAVE_TSEARCH || defined _LIBC
4864+ msgid_len = strlen (msgid1) + 1;
4865+
4866+ /* Try to find the translation among those which we found at
4867+ some time. */
4868+ search = (struct known_translation_t *)
4869+ alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
4870+ memcpy (search->msgid, msgid1, msgid_len);
4871+ search->domainname = (char *) domainname;
4872+ search->category = category;
4873+
4874+ foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
4875+ freea (search);
4876+ if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
4877+ {
4878+ /* Now deal with plural. */
4879+ if (plural)
4880+ retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
4881+ (*foundp)->translation_length);
4882+ else
4883+ retval = (char *) (*foundp)->translation;
4884+
4885+ __libc_rwlock_unlock (_nl_state_lock);
4886+ return retval;
4887+ }
4888+#endif
4889+
4890+ /* Preserve the `errno' value. */
4891+ saved_errno = errno;
4892+
4893+ /* See whether this is a SUID binary or not. */
4894+ DETERMINE_SECURE;
4895+
4896+ /* First find matching binding. */
4897+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
4898+ {
4899+ int compare = strcmp (domainname, binding->domainname);
4900+ if (compare == 0)
4901+ /* We found it! */
4902+ break;
4903+ if (compare < 0)
4904+ {
4905+ /* It is not in the list. */
4906+ binding = NULL;
4907+ break;
4908+ }
4909+ }
4910+
4911+ if (binding == NULL)
4912+ dirname = (char *) INTUSE(_nl_default_dirname);
4913+ else if (IS_ABSOLUTE_PATH (binding->dirname))
4914+ dirname = binding->dirname;
4915+ else
4916+ {
4917+ /* We have a relative path. Make it absolute now. */
4918+ size_t dirname_len = strlen (binding->dirname) + 1;
4919+ size_t path_max;
4920+ char *ret;
4921+
4922+ path_max = (unsigned int) PATH_MAX;
4923+ path_max += 2; /* The getcwd docs say to do this. */
4924+
4925+ for (;;)
4926+ {
4927+ dirname = (char *) alloca (path_max + dirname_len);
4928+ ADD_BLOCK (block_list, dirname);
4929+
4930+ __set_errno (0);
4931+ ret = getcwd (dirname, path_max);
4932+ if (ret != NULL || errno != ERANGE)
4933+ break;
4934+
4935+ path_max += path_max / 2;
4936+ path_max += PATH_INCR;
4937+ }
4938+
4939+ if (ret == NULL)
4940+ /* We cannot get the current working directory. Don't signal an
4941+ error but simply return the default string. */
4942+ goto return_untranslated;
4943+
4944+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
4945+ }
4946+
4947+ /* Now determine the symbolic name of CATEGORY and its value. */
4948+ categoryname = category_to_name (category);
4949+ categoryvalue = guess_category_value (category, categoryname);
4950+
4951+ domainname_len = strlen (domainname);
4952+ xdomainname = (char *) alloca (strlen (categoryname)
4953+ + domainname_len + 5);
4954+ ADD_BLOCK (block_list, xdomainname);
4955+
4956+ stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
4957+ domainname, domainname_len),
4958+ ".mo");
4959+
4960+ /* Creating working area. */
4961+ single_locale = (char *) alloca (strlen (categoryvalue) + 1);
4962+ ADD_BLOCK (block_list, single_locale);
4963+
4964+
4965+ /* Search for the given string. This is a loop because we perhaps
4966+ got an ordered list of languages to consider for the translation. */
4967+ while (1)
4968+ {
4969+ /* Make CATEGORYVALUE point to the next element of the list. */
4970+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
4971+ ++categoryvalue;
4972+ if (categoryvalue[0] == '\0')
4973+ {
4974+ /* The whole contents of CATEGORYVALUE has been searched but
4975+ no valid entry has been found. We solve this situation
4976+ by implicitly appending a "C" entry, i.e. no translation
4977+ will take place. */
4978+ single_locale[0] = 'C';
4979+ single_locale[1] = '\0';
4980+ }
4981+ else
4982+ {
4983+ char *cp = single_locale;
4984+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
4985+ *cp++ = *categoryvalue++;
4986+ *cp = '\0';
4987+
4988+ /* When this is a SUID binary we must not allow accessing files
4989+ outside the dedicated directories. */
4990+ if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
4991+ /* Ingore this entry. */
4992+ continue;
4993+ }
4994+
4995+ /* If the current locale value is C (or POSIX) we don't load a
4996+ domain. Return the MSGID. */
4997+ if (strcmp (single_locale, "C") == 0
4998+ || strcmp (single_locale, "POSIX") == 0)
4999+ break;
5000+
5001+ /* Find structure describing the message catalog matching the
5002+ DOMAINNAME and CATEGORY. */
5003+ domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
5004+
5005+ if (domain != NULL)
5006+ {
5007+ retval = _nl_find_msg (domain, binding, msgid1, &retlen);
5008+
5009+ if (retval == NULL)
5010+ {
5011+ int cnt;
5012+
5013+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
5014+ {
5015+ retval = _nl_find_msg (domain->successor[cnt], binding,
5016+ msgid1, &retlen);
5017+
5018+ if (retval != NULL)
5019+ {
5020+ domain = domain->successor[cnt];
5021+ break;
5022+ }
5023+ }
5024+ }
5025+
5026+ if (retval != NULL)
5027+ {
5028+ /* Found the translation of MSGID1 in domain DOMAIN:
5029+ starting at RETVAL, RETLEN bytes. */
5030+ FREE_BLOCKS (block_list);
5031+#if defined HAVE_TSEARCH || defined _LIBC
5032+ if (foundp == NULL)
5033+ {
5034+ /* Create a new entry and add it to the search tree. */
5035+ struct known_translation_t *newp;
5036+
5037+ newp = (struct known_translation_t *)
5038+ malloc (offsetof (struct known_translation_t, msgid)
5039+ + msgid_len + domainname_len + 1);
5040+ if (newp != NULL)
5041+ {
5042+ newp->domainname =
5043+ mempcpy (newp->msgid, msgid1, msgid_len);
5044+ memcpy (newp->domainname, domainname, domainname_len + 1);
5045+ newp->category = category;
5046+ newp->counter = _nl_msg_cat_cntr;
5047+ newp->domain = domain;
5048+ newp->translation = retval;
5049+ newp->translation_length = retlen;
5050+
5051+ /* Insert the entry in the search tree. */
5052+ foundp = (struct known_translation_t **)
5053+ tsearch (newp, &root, transcmp);
5054+ if (foundp == NULL
5055+ || __builtin_expect (*foundp != newp, 0))
5056+ /* The insert failed. */
5057+ free (newp);
5058+ }
5059+ }
5060+ else
5061+ {
5062+ /* We can update the existing entry. */
5063+ (*foundp)->counter = _nl_msg_cat_cntr;
5064+ (*foundp)->domain = domain;
5065+ (*foundp)->translation = retval;
5066+ (*foundp)->translation_length = retlen;
5067+ }
5068+#endif
5069+ __set_errno (saved_errno);
5070+
5071+ /* Now deal with plural. */
5072+ if (plural)
5073+ retval = plural_lookup (domain, n, retval, retlen);
5074+
5075+ __libc_rwlock_unlock (_nl_state_lock);
5076+ return retval;
5077+ }
5078+ }
5079+ }
5080+
5081+ return_untranslated:
5082+ /* Return the untranslated MSGID. */
5083+ FREE_BLOCKS (block_list);
5084+ __libc_rwlock_unlock (_nl_state_lock);
5085+#ifndef _LIBC
5086+ if (!ENABLE_SECURE)
5087+ {
5088+ extern void _nl_log_untranslated (const char *logfilename,
5089+ const char *domainname,
5090+ const char *msgid1, const char *msgid2,
5091+ int plural);
5092+ const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
5093+
5094+ if (logfilename != NULL && logfilename[0] != '\0')
5095+ _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
5096+ }
5097+#endif
5098+ __set_errno (saved_errno);
5099+ return (plural == 0
5100+ ? (char *) msgid1
5101+ /* Use the Germanic plural rule. */
5102+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
5103+}
5104+
5105+
5106+char *
5107+internal_function
5108+_nl_find_msg (struct loaded_l10nfile *domain_file,
5109+ struct binding *domainbinding, const char *msgid,
5110+ size_t *lengthp)
5111+{
5112+ struct loaded_domain *domain;
5113+ nls_uint32 nstrings;
5114+ size_t act;
5115+ char *result;
5116+ size_t resultlen;
5117+
5118+ if (domain_file->decided == 0)
5119+ _nl_load_domain (domain_file, domainbinding);
5120+
5121+ if (domain_file->data == NULL)
5122+ return NULL;
5123+
5124+ domain = (struct loaded_domain *) domain_file->data;
5125+
5126+ nstrings = domain->nstrings;
5127+
5128+ /* Locate the MSGID and its translation. */
5129+ if (domain->hash_tab != NULL)
5130+ {
5131+ /* Use the hashing table. */
5132+ nls_uint32 len = strlen (msgid);
5133+ nls_uint32 hash_val = hash_string (msgid);
5134+ nls_uint32 idx = hash_val % domain->hash_size;
5135+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
5136+
5137+ while (1)
5138+ {
5139+ nls_uint32 nstr =
5140+ W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
5141+
5142+ if (nstr == 0)
5143+ /* Hash table entry is empty. */
5144+ return NULL;
5145+
5146+ nstr--;
5147+
5148+ /* Compare msgid with the original string at index nstr.
5149+ We compare the lengths with >=, not ==, because plural entries
5150+ are represented by strings with an embedded NUL. */
5151+ if (nstr < nstrings
5152+ ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
5153+ && (strcmp (msgid,
5154+ domain->data + W (domain->must_swap,
5155+ domain->orig_tab[nstr].offset))
5156+ == 0)
5157+ : domain->orig_sysdep_tab[nstr - nstrings].length > len
5158+ && (strcmp (msgid,
5159+ domain->orig_sysdep_tab[nstr - nstrings].pointer)
5160+ == 0))
5161+ {
5162+ act = nstr;
5163+ goto found;
5164+ }
5165+
5166+ if (idx >= domain->hash_size - incr)
5167+ idx -= domain->hash_size - incr;
5168+ else
5169+ idx += incr;
5170+ }
5171+ /* NOTREACHED */
5172+ }
5173+ else
5174+ {
5175+ /* Try the default method: binary search in the sorted array of
5176+ messages. */
5177+ size_t top, bottom;
5178+
5179+ bottom = 0;
5180+ top = nstrings;
5181+ while (bottom < top)
5182+ {
5183+ int cmp_val;
5184+
5185+ act = (bottom + top) / 2;
5186+ cmp_val = strcmp (msgid, (domain->data
5187+ + W (domain->must_swap,
5188+ domain->orig_tab[act].offset)));
5189+ if (cmp_val < 0)
5190+ top = act;
5191+ else if (cmp_val > 0)
5192+ bottom = act + 1;
5193+ else
5194+ goto found;
5195+ }
5196+ /* No translation was found. */
5197+ return NULL;
5198+ }
5199+
5200+ found:
5201+ /* The translation was found at index ACT. If we have to convert the
5202+ string to use a different character set, this is the time. */
5203+ if (act < nstrings)
5204+ {
5205+ result = (char *)
5206+ (domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
5207+ resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
5208+ }
5209+ else
5210+ {
5211+ result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
5212+ resultlen = domain->trans_sysdep_tab[act - nstrings].length;
5213+ }
5214+
5215+#if defined _LIBC || HAVE_ICONV
5216+ if (domain->codeset_cntr
5217+ != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
5218+ {
5219+ /* The domain's codeset has changed through bind_textdomain_codeset()
5220+ since the message catalog was initialized or last accessed. We
5221+ have to reinitialize the converter. */
5222+ _nl_free_domain_conv (domain);
5223+ _nl_init_domain_conv (domain_file, domain, domainbinding);
5224+ }
5225+
5226+ if (
5227+# ifdef _LIBC
5228+ domain->conv != (__gconv_t) -1
5229+# else
5230+# if HAVE_ICONV
5231+ domain->conv != (iconv_t) -1
5232+# endif
5233+# endif
5234+ )
5235+ {
5236+ /* We are supposed to do a conversion. First allocate an
5237+ appropriate table with the same structure as the table
5238+ of translations in the file, where we can put the pointers
5239+ to the converted strings in.
5240+ There is a slight complication with plural entries. They
5241+ are represented by consecutive NUL terminated strings. We
5242+ handle this case by converting RESULTLEN bytes, including
5243+ NULs. */
5244+
5245+ if (domain->conv_tab == NULL
5246+ && ((domain->conv_tab =
5247+ (char **) calloc (nstrings + domain->n_sysdep_strings,
5248+ sizeof (char *)))
5249+ == NULL))
5250+ /* Mark that we didn't succeed allocating a table. */
5251+ domain->conv_tab = (char **) -1;
5252+
5253+ if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
5254+ /* Nothing we can do, no more memory. */
5255+ goto converted;
5256+
5257+ if (domain->conv_tab[act] == NULL)
5258+ {
5259+ /* We haven't used this string so far, so it is not
5260+ translated yet. Do this now. */
5261+ /* We use a bit more efficient memory handling.
5262+ We allocate always larger blocks which get used over
5263+ time. This is faster than many small allocations. */
5264+ __libc_lock_define_initialized (static, lock)
5265+# define INITIAL_BLOCK_SIZE 4080
5266+ static unsigned char *freemem;
5267+ static size_t freemem_size;
5268+
5269+ const unsigned char *inbuf;
5270+ unsigned char *outbuf;
5271+ int malloc_count;
5272+# ifndef _LIBC
5273+ transmem_block_t *transmem_list = NULL;
5274+# endif
5275+
5276+ __libc_lock_lock (lock);
5277+
5278+ inbuf = (const unsigned char *) result;
5279+ outbuf = freemem + sizeof (size_t);
5280+
5281+ malloc_count = 0;
5282+ while (1)
5283+ {
5284+ transmem_block_t *newmem;
5285+# ifdef _LIBC
5286+ size_t non_reversible;
5287+ int res;
5288+
5289+ if (freemem_size < sizeof (size_t))
5290+ goto resize_freemem;
5291+
5292+ res = __gconv (domain->conv,
5293+ &inbuf, inbuf + resultlen,
5294+ &outbuf,
5295+ outbuf + freemem_size - sizeof (size_t),
5296+ &non_reversible);
5297+
5298+ if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
5299+ break;
5300+
5301+ if (res != __GCONV_FULL_OUTPUT)
5302+ {
5303+ __libc_lock_unlock (lock);
5304+ goto converted;
5305+ }
5306+
5307+ inbuf = result;
5308+# else
5309+# if HAVE_ICONV
5310+ const char *inptr = (const char *) inbuf;
5311+ size_t inleft = resultlen;
5312+ char *outptr = (char *) outbuf;
5313+ size_t outleft;
5314+
5315+ if (freemem_size < sizeof (size_t))
5316+ goto resize_freemem;
5317+
5318+ outleft = freemem_size - sizeof (size_t);
5319+ if (iconv (domain->conv,
5320+ (ICONV_CONST char **) &inptr, &inleft,
5321+ &outptr, &outleft)
5322+ != (size_t) (-1))
5323+ {
5324+ outbuf = (unsigned char *) outptr;
5325+ break;
5326+ }
5327+ if (errno != E2BIG)
5328+ {
5329+ __libc_lock_unlock (lock);
5330+ goto converted;
5331+ }
5332+# endif
5333+# endif
5334+
5335+ resize_freemem:
5336+ /* We must allocate a new buffer or resize the old one. */
5337+ if (malloc_count > 0)
5338+ {
5339+ ++malloc_count;
5340+ freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
5341+ newmem = (transmem_block_t *) realloc (transmem_list,
5342+ freemem_size);
5343+# ifdef _LIBC
5344+ if (newmem != NULL)
5345+ transmem_list = transmem_list->next;
5346+ else
5347+ {
5348+ struct transmem_list *old = transmem_list;
5349+
5350+ transmem_list = transmem_list->next;
5351+ free (old);
5352+ }
5353+# endif
5354+ }
5355+ else
5356+ {
5357+ malloc_count = 1;
5358+ freemem_size = INITIAL_BLOCK_SIZE;
5359+ newmem = (transmem_block_t *) malloc (freemem_size);
5360+ }
5361+ if (__builtin_expect (newmem == NULL, 0))
5362+ {
5363+ freemem = NULL;
5364+ freemem_size = 0;
5365+ __libc_lock_unlock (lock);
5366+ goto converted;
5367+ }
5368+
5369+# ifdef _LIBC
5370+ /* Add the block to the list of blocks we have to free
5371+ at some point. */
5372+ newmem->next = transmem_list;
5373+ transmem_list = newmem;
5374+
5375+ freemem = newmem->data;
5376+ freemem_size -= offsetof (struct transmem_list, data);
5377+# else
5378+ transmem_list = newmem;
5379+ freemem = newmem;
5380+# endif
5381+
5382+ outbuf = freemem + sizeof (size_t);
5383+ }
5384+
5385+ /* We have now in our buffer a converted string. Put this
5386+ into the table of conversions. */
5387+ *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
5388+ domain->conv_tab[act] = (char *) freemem;
5389+ /* Shrink freemem, but keep it aligned. */
5390+ freemem_size -= outbuf - freemem;
5391+ freemem = outbuf;
5392+ freemem += freemem_size & (alignof (size_t) - 1);
5393+ freemem_size = freemem_size & ~ (alignof (size_t) - 1);
5394+
5395+ __libc_lock_unlock (lock);
5396+ }
5397+
5398+ /* Now domain->conv_tab[act] contains the translation of all
5399+ the plural variants. */
5400+ result = domain->conv_tab[act] + sizeof (size_t);
5401+ resultlen = *(size_t *) domain->conv_tab[act];
5402+ }
5403+
5404+ converted:
5405+ /* The result string is converted. */
5406+
5407+#endif /* _LIBC || HAVE_ICONV */
5408+
5409+ *lengthp = resultlen;
5410+ return result;
5411+}
5412+
5413+
5414+/* Look up a plural variant. */
5415+static char *
5416+internal_function
5417+plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
5418+ const char *translation, size_t translation_len)
5419+{
5420+ struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
5421+ unsigned long int index;
5422+ const char *p;
5423+
5424+ index = plural_eval (domaindata->plural, n);
5425+ if (index >= domaindata->nplurals)
5426+ /* This should never happen. It means the plural expression and the
5427+ given maximum value do not match. */
5428+ index = 0;
5429+
5430+ /* Skip INDEX strings at TRANSLATION. */
5431+ p = translation;
5432+ while (index-- > 0)
5433+ {
5434+#ifdef _LIBC
5435+ p = __rawmemchr (p, '\0');
5436+#else
5437+ p = strchr (p, '\0');
5438+#endif
5439+ /* And skip over the NUL byte. */
5440+ p++;
5441+
5442+ if (p >= translation + translation_len)
5443+ /* This should never happen. It means the plural expression
5444+ evaluated to a value larger than the number of variants
5445+ available for MSGID1. */
5446+ return (char *) translation;
5447+ }
5448+ return (char *) p;
5449+}
5450+
5451+#ifndef _LIBC
5452+/* Return string representation of locale CATEGORY. */
5453+static const char *
5454+internal_function
5455+category_to_name (int category)
5456+{
5457+ const char *retval;
5458+
5459+ switch (category)
5460+ {
5461+#ifdef LC_COLLATE
5462+ case LC_COLLATE:
5463+ retval = "LC_COLLATE";
5464+ break;
5465+#endif
5466+#ifdef LC_CTYPE
5467+ case LC_CTYPE:
5468+ retval = "LC_CTYPE";
5469+ break;
5470+#endif
5471+#ifdef LC_MONETARY
5472+ case LC_MONETARY:
5473+ retval = "LC_MONETARY";
5474+ break;
5475+#endif
5476+#ifdef LC_NUMERIC
5477+ case LC_NUMERIC:
5478+ retval = "LC_NUMERIC";
5479+ break;
5480+#endif
5481+#ifdef LC_TIME
5482+ case LC_TIME:
5483+ retval = "LC_TIME";
5484+ break;
5485+#endif
5486+#ifdef LC_MESSAGES
5487+ case LC_MESSAGES:
5488+ retval = "LC_MESSAGES";
5489+ break;
5490+#endif
5491+#ifdef LC_RESPONSE
5492+ case LC_RESPONSE:
5493+ retval = "LC_RESPONSE";
5494+ break;
5495+#endif
5496+#ifdef LC_ALL
5497+ case LC_ALL:
5498+ /* This might not make sense but is perhaps better than any other
5499+ value. */
5500+ retval = "LC_ALL";
5501+ break;
5502+#endif
5503+ default:
5504+ /* If you have a better idea for a default value let me know. */
5505+ retval = "LC_XXX";
5506+ }
5507+
5508+ return retval;
5509+}
5510+#endif
5511+
5512+/* Guess value of current locale from value of the environment variables. */
5513+static const char *
5514+internal_function
5515+guess_category_value (int category, const char *categoryname)
5516+{
5517+ const char *language;
5518+ const char *retval;
5519+
5520+ /* The highest priority value is the `LANGUAGE' environment
5521+ variable. But we don't use the value if the currently selected
5522+ locale is the C locale. This is a GNU extension. */
5523+ language = getenv ("LANGUAGE");
5524+ if (language != NULL && language[0] == '\0')
5525+ language = NULL;
5526+
5527+ /* We have to proceed with the POSIX methods of looking to `LC_ALL',
5528+ `LC_xxx', and `LANG'. On some systems this can be done by the
5529+ `setlocale' function itself. */
5530+#ifdef _LIBC
5531+ retval = __current_locale_name (category);
5532+#else
5533+ retval = _nl_locale_name (category, categoryname);
5534+#endif
5535+
5536+ /* Ignore LANGUAGE if the locale is set to "C" because
5537+ 1. "C" locale usually uses the ASCII encoding, and most international
5538+ messages use non-ASCII characters. These characters get displayed
5539+ as question marks (if using glibc's iconv()) or as invalid 8-bit
5540+ characters (because other iconv()s refuse to convert most non-ASCII
5541+ characters to ASCII). In any case, the output is ugly.
5542+ 2. The precise output of some programs in the "C" locale is specified
5543+ by POSIX and should not depend on environment variables like
5544+ "LANGUAGE". We allow such programs to use gettext(). */
5545+ return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
5546+}
5547+
5548+/* @@ begin of epilog @@ */
5549+
5550+/* We don't want libintl.a to depend on any other library. So we
5551+ avoid the non-standard function stpcpy. In GNU C Library this
5552+ function is available, though. Also allow the symbol HAVE_STPCPY
5553+ to be defined. */
5554+#if !_LIBC && !HAVE_STPCPY
5555+static char *
5556+stpcpy (char *dest, const char *src)
5557+{
5558+ while ((*dest++ = *src++) != '\0')
5559+ /* Do nothing. */ ;
5560+ return dest - 1;
5561+}
5562+#endif
5563+
5564+#if !_LIBC && !HAVE_MEMPCPY
5565+static void *
5566+mempcpy (void *dest, const void *src, size_t n)
5567+{
5568+ return (void *) ((char *) memcpy (dest, src, n) + n);
5569+}
5570+#endif
5571+
5572+
5573+#ifdef _LIBC
5574+/* If we want to free all resources we have to do some work at
5575+ program's end. */
5576+libc_freeres_fn (free_mem)
5577+{
5578+ void *old;
5579+
5580+ while (_nl_domain_bindings != NULL)
5581+ {
5582+ struct binding *oldp = _nl_domain_bindings;
5583+ _nl_domain_bindings = _nl_domain_bindings->next;
5584+ if (oldp->dirname != INTUSE(_nl_default_dirname))
5585+ /* Yes, this is a pointer comparison. */
5586+ free (oldp->dirname);
5587+ free (oldp->codeset);
5588+ free (oldp);
5589+ }
5590+
5591+ if (_nl_current_default_domain != _nl_default_default_domain)
5592+ /* Yes, again a pointer comparison. */
5593+ free ((char *) _nl_current_default_domain);
5594+
5595+ /* Remove the search tree with the known translations. */
5596+ __tdestroy (root, free);
5597+ root = NULL;
5598+
5599+ while (transmem_list != NULL)
5600+ {
5601+ old = transmem_list;
5602+ transmem_list = transmem_list->next;
5603+ free (old);
5604+ }
5605+}
5606+#endif
5607--- lrzsz-0.12.20.safe/intl/dcngettext.c 1969-12-31 19:00:00.000000000 -0500
5608+++ lrzsz-0.12.20/intl/dcngettext.c 2004-09-12 14:40:34.375745048 -0400
5609@@ -0,0 +1,57 @@
5610+/* Implementation of the dcngettext(3) function.
5611+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
5612+
5613+ This program is free software; you can redistribute it and/or modify it
5614+ under the terms of the GNU Library General Public License as published
5615+ by the Free Software Foundation; either version 2, or (at your option)
5616+ any later version.
5617+
5618+ This program is distributed in the hope that it will be useful,
5619+ but WITHOUT ANY WARRANTY; without even the implied warranty of
5620+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5621+ Library General Public License for more details.
5622+
5623+ You should have received a copy of the GNU Library General Public
5624+ License along with this program; if not, write to the Free Software
5625+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
5626+ USA. */
5627+
5628+#ifdef HAVE_CONFIG_H
5629+# include <config.h>
5630+#endif
5631+
5632+#include "gettextP.h"
5633+#ifdef _LIBC
5634+# include <libintl.h>
5635+#else
5636+# include "libgnuintl.h"
5637+#endif
5638+
5639+/* @@ end of prolog @@ */
5640+
5641+/* Names for the libintl functions are a problem. They must not clash
5642+ with existing names and they should follow ANSI C. But this source
5643+ code is also used in GNU C Library where the names have a __
5644+ prefix. So we have to make a difference here. */
5645+#ifdef _LIBC
5646+# define DCNGETTEXT __dcngettext
5647+# define DCIGETTEXT __dcigettext
5648+#else
5649+# define DCNGETTEXT libintl_dcngettext
5650+# define DCIGETTEXT libintl_dcigettext
5651+#endif
5652+
5653+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
5654+ locale. */
5655+char *
5656+DCNGETTEXT (const char *domainname,
5657+ const char *msgid1, const char *msgid2, unsigned long int n,
5658+ int category)
5659+{
5660+ return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
5661+}
5662+
5663+#ifdef _LIBC
5664+/* Alias for function name in GNU C Library. */
5665+weak_alias (__dcngettext, dcngettext);
5666+#endif
5667--- lrzsz-0.12.20.safe/intl/dgettext.c 1998-04-26 09:20:52.000000000 -0400
5668+++ lrzsz-0.12.20/intl/dgettext.c 2004-09-12 14:40:34.380744288 -0400
5669@@ -1,32 +1,33 @@
5670-/* dgettext.c -- implementation of the dgettext(3) function
5671- Copyright (C) 1995 Software Foundation, Inc.
5672+/* Implementation of the dgettext(3) function.
5673+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
5674
5675-This program is free software; you can redistribute it and/or modify
5676-it under the terms of the GNU General Public License as published by
5677-the Free Software Foundation; either version 2, or (at your option)
5678-any later version.
5679+ This program is free software; you can redistribute it and/or modify it
5680+ under the terms of the GNU Library General Public License as published
5681+ by the Free Software Foundation; either version 2, or (at your option)
5682+ any later version.
5683
5684-This program is distributed in the hope that it will be useful,
5685-but WITHOUT ANY WARRANTY; without even the implied warranty of
5686-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5687-GNU General Public License for more details.
5688+ This program is distributed in the hope that it will be useful,
5689+ but WITHOUT ANY WARRANTY; without even the implied warranty of
5690+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5691+ Library General Public License for more details.
5692
5693-You should have received a copy of the GNU General Public License
5694-along with this program; if not, write to the Free Software
5695-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
5696+ You should have received a copy of the GNU Library General Public
5697+ License along with this program; if not, write to the Free Software
5698+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
5699+ USA. */
5700
5701 #ifdef HAVE_CONFIG_H
5702 # include <config.h>
5703 #endif
5704
5705-#if defined HAVE_LOCALE_H || defined _LIBC
5706-# include <locale.h>
5707-#endif
5708+#include "gettextP.h"
5709+
5710+#include <locale.h>
5711
5712 #ifdef _LIBC
5713 # include <libintl.h>
5714 #else
5715-# include "libgettext.h"
5716+# include "libgnuintl.h"
5717 #endif
5718
5719 /* @@ end of prolog @@ */
5720@@ -37,18 +38,16 @@
5721 prefix. So we have to make a difference here. */
5722 #ifdef _LIBC
5723 # define DGETTEXT __dgettext
5724-# define DCGETTEXT __dcgettext
5725+# define DCGETTEXT INTUSE(__dcgettext)
5726 #else
5727-# define DGETTEXT dgettext__
5728-# define DCGETTEXT dcgettext__
5729+# define DGETTEXT libintl_dgettext
5730+# define DCGETTEXT libintl_dcgettext
5731 #endif
5732
5733 /* Look up MSGID in the DOMAINNAME message catalog of the current
5734 LC_MESSAGES locale. */
5735 char *
5736-DGETTEXT (domainname, msgid)
5737- const char *domainname;
5738- const char *msgid;
5739+DGETTEXT (const char *domainname, const char *msgid)
5740 {
5741 return DCGETTEXT (domainname, msgid, LC_MESSAGES);
5742 }
5743--- lrzsz-0.12.20.safe/intl/dngettext.c 1969-12-31 19:00:00.000000000 -0500
5744+++ lrzsz-0.12.20/intl/dngettext.c 2004-09-12 14:40:34.385743528 -0400
5745@@ -0,0 +1,59 @@
5746+/* Implementation of the dngettext(3) function.
5747+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
5748+
5749+ This program is free software; you can redistribute it and/or modify it
5750+ under the terms of the GNU Library General Public License as published
5751+ by the Free Software Foundation; either version 2, or (at your option)
5752+ any later version.
5753+
5754+ This program is distributed in the hope that it will be useful,
5755+ but WITHOUT ANY WARRANTY; without even the implied warranty of
5756+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5757+ Library General Public License for more details.
5758+
5759+ You should have received a copy of the GNU Library General Public
5760+ License along with this program; if not, write to the Free Software
5761+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
5762+ USA. */
5763+
5764+#ifdef HAVE_CONFIG_H
5765+# include <config.h>
5766+#endif
5767+
5768+#include "gettextP.h"
5769+
5770+#include <locale.h>
5771+
5772+#ifdef _LIBC
5773+# include <libintl.h>
5774+#else
5775+# include "libgnuintl.h"
5776+#endif
5777+
5778+/* @@ end of prolog @@ */
5779+
5780+/* Names for the libintl functions are a problem. They must not clash
5781+ with existing names and they should follow ANSI C. But this source
5782+ code is also used in GNU C Library where the names have a __
5783+ prefix. So we have to make a difference here. */
5784+#ifdef _LIBC
5785+# define DNGETTEXT __dngettext
5786+# define DCNGETTEXT __dcngettext
5787+#else
5788+# define DNGETTEXT libintl_dngettext
5789+# define DCNGETTEXT libintl_dcngettext
5790+#endif
5791+
5792+/* Look up MSGID in the DOMAINNAME message catalog of the current
5793+ LC_MESSAGES locale and skip message according to the plural form. */
5794+char *
5795+DNGETTEXT (const char *domainname,
5796+ const char *msgid1, const char *msgid2, unsigned long int n)
5797+{
5798+ return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
5799+}
5800+
5801+#ifdef _LIBC
5802+/* Alias for function name in GNU C Library. */
5803+weak_alias (__dngettext, dngettext);
5804+#endif
5805--- lrzsz-0.12.20.safe/intl/eval-plural.h 1969-12-31 19:00:00.000000000 -0500
5806+++ lrzsz-0.12.20/intl/eval-plural.h 2004-09-12 14:40:34.390742768 -0400
5807@@ -0,0 +1,108 @@
5808+/* Plural expression evaluation.
5809+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
5810+
5811+ This program is free software; you can redistribute it and/or modify it
5812+ under the terms of the GNU Library General Public License as published
5813+ by the Free Software Foundation; either version 2, or (at your option)
5814+ any later version.
5815+
5816+ This program is distributed in the hope that it will be useful,
5817+ but WITHOUT ANY WARRANTY; without even the implied warranty of
5818+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5819+ Library General Public License for more details.
5820+
5821+ You should have received a copy of the GNU Library General Public
5822+ License along with this program; if not, write to the Free Software
5823+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
5824+ USA. */
5825+
5826+#ifndef STATIC
5827+#define STATIC static
5828+#endif
5829+
5830+/* Evaluate the plural expression and return an index value. */
5831+STATIC
5832+unsigned long int
5833+internal_function
5834+plural_eval (struct expression *pexp, unsigned long int n)
5835+{
5836+ switch (pexp->nargs)
5837+ {
5838+ case 0:
5839+ switch (pexp->operation)
5840+ {
5841+ case var:
5842+ return n;
5843+ case num:
5844+ return pexp->val.num;
5845+ default:
5846+ break;
5847+ }
5848+ /* NOTREACHED */
5849+ break;
5850+ case 1:
5851+ {
5852+ /* pexp->operation must be lnot. */
5853+ unsigned long int arg = plural_eval (pexp->val.args[0], n);
5854+ return ! arg;
5855+ }
5856+ case 2:
5857+ {
5858+ unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
5859+ if (pexp->operation == lor)
5860+ return leftarg || plural_eval (pexp->val.args[1], n);
5861+ else if (pexp->operation == land)
5862+ return leftarg && plural_eval (pexp->val.args[1], n);
5863+ else
5864+ {
5865+ unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
5866+
5867+ switch (pexp->operation)
5868+ {
5869+ case mult:
5870+ return leftarg * rightarg;
5871+ case divide:
5872+#if !INTDIV0_RAISES_SIGFPE
5873+ if (rightarg == 0)
5874+ raise (SIGFPE);
5875+#endif
5876+ return leftarg / rightarg;
5877+ case module:
5878+#if !INTDIV0_RAISES_SIGFPE
5879+ if (rightarg == 0)
5880+ raise (SIGFPE);
5881+#endif
5882+ return leftarg % rightarg;
5883+ case plus:
5884+ return leftarg + rightarg;
5885+ case minus:
5886+ return leftarg - rightarg;
5887+ case less_than:
5888+ return leftarg < rightarg;
5889+ case greater_than:
5890+ return leftarg > rightarg;
5891+ case less_or_equal:
5892+ return leftarg <= rightarg;
5893+ case greater_or_equal:
5894+ return leftarg >= rightarg;
5895+ case equal:
5896+ return leftarg == rightarg;
5897+ case not_equal:
5898+ return leftarg != rightarg;
5899+ default:
5900+ break;
5901+ }
5902+ }
5903+ /* NOTREACHED */
5904+ break;
5905+ }
5906+ case 3:
5907+ {
5908+ /* pexp->operation must be qmop. */
5909+ unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
5910+ return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
5911+ }
5912+ }
5913+ /* NOTREACHED */
5914+ return 0;
5915+}
5916--- lrzsz-0.12.20.safe/intl/explodename.c 1998-04-26 09:22:37.000000000 -0400
5917+++ lrzsz-0.12.20/intl/explodename.c 2004-09-12 14:40:34.395742008 -0400
5918@@ -1,19 +1,20 @@
5919-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
5920+/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
5921 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
5922
5923- This program is free software; you can redistribute it and/or modify
5924- it under the terms of the GNU General Public License as published by
5925- the Free Software Foundation; either version 2, or (at your option)
5926+ This program is free software; you can redistribute it and/or modify it
5927+ under the terms of the GNU Library General Public License as published
5928+ by the Free Software Foundation; either version 2, or (at your option)
5929 any later version.
5930
5931 This program is distributed in the hope that it will be useful,
5932 but WITHOUT ANY WARRANTY; without even the implied warranty of
5933- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5934- GNU General Public License for more details.
5935+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5936+ Library General Public License for more details.
5937
5938- You should have received a copy of the GNU General Public License
5939- along with this program; if not, write to the Free Software Foundation,
5940- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
5941+ You should have received a copy of the GNU Library General Public
5942+ License along with this program; if not, write to the Free Software
5943+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
5944+ USA. */
5945
5946 #ifdef HAVE_CONFIG_H
5947 # include <config.h>
5948@@ -36,18 +37,23 @@
5949
5950 /* @@ end of prolog @@ */
5951
5952+char *
5953+_nl_find_language (const char *name)
5954+{
5955+ while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
5956+ && name[0] != '+' && name[0] != ',')
5957+ ++name;
5958+
5959+ return (char *) name;
5960+}
5961+
5962+
5963 int
5964-_nl_explode_name (name, language, modifier, territory, codeset,
5965- normalized_codeset, special, sponsor, revision)
5966- char *name;
5967- const char **language;
5968- const char **modifier;
5969- const char **territory;
5970- const char **codeset;
5971- const char **normalized_codeset;
5972- const char **special;
5973- const char **sponsor;
5974- const char **revision;
5975+_nl_explode_name (char *name,
5976+ const char **language, const char **modifier,
5977+ const char **territory, const char **codeset,
5978+ const char **normalized_codeset, const char **special,
5979+ const char **sponsor, const char **revision)
5980 {
5981 enum { undecided, xpg, cen } syntax;
5982 char *cp;
5983@@ -67,9 +73,7 @@
5984 mask = 0;
5985 syntax = undecided;
5986 *language = cp = name;
5987- while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
5988- && cp[0] != '+' && cp[0] != ',')
5989- ++cp;
5990+ cp = _nl_find_language (*language);
5991
5992 if (*language == cp)
5993 /* This does not make sense: language has to be specified. Use
5994--- lrzsz-0.12.20.safe/intl/finddomain.c 1998-04-26 09:22:36.000000000 -0400
5995+++ lrzsz-0.12.20/intl/finddomain.c 2004-09-12 14:40:34.415738968 -0400
5996@@ -1,64 +1,40 @@
5997 /* Handle list of needed message catalogs
5998- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
5999- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
6000+ Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
6001+ Written by Ulrich Drepper <drepper@gnu.org>, 1995.
6002
6003- This program is free software; you can redistribute it and/or modify
6004- it under the terms of the GNU General Public License as published by
6005- the Free Software Foundation; either version 2, or (at your option)
6006+ This program is free software; you can redistribute it and/or modify it
6007+ under the terms of the GNU Library General Public License as published
6008+ by the Free Software Foundation; either version 2, or (at your option)
6009 any later version.
6010
6011 This program is distributed in the hope that it will be useful,
6012 but WITHOUT ANY WARRANTY; without even the implied warranty of
6013- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6014- GNU General Public License for more details.
6015+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6016+ Library General Public License for more details.
6017
6018- You should have received a copy of the GNU General Public License
6019- along with this program; if not, write to the Free Software Foundation,
6020- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
6021+ You should have received a copy of the GNU Library General Public
6022+ License along with this program; if not, write to the Free Software
6023+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6024+ USA. */
6025
6026 #ifdef HAVE_CONFIG_H
6027 # include <config.h>
6028 #endif
6029
6030-#include <ctype.h>
6031-#include <errno.h>
6032 #include <stdio.h>
6033 #include <sys/types.h>
6034-
6035-#if defined STDC_HEADERS || defined _LIBC
6036-# include <stdlib.h>
6037-#else
6038-# ifdef HAVE_MALLOC_H
6039-# include <malloc.h>
6040-# else
6041-void free ();
6042-# endif
6043-#endif
6044-
6045-#if defined HAVE_STRING_H || defined _LIBC
6046-# include <string.h>
6047-#else
6048-# include <strings.h>
6049-# ifndef memcpy
6050-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
6051-# endif
6052-#endif
6053-#if !HAVE_STRCHR && !defined _LIBC
6054-# ifndef strchr
6055-# define strchr index
6056-# endif
6057-#endif
6058+#include <stdlib.h>
6059+#include <string.h>
6060
6061 #if defined HAVE_UNISTD_H || defined _LIBC
6062 # include <unistd.h>
6063 #endif
6064
6065-#include "gettext.h"
6066 #include "gettextP.h"
6067 #ifdef _LIBC
6068 # include <libintl.h>
6069 #else
6070-# include "libgettext.h"
6071+# include "libgnuintl.h"
6072 #endif
6073
6074 /* @@ end of prolog @@ */
6075@@ -70,10 +46,9 @@
6076 the DOMAINNAME and CATEGORY parameters with respect to the currently
6077 established bindings. */
6078 struct loaded_l10nfile *
6079-_nl_find_domain (dirname, locale, domainname)
6080- const char *dirname;
6081- char *locale;
6082- const char *domainname;
6083+internal_function
6084+_nl_find_domain (const char *dirname, char *locale,
6085+ const char *domainname, struct binding *domainbinding)
6086 {
6087 struct loaded_l10nfile *retval;
6088 const char *language;
6089@@ -95,9 +70,9 @@
6090
6091 language[_territory][+audience][+special][,[sponsor][_revision]]
6092
6093- Beside the first all of them are allowed to be missing. If the
6094- full specified locale is not found, the less specific one are
6095- looked for. The various part will be stripped of according to
6096+ Beside the first part all of them are allowed to be missing. If
6097+ the full specified locale is not found, the less specific one are
6098+ looked for. The various parts will be stripped off according to
6099 the following order:
6100 (1) revision
6101 (2) sponsor
6102@@ -119,7 +94,7 @@
6103 int cnt;
6104
6105 if (retval->decided == 0)
6106- _nl_load_domain (retval);
6107+ _nl_load_domain (retval, domainbinding);
6108
6109 if (retval->data != NULL)
6110 return retval;
6111@@ -127,7 +102,7 @@
6112 for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
6113 {
6114 if (retval->successor[cnt]->decided == 0)
6115- _nl_load_domain (retval->successor[cnt]);
6116+ _nl_load_domain (retval->successor[cnt], domainbinding);
6117
6118 if (retval->successor[cnt]->data != NULL)
6119 break;
6120@@ -142,12 +117,18 @@
6121 alias_value = _nl_expand_alias (locale);
6122 if (alias_value != NULL)
6123 {
6124+#if defined _LIBC || defined HAVE_STRDUP
6125+ locale = strdup (alias_value);
6126+ if (locale == NULL)
6127+ return NULL;
6128+#else
6129 size_t len = strlen (alias_value) + 1;
6130 locale = (char *) malloc (len);
6131 if (locale == NULL)
6132 return NULL;
6133
6134 memcpy (locale, alias_value, len);
6135+#endif
6136 }
6137
6138 /* Now we determine the single parts of the locale name. First
6139@@ -168,14 +149,14 @@
6140 return NULL;
6141
6142 if (retval->decided == 0)
6143- _nl_load_domain (retval);
6144+ _nl_load_domain (retval, domainbinding);
6145 if (retval->data == NULL)
6146 {
6147 int cnt;
6148 for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
6149 {
6150 if (retval->successor[cnt]->decided == 0)
6151- _nl_load_domain (retval->successor[cnt]);
6152+ _nl_load_domain (retval->successor[cnt], domainbinding);
6153 if (retval->successor[cnt]->data != NULL)
6154 break;
6155 }
6156@@ -185,5 +166,27 @@
6157 if (alias_value != NULL)
6158 free (locale);
6159
6160+ /* The space for normalized_codeset is dynamically allocated. Free it. */
6161+ if (mask & XPG_NORM_CODESET)
6162+ free ((void *) normalized_codeset);
6163+
6164 return retval;
6165 }
6166+
6167+
6168+#ifdef _LIBC
6169+libc_freeres_fn (free_mem)
6170+{
6171+ struct loaded_l10nfile *runp = _nl_loaded_domains;
6172+
6173+ while (runp != NULL)
6174+ {
6175+ struct loaded_l10nfile *here = runp;
6176+ if (runp->data != NULL)
6177+ _nl_unload_domain ((struct loaded_domain *) runp->data);
6178+ runp = runp->next;
6179+ free ((char *) here->filename);
6180+ free (here);
6181+ }
6182+}
6183+#endif
6184--- lrzsz-0.12.20.safe/intl/gettext.c 1998-04-26 09:22:36.000000000 -0400
6185+++ lrzsz-0.12.20/intl/gettext.c 2004-09-12 14:40:34.420738208 -0400
6186@@ -1,19 +1,20 @@
6187-/* Implementation of gettext(3) function
6188- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
6189+/* Implementation of gettext(3) function.
6190+ Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
6191
6192- This program is free software; you can redistribute it and/or modify
6193- it under the terms of the GNU General Public License as published by
6194- the Free Software Foundation; either version 2, or (at your option)
6195+ This program is free software; you can redistribute it and/or modify it
6196+ under the terms of the GNU Library General Public License as published
6197+ by the Free Software Foundation; either version 2, or (at your option)
6198 any later version.
6199
6200 This program is distributed in the hope that it will be useful,
6201 but WITHOUT ANY WARRANTY; without even the implied warranty of
6202- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6203- GNU General Public License for more details.
6204+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6205+ Library General Public License for more details.
6206
6207- You should have received a copy of the GNU General Public License
6208- along with this program; if not, write to the Free Software Foundation,
6209- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
6210+ You should have received a copy of the GNU Library General Public
6211+ License along with this program; if not, write to the Free Software
6212+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6213+ USA. */
6214
6215 #ifdef HAVE_CONFIG_H
6216 # include <config.h>
6217@@ -23,21 +24,14 @@
6218 # define __need_NULL
6219 # include <stddef.h>
6220 #else
6221-# ifdef STDC_HEADERS
6222-# include <stdlib.h> /* Just for NULL. */
6223-# else
6224-# ifdef HAVE_STRING_H
6225-# include <string.h>
6226-# else
6227-# define NULL ((void *) 0)
6228-# endif
6229-# endif
6230+# include <stdlib.h> /* Just for NULL. */
6231 #endif
6232
6233+#include "gettextP.h"
6234 #ifdef _LIBC
6235 # include <libintl.h>
6236 #else
6237-# include "libgettext.h"
6238+# include "libgnuintl.h"
6239 #endif
6240
6241 /* @@ end of prolog @@ */
6242@@ -48,20 +42,19 @@
6243 prefix. So we have to make a difference here. */
6244 #ifdef _LIBC
6245 # define GETTEXT __gettext
6246-# define DGETTEXT __dgettext
6247+# define DCGETTEXT INTUSE(__dcgettext)
6248 #else
6249-# define GETTEXT gettext__
6250-# define DGETTEXT dgettext__
6251+# define GETTEXT libintl_gettext
6252+# define DCGETTEXT libintl_dcgettext
6253 #endif
6254
6255 /* Look up MSGID in the current default message catalog for the current
6256 LC_MESSAGES locale. If not found, returns MSGID itself (the default
6257 text). */
6258 char *
6259-GETTEXT (msgid)
6260- const char *msgid;
6261+GETTEXT (const char *msgid)
6262 {
6263- return DGETTEXT (NULL, msgid);
6264+ return DCGETTEXT (NULL, msgid, LC_MESSAGES);
6265 }
6266
6267 #ifdef _LIBC
6268--- lrzsz-0.12.20.safe/intl/gettext.h 1998-04-26 09:22:35.000000000 -0400
6269+++ lrzsz-0.12.20/intl/gettext.h 1969-12-31 19:00:00.000000000 -0500
6270@@ -1,105 +0,0 @@
6271-/* Internal header for GNU gettext internationalization functions
6272- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
6273-
6274- This program is free software; you can redistribute it and/or modify
6275- it under the terms of the GNU General Public License as published by
6276- the Free Software Foundation; either version 2, or (at your option)
6277- any later version.
6278-
6279- This program is distributed in the hope that it will be useful,
6280- but WITHOUT ANY WARRANTY; without even the implied warranty of
6281- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6282- GNU General Public License for more details.
6283-
6284- You should have received a copy of the GNU Library General Public
6285- License along with the GNU C Library; see the file COPYING.LIB. If not,
6286- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
6287- Boston, MA 02111-1307, USA. */
6288-
6289-#ifndef _GETTEXT_H
6290-#define _GETTEXT_H 1
6291-
6292-#include <stdio.h>
6293-
6294-#if HAVE_LIMITS_H || _LIBC
6295-# include <limits.h>
6296-#endif
6297-
6298-/* @@ end of prolog @@ */
6299-
6300-/* The magic number of the GNU message catalog format. */
6301-#define _MAGIC 0x950412de
6302-#define _MAGIC_SWAPPED 0xde120495
6303-
6304-/* Revision number of the currently used .mo (binary) file format. */
6305-#define MO_REVISION_NUMBER 0
6306-
6307-/* The following contortions are an attempt to use the C preprocessor
6308- to determine an unsigned integral type that is 32 bits wide. An
6309- alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
6310- doing that would require that the configure script compile and *run*
6311- the resulting executable. Locally running cross-compiled executables
6312- is usually not possible. */
6313-
6314-#if __STDC__
6315-# define UINT_MAX_32_BITS 4294967295U
6316-#else
6317-# define UINT_MAX_32_BITS 0xFFFFFFFF
6318-#endif
6319-
6320-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
6321- This should be valid for all systems GNU cares about because
6322- that doesn't include 16-bit systems, and only modern systems
6323- (that certainly have <limits.h>) have 64+-bit integral types. */
6324-
6325-#ifndef UINT_MAX
6326-# define UINT_MAX UINT_MAX_32_BITS
6327-#endif
6328-
6329-#if UINT_MAX == UINT_MAX_32_BITS
6330-typedef unsigned nls_uint32;
6331-#else
6332-# if USHRT_MAX == UINT_MAX_32_BITS
6333-typedef unsigned short nls_uint32;
6334-# else
6335-# if ULONG_MAX == UINT_MAX_32_BITS
6336-typedef unsigned long nls_uint32;
6337-# else
6338- /* The following line is intended to throw an error. Using #error is
6339- not portable enough. */
6340- "Cannot determine unsigned 32-bit data type."
6341-# endif
6342-# endif
6343-#endif
6344-
6345-
6346-/* Header for binary .mo file format. */
6347-struct mo_file_header
6348-{
6349- /* The magic number. */
6350- nls_uint32 magic;
6351- /* The revision number of the file format. */
6352- nls_uint32 revision;
6353- /* The number of strings pairs. */
6354- nls_uint32 nstrings;
6355- /* Offset of table with start offsets of original strings. */
6356- nls_uint32 orig_tab_offset;
6357- /* Offset of table with start offsets of translation strings. */
6358- nls_uint32 trans_tab_offset;
6359- /* Size of hashing table. */
6360- nls_uint32 hash_tab_size;
6361- /* Offset of first hashing entry. */
6362- nls_uint32 hash_tab_offset;
6363-};
6364-
6365-struct string_desc
6366-{
6367- /* Length of addressed string. */
6368- nls_uint32 length;
6369- /* Offset of string in file. */
6370- nls_uint32 offset;
6371-};
6372-
6373-/* @@ begin of epilog @@ */
6374-
6375-#endif /* gettext.h */
6376--- lrzsz-0.12.20.safe/intl/gettextP.h 1998-04-26 09:22:35.000000000 -0400
6377+++ lrzsz-0.12.20/intl/gettextP.h 2004-09-12 14:40:34.426737296 -0400
6378@@ -1,33 +1,53 @@
6379-/* Header describing internals of gettext library
6380- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
6381+/* Header describing internals of libintl library.
6382+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
6383+ Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
6384
6385- This program is free software; you can redistribute it and/or modify
6386- it under the terms of the GNU General Public License as published by
6387- the Free Software Foundation; either version 2, or (at your option)
6388+ This program is free software; you can redistribute it and/or modify it
6389+ under the terms of the GNU Library General Public License as published
6390+ by the Free Software Foundation; either version 2, or (at your option)
6391 any later version.
6392
6393 This program is distributed in the hope that it will be useful,
6394 but WITHOUT ANY WARRANTY; without even the implied warranty of
6395- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6396- GNU General Public License for more details.
6397+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6398+ Library General Public License for more details.
6399
6400- You should have received a copy of the GNU General Public License
6401- along with this program; if not, write to the Free Software Foundation,
6402- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
6403+ You should have received a copy of the GNU Library General Public
6404+ License along with this program; if not, write to the Free Software
6405+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6406+ USA. */
6407
6408 #ifndef _GETTEXTP_H
6409 #define _GETTEXTP_H
6410
6411+#include <stddef.h> /* Get size_t. */
6412+
6413+#ifdef _LIBC
6414+# include "../iconv/gconv_int.h"
6415+#else
6416+# if HAVE_ICONV
6417+# include <iconv.h>
6418+# endif
6419+#endif
6420+
6421 #include "loadinfo.h"
6422
6423+#include "gmo.h" /* Get nls_uint32. */
6424+
6425 /* @@ end of prolog @@ */
6426
6427-#ifndef PARAMS
6428-# if __STDC__
6429-# define PARAMS(args) args
6430-# else
6431-# define PARAMS(args) ()
6432-# endif
6433+#ifndef internal_function
6434+# define internal_function
6435+#endif
6436+
6437+#ifndef attribute_hidden
6438+# define attribute_hidden
6439+#endif
6440+
6441+/* Tell the compiler when a conditional or integer expression is
6442+ almost always true or almost always false. */
6443+#ifndef HAVE_BUILTIN_EXPECT
6444+# define __builtin_expect(expr, val) (expr)
6445 #endif
6446
6447 #ifndef W
6448@@ -35,38 +55,160 @@
6449 #endif
6450
6451
6452-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
6453-
6454+#ifdef _LIBC
6455+# include <byteswap.h>
6456+# define SWAP(i) bswap_32 (i)
6457+#else
6458 static inline nls_uint32
6459 SWAP (i)
6460 nls_uint32 i;
6461 {
6462 return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
6463 }
6464+#endif
6465+
6466
6467+/* In-memory representation of system dependent string. */
6468+struct sysdep_string_desc
6469+{
6470+ /* Length of addressed string, including the trailing NUL. */
6471+ size_t length;
6472+ /* Pointer to addressed string. */
6473+ const char *pointer;
6474+};
6475
6476+/* The representation of an opened message catalog. */
6477 struct loaded_domain
6478 {
6479+ /* Pointer to memory containing the .mo file. */
6480 const char *data;
6481+ /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */
6482+ int use_mmap;
6483+ /* Size of mmap()ed memory. */
6484+ size_t mmap_size;
6485+ /* 1 if the .mo file uses a different endianness than this machine. */
6486 int must_swap;
6487+ /* Pointer to additional malloc()ed memory. */
6488+ void *malloced;
6489+
6490+ /* Number of static strings pairs. */
6491 nls_uint32 nstrings;
6492- struct string_desc *orig_tab;
6493- struct string_desc *trans_tab;
6494+ /* Pointer to descriptors of original strings in the file. */
6495+ const struct string_desc *orig_tab;
6496+ /* Pointer to descriptors of translated strings in the file. */
6497+ const struct string_desc *trans_tab;
6498+
6499+ /* Number of system dependent strings pairs. */
6500+ nls_uint32 n_sysdep_strings;
6501+ /* Pointer to descriptors of original sysdep strings. */
6502+ const struct sysdep_string_desc *orig_sysdep_tab;
6503+ /* Pointer to descriptors of translated sysdep strings. */
6504+ const struct sysdep_string_desc *trans_sysdep_tab;
6505+
6506+ /* Size of hash table. */
6507 nls_uint32 hash_size;
6508- nls_uint32 *hash_tab;
6509+ /* Pointer to hash table. */
6510+ const nls_uint32 *hash_tab;
6511+ /* 1 if the hash table uses a different endianness than this machine. */
6512+ int must_swap_hash_tab;
6513+
6514+ int codeset_cntr;
6515+#ifdef _LIBC
6516+ __gconv_t conv;
6517+#else
6518+# if HAVE_ICONV
6519+ iconv_t conv;
6520+# endif
6521+#endif
6522+ char **conv_tab;
6523+
6524+ struct expression *plural;
6525+ unsigned long int nplurals;
6526 };
6527
6528+/* We want to allocate a string at the end of the struct. But ISO C
6529+ doesn't allow zero sized arrays. */
6530+#ifdef __GNUC__
6531+# define ZERO 0
6532+#else
6533+# define ZERO 1
6534+#endif
6535+
6536+/* A set of settings bound to a message domain. Used to store settings
6537+ from bindtextdomain() and bind_textdomain_codeset(). */
6538 struct binding
6539 {
6540 struct binding *next;
6541- char *domainname;
6542 char *dirname;
6543+ int codeset_cntr; /* Incremented each time codeset changes. */
6544+ char *codeset;
6545+ char domainname[ZERO];
6546 };
6547
6548-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
6549- char *__locale,
6550- const char *__domainname));
6551-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain));
6552+/* A counter which is incremented each time some previous translations
6553+ become invalid.
6554+ This variable is part of the external ABI of the GNU libintl. */
6555+extern int _nl_msg_cat_cntr;
6556+
6557+#ifndef _LIBC
6558+const char *_nl_locale_name (int category, const char *categoryname);
6559+#endif
6560+
6561+struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
6562+ const char *__domainname,
6563+ struct binding *__domainbinding)
6564+ internal_function;
6565+void _nl_load_domain (struct loaded_l10nfile *__domain,
6566+ struct binding *__domainbinding)
6567+ internal_function;
6568+void _nl_unload_domain (struct loaded_domain *__domain)
6569+ internal_function;
6570+const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
6571+ struct loaded_domain *__domain,
6572+ struct binding *__domainbinding)
6573+ internal_function;
6574+void _nl_free_domain_conv (struct loaded_domain *__domain)
6575+ internal_function;
6576+
6577+char *_nl_find_msg (struct loaded_l10nfile *domain_file,
6578+ struct binding *domainbinding, const char *msgid,
6579+ size_t *lengthp)
6580+ internal_function;
6581+
6582+#ifdef _LIBC
6583+extern char *__gettext (const char *__msgid);
6584+extern char *__dgettext (const char *__domainname, const char *__msgid);
6585+extern char *__dcgettext (const char *__domainname, const char *__msgid,
6586+ int __category);
6587+extern char *__ngettext (const char *__msgid1, const char *__msgid2,
6588+ unsigned long int __n);
6589+extern char *__dngettext (const char *__domainname,
6590+ const char *__msgid1, const char *__msgid2,
6591+ unsigned long int n);
6592+extern char *__dcngettext (const char *__domainname,
6593+ const char *__msgid1, const char *__msgid2,
6594+ unsigned long int __n, int __category);
6595+extern char *__dcigettext (const char *__domainname,
6596+ const char *__msgid1, const char *__msgid2,
6597+ int __plural, unsigned long int __n,
6598+ int __category);
6599+extern char *__textdomain (const char *__domainname);
6600+extern char *__bindtextdomain (const char *__domainname,
6601+ const char *__dirname);
6602+extern char *__bind_textdomain_codeset (const char *__domainname,
6603+ const char *__codeset);
6604+#else
6605+/* Declare the exported libintl_* functions, in a way that allows us to
6606+ call them under their real name. */
6607+# undef _INTL_REDIRECT_INLINE
6608+# undef _INTL_REDIRECT_MACROS
6609+# define _INTL_REDIRECT_MACROS
6610+# include "libgnuintl.h"
6611+extern char *libintl_dcigettext (const char *__domainname,
6612+ const char *__msgid1, const char *__msgid2,
6613+ int __plural, unsigned long int __n,
6614+ int __category);
6615+#endif
6616
6617 /* @@ begin of epilog @@ */
6618
6619--- lrzsz-0.12.20.safe/intl/gmo.h 1969-12-31 19:00:00.000000000 -0500
6620+++ lrzsz-0.12.20/intl/gmo.h 2004-09-12 14:40:34.431736536 -0400
6621@@ -0,0 +1,149 @@
6622+/* Description of GNU message catalog format: general file layout.
6623+ Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
6624+
6625+ This program is free software; you can redistribute it and/or modify it
6626+ under the terms of the GNU Library General Public License as published
6627+ by the Free Software Foundation; either version 2, or (at your option)
6628+ any later version.
6629+
6630+ This program is distributed in the hope that it will be useful,
6631+ but WITHOUT ANY WARRANTY; without even the implied warranty of
6632+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6633+ Library General Public License for more details.
6634+
6635+ You should have received a copy of the GNU Library General Public
6636+ License along with this program; if not, write to the Free Software
6637+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6638+ USA. */
6639+
6640+#ifndef _GETTEXT_H
6641+#define _GETTEXT_H 1
6642+
6643+#include <limits.h>
6644+
6645+/* @@ end of prolog @@ */
6646+
6647+/* The magic number of the GNU message catalog format. */
6648+#define _MAGIC 0x950412de
6649+#define _MAGIC_SWAPPED 0xde120495
6650+
6651+/* Revision number of the currently used .mo (binary) file format. */
6652+#define MO_REVISION_NUMBER 0
6653+#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
6654+
6655+/* The following contortions are an attempt to use the C preprocessor
6656+ to determine an unsigned integral type that is 32 bits wide. An
6657+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
6658+ as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
6659+ when cross-compiling. */
6660+
6661+#if __STDC__
6662+# define UINT_MAX_32_BITS 4294967295U
6663+#else
6664+# define UINT_MAX_32_BITS 0xFFFFFFFF
6665+#endif
6666+
6667+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
6668+ This should be valid for all systems GNU cares about because
6669+ that doesn't include 16-bit systems, and only modern systems
6670+ (that certainly have <limits.h>) have 64+-bit integral types. */
6671+
6672+#ifndef UINT_MAX
6673+# define UINT_MAX UINT_MAX_32_BITS
6674+#endif
6675+
6676+#if UINT_MAX == UINT_MAX_32_BITS
6677+typedef unsigned nls_uint32;
6678+#else
6679+# if USHRT_MAX == UINT_MAX_32_BITS
6680+typedef unsigned short nls_uint32;
6681+# else
6682+# if ULONG_MAX == UINT_MAX_32_BITS
6683+typedef unsigned long nls_uint32;
6684+# else
6685+ /* The following line is intended to throw an error. Using #error is
6686+ not portable enough. */
6687+ "Cannot determine unsigned 32-bit data type."
6688+# endif
6689+# endif
6690+#endif
6691+
6692+
6693+/* Header for binary .mo file format. */
6694+struct mo_file_header
6695+{
6696+ /* The magic number. */
6697+ nls_uint32 magic;
6698+ /* The revision number of the file format. */
6699+ nls_uint32 revision;
6700+
6701+ /* The following are only used in .mo files with major revision 0 or 1. */
6702+
6703+ /* The number of strings pairs. */
6704+ nls_uint32 nstrings;
6705+ /* Offset of table with start offsets of original strings. */
6706+ nls_uint32 orig_tab_offset;
6707+ /* Offset of table with start offsets of translated strings. */
6708+ nls_uint32 trans_tab_offset;
6709+ /* Size of hash table. */
6710+ nls_uint32 hash_tab_size;
6711+ /* Offset of first hash table entry. */
6712+ nls_uint32 hash_tab_offset;
6713+
6714+ /* The following are only used in .mo files with minor revision >= 1. */
6715+
6716+ /* The number of system dependent segments. */
6717+ nls_uint32 n_sysdep_segments;
6718+ /* Offset of table describing system dependent segments. */
6719+ nls_uint32 sysdep_segments_offset;
6720+ /* The number of system dependent strings pairs. */
6721+ nls_uint32 n_sysdep_strings;
6722+ /* Offset of table with start offsets of original sysdep strings. */
6723+ nls_uint32 orig_sysdep_tab_offset;
6724+ /* Offset of table with start offsets of translated sysdep strings. */
6725+ nls_uint32 trans_sysdep_tab_offset;
6726+};
6727+
6728+/* Descriptor for static string contained in the binary .mo file. */
6729+struct string_desc
6730+{
6731+ /* Length of addressed string, not including the trailing NUL. */
6732+ nls_uint32 length;
6733+ /* Offset of string in file. */
6734+ nls_uint32 offset;
6735+};
6736+
6737+/* The following are only used in .mo files with minor revision >= 1. */
6738+
6739+/* Descriptor for system dependent string segment. */
6740+struct sysdep_segment
6741+{
6742+ /* Length of addressed string, including the trailing NUL. */
6743+ nls_uint32 length;
6744+ /* Offset of string in file. */
6745+ nls_uint32 offset;
6746+};
6747+
6748+/* Descriptor for system dependent string. */
6749+struct sysdep_string
6750+{
6751+ /* Offset of static string segments in file. */
6752+ nls_uint32 offset;
6753+ /* Alternating sequence of static and system dependent segments.
6754+ The last segment is a static segment, including the trailing NUL. */
6755+ struct segment_pair
6756+ {
6757+ /* Size of static segment. */
6758+ nls_uint32 segsize;
6759+ /* Reference to system dependent string segment, or ~0 at the end. */
6760+ nls_uint32 sysdepref;
6761+ } segments[1];
6762+};
6763+
6764+/* Marker for the end of the segments[] array. This has the value 0xFFFFFFFF,
6765+ regardless whether 'int' is 16 bit, 32 bit, or 64 bit. */
6766+#define SEGMENTS_END ((nls_uint32) ~0)
6767+
6768+/* @@ begin of epilog @@ */
6769+
6770+#endif /* gettext.h */
6771--- lrzsz-0.12.20.safe/intl/hash-string.h 1998-04-26 09:22:36.000000000 -0400
6772+++ lrzsz-0.12.20/intl/hash-string.h 2004-09-12 14:40:34.436735776 -0400
6773@@ -1,35 +1,23 @@
6774-/* Implements a string hashing function.
6775- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
6776+/* Description of GNU message catalog format: string hashing function.
6777+ Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
6778
6779- This program is free software; you can redistribute it and/or modify
6780- it under the terms of the GNU General Public License as published by
6781- the Free Software Foundation; either version 2, or (at your option)
6782+ This program is free software; you can redistribute it and/or modify it
6783+ under the terms of the GNU Library General Public License as published
6784+ by the Free Software Foundation; either version 2, or (at your option)
6785 any later version.
6786
6787 This program is distributed in the hope that it will be useful,
6788 but WITHOUT ANY WARRANTY; without even the implied warranty of
6789- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6790- GNU General Public License for more details.
6791+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6792+ Library General Public License for more details.
6793
6794 You should have received a copy of the GNU Library General Public
6795- License along with the GNU C Library; see the file COPYING.LIB. If not,
6796- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
6797- Boston, MA 02111-1307, USA. */
6798-
6799-#ifdef HAVE_VALUES_H
6800-# include <values.h>
6801-#endif
6802+ License along with this program; if not, write to the Free Software
6803+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6804+ USA. */
6805
6806 /* @@ end of prolog @@ */
6807
6808-#ifndef PARAMS
6809-# if __STDC__
6810-# define PARAMS(Args) Args
6811-# else
6812-# define PARAMS(Args) ()
6813-# endif
6814-#endif
6815-
6816 /* We assume to have `unsigned long int' value with at least 32 bits. */
6817 #define HASHWORDBITS 32
6818
6819@@ -37,11 +25,8 @@
6820 /* Defines the so called `hashpjw' function by P.J. Weinberger
6821 [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
6822 1986, 1987 Bell Telephone Laboratories, Inc.] */
6823-static unsigned long hash_string PARAMS ((const char *__str_param));
6824-
6825-static inline unsigned long
6826-hash_string (str_param)
6827- const char *str_param;
6828+static inline unsigned long int
6829+hash_string (const char *str_param)
6830 {
6831 unsigned long int hval, g;
6832 const char *str = str_param;
6833@@ -51,8 +36,8 @@
6834 while (*str != '\0')
6835 {
6836 hval <<= 4;
6837- hval += (unsigned long) *str++;
6838- g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
6839+ hval += (unsigned char) *str++;
6840+ g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
6841 if (g != 0)
6842 {
6843 hval ^= g >> (HASHWORDBITS - 8);
6844--- lrzsz-0.12.20.safe/intl/intl-compat.c 1998-04-26 09:20:52.000000000 -0400
6845+++ lrzsz-0.12.20/intl/intl-compat.c 2004-09-12 14:40:34.441735016 -0400
6846@@ -1,76 +1,131 @@
6847 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
6848 Library.
6849- Copyright (C) 1995 Software Foundation, Inc.
6850+ Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
6851
6852-This program is free software; you can redistribute it and/or modify
6853-it under the terms of the GNU General Public License as published by
6854-the Free Software Foundation; either version 2, or (at your option)
6855-any later version.
6856+ This program is free software; you can redistribute it and/or modify it
6857+ under the terms of the GNU Library General Public License as published
6858+ by the Free Software Foundation; either version 2, or (at your option)
6859+ any later version.
6860
6861-This program is distributed in the hope that it will be useful,
6862-but WITHOUT ANY WARRANTY; without even the implied warranty of
6863-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6864-GNU General Public License for more details.
6865+ This program is distributed in the hope that it will be useful,
6866+ but WITHOUT ANY WARRANTY; without even the implied warranty of
6867+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6868+ Library General Public License for more details.
6869
6870-You should have received a copy of the GNU General Public License
6871-along with this program; if not, write to the Free Software
6872-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
6873+ You should have received a copy of the GNU Library General Public
6874+ License along with this program; if not, write to the Free Software
6875+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
6876+ USA. */
6877
6878 #ifdef HAVE_CONFIG_H
6879 # include <config.h>
6880 #endif
6881
6882-#include "libgettext.h"
6883+#include "gettextP.h"
6884
6885 /* @@ end of prolog @@ */
6886
6887+/* This file redirects the gettext functions (without prefix) to those
6888+ defined in the included GNU libintl library (with "libintl_" prefix).
6889+ It is compiled into libintl in order to make the AM_GNU_GETTEXT test
6890+ of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
6891+ has the redirections primarily in the <libintl.h> include file.
6892+ It is also compiled into libgnuintl so that libgnuintl.so can be used
6893+ as LD_PRELOADable library on glibc systems, to provide the extra
6894+ features that the functions in the libc don't have (namely, logging). */
6895+
6896
6897 #undef gettext
6898 #undef dgettext
6899 #undef dcgettext
6900+#undef ngettext
6901+#undef dngettext
6902+#undef dcngettext
6903 #undef textdomain
6904 #undef bindtextdomain
6905+#undef bind_textdomain_codeset
6906+
6907+
6908+/* When building a DLL, we must export some functions. Note that because
6909+ the functions are only defined for binary backward compatibility, we
6910+ don't need to use __declspec(dllimport) in any case. */
6911+#if defined _MSC_VER && BUILDING_DLL
6912+# define DLL_EXPORTED __declspec(dllexport)
6913+#else
6914+# define DLL_EXPORTED
6915+#endif
6916
6917
6918+DLL_EXPORTED
6919 char *
6920-bindtextdomain (domainname, dirname)
6921- const char *domainname;
6922- const char *dirname;
6923+gettext (const char *msgid)
6924 {
6925- return bindtextdomain__ (domainname, dirname);
6926+ return libintl_gettext (msgid);
6927 }
6928
6929
6930+DLL_EXPORTED
6931 char *
6932-dcgettext (domainname, msgid, category)
6933- const char *domainname;
6934- const char *msgid;
6935- int category;
6936+dgettext (const char *domainname, const char *msgid)
6937 {
6938- return dcgettext__ (domainname, msgid, category);
6939+ return libintl_dgettext (domainname, msgid);
6940 }
6941
6942
6943+DLL_EXPORTED
6944 char *
6945-dgettext (domainname, msgid)
6946- const char *domainname;
6947- const char *msgid;
6948+dcgettext (const char *domainname, const char *msgid, int category)
6949 {
6950- return dgettext__ (domainname, msgid);
6951+ return libintl_dcgettext (domainname, msgid, category);
6952 }
6953
6954
6955+DLL_EXPORTED
6956 char *
6957-gettext (msgid)
6958- const char *msgid;
6959+ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
6960 {
6961- return gettext__ (msgid);
6962+ return libintl_ngettext (msgid1, msgid2, n);
6963 }
6964
6965
6966+DLL_EXPORTED
6967 char *
6968-textdomain (domainname)
6969- const char *domainname;
6970+dngettext (const char *domainname,
6971+ const char *msgid1, const char *msgid2, unsigned long int n)
6972 {
6973- return textdomain__ (domainname);
6974+ return libintl_dngettext (domainname, msgid1, msgid2, n);
6975+}
6976+
6977+
6978+DLL_EXPORTED
6979+char *
6980+dcngettext (const char *domainname,
6981+ const char *msgid1, const char *msgid2, unsigned long int n,
6982+ int category)
6983+{
6984+ return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
6985+}
6986+
6987+
6988+DLL_EXPORTED
6989+char *
6990+textdomain (const char *domainname)
6991+{
6992+ return libintl_textdomain (domainname);
6993+}
6994+
6995+
6996+DLL_EXPORTED
6997+char *
6998+bindtextdomain (const char *domainname, const char *dirname)
6999+{
7000+ return libintl_bindtextdomain (domainname, dirname);
7001+}
7002+
7003+
7004+DLL_EXPORTED
7005+char *
7006+bind_textdomain_codeset (const char *domainname, const char *codeset)
7007+{
7008+ return libintl_bind_textdomain_codeset (domainname, codeset);
7009 }
7010--- lrzsz-0.12.20.safe/intl/l10nflist.c 1998-04-26 09:22:37.000000000 -0400
7011+++ lrzsz-0.12.20/intl/l10nflist.c 2004-09-12 14:40:34.457732584 -0400
7012@@ -1,52 +1,40 @@
7013-/* Handle list of needed message catalogs
7014- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
7015- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
7016+/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
7017+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
7018
7019- This program is free software; you can redistribute it and/or modify
7020- it under the terms of the GNU General Public License as published by
7021- the Free Software Foundation; either version 2, or (at your option)
7022+ This program is free software; you can redistribute it and/or modify it
7023+ under the terms of the GNU Library General Public License as published
7024+ by the Free Software Foundation; either version 2, or (at your option)
7025 any later version.
7026
7027 This program is distributed in the hope that it will be useful,
7028 but WITHOUT ANY WARRANTY; without even the implied warranty of
7029- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7030- GNU General Public License for more details.
7031+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7032+ Library General Public License for more details.
7033
7034- You should have received a copy of the GNU General Public License
7035- along with this program; if not, write to the Free Software Foundation,
7036- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
7037+ You should have received a copy of the GNU Library General Public
7038+ License along with this program; if not, write to the Free Software
7039+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
7040+ USA. */
7041+
7042+/* Tell glibc's <string.h> to provide a prototype for stpcpy().
7043+ This must come before <config.h> because <config.h> may include
7044+ <features.h>, and once <features.h> has been included, it's too late. */
7045+#ifndef _GNU_SOURCE
7046+# define _GNU_SOURCE 1
7047+#endif
7048
7049 #ifdef HAVE_CONFIG_H
7050 # include <config.h>
7051 #endif
7052
7053-
7054-#if defined HAVE_STRING_H || defined _LIBC
7055-# ifndef _GNU_SOURCE
7056-# define _GNU_SOURCE 1
7057-# endif
7058-# include <string.h>
7059-#else
7060-# include <strings.h>
7061-# ifndef memcpy
7062-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
7063-# endif
7064-#endif
7065-#if !HAVE_STRCHR && !defined _LIBC
7066-# ifndef strchr
7067-# define strchr index
7068-# endif
7069-#endif
7070+#include <string.h>
7071
7072 #if defined _LIBC || defined HAVE_ARGZ_H
7073 # include <argz.h>
7074 #endif
7075 #include <ctype.h>
7076 #include <sys/types.h>
7077-
7078-#if defined STDC_HEADERS || defined _LIBC
7079-# include <stdlib.h>
7080-#endif
7081+#include <stdlib.h>
7082
7083 #include "loadinfo.h"
7084
7085@@ -65,23 +53,39 @@
7086 /* Rename the non ANSI C functions. This is required by the standard
7087 because some ANSI C functions will require linking with this object
7088 file and the name space must not be polluted. */
7089-# define stpcpy(dest, src) __stpcpy(dest, src)
7090+# ifndef stpcpy
7091+# define stpcpy(dest, src) __stpcpy(dest, src)
7092+# endif
7093 #else
7094 # ifndef HAVE_STPCPY
7095-static char *stpcpy PARAMS ((char *dest, const char *src));
7096+static char *stpcpy (char *dest, const char *src);
7097 # endif
7098 #endif
7099
7100+/* Pathname support.
7101+ ISSLASH(C) tests whether C is a directory separator character.
7102+ IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not,
7103+ it may be concatenated to a directory pathname.
7104+ */
7105+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
7106+ /* Win32, OS/2, DOS */
7107+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
7108+# define HAS_DEVICE(P) \
7109+ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
7110+ && (P)[1] == ':')
7111+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
7112+#else
7113+ /* Unix */
7114+# define ISSLASH(C) ((C) == '/')
7115+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
7116+#endif
7117+
7118 /* Define function which are usually not available. */
7119
7120 #if !defined _LIBC && !defined HAVE___ARGZ_COUNT
7121 /* Returns the number of strings in ARGZ. */
7122-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
7123-
7124 static size_t
7125-argz_count__ (argz, len)
7126- const char *argz;
7127- size_t len;
7128+argz_count__ (const char *argz, size_t len)
7129 {
7130 size_t count = 0;
7131 while (len > 0)
7132@@ -95,18 +99,17 @@
7133 }
7134 # undef __argz_count
7135 # define __argz_count(argz, len) argz_count__ (argz, len)
7136+#else
7137+# ifdef _LIBC
7138+# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
7139+# endif
7140 #endif /* !_LIBC && !HAVE___ARGZ_COUNT */
7141
7142 #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
7143 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
7144 except the last into the character SEP. */
7145-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
7146-
7147 static void
7148-argz_stringify__ (argz, len, sep)
7149- char *argz;
7150- size_t len;
7151- int sep;
7152+argz_stringify__ (char *argz, size_t len, int sep)
7153 {
7154 while (len > 0)
7155 {
7156@@ -119,17 +122,16 @@
7157 }
7158 # undef __argz_stringify
7159 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
7160+#else
7161+# ifdef _LIBC
7162+# define __argz_stringify(argz, len, sep) \
7163+ INTUSE(__argz_stringify) (argz, len, sep)
7164+# endif
7165 #endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
7166
7167 #if !defined _LIBC && !defined HAVE___ARGZ_NEXT
7168-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
7169- const char *entry));
7170-
7171 static char *
7172-argz_next__ (argz, argz_len, entry)
7173- char *argz;
7174- size_t argz_len;
7175- const char *entry;
7176+argz_next__ (char *argz, size_t argz_len, const char *entry)
7177 {
7178 if (entry)
7179 {
7180@@ -150,11 +152,8 @@
7181
7182
7183 /* Return number of bits set in X. */
7184-static int pop PARAMS ((int x));
7185-
7186 static inline int
7187-pop (x)
7188- int x;
7189+pop (int x)
7190 {
7191 /* We assume that no more than 16 bits are used. */
7192 x = ((x & ~0x5555) >> 1) + (x & 0x5555);
7193@@ -167,31 +166,27 @@
7194
7195
7196 struct loaded_l10nfile *
7197-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
7198- territory, codeset, normalized_codeset, modifier, special,
7199- sponsor, revision, filename, do_allocate)
7200- struct loaded_l10nfile **l10nfile_list;
7201- const char *dirlist;
7202- size_t dirlist_len;
7203- int mask;
7204- const char *language;
7205- const char *territory;
7206- const char *codeset;
7207- const char *normalized_codeset;
7208- const char *modifier;
7209- const char *special;
7210- const char *sponsor;
7211- const char *revision;
7212- const char *filename;
7213- int do_allocate;
7214+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
7215+ const char *dirlist, size_t dirlist_len,
7216+ int mask, const char *language, const char *territory,
7217+ const char *codeset, const char *normalized_codeset,
7218+ const char *modifier, const char *special,
7219+ const char *sponsor, const char *revision,
7220+ const char *filename, int do_allocate)
7221 {
7222 char *abs_filename;
7223- struct loaded_l10nfile *last = NULL;
7224+ struct loaded_l10nfile **lastp;
7225 struct loaded_l10nfile *retval;
7226 char *cp;
7227+ size_t dirlist_count;
7228 size_t entries;
7229 int cnt;
7230
7231+ /* If LANGUAGE contains an absolute directory specification, we ignore
7232+ DIRLIST. */
7233+ if (IS_ABSOLUTE_PATH (language))
7234+ dirlist_len = 0;
7235+
7236 /* Allocate room for the full file name. */
7237 abs_filename = (char *) malloc (dirlist_len
7238 + strlen (language)
7239@@ -209,7 +204,7 @@
7240 + (((mask & CEN_SPONSOR) != 0
7241 || (mask & CEN_REVISION) != 0)
7242 ? (1 + ((mask & CEN_SPONSOR) != 0
7243- ? strlen (sponsor) + 1 : 0)
7244+ ? strlen (sponsor) : 0)
7245 + ((mask & CEN_REVISION) != 0
7246 ? strlen (revision) + 1 : 0)) : 0)
7247 + 1 + strlen (filename) + 1);
7248@@ -217,14 +212,16 @@
7249 if (abs_filename == NULL)
7250 return NULL;
7251
7252- retval = NULL;
7253- last = NULL;
7254-
7255 /* Construct file name. */
7256- memcpy (abs_filename, dirlist, dirlist_len);
7257- __argz_stringify (abs_filename, dirlist_len, ':');
7258- cp = abs_filename + (dirlist_len - 1);
7259- *cp++ = '/';
7260+ cp = abs_filename;
7261+ if (dirlist_len > 0)
7262+ {
7263+ memcpy (cp, dirlist, dirlist_len);
7264+ __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
7265+ cp += dirlist_len;
7266+ cp[-1] = '/';
7267+ }
7268+
7269 cp = stpcpy (cp, language);
7270
7271 if ((mask & TERRITORY) != 0)
7272@@ -271,7 +268,7 @@
7273
7274 /* Look in list of already loaded domains whether it is already
7275 available. */
7276- last = NULL;
7277+ lastp = l10nfile_list;
7278 for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
7279 if (retval->filename != NULL)
7280 {
7281@@ -286,7 +283,7 @@
7282 break;
7283 }
7284
7285- last = retval;
7286+ lastp = &retval->next;
7287 }
7288
7289 if (retval != NULL || do_allocate == 0)
7290@@ -295,48 +292,66 @@
7291 return retval;
7292 }
7293
7294- retval = (struct loaded_l10nfile *)
7295- malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
7296- * (1 << pop (mask))
7297- * sizeof (struct loaded_l10nfile *)));
7298+ dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
7299+
7300+ /* Allocate a new loaded_l10nfile. */
7301+ retval =
7302+ (struct loaded_l10nfile *)
7303+ malloc (sizeof (*retval)
7304+ + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
7305+ * sizeof (struct loaded_l10nfile *)));
7306 if (retval == NULL)
7307 return NULL;
7308
7309 retval->filename = abs_filename;
7310- retval->decided = (__argz_count (dirlist, dirlist_len) != 1
7311+
7312+ /* We set retval->data to NULL here; it is filled in later.
7313+ Setting retval->decided to 1 here means that retval does not
7314+ correspond to a real file (dirlist_count > 1) or is not worth
7315+ looking up (if an unnormalized codeset was specified). */
7316+ retval->decided = (dirlist_count > 1
7317 || ((mask & XPG_CODESET) != 0
7318 && (mask & XPG_NORM_CODESET) != 0));
7319 retval->data = NULL;
7320
7321- if (last == NULL)
7322- {
7323- retval->next = *l10nfile_list;
7324- *l10nfile_list = retval;
7325- }
7326- else
7327- {
7328- retval->next = last->next;
7329- last->next = retval;
7330- }
7331+ retval->next = *lastp;
7332+ *lastp = retval;
7333
7334 entries = 0;
7335- /* If the DIRLIST is a real list the RETVAL entry corresponds not to
7336- a real file. So we have to use the DIRLIST separation mechanism
7337- of the inner loop. */
7338- cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
7339- for (; cnt >= 0; --cnt)
7340+ /* Recurse to fill the inheritance list of RETVAL.
7341+ If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
7342+ entry does not correspond to a real file; retval->filename contains
7343+ colons. In this case we loop across all elements of DIRLIST and
7344+ across all bit patterns dominated by MASK.
7345+ If the DIRLIST is a single directory or entirely redundant (i.e.
7346+ DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
7347+ MASK, excluding MASK itself.
7348+ In either case, we loop down from MASK to 0. This has the effect
7349+ that the extra bits in the locale name are dropped in this order:
7350+ first the modifier, then the territory, then the codeset, then the
7351+ normalized_codeset. */
7352+ for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
7353 if ((cnt & ~mask) == 0
7354 && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
7355 && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
7356 {
7357- /* Iterate over all elements of the DIRLIST. */
7358- char *dir = NULL;
7359+ if (dirlist_count > 1)
7360+ {
7361+ /* Iterate over all elements of the DIRLIST. */
7362+ char *dir = NULL;
7363
7364- while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
7365- != NULL)
7366+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
7367+ != NULL)
7368+ retval->successor[entries++]
7369+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
7370+ cnt, language, territory, codeset,
7371+ normalized_codeset, modifier, special,
7372+ sponsor, revision, filename, 1);
7373+ }
7374+ else
7375 retval->successor[entries++]
7376- = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
7377- language, territory, codeset,
7378+ = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
7379+ cnt, language, territory, codeset,
7380 normalized_codeset, modifier, special,
7381 sponsor, revision, filename, 1);
7382 }
7383@@ -347,11 +362,10 @@
7384
7385 /* Normalize codeset name. There is no standard for the codeset
7386 names. Normalization allows the user to use any of the common
7387- names. */
7388+ names. The return value is dynamically allocated and has to be
7389+ freed by the caller. */
7390 const char *
7391-_nl_normalize_codeset (codeset, name_len)
7392- const char *codeset;
7393- size_t name_len;
7394+_nl_normalize_codeset (const char *codeset, size_t name_len)
7395 {
7396 int len = 0;
7397 int only_digit = 1;
7398@@ -360,11 +374,11 @@
7399 size_t cnt;
7400
7401 for (cnt = 0; cnt < name_len; ++cnt)
7402- if (isalnum (codeset[cnt]))
7403+ if (isalnum ((unsigned char) codeset[cnt]))
7404 {
7405 ++len;
7406
7407- if (isalpha (codeset[cnt]))
7408+ if (isalpha ((unsigned char) codeset[cnt]))
7409 only_digit = 0;
7410 }
7411
7412@@ -378,9 +392,9 @@
7413 wp = retval;
7414
7415 for (cnt = 0; cnt < name_len; ++cnt)
7416- if (isalpha (codeset[cnt]))
7417- *wp++ = tolower (codeset[cnt]);
7418- else if (isdigit (codeset[cnt]))
7419+ if (isalpha ((unsigned char) codeset[cnt]))
7420+ *wp++ = tolower ((unsigned char) codeset[cnt]);
7421+ else if (isdigit ((unsigned char) codeset[cnt]))
7422 *wp++ = codeset[cnt];
7423
7424 *wp = '\0';
7425@@ -398,9 +412,7 @@
7426 to be defined. */
7427 #if !_LIBC && !HAVE_STPCPY
7428 static char *
7429-stpcpy (dest, src)
7430- char *dest;
7431- const char *src;
7432+stpcpy (char *dest, const char *src)
7433 {
7434 while ((*dest++ = *src++) != '\0')
7435 /* Do nothing. */ ;
7436--- lrzsz-0.12.20.safe/intl/libgettext.h 1998-04-26 09:22:36.000000000 -0400
7437+++ lrzsz-0.12.20/intl/libgettext.h 1969-12-31 19:00:00.000000000 -0500
7438@@ -1,182 +0,0 @@
7439-/* Message catalogs for internationalization.
7440- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
7441-
7442- This program is free software; you can redistribute it and/or modify
7443- it under the terms of the GNU General Public License as published by
7444- the Free Software Foundation; either version 2, or (at your option)
7445- any later version.
7446-
7447- This program is distributed in the hope that it will be useful,
7448- but WITHOUT ANY WARRANTY; without even the implied warranty of
7449- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7450- GNU General Public License for more details.
7451-
7452- You should have received a copy of the GNU General Public License
7453- along with this program; if not, write to the Free Software Foundation,
7454- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
7455-
7456-/* Because on some systems (e.g. Solaris) we sometimes have to include
7457- the systems libintl.h as well as this file we have more complex
7458- include protection above. But the systems header might perhaps also
7459- define _LIBINTL_H and therefore we have to protect the definition here. */
7460-
7461-#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H)
7462-#if !defined (_LIBINTL_H)
7463-# define _LIBINTL_H 1
7464-#endif
7465-#define _LIBGETTEXT_H 1
7466-
7467-/* We define an additional symbol to signal that we use the GNU
7468- implementation of gettext. */
7469-#define __USE_GNU_GETTEXT 1
7470-
7471-#include <sys/types.h>
7472-
7473-#if HAVE_LOCALE_H
7474-# include <locale.h>
7475-#endif
7476-
7477-
7478-#ifdef __cplusplus
7479-extern "C" {
7480-#endif
7481-
7482-/* @@ end of prolog @@ */
7483-
7484-#ifndef PARAMS
7485-# if __STDC__
7486-# define PARAMS(args) args
7487-# else
7488-# define PARAMS(args) ()
7489-# endif
7490-#endif
7491-
7492-#ifndef NULL
7493-# if !defined __cplusplus || defined __GNUC__
7494-# define NULL ((void *) 0)
7495-# else
7496-# define NULL (0)
7497-# endif
7498-#endif
7499-
7500-#if !HAVE_LC_MESSAGES
7501-/* This value determines the behaviour of the gettext() and dgettext()
7502- function. But some system does not have this defined. Define it
7503- to a default value. */
7504-# define LC_MESSAGES (-1)
7505-#endif
7506-
7507-
7508-/* Declarations for gettext-using-catgets interface. Derived from
7509- Jim Meyering's libintl.h. */
7510-struct _msg_ent
7511-{
7512- const char *_msg;
7513- int _msg_number;
7514-};
7515-
7516-
7517-#if HAVE_CATGETS
7518-/* These two variables are defined in the automatically by po-to-tbl.sed
7519- generated file `cat-id-tbl.c'. */
7520-extern const struct _msg_ent _msg_tbl[];
7521-extern int _msg_tbl_length;
7522-#endif
7523-
7524-
7525-/* For automatical extraction of messages sometimes no real
7526- translation is needed. Instead the string itself is the result. */
7527-#define gettext_noop(Str) (Str)
7528-
7529-/* Look up MSGID in the current default message catalog for the current
7530- LC_MESSAGES locale. If not found, returns MSGID itself (the default
7531- text). */
7532-extern char *gettext PARAMS ((const char *__msgid));
7533-extern char *gettext__ PARAMS ((const char *__msgid));
7534-
7535-/* Look up MSGID in the DOMAINNAME message catalog for the current
7536- LC_MESSAGES locale. */
7537-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
7538-extern char *dgettext__ PARAMS ((const char *__domainname,
7539- const char *__msgid));
7540-
7541-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
7542- locale. */
7543-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
7544- int __category));
7545-extern char *dcgettext__ PARAMS ((const char *__domainname,
7546- const char *__msgid, int __category));
7547-
7548-
7549-/* Set the current default message catalog to DOMAINNAME.
7550- If DOMAINNAME is null, return the current default.
7551- If DOMAINNAME is "", reset to the default of "messages". */
7552-extern char *textdomain PARAMS ((const char *__domainname));
7553-extern char *textdomain__ PARAMS ((const char *__domainname));
7554-
7555-/* Specify that the DOMAINNAME message catalog will be found
7556- in DIRNAME rather than in the system locale data base. */
7557-extern char *bindtextdomain PARAMS ((const char *__domainname,
7558- const char *__dirname));
7559-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
7560- const char *__dirname));
7561-
7562-#if ENABLE_NLS
7563-
7564-/* Solaris 2.3 has the gettext function but dcgettext is missing.
7565- So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4
7566- has dcgettext. */
7567-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
7568-
7569-# define gettext(Msgid) \
7570- dgettext (NULL, Msgid)
7571-
7572-# define dgettext(Domainname, Msgid) \
7573- dcgettext (Domainname, Msgid, LC_MESSAGES)
7574-
7575-# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
7576-/* This global variable is defined in loadmsgcat.c. We need a sign,
7577- whether a new catalog was loaded, which can be associated with all
7578- translations. */
7579-extern int _nl_msg_cat_cntr;
7580-
7581-# define dcgettext(Domainname, Msgid, Category) \
7582- (__extension__ \
7583- ({ \
7584- char *__result; \
7585- if (__builtin_constant_p (Msgid)) \
7586- { \
7587- static char *__translation__; \
7588- static int __catalog_counter__; \
7589- if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \
7590- { \
7591- __translation__ = \
7592- dcgettext__ (Domainname, Msgid, Category); \
7593- __catalog_counter__ = _nl_msg_cat_cntr; \
7594- } \
7595- __result = __translation__; \
7596- } \
7597- else \
7598- __result = dcgettext__ (Domainname, Msgid, Category); \
7599- __result; \
7600- }))
7601-# endif
7602-# endif
7603-
7604-#else
7605-
7606-# define gettext(Msgid) (Msgid)
7607-# define dgettext(Domainname, Msgid) (Msgid)
7608-# define dcgettext(Domainname, Msgid, Category) (Msgid)
7609-# define textdomain(Domainname) while (0) /* nothing */
7610-# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
7611-
7612-#endif
7613-
7614-/* @@ begin of epilog @@ */
7615-
7616-#ifdef __cplusplus
7617-}
7618-#endif
7619-
7620-#endif
7621--- lrzsz-0.12.20.safe/intl/libgnuintl.h.in 1969-12-31 19:00:00.000000000 -0500
7622+++ lrzsz-0.12.20/intl/libgnuintl.h.in 2004-09-12 14:40:34.462731824 -0400
7623@@ -0,0 +1,383 @@
7624+/* Message catalogs for internationalization.
7625+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
7626+
7627+ This program is free software; you can redistribute it and/or modify it
7628+ under the terms of the GNU Library General Public License as published
7629+ by the Free Software Foundation; either version 2, or (at your option)
7630+ any later version.
7631+
7632+ This program is distributed in the hope that it will be useful,
7633+ but WITHOUT ANY WARRANTY; without even the implied warranty of
7634+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7635+ Library General Public License for more details.
7636+
7637+ You should have received a copy of the GNU Library General Public
7638+ License along with this program; if not, write to the Free Software
7639+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
7640+ USA. */
7641+
7642+#ifndef _LIBINTL_H
7643+#define _LIBINTL_H 1
7644+
7645+#include <locale.h>
7646+
7647+/* The LC_MESSAGES locale category is the category used by the functions
7648+ gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
7649+ On systems that don't define it, use an arbitrary value instead.
7650+ On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
7651+ then includes <libintl.h> (i.e. this file!) and then only defines
7652+ LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
7653+ in this case. */
7654+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
7655+# define LC_MESSAGES 1729
7656+#endif
7657+
7658+/* We define an additional symbol to signal that we use the GNU
7659+ implementation of gettext. */
7660+#define __USE_GNU_GETTEXT 1
7661+
7662+/* Provide information about the supported file formats. Returns the
7663+ maximum minor revision number supported for a given major revision. */
7664+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
7665+ ((major) == 0 ? 1 : -1)
7666+
7667+/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
7668+ precedence over _conio_gettext. */
7669+#ifdef __DJGPP__
7670+# undef gettext
7671+#endif
7672+
7673+#ifdef __cplusplus
7674+extern "C" {
7675+#endif
7676+
7677+
7678+/* We redirect the functions to those prefixed with "libintl_". This is
7679+ necessary, because some systems define gettext/textdomain/... in the C
7680+ library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
7681+ If we used the unprefixed names, there would be cases where the
7682+ definition in the C library would override the one in the libintl.so
7683+ shared library. Recall that on ELF systems, the symbols are looked
7684+ up in the following order:
7685+ 1. in the executable,
7686+ 2. in the shared libraries specified on the link command line, in order,
7687+ 3. in the dependencies of the shared libraries specified on the link
7688+ command line,
7689+ 4. in the dlopen()ed shared libraries, in the order in which they were
7690+ dlopen()ed.
7691+ The definition in the C library would override the one in libintl.so if
7692+ either
7693+ * -lc is given on the link command line and -lintl isn't, or
7694+ * -lc is given on the link command line before -lintl, or
7695+ * libintl.so is a dependency of a dlopen()ed shared library but not
7696+ linked to the executable at link time.
7697+ Since Solaris gettext() behaves differently than GNU gettext(), this
7698+ would be unacceptable.
7699+
7700+ The redirection happens by default through macros in C, so that &gettext
7701+ is independent of the compilation unit, but through inline functions in
7702+ C++, in order not to interfere with the name mangling of class fields or
7703+ class methods called 'gettext'. */
7704+
7705+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
7706+ If he doesn't, we choose the method. A third possible method is
7707+ _INTL_REDIRECT_ASM, supported only by GCC. */
7708+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
7709+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
7710+# define _INTL_REDIRECT_ASM
7711+# else
7712+# ifdef __cplusplus
7713+# define _INTL_REDIRECT_INLINE
7714+# else
7715+# define _INTL_REDIRECT_MACROS
7716+# endif
7717+# endif
7718+#endif
7719+/* Auxiliary macros. */
7720+#ifdef _INTL_REDIRECT_ASM
7721+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
7722+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
7723+# define _INTL_STRINGIFY(prefix) #prefix
7724+#else
7725+# define _INTL_ASM(cname)
7726+#endif
7727+
7728+/* Look up MSGID in the current default message catalog for the current
7729+ LC_MESSAGES locale. If not found, returns MSGID itself (the default
7730+ text). */
7731+#ifdef _INTL_REDIRECT_INLINE
7732+extern char *libintl_gettext (const char *__msgid);
7733+static inline char *gettext (const char *__msgid)
7734+{
7735+ return libintl_gettext (__msgid);
7736+}
7737+#else
7738+#ifdef _INTL_REDIRECT_MACROS
7739+# define gettext libintl_gettext
7740+#endif
7741+extern char *gettext (const char *__msgid)
7742+ _INTL_ASM (libintl_gettext);
7743+#endif
7744+
7745+/* Look up MSGID in the DOMAINNAME message catalog for the current
7746+ LC_MESSAGES locale. */
7747+#ifdef _INTL_REDIRECT_INLINE
7748+extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
7749+static inline char *dgettext (const char *__domainname, const char *__msgid)
7750+{
7751+ return libintl_dgettext (__domainname, __msgid);
7752+}
7753+#else
7754+#ifdef _INTL_REDIRECT_MACROS
7755+# define dgettext libintl_dgettext
7756+#endif
7757+extern char *dgettext (const char *__domainname, const char *__msgid)
7758+ _INTL_ASM (libintl_dgettext);
7759+#endif
7760+
7761+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
7762+ locale. */
7763+#ifdef _INTL_REDIRECT_INLINE
7764+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
7765+ int __category);
7766+static inline char *dcgettext (const char *__domainname, const char *__msgid,
7767+ int __category)
7768+{
7769+ return libintl_dcgettext (__domainname, __msgid, __category);
7770+}
7771+#else
7772+#ifdef _INTL_REDIRECT_MACROS
7773+# define dcgettext libintl_dcgettext
7774+#endif
7775+extern char *dcgettext (const char *__domainname, const char *__msgid,
7776+ int __category)
7777+ _INTL_ASM (libintl_dcgettext);
7778+#endif
7779+
7780+
7781+/* Similar to `gettext' but select the plural form corresponding to the
7782+ number N. */
7783+#ifdef _INTL_REDIRECT_INLINE
7784+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
7785+ unsigned long int __n);
7786+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
7787+ unsigned long int __n)
7788+{
7789+ return libintl_ngettext (__msgid1, __msgid2, __n);
7790+}
7791+#else
7792+#ifdef _INTL_REDIRECT_MACROS
7793+# define ngettext libintl_ngettext
7794+#endif
7795+extern char *ngettext (const char *__msgid1, const char *__msgid2,
7796+ unsigned long int __n)
7797+ _INTL_ASM (libintl_ngettext);
7798+#endif
7799+
7800+/* Similar to `dgettext' but select the plural form corresponding to the
7801+ number N. */
7802+#ifdef _INTL_REDIRECT_INLINE
7803+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
7804+ const char *__msgid2, unsigned long int __n);
7805+static inline char *dngettext (const char *__domainname, const char *__msgid1,
7806+ const char *__msgid2, unsigned long int __n)
7807+{
7808+ return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
7809+}
7810+#else
7811+#ifdef _INTL_REDIRECT_MACROS
7812+# define dngettext libintl_dngettext
7813+#endif
7814+extern char *dngettext (const char *__domainname,
7815+ const char *__msgid1, const char *__msgid2,
7816+ unsigned long int __n)
7817+ _INTL_ASM (libintl_dngettext);
7818+#endif
7819+
7820+/* Similar to `dcgettext' but select the plural form corresponding to the
7821+ number N. */
7822+#ifdef _INTL_REDIRECT_INLINE
7823+extern char *libintl_dcngettext (const char *__domainname,
7824+ const char *__msgid1, const char *__msgid2,
7825+ unsigned long int __n, int __category);
7826+static inline char *dcngettext (const char *__domainname,
7827+ const char *__msgid1, const char *__msgid2,
7828+ unsigned long int __n, int __category)
7829+{
7830+ return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
7831+}
7832+#else
7833+#ifdef _INTL_REDIRECT_MACROS
7834+# define dcngettext libintl_dcngettext
7835+#endif
7836+extern char *dcngettext (const char *__domainname,
7837+ const char *__msgid1, const char *__msgid2,
7838+ unsigned long int __n, int __category)
7839+ _INTL_ASM (libintl_dcngettext);
7840+#endif
7841+
7842+
7843+/* Set the current default message catalog to DOMAINNAME.
7844+ If DOMAINNAME is null, return the current default.
7845+ If DOMAINNAME is "", reset to the default of "messages". */
7846+#ifdef _INTL_REDIRECT_INLINE
7847+extern char *libintl_textdomain (const char *__domainname);
7848+static inline char *textdomain (const char *__domainname)
7849+{
7850+ return libintl_textdomain (__domainname);
7851+}
7852+#else
7853+#ifdef _INTL_REDIRECT_MACROS
7854+# define textdomain libintl_textdomain
7855+#endif
7856+extern char *textdomain (const char *__domainname)
7857+ _INTL_ASM (libintl_textdomain);
7858+#endif
7859+
7860+/* Specify that the DOMAINNAME message catalog will be found
7861+ in DIRNAME rather than in the system locale data base. */
7862+#ifdef _INTL_REDIRECT_INLINE
7863+extern char *libintl_bindtextdomain (const char *__domainname,
7864+ const char *__dirname);
7865+static inline char *bindtextdomain (const char *__domainname,
7866+ const char *__dirname)
7867+{
7868+ return libintl_bindtextdomain (__domainname, __dirname);
7869+}
7870+#else
7871+#ifdef _INTL_REDIRECT_MACROS
7872+# define bindtextdomain libintl_bindtextdomain
7873+#endif
7874+extern char *bindtextdomain (const char *__domainname, const char *__dirname)
7875+ _INTL_ASM (libintl_bindtextdomain);
7876+#endif
7877+
7878+/* Specify the character encoding in which the messages from the
7879+ DOMAINNAME message catalog will be returned. */
7880+#ifdef _INTL_REDIRECT_INLINE
7881+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
7882+ const char *__codeset);
7883+static inline char *bind_textdomain_codeset (const char *__domainname,
7884+ const char *__codeset)
7885+{
7886+ return libintl_bind_textdomain_codeset (__domainname, __codeset);
7887+}
7888+#else
7889+#ifdef _INTL_REDIRECT_MACROS
7890+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
7891+#endif
7892+extern char *bind_textdomain_codeset (const char *__domainname,
7893+ const char *__codeset)
7894+ _INTL_ASM (libintl_bind_textdomain_codeset);
7895+#endif
7896+
7897+
7898+/* Support for format strings with positions in *printf(), following the
7899+ POSIX/XSI specification.
7900+ Note: These replacements for the *printf() functions are visible only
7901+ in source files that #include <libintl.h> or #include "gettext.h".
7902+ Packages that use *printf() in source files that don't refer to _()
7903+ or gettext() but for which the format string could be the return value
7904+ of _() or gettext() need to add this #include. Oh well. */
7905+
7906+#if !@HAVE_POSIX_PRINTF@
7907+
7908+#include <stdio.h>
7909+#include <stddef.h>
7910+
7911+/* Get va_list. */
7912+#if __STDC__ || defined __cplusplus || defined _MSC_VER
7913+# include <stdarg.h>
7914+#else
7915+# include <varargs.h>
7916+#endif
7917+
7918+#undef fprintf
7919+#define fprintf libintl_fprintf
7920+extern int fprintf (FILE *, const char *, ...);
7921+#undef vfprintf
7922+#define vfprintf libintl_vfprintf
7923+extern int vfprintf (FILE *, const char *, va_list);
7924+
7925+#undef printf
7926+#define printf libintl_printf
7927+extern int printf (const char *, ...);
7928+#undef vprintf
7929+#define vprintf libintl_vprintf
7930+extern int vprintf (const char *, va_list);
7931+
7932+#undef sprintf
7933+#define sprintf libintl_sprintf
7934+extern int sprintf (char *, const char *, ...);
7935+#undef vsprintf
7936+#define vsprintf libintl_vsprintf
7937+extern int vsprintf (char *, const char *, va_list);
7938+
7939+#if @HAVE_SNPRINTF@
7940+
7941+#undef snprintf
7942+#define snprintf libintl_snprintf
7943+extern int snprintf (char *, size_t, const char *, ...);
7944+#undef vsnprintf
7945+#define vsnprintf libintl_vsnprintf
7946+extern int vsnprintf (char *, size_t, const char *, va_list);
7947+
7948+#endif
7949+
7950+#if @HAVE_ASPRINTF@
7951+
7952+#undef asprintf
7953+#define asprintf libintl_asprintf
7954+extern int asprintf (char **, const char *, ...);
7955+#undef vasprintf
7956+#define vasprintf libintl_vasprintf
7957+extern int vasprintf (char **, const char *, va_list);
7958+
7959+#endif
7960+
7961+#if @HAVE_WPRINTF@
7962+
7963+#undef fwprintf
7964+#define fwprintf libintl_fwprintf
7965+extern int fwprintf (FILE *, const wchar_t *, ...);
7966+#undef vfwprintf
7967+#define vfwprintf libintl_vfwprintf
7968+extern int vfwprintf (FILE *, const wchar_t *, va_list);
7969+
7970+#undef wprintf
7971+#define wprintf libintl_wprintf
7972+extern int wprintf (const wchar_t *, ...);
7973+#undef vwprintf
7974+#define vwprintf libintl_vwprintf
7975+extern int vwprintf (const wchar_t *, va_list);
7976+
7977+#undef swprintf
7978+#define swprintf libintl_swprintf
7979+extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
7980+#undef vswprintf
7981+#define vswprintf libintl_vswprintf
7982+extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
7983+
7984+#endif
7985+
7986+#endif
7987+
7988+
7989+/* Support for relocatable packages. */
7990+
7991+/* Sets the original and the current installation prefix of the package.
7992+ Relocation simply replaces a pathname starting with the original prefix
7993+ by the corresponding pathname with the current prefix instead. Both
7994+ prefixes should be directory names without trailing slash (i.e. use ""
7995+ instead of "/"). */
7996+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
7997+extern void
7998+ libintl_set_relocation_prefix (const char *orig_prefix,
7999+ const char *curr_prefix);
8000+
8001+
8002+#ifdef __cplusplus
8003+}
8004+#endif
8005+
8006+#endif /* libintl.h */
8007--- lrzsz-0.12.20.safe/intl/linux-msg.sed 1998-04-26 09:20:52.000000000 -0400
8008+++ lrzsz-0.12.20/intl/linux-msg.sed 1969-12-31 19:00:00.000000000 -0500
8009@@ -1,100 +0,0 @@
8010-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
8011-# Copyright (C) 1995 Free Software Foundation, Inc.
8012-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
8013-#
8014-# This program is free software; you can redistribute it and/or modify
8015-# it under the terms of the GNU General Public License as published by
8016-# the Free Software Foundation; either version 2, or (at your option)
8017-# any later version.
8018-#
8019-# This program is distributed in the hope that it will be useful,
8020-# but WITHOUT ANY WARRANTY; without even the implied warranty of
8021-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8022-# GNU General Public License for more details.
8023-#
8024-# You should have received a copy of the GNU General Public License
8025-# along with this program; if not, write to the Free Software
8026-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
8027-#
8028-#
8029-# The first directive in the .msg should be the definition of the
8030-# message set number. We use always set number 1.
8031-#
8032-1 {
8033- i\
8034-$set 1 # Automatically created by po2msg.sed
8035- h
8036- s/.*/0/
8037- x
8038-}
8039-#
8040-# Mitch's old catalog format does not allow comments.
8041-#
8042-# We copy the original message as a comment into the .msg file.
8043-#
8044-/^msgid/ {
8045- s/msgid[ ]*"//
8046-#
8047-# This does not work now with the new format.
8048-# /"$/! {
8049-# s/\\$//
8050-# s/$/ ... (more lines following)"/
8051-# }
8052- x
8053-# The following nice solution is by
8054-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
8055- td
8056-# Increment a decimal number in pattern space.
8057-# First hide trailing `9' digits.
8058- :d
8059- s/9\(_*\)$/_\1/
8060- td
8061-# Assure at least one digit is available.
8062- s/^\(_*\)$/0\1/
8063-# Increment the last digit.
8064- s/8\(_*\)$/9\1/
8065- s/7\(_*\)$/8\1/
8066- s/6\(_*\)$/7\1/
8067- s/5\(_*\)$/6\1/
8068- s/4\(_*\)$/5\1/
8069- s/3\(_*\)$/4\1/
8070- s/2\(_*\)$/3\1/
8071- s/1\(_*\)$/2\1/
8072- s/0\(_*\)$/1\1/
8073-# Convert the hidden `9' digits to `0's.
8074- s/_/0/g
8075- x
8076- G
8077- s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
8078-}
8079-#
8080-# The .msg file contains, other then the .po file, only the translations
8081-# but each given a unique ID. Starting from 1 and incrementing by 1 for
8082-# each message we assign them to the messages.
8083-# It is important that the .po file used to generate the cat-id-tbl.c file
8084-# (with po-to-tbl) is the same as the one used here. (At least the order
8085-# of declarations must not be changed.)
8086-#
8087-/^msgstr/ {
8088- s/msgstr[ ]*"\(.*\)"/# \1/
8089-# Clear substitution flag.
8090- tb
8091-# Append the next line.
8092- :b
8093- N
8094-# Look whether second part is continuation line.
8095- s/\(.*\n\)"\(.*\)"/\1\2/
8096-# Yes, then branch.
8097- ta
8098- P
8099- D
8100-# Note that D includes a jump to the start!!
8101-# We found a continuation line. But before printing insert '\'.
8102- :a
8103- s/\(.*\)\(\n.*\)/\1\\\2/
8104- P
8105-# We cannot use D here.
8106- s/.*\n\(.*\)/\1/
8107- tb
8108-}
8109-d
8110--- lrzsz-0.12.20.safe/intl/loadinfo.h 1998-04-26 09:20:52.000000000 -0400
8111+++ lrzsz-0.12.20/intl/loadinfo.h 2004-09-12 14:40:34.468730912 -0400
8112@@ -1,9 +1,54 @@
8113-#ifndef PARAMS
8114-# if __STDC__
8115-# define PARAMS(args) args
8116-# else
8117-# define PARAMS(args) ()
8118-# endif
8119+/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
8120+ This file is part of the GNU C Library.
8121+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
8122+
8123+ This program is free software; you can redistribute it and/or modify it
8124+ under the terms of the GNU Library General Public License as published
8125+ by the Free Software Foundation; either version 2, or (at your option)
8126+ any later version.
8127+
8128+ This program is distributed in the hope that it will be useful,
8129+ but WITHOUT ANY WARRANTY; without even the implied warranty of
8130+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8131+ Library General Public License for more details.
8132+
8133+ You should have received a copy of the GNU Library General Public
8134+ License along with this program; if not, write to the Free Software
8135+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
8136+ USA. */
8137+
8138+#ifndef _LOADINFO_H
8139+#define _LOADINFO_H 1
8140+
8141+/* Declarations of locale dependent catalog lookup functions.
8142+ Implemented in
8143+
8144+ localealias.c Possibly replace a locale name by another.
8145+ explodename.c Split a locale name into its various fields.
8146+ l10nflist.c Generate a list of filenames of possible message catalogs.
8147+ finddomain.c Find and open the relevant message catalogs.
8148+
8149+ The main function _nl_find_domain() in finddomain.c is declared
8150+ in gettextP.h.
8151+ */
8152+
8153+#ifndef internal_function
8154+# define internal_function
8155+#endif
8156+
8157+/* Tell the compiler when a conditional or integer expression is
8158+ almost always true or almost always false. */
8159+#ifndef HAVE_BUILTIN_EXPECT
8160+# define __builtin_expect(expr, val) (expr)
8161+#endif
8162+
8163+/* Separator in PATH like lists of pathnames. */
8164+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
8165+ /* Win32, OS/2, DOS */
8166+# define PATH_SEPARATOR ';'
8167+#else
8168+ /* Unix */
8169+# define PATH_SEPARATOR ':'
8170 #endif
8171
8172 /* Encoding of locale name parts. */
8173@@ -32,27 +77,69 @@
8174 };
8175
8176
8177-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
8178- size_t name_len));
8179+/* Normalize codeset name. There is no standard for the codeset
8180+ names. Normalization allows the user to use any of the common
8181+ names. The return value is dynamically allocated and has to be
8182+ freed by the caller. */
8183+extern const char *_nl_normalize_codeset (const char *codeset,
8184+ size_t name_len);
8185
8186+/* Lookup a locale dependent file.
8187+ *L10NFILE_LIST denotes a pool of lookup results of locale dependent
8188+ files of the same kind, sorted in decreasing order of ->filename.
8189+ DIRLIST and DIRLIST_LEN are an argz list of directories in which to
8190+ look, containing at least one directory (i.e. DIRLIST_LEN > 0).
8191+ MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
8192+ SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
8193+ produced by _nl_explode_name(). FILENAME is the filename suffix.
8194+ The return value is the lookup result, either found in *L10NFILE_LIST,
8195+ or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
8196+ If the return value is non-NULL, it is added to *L10NFILE_LIST, and
8197+ its ->next field denotes the chaining inside *L10NFILE_LIST, and
8198+ furthermore its ->successor[] field contains a list of other lookup
8199+ results from which this lookup result inherits. */
8200 extern struct loaded_l10nfile *
8201-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
8202- const char *dirlist, size_t dirlist_len, int mask,
8203- const char *language, const char *territory,
8204- const char *codeset,
8205- const char *normalized_codeset,
8206- const char *modifier, const char *special,
8207- const char *sponsor, const char *revision,
8208- const char *filename, int do_allocate));
8209+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
8210+ const char *dirlist, size_t dirlist_len, int mask,
8211+ const char *language, const char *territory,
8212+ const char *codeset, const char *normalized_codeset,
8213+ const char *modifier, const char *special,
8214+ const char *sponsor, const char *revision,
8215+ const char *filename, int do_allocate);
8216
8217+/* Lookup the real locale name for a locale alias NAME, or NULL if
8218+ NAME is not a locale alias (but possibly a real locale name).
8219+ The return value is statically allocated and must not be freed. */
8220+extern const char *_nl_expand_alias (const char *name);
8221
8222-extern const char *_nl_expand_alias PARAMS ((const char *name));
8223+/* Split a locale name NAME into its pieces: language, modifier,
8224+ territory, codeset, special, sponsor, revision.
8225+ NAME gets destructively modified: NUL bytes are inserted here and
8226+ there. *LANGUAGE gets assigned NAME. Each of *MODIFIER, *TERRITORY,
8227+ *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
8228+ pointer into the old NAME string, or NULL. *NORMALIZED_CODESET
8229+ gets assigned the expanded *CODESET, if it is different from *CODESET;
8230+ this one is dynamically allocated and has to be freed by the caller.
8231+ The return value is a bitmask, where each bit corresponds to one
8232+ filled-in value:
8233+ XPG_MODIFIER, CEN_AUDIENCE for *MODIFIER,
8234+ TERRITORY for *TERRITORY,
8235+ XPG_CODESET for *CODESET,
8236+ XPG_NORM_CODESET for *NORMALIZED_CODESET,
8237+ CEN_SPECIAL for *SPECIAL,
8238+ CEN_SPONSOR for *SPONSOR,
8239+ CEN_REVISION for *REVISION.
8240+ */
8241+extern int _nl_explode_name (char *name, const char **language,
8242+ const char **modifier, const char **territory,
8243+ const char **codeset,
8244+ const char **normalized_codeset,
8245+ const char **special, const char **sponsor,
8246+ const char **revision);
8247
8248-extern int _nl_explode_name PARAMS ((char *name, const char **language,
8249- const char **modifier,
8250- const char **territory,
8251- const char **codeset,
8252- const char **normalized_codeset,
8253- const char **special,
8254- const char **sponsor,
8255- const char **revision));
8256+/* Split a locale name NAME into a leading language part and all the
8257+ rest. Return a pointer to the first character after the language,
8258+ i.e. to the first byte of the rest. */
8259+extern char *_nl_find_language (const char *name);
8260+
8261+#endif /* loadinfo.h */
8262--- lrzsz-0.12.20.safe/intl/loadmsgcat.c 1998-04-26 09:22:37.000000000 -0400
8263+++ lrzsz-0.12.20/intl/loadmsgcat.c 2004-09-12 14:40:34.473730152 -0400
8264@@ -1,42 +1,455 @@
8265-/* Load needed message catalogs
8266- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
8267+/* Load needed message catalogs.
8268+ Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
8269
8270- This program is free software; you can redistribute it and/or modify
8271- it under the terms of the GNU General Public License as published by
8272- the Free Software Foundation; either version 2, or (at your option)
8273+ This program is free software; you can redistribute it and/or modify it
8274+ under the terms of the GNU Library General Public License as published
8275+ by the Free Software Foundation; either version 2, or (at your option)
8276 any later version.
8277
8278 This program is distributed in the hope that it will be useful,
8279 but WITHOUT ANY WARRANTY; without even the implied warranty of
8280- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8281- GNU General Public License for more details.
8282+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8283+ Library General Public License for more details.
8284
8285- You should have received a copy of the GNU General Public License
8286- along with this program; if not, write to the Free Software Foundation,
8287- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
8288+ You should have received a copy of the GNU Library General Public
8289+ License along with this program; if not, write to the Free Software
8290+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
8291+ USA. */
8292+
8293+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
8294+ This must come before <config.h> because <config.h> may include
8295+ <features.h>, and once <features.h> has been included, it's too late. */
8296+#ifndef _GNU_SOURCE
8297+# define _GNU_SOURCE 1
8298+#endif
8299
8300 #ifdef HAVE_CONFIG_H
8301 # include <config.h>
8302 #endif
8303
8304+#include <ctype.h>
8305+#include <errno.h>
8306 #include <fcntl.h>
8307 #include <sys/types.h>
8308 #include <sys/stat.h>
8309
8310-#if defined STDC_HEADERS || defined _LIBC
8311-# include <stdlib.h>
8312+#ifdef __GNUC__
8313+# undef alloca
8314+# define alloca __builtin_alloca
8315+# define HAVE_ALLOCA 1
8316+#else
8317+# ifdef _MSC_VER
8318+# include <malloc.h>
8319+# define alloca _alloca
8320+# else
8321+# if defined HAVE_ALLOCA_H || defined _LIBC
8322+# include <alloca.h>
8323+# else
8324+# ifdef _AIX
8325+ #pragma alloca
8326+# else
8327+# ifndef alloca
8328+char *alloca ();
8329+# endif
8330+# endif
8331+# endif
8332+# endif
8333 #endif
8334
8335+#include <stdlib.h>
8336+#include <string.h>
8337+
8338 #if defined HAVE_UNISTD_H || defined _LIBC
8339 # include <unistd.h>
8340 #endif
8341
8342-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
8343+#ifdef _LIBC
8344+# include <langinfo.h>
8345+# include <locale.h>
8346+#endif
8347+
8348+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
8349+ || (defined _LIBC && defined _POSIX_MAPPED_FILES)
8350 # include <sys/mman.h>
8351+# undef HAVE_MMAP
8352+# define HAVE_MMAP 1
8353+#else
8354+# undef HAVE_MMAP
8355 #endif
8356
8357-#include "gettext.h"
8358+#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
8359+# include <stdint.h>
8360+#endif
8361+#if defined HAVE_INTTYPES_H || defined _LIBC
8362+# include <inttypes.h>
8363+#endif
8364+
8365+#include "gmo.h"
8366 #include "gettextP.h"
8367+#include "hash-string.h"
8368+#include "plural-exp.h"
8369+
8370+#ifdef _LIBC
8371+# include "../locale/localeinfo.h"
8372+#endif
8373+
8374+/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
8375+ Note that our fallback values need not be literal strings, because we don't
8376+ use them with preprocessor string concatenation. */
8377+#if !defined PRId8 || PRI_MACROS_BROKEN
8378+# undef PRId8
8379+# define PRId8 "d"
8380+#endif
8381+#if !defined PRIi8 || PRI_MACROS_BROKEN
8382+# undef PRIi8
8383+# define PRIi8 "i"
8384+#endif
8385+#if !defined PRIo8 || PRI_MACROS_BROKEN
8386+# undef PRIo8
8387+# define PRIo8 "o"
8388+#endif
8389+#if !defined PRIu8 || PRI_MACROS_BROKEN
8390+# undef PRIu8
8391+# define PRIu8 "u"
8392+#endif
8393+#if !defined PRIx8 || PRI_MACROS_BROKEN
8394+# undef PRIx8
8395+# define PRIx8 "x"
8396+#endif
8397+#if !defined PRIX8 || PRI_MACROS_BROKEN
8398+# undef PRIX8
8399+# define PRIX8 "X"
8400+#endif
8401+#if !defined PRId16 || PRI_MACROS_BROKEN
8402+# undef PRId16
8403+# define PRId16 "d"
8404+#endif
8405+#if !defined PRIi16 || PRI_MACROS_BROKEN
8406+# undef PRIi16
8407+# define PRIi16 "i"
8408+#endif
8409+#if !defined PRIo16 || PRI_MACROS_BROKEN
8410+# undef PRIo16
8411+# define PRIo16 "o"
8412+#endif
8413+#if !defined PRIu16 || PRI_MACROS_BROKEN
8414+# undef PRIu16
8415+# define PRIu16 "u"
8416+#endif
8417+#if !defined PRIx16 || PRI_MACROS_BROKEN
8418+# undef PRIx16
8419+# define PRIx16 "x"
8420+#endif
8421+#if !defined PRIX16 || PRI_MACROS_BROKEN
8422+# undef PRIX16
8423+# define PRIX16 "X"
8424+#endif
8425+#if !defined PRId32 || PRI_MACROS_BROKEN
8426+# undef PRId32
8427+# define PRId32 "d"
8428+#endif
8429+#if !defined PRIi32 || PRI_MACROS_BROKEN
8430+# undef PRIi32
8431+# define PRIi32 "i"
8432+#endif
8433+#if !defined PRIo32 || PRI_MACROS_BROKEN
8434+# undef PRIo32
8435+# define PRIo32 "o"
8436+#endif
8437+#if !defined PRIu32 || PRI_MACROS_BROKEN
8438+# undef PRIu32
8439+# define PRIu32 "u"
8440+#endif
8441+#if !defined PRIx32 || PRI_MACROS_BROKEN
8442+# undef PRIx32
8443+# define PRIx32 "x"
8444+#endif
8445+#if !defined PRIX32 || PRI_MACROS_BROKEN
8446+# undef PRIX32
8447+# define PRIX32 "X"
8448+#endif
8449+#if !defined PRId64 || PRI_MACROS_BROKEN
8450+# undef PRId64
8451+# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
8452+#endif
8453+#if !defined PRIi64 || PRI_MACROS_BROKEN
8454+# undef PRIi64
8455+# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
8456+#endif
8457+#if !defined PRIo64 || PRI_MACROS_BROKEN
8458+# undef PRIo64
8459+# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
8460+#endif
8461+#if !defined PRIu64 || PRI_MACROS_BROKEN
8462+# undef PRIu64
8463+# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
8464+#endif
8465+#if !defined PRIx64 || PRI_MACROS_BROKEN
8466+# undef PRIx64
8467+# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
8468+#endif
8469+#if !defined PRIX64 || PRI_MACROS_BROKEN
8470+# undef PRIX64
8471+# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
8472+#endif
8473+#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
8474+# undef PRIdLEAST8
8475+# define PRIdLEAST8 "d"
8476+#endif
8477+#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
8478+# undef PRIiLEAST8
8479+# define PRIiLEAST8 "i"
8480+#endif
8481+#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
8482+# undef PRIoLEAST8
8483+# define PRIoLEAST8 "o"
8484+#endif
8485+#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
8486+# undef PRIuLEAST8
8487+# define PRIuLEAST8 "u"
8488+#endif
8489+#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
8490+# undef PRIxLEAST8
8491+# define PRIxLEAST8 "x"
8492+#endif
8493+#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
8494+# undef PRIXLEAST8
8495+# define PRIXLEAST8 "X"
8496+#endif
8497+#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
8498+# undef PRIdLEAST16
8499+# define PRIdLEAST16 "d"
8500+#endif
8501+#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
8502+# undef PRIiLEAST16
8503+# define PRIiLEAST16 "i"
8504+#endif
8505+#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
8506+# undef PRIoLEAST16
8507+# define PRIoLEAST16 "o"
8508+#endif
8509+#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
8510+# undef PRIuLEAST16
8511+# define PRIuLEAST16 "u"
8512+#endif
8513+#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
8514+# undef PRIxLEAST16
8515+# define PRIxLEAST16 "x"
8516+#endif
8517+#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
8518+# undef PRIXLEAST16
8519+# define PRIXLEAST16 "X"
8520+#endif
8521+#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
8522+# undef PRIdLEAST32
8523+# define PRIdLEAST32 "d"
8524+#endif
8525+#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
8526+# undef PRIiLEAST32
8527+# define PRIiLEAST32 "i"
8528+#endif
8529+#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
8530+# undef PRIoLEAST32
8531+# define PRIoLEAST32 "o"
8532+#endif
8533+#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
8534+# undef PRIuLEAST32
8535+# define PRIuLEAST32 "u"
8536+#endif
8537+#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
8538+# undef PRIxLEAST32
8539+# define PRIxLEAST32 "x"
8540+#endif
8541+#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
8542+# undef PRIXLEAST32
8543+# define PRIXLEAST32 "X"
8544+#endif
8545+#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
8546+# undef PRIdLEAST64
8547+# define PRIdLEAST64 PRId64
8548+#endif
8549+#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
8550+# undef PRIiLEAST64
8551+# define PRIiLEAST64 PRIi64
8552+#endif
8553+#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
8554+# undef PRIoLEAST64
8555+# define PRIoLEAST64 PRIo64
8556+#endif
8557+#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
8558+# undef PRIuLEAST64
8559+# define PRIuLEAST64 PRIu64
8560+#endif
8561+#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
8562+# undef PRIxLEAST64
8563+# define PRIxLEAST64 PRIx64
8564+#endif
8565+#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
8566+# undef PRIXLEAST64
8567+# define PRIXLEAST64 PRIX64
8568+#endif
8569+#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
8570+# undef PRIdFAST8
8571+# define PRIdFAST8 "d"
8572+#endif
8573+#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
8574+# undef PRIiFAST8
8575+# define PRIiFAST8 "i"
8576+#endif
8577+#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
8578+# undef PRIoFAST8
8579+# define PRIoFAST8 "o"
8580+#endif
8581+#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
8582+# undef PRIuFAST8
8583+# define PRIuFAST8 "u"
8584+#endif
8585+#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
8586+# undef PRIxFAST8
8587+# define PRIxFAST8 "x"
8588+#endif
8589+#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
8590+# undef PRIXFAST8
8591+# define PRIXFAST8 "X"
8592+#endif
8593+#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
8594+# undef PRIdFAST16
8595+# define PRIdFAST16 "d"
8596+#endif
8597+#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
8598+# undef PRIiFAST16
8599+# define PRIiFAST16 "i"
8600+#endif
8601+#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
8602+# undef PRIoFAST16
8603+# define PRIoFAST16 "o"
8604+#endif
8605+#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
8606+# undef PRIuFAST16
8607+# define PRIuFAST16 "u"
8608+#endif
8609+#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
8610+# undef PRIxFAST16
8611+# define PRIxFAST16 "x"
8612+#endif
8613+#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
8614+# undef PRIXFAST16
8615+# define PRIXFAST16 "X"
8616+#endif
8617+#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
8618+# undef PRIdFAST32
8619+# define PRIdFAST32 "d"
8620+#endif
8621+#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
8622+# undef PRIiFAST32
8623+# define PRIiFAST32 "i"
8624+#endif
8625+#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
8626+# undef PRIoFAST32
8627+# define PRIoFAST32 "o"
8628+#endif
8629+#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
8630+# undef PRIuFAST32
8631+# define PRIuFAST32 "u"
8632+#endif
8633+#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
8634+# undef PRIxFAST32
8635+# define PRIxFAST32 "x"
8636+#endif
8637+#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
8638+# undef PRIXFAST32
8639+# define PRIXFAST32 "X"
8640+#endif
8641+#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
8642+# undef PRIdFAST64
8643+# define PRIdFAST64 PRId64
8644+#endif
8645+#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
8646+# undef PRIiFAST64
8647+# define PRIiFAST64 PRIi64
8648+#endif
8649+#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
8650+# undef PRIoFAST64
8651+# define PRIoFAST64 PRIo64
8652+#endif
8653+#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
8654+# undef PRIuFAST64
8655+# define PRIuFAST64 PRIu64
8656+#endif
8657+#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
8658+# undef PRIxFAST64
8659+# define PRIxFAST64 PRIx64
8660+#endif
8661+#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
8662+# undef PRIXFAST64
8663+# define PRIXFAST64 PRIX64
8664+#endif
8665+#if !defined PRIdMAX || PRI_MACROS_BROKEN
8666+# undef PRIdMAX
8667+# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
8668+#endif
8669+#if !defined PRIiMAX || PRI_MACROS_BROKEN
8670+# undef PRIiMAX
8671+# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
8672+#endif
8673+#if !defined PRIoMAX || PRI_MACROS_BROKEN
8674+# undef PRIoMAX
8675+# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
8676+#endif
8677+#if !defined PRIuMAX || PRI_MACROS_BROKEN
8678+# undef PRIuMAX
8679+# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
8680+#endif
8681+#if !defined PRIxMAX || PRI_MACROS_BROKEN
8682+# undef PRIxMAX
8683+# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
8684+#endif
8685+#if !defined PRIXMAX || PRI_MACROS_BROKEN
8686+# undef PRIXMAX
8687+# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
8688+#endif
8689+#if !defined PRIdPTR || PRI_MACROS_BROKEN
8690+# undef PRIdPTR
8691+# define PRIdPTR \
8692+ (sizeof (void *) == sizeof (long) ? "ld" : \
8693+ sizeof (void *) == sizeof (int) ? "d" : \
8694+ "lld")
8695+#endif
8696+#if !defined PRIiPTR || PRI_MACROS_BROKEN
8697+# undef PRIiPTR
8698+# define PRIiPTR \
8699+ (sizeof (void *) == sizeof (long) ? "li" : \
8700+ sizeof (void *) == sizeof (int) ? "i" : \
8701+ "lli")
8702+#endif
8703+#if !defined PRIoPTR || PRI_MACROS_BROKEN
8704+# undef PRIoPTR
8705+# define PRIoPTR \
8706+ (sizeof (void *) == sizeof (long) ? "lo" : \
8707+ sizeof (void *) == sizeof (int) ? "o" : \
8708+ "llo")
8709+#endif
8710+#if !defined PRIuPTR || PRI_MACROS_BROKEN
8711+# undef PRIuPTR
8712+# define PRIuPTR \
8713+ (sizeof (void *) == sizeof (long) ? "lu" : \
8714+ sizeof (void *) == sizeof (int) ? "u" : \
8715+ "llu")
8716+#endif
8717+#if !defined PRIxPTR || PRI_MACROS_BROKEN
8718+# undef PRIxPTR
8719+# define PRIxPTR \
8720+ (sizeof (void *) == sizeof (long) ? "lx" : \
8721+ sizeof (void *) == sizeof (int) ? "x" : \
8722+ "llx")
8723+#endif
8724+#if !defined PRIXPTR || PRI_MACROS_BROKEN
8725+# undef PRIXPTR
8726+# define PRIXPTR \
8727+ (sizeof (void *) == sizeof (long) ? "lX" : \
8728+ sizeof (void *) == sizeof (int) ? "X" : \
8729+ "llX")
8730+#endif
8731
8732 /* @@ end of prolog @@ */
8733
8734@@ -44,7 +457,6 @@
8735 /* Rename the non ISO C functions. This is required by the standard
8736 because some ISO C functions will require linking with this object
8737 file and the name space must not be polluted. */
8738-# define fstat __fstat
8739 # define open __open
8740 # define close __close
8741 # define read __read
8742@@ -52,30 +464,471 @@
8743 # define munmap __munmap
8744 #endif
8745
8746+/* For those losing systems which don't have `alloca' we have to add
8747+ some additional code emulating it. */
8748+#ifdef HAVE_ALLOCA
8749+# define freea(p) /* nothing */
8750+#else
8751+# define alloca(n) malloc (n)
8752+# define freea(p) free (p)
8753+#endif
8754+
8755+/* For systems that distinguish between text and binary I/O.
8756+ O_BINARY is usually declared in <fcntl.h>. */
8757+#if !defined O_BINARY && defined _O_BINARY
8758+ /* For MSC-compatible compilers. */
8759+# define O_BINARY _O_BINARY
8760+# define O_TEXT _O_TEXT
8761+#endif
8762+#ifdef __BEOS__
8763+ /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */
8764+# undef O_BINARY
8765+# undef O_TEXT
8766+#endif
8767+/* On reasonable systems, binary I/O is the default. */
8768+#ifndef O_BINARY
8769+# define O_BINARY 0
8770+#endif
8771+
8772+
8773 /* We need a sign, whether a new catalog was loaded, which can be associated
8774 with all translations. This is important if the translations are
8775 cached by one of GCC's features. */
8776-int _nl_msg_cat_cntr = 0;
8777+int _nl_msg_cat_cntr;
8778
8779
8780+/* Expand a system dependent string segment. Return NULL if unsupported. */
8781+static const char *
8782+get_sysdep_segment_value (const char *name)
8783+{
8784+ /* Test for an ISO C 99 section 7.8.1 format string directive.
8785+ Syntax:
8786+ P R I { d | i | o | u | x | X }
8787+ { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */
8788+ /* We don't use a table of 14 times 6 'const char *' strings here, because
8789+ data relocations cost startup time. */
8790+ if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
8791+ {
8792+ if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
8793+ || name[3] == 'x' || name[3] == 'X')
8794+ {
8795+ if (name[4] == '8' && name[5] == '\0')
8796+ {
8797+ if (name[3] == 'd')
8798+ return PRId8;
8799+ if (name[3] == 'i')
8800+ return PRIi8;
8801+ if (name[3] == 'o')
8802+ return PRIo8;
8803+ if (name[3] == 'u')
8804+ return PRIu8;
8805+ if (name[3] == 'x')
8806+ return PRIx8;
8807+ if (name[3] == 'X')
8808+ return PRIX8;
8809+ abort ();
8810+ }
8811+ if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
8812+ {
8813+ if (name[3] == 'd')
8814+ return PRId16;
8815+ if (name[3] == 'i')
8816+ return PRIi16;
8817+ if (name[3] == 'o')
8818+ return PRIo16;
8819+ if (name[3] == 'u')
8820+ return PRIu16;
8821+ if (name[3] == 'x')
8822+ return PRIx16;
8823+ if (name[3] == 'X')
8824+ return PRIX16;
8825+ abort ();
8826+ }
8827+ if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
8828+ {
8829+ if (name[3] == 'd')
8830+ return PRId32;
8831+ if (name[3] == 'i')
8832+ return PRIi32;
8833+ if (name[3] == 'o')
8834+ return PRIo32;
8835+ if (name[3] == 'u')
8836+ return PRIu32;
8837+ if (name[3] == 'x')
8838+ return PRIx32;
8839+ if (name[3] == 'X')
8840+ return PRIX32;
8841+ abort ();
8842+ }
8843+ if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
8844+ {
8845+ if (name[3] == 'd')
8846+ return PRId64;
8847+ if (name[3] == 'i')
8848+ return PRIi64;
8849+ if (name[3] == 'o')
8850+ return PRIo64;
8851+ if (name[3] == 'u')
8852+ return PRIu64;
8853+ if (name[3] == 'x')
8854+ return PRIx64;
8855+ if (name[3] == 'X')
8856+ return PRIX64;
8857+ abort ();
8858+ }
8859+ if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
8860+ && name[7] == 'S' && name[8] == 'T')
8861+ {
8862+ if (name[9] == '8' && name[10] == '\0')
8863+ {
8864+ if (name[3] == 'd')
8865+ return PRIdLEAST8;
8866+ if (name[3] == 'i')
8867+ return PRIiLEAST8;
8868+ if (name[3] == 'o')
8869+ return PRIoLEAST8;
8870+ if (name[3] == 'u')
8871+ return PRIuLEAST8;
8872+ if (name[3] == 'x')
8873+ return PRIxLEAST8;
8874+ if (name[3] == 'X')
8875+ return PRIXLEAST8;
8876+ abort ();
8877+ }
8878+ if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
8879+ {
8880+ if (name[3] == 'd')
8881+ return PRIdLEAST16;
8882+ if (name[3] == 'i')
8883+ return PRIiLEAST16;
8884+ if (name[3] == 'o')
8885+ return PRIoLEAST16;
8886+ if (name[3] == 'u')
8887+ return PRIuLEAST16;
8888+ if (name[3] == 'x')
8889+ return PRIxLEAST16;
8890+ if (name[3] == 'X')
8891+ return PRIXLEAST16;
8892+ abort ();
8893+ }
8894+ if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
8895+ {
8896+ if (name[3] == 'd')
8897+ return PRIdLEAST32;
8898+ if (name[3] == 'i')
8899+ return PRIiLEAST32;
8900+ if (name[3] == 'o')
8901+ return PRIoLEAST32;
8902+ if (name[3] == 'u')
8903+ return PRIuLEAST32;
8904+ if (name[3] == 'x')
8905+ return PRIxLEAST32;
8906+ if (name[3] == 'X')
8907+ return PRIXLEAST32;
8908+ abort ();
8909+ }
8910+ if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
8911+ {
8912+ if (name[3] == 'd')
8913+ return PRIdLEAST64;
8914+ if (name[3] == 'i')
8915+ return PRIiLEAST64;
8916+ if (name[3] == 'o')
8917+ return PRIoLEAST64;
8918+ if (name[3] == 'u')
8919+ return PRIuLEAST64;
8920+ if (name[3] == 'x')
8921+ return PRIxLEAST64;
8922+ if (name[3] == 'X')
8923+ return PRIXLEAST64;
8924+ abort ();
8925+ }
8926+ }
8927+ if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
8928+ && name[7] == 'T')
8929+ {
8930+ if (name[8] == '8' && name[9] == '\0')
8931+ {
8932+ if (name[3] == 'd')
8933+ return PRIdFAST8;
8934+ if (name[3] == 'i')
8935+ return PRIiFAST8;
8936+ if (name[3] == 'o')
8937+ return PRIoFAST8;
8938+ if (name[3] == 'u')
8939+ return PRIuFAST8;
8940+ if (name[3] == 'x')
8941+ return PRIxFAST8;
8942+ if (name[3] == 'X')
8943+ return PRIXFAST8;
8944+ abort ();
8945+ }
8946+ if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
8947+ {
8948+ if (name[3] == 'd')
8949+ return PRIdFAST16;
8950+ if (name[3] == 'i')
8951+ return PRIiFAST16;
8952+ if (name[3] == 'o')
8953+ return PRIoFAST16;
8954+ if (name[3] == 'u')
8955+ return PRIuFAST16;
8956+ if (name[3] == 'x')
8957+ return PRIxFAST16;
8958+ if (name[3] == 'X')
8959+ return PRIXFAST16;
8960+ abort ();
8961+ }
8962+ if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
8963+ {
8964+ if (name[3] == 'd')
8965+ return PRIdFAST32;
8966+ if (name[3] == 'i')
8967+ return PRIiFAST32;
8968+ if (name[3] == 'o')
8969+ return PRIoFAST32;
8970+ if (name[3] == 'u')
8971+ return PRIuFAST32;
8972+ if (name[3] == 'x')
8973+ return PRIxFAST32;
8974+ if (name[3] == 'X')
8975+ return PRIXFAST32;
8976+ abort ();
8977+ }
8978+ if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
8979+ {
8980+ if (name[3] == 'd')
8981+ return PRIdFAST64;
8982+ if (name[3] == 'i')
8983+ return PRIiFAST64;
8984+ if (name[3] == 'o')
8985+ return PRIoFAST64;
8986+ if (name[3] == 'u')
8987+ return PRIuFAST64;
8988+ if (name[3] == 'x')
8989+ return PRIxFAST64;
8990+ if (name[3] == 'X')
8991+ return PRIXFAST64;
8992+ abort ();
8993+ }
8994+ }
8995+ if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
8996+ && name[7] == '\0')
8997+ {
8998+ if (name[3] == 'd')
8999+ return PRIdMAX;
9000+ if (name[3] == 'i')
9001+ return PRIiMAX;
9002+ if (name[3] == 'o')
9003+ return PRIoMAX;
9004+ if (name[3] == 'u')
9005+ return PRIuMAX;
9006+ if (name[3] == 'x')
9007+ return PRIxMAX;
9008+ if (name[3] == 'X')
9009+ return PRIXMAX;
9010+ abort ();
9011+ }
9012+ if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
9013+ && name[7] == '\0')
9014+ {
9015+ if (name[3] == 'd')
9016+ return PRIdPTR;
9017+ if (name[3] == 'i')
9018+ return PRIiPTR;
9019+ if (name[3] == 'o')
9020+ return PRIoPTR;
9021+ if (name[3] == 'u')
9022+ return PRIuPTR;
9023+ if (name[3] == 'x')
9024+ return PRIxPTR;
9025+ if (name[3] == 'X')
9026+ return PRIXPTR;
9027+ abort ();
9028+ }
9029+ }
9030+ }
9031+ /* Test for a glibc specific printf() format directive flag. */
9032+ if (name[0] == 'I' && name[1] == '\0')
9033+ {
9034+#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
9035+ /* The 'I' flag, in numeric format directives, replaces ASCII digits
9036+ with the 'outdigits' defined in the LC_CTYPE locale facet. This is
9037+ used for Farsi (Persian) and maybe Arabic. */
9038+ return "I";
9039+#else
9040+ return "";
9041+#endif
9042+ }
9043+ /* Other system dependent strings are not valid. */
9044+ return NULL;
9045+}
9046+
9047+/* Initialize the codeset dependent parts of an opened message catalog.
9048+ Return the header entry. */
9049+const char *
9050+internal_function
9051+_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
9052+ struct loaded_domain *domain,
9053+ struct binding *domainbinding)
9054+{
9055+ /* Find out about the character set the file is encoded with.
9056+ This can be found (in textual form) in the entry "". If this
9057+ entry does not exist or if this does not contain the `charset='
9058+ information, we will assume the charset matches the one the
9059+ current locale and we don't have to perform any conversion. */
9060+ char *nullentry;
9061+ size_t nullentrylen;
9062+
9063+ /* Preinitialize fields, to avoid recursion during _nl_find_msg. */
9064+ domain->codeset_cntr =
9065+ (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
9066+#ifdef _LIBC
9067+ domain->conv = (__gconv_t) -1;
9068+#else
9069+# if HAVE_ICONV
9070+ domain->conv = (iconv_t) -1;
9071+# endif
9072+#endif
9073+ domain->conv_tab = NULL;
9074+
9075+ /* Get the header entry. */
9076+ nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
9077+
9078+ if (nullentry != NULL)
9079+ {
9080+#if defined _LIBC || HAVE_ICONV
9081+ const char *charsetstr;
9082+
9083+ charsetstr = strstr (nullentry, "charset=");
9084+ if (charsetstr != NULL)
9085+ {
9086+ size_t len;
9087+ char *charset;
9088+ const char *outcharset;
9089+
9090+ charsetstr += strlen ("charset=");
9091+ len = strcspn (charsetstr, " \t\n");
9092+
9093+ charset = (char *) alloca (len + 1);
9094+# if defined _LIBC || HAVE_MEMPCPY
9095+ *((char *) mempcpy (charset, charsetstr, len)) = '\0';
9096+# else
9097+ memcpy (charset, charsetstr, len);
9098+ charset[len] = '\0';
9099+# endif
9100+
9101+ /* The output charset should normally be determined by the
9102+ locale. But sometimes the locale is not used or not correctly
9103+ set up, so we provide a possibility for the user to override
9104+ this. Moreover, the value specified through
9105+ bind_textdomain_codeset overrides both. */
9106+ if (domainbinding != NULL && domainbinding->codeset != NULL)
9107+ outcharset = domainbinding->codeset;
9108+ else
9109+ {
9110+ outcharset = getenv ("OUTPUT_CHARSET");
9111+ if (outcharset == NULL || outcharset[0] == '\0')
9112+ {
9113+# ifdef _LIBC
9114+ outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
9115+# else
9116+# if HAVE_ICONV
9117+ extern const char *locale_charset (void);
9118+ outcharset = locale_charset ();
9119+# endif
9120+# endif
9121+ }
9122+ }
9123+
9124+# ifdef _LIBC
9125+ /* We always want to use transliteration. */
9126+ outcharset = norm_add_slashes (outcharset, "TRANSLIT");
9127+ charset = norm_add_slashes (charset, NULL);
9128+ if (__gconv_open (outcharset, charset, &domain->conv,
9129+ GCONV_AVOID_NOCONV)
9130+ != __GCONV_OK)
9131+ domain->conv = (__gconv_t) -1;
9132+# else
9133+# if HAVE_ICONV
9134+ /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
9135+ we want to use transliteration. */
9136+# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
9137+ || _LIBICONV_VERSION >= 0x0105
9138+ if (strchr (outcharset, '/') == NULL)
9139+ {
9140+ char *tmp;
9141+
9142+ len = strlen (outcharset);
9143+ tmp = (char *) alloca (len + 10 + 1);
9144+ memcpy (tmp, outcharset, len);
9145+ memcpy (tmp + len, "//TRANSLIT", 10 + 1);
9146+ outcharset = tmp;
9147+
9148+ domain->conv = iconv_open (outcharset, charset);
9149+
9150+ freea (outcharset);
9151+ }
9152+ else
9153+# endif
9154+ domain->conv = iconv_open (outcharset, charset);
9155+# endif
9156+# endif
9157+
9158+ freea (charset);
9159+ }
9160+#endif /* _LIBC || HAVE_ICONV */
9161+ }
9162+
9163+ return nullentry;
9164+}
9165+
9166+/* Frees the codeset dependent parts of an opened message catalog. */
9167+void
9168+internal_function
9169+_nl_free_domain_conv (struct loaded_domain *domain)
9170+{
9171+ if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
9172+ free (domain->conv_tab);
9173+
9174+#ifdef _LIBC
9175+ if (domain->conv != (__gconv_t) -1)
9176+ __gconv_close (domain->conv);
9177+#else
9178+# if HAVE_ICONV
9179+ if (domain->conv != (iconv_t) -1)
9180+ iconv_close (domain->conv);
9181+# endif
9182+#endif
9183+}
9184+
9185 /* Load the message catalogs specified by FILENAME. If it is no valid
9186 message catalog do nothing. */
9187 void
9188-_nl_load_domain (domain_file)
9189- struct loaded_l10nfile *domain_file;
9190+internal_function
9191+_nl_load_domain (struct loaded_l10nfile *domain_file,
9192+ struct binding *domainbinding)
9193 {
9194 int fd;
9195+ size_t size;
9196+#ifdef _LIBC
9197+ struct stat64 st;
9198+#else
9199 struct stat st;
9200+#endif
9201 struct mo_file_header *data = (struct mo_file_header *) -1;
9202-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
9203- || defined _LIBC
9204 int use_mmap = 0;
9205-#endif
9206 struct loaded_domain *domain;
9207+ int revision;
9208+ const char *nullentry;
9209
9210 domain_file->decided = 1;
9211 domain_file->data = NULL;
9212
9213+ /* Note that it would be useless to store domainbinding in domain_file
9214+ because domainbinding might be == NULL now but != NULL later (after
9215+ a call to bind_textdomain_codeset). */
9216+
9217 /* If the record does not represent a valid locale the FILENAME
9218 might be NULL. This can happen when according to the given
9219 specification the locale file name is different for XPG and CEN
9220@@ -84,27 +937,32 @@
9221 return;
9222
9223 /* Try to open the addressed file. */
9224- fd = open (domain_file->filename, O_RDONLY);
9225+ fd = open (domain_file->filename, O_RDONLY | O_BINARY);
9226 if (fd == -1)
9227 return;
9228
9229 /* We must know about the size of the file. */
9230- if (fstat (fd, &st) != 0
9231- && st.st_size < (off_t) sizeof (struct mo_file_header))
9232+ if (
9233+#ifdef _LIBC
9234+ __builtin_expect (fstat64 (fd, &st) != 0, 0)
9235+#else
9236+ __builtin_expect (fstat (fd, &st) != 0, 0)
9237+#endif
9238+ || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
9239+ || __builtin_expect (size < sizeof (struct mo_file_header), 0))
9240 {
9241 /* Something went wrong. */
9242 close (fd);
9243 return;
9244 }
9245
9246-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
9247- || defined _LIBC
9248+#ifdef HAVE_MMAP
9249 /* Now we are ready to load the file. If mmap() is available we try
9250 this first. If not available or it failed we try to load it. */
9251- data = (struct mo_file_header *) mmap (NULL, st.st_size, PROT_READ,
9252+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
9253 MAP_PRIVATE, fd, 0);
9254
9255- if (data != (struct mo_file_header *) -1)
9256+ if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
9257 {
9258 /* mmap() call was successful. */
9259 close (fd);
9260@@ -116,24 +974,27 @@
9261 it manually. */
9262 if (data == (struct mo_file_header *) -1)
9263 {
9264- off_t to_read;
9265+ size_t to_read;
9266 char *read_ptr;
9267
9268- data = (struct mo_file_header *) malloc (st.st_size);
9269+ data = (struct mo_file_header *) malloc (size);
9270 if (data == NULL)
9271 return;
9272
9273- to_read = st.st_size;
9274+ to_read = size;
9275 read_ptr = (char *) data;
9276 do
9277 {
9278 long int nb = (long int) read (fd, read_ptr, to_read);
9279- if (nb == -1)
9280+ if (nb <= 0)
9281 {
9282+#ifdef EINTR
9283+ if (nb == -1 && errno == EINTR)
9284+ continue;
9285+#endif
9286 close (fd);
9287 return;
9288 }
9289-
9290 read_ptr += nb;
9291 to_read -= nb;
9292 }
9293@@ -144,47 +1005,378 @@
9294
9295 /* Using the magic number we can test whether it really is a message
9296 catalog file. */
9297- if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
9298+ if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
9299+ 0))
9300 {
9301 /* The magic number is wrong: not a message catalog file. */
9302-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
9303- || defined _LIBC
9304+#ifdef HAVE_MMAP
9305 if (use_mmap)
9306- munmap ((caddr_t) data, st.st_size);
9307+ munmap ((caddr_t) data, size);
9308 else
9309 #endif
9310 free (data);
9311 return;
9312 }
9313
9314- domain_file->data
9315- = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
9316- if (domain_file->data == NULL)
9317+ domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
9318+ if (domain == NULL)
9319 return;
9320+ domain_file->data = domain;
9321
9322- domain = (struct loaded_domain *) domain_file->data;
9323 domain->data = (char *) data;
9324+ domain->use_mmap = use_mmap;
9325+ domain->mmap_size = size;
9326 domain->must_swap = data->magic != _MAGIC;
9327+ domain->malloced = NULL;
9328
9329 /* Fill in the information about the available tables. */
9330- switch (W (domain->must_swap, data->revision))
9331+ revision = W (domain->must_swap, data->revision);
9332+ /* We support only the major revisions 0 and 1. */
9333+ switch (revision >> 16)
9334 {
9335 case 0:
9336+ case 1:
9337 domain->nstrings = W (domain->must_swap, data->nstrings);
9338- domain->orig_tab = (struct string_desc *)
9339+ domain->orig_tab = (const struct string_desc *)
9340 ((char *) data + W (domain->must_swap, data->orig_tab_offset));
9341- domain->trans_tab = (struct string_desc *)
9342+ domain->trans_tab = (const struct string_desc *)
9343 ((char *) data + W (domain->must_swap, data->trans_tab_offset));
9344 domain->hash_size = W (domain->must_swap, data->hash_tab_size);
9345- domain->hash_tab = (nls_uint32 *)
9346- ((char *) data + W (domain->must_swap, data->hash_tab_offset));
9347+ domain->hash_tab =
9348+ (domain->hash_size > 2
9349+ ? (const nls_uint32 *)
9350+ ((char *) data + W (domain->must_swap, data->hash_tab_offset))
9351+ : NULL);
9352+ domain->must_swap_hash_tab = domain->must_swap;
9353+
9354+ /* Now dispatch on the minor revision. */
9355+ switch (revision & 0xffff)
9356+ {
9357+ case 0:
9358+ domain->n_sysdep_strings = 0;
9359+ domain->orig_sysdep_tab = NULL;
9360+ domain->trans_sysdep_tab = NULL;
9361+ break;
9362+ case 1:
9363+ default:
9364+ {
9365+ nls_uint32 n_sysdep_strings;
9366+
9367+ if (domain->hash_tab == NULL)
9368+ /* This is invalid. These minor revisions need a hash table. */
9369+ goto invalid;
9370+
9371+ n_sysdep_strings =
9372+ W (domain->must_swap, data->n_sysdep_strings);
9373+ if (n_sysdep_strings > 0)
9374+ {
9375+ nls_uint32 n_sysdep_segments;
9376+ const struct sysdep_segment *sysdep_segments;
9377+ const char **sysdep_segment_values;
9378+ const nls_uint32 *orig_sysdep_tab;
9379+ const nls_uint32 *trans_sysdep_tab;
9380+ nls_uint32 n_inmem_sysdep_strings;
9381+ size_t memneed;
9382+ char *mem;
9383+ struct sysdep_string_desc *inmem_orig_sysdep_tab;
9384+ struct sysdep_string_desc *inmem_trans_sysdep_tab;
9385+ nls_uint32 *inmem_hash_tab;
9386+ unsigned int i, j;
9387+
9388+ /* Get the values of the system dependent segments. */
9389+ n_sysdep_segments =
9390+ W (domain->must_swap, data->n_sysdep_segments);
9391+ sysdep_segments = (const struct sysdep_segment *)
9392+ ((char *) data
9393+ + W (domain->must_swap, data->sysdep_segments_offset));
9394+ sysdep_segment_values =
9395+ alloca (n_sysdep_segments * sizeof (const char *));
9396+ for (i = 0; i < n_sysdep_segments; i++)
9397+ {
9398+ const char *name =
9399+ (char *) data
9400+ + W (domain->must_swap, sysdep_segments[i].offset);
9401+ nls_uint32 namelen =
9402+ W (domain->must_swap, sysdep_segments[i].length);
9403+
9404+ if (!(namelen > 0 && name[namelen - 1] == '\0'))
9405+ {
9406+ freea (sysdep_segment_values);
9407+ goto invalid;
9408+ }
9409+
9410+ sysdep_segment_values[i] = get_sysdep_segment_value (name);
9411+ }
9412+
9413+ orig_sysdep_tab = (const nls_uint32 *)
9414+ ((char *) data
9415+ + W (domain->must_swap, data->orig_sysdep_tab_offset));
9416+ trans_sysdep_tab = (const nls_uint32 *)
9417+ ((char *) data
9418+ + W (domain->must_swap, data->trans_sysdep_tab_offset));
9419+
9420+ /* Compute the amount of additional memory needed for the
9421+ system dependent strings and the augmented hash table.
9422+ At the same time, also drop string pairs which refer to
9423+ an undefined system dependent segment. */
9424+ n_inmem_sysdep_strings = 0;
9425+ memneed = domain->hash_size * sizeof (nls_uint32);
9426+ for (i = 0; i < n_sysdep_strings; i++)
9427+ {
9428+ int valid = 1;
9429+ size_t needs[2];
9430+
9431+ for (j = 0; j < 2; j++)
9432+ {
9433+ const struct sysdep_string *sysdep_string =
9434+ (const struct sysdep_string *)
9435+ ((char *) data
9436+ + W (domain->must_swap,
9437+ j == 0
9438+ ? orig_sysdep_tab[i]
9439+ : trans_sysdep_tab[i]));
9440+ size_t need = 0;
9441+ const struct segment_pair *p = sysdep_string->segments;
9442+
9443+ if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
9444+ for (p = sysdep_string->segments;; p++)
9445+ {
9446+ nls_uint32 sysdepref;
9447+
9448+ need += W (domain->must_swap, p->segsize);
9449+
9450+ sysdepref = W (domain->must_swap, p->sysdepref);
9451+ if (sysdepref == SEGMENTS_END)
9452+ break;
9453+
9454+ if (sysdepref >= n_sysdep_segments)
9455+ {
9456+ /* Invalid. */
9457+ freea (sysdep_segment_values);
9458+ goto invalid;
9459+ }
9460+
9461+ if (sysdep_segment_values[sysdepref] == NULL)
9462+ {
9463+ /* This particular string pair is invalid. */
9464+ valid = 0;
9465+ break;
9466+ }
9467+
9468+ need += strlen (sysdep_segment_values[sysdepref]);
9469+ }
9470+
9471+ needs[j] = need;
9472+ if (!valid)
9473+ break;
9474+ }
9475+
9476+ if (valid)
9477+ {
9478+ n_inmem_sysdep_strings++;
9479+ memneed += needs[0] + needs[1];
9480+ }
9481+ }
9482+ memneed += 2 * n_inmem_sysdep_strings
9483+ * sizeof (struct sysdep_string_desc);
9484+
9485+ if (n_inmem_sysdep_strings > 0)
9486+ {
9487+ unsigned int k;
9488+
9489+ /* Allocate additional memory. */
9490+ mem = (char *) malloc (memneed);
9491+ if (mem == NULL)
9492+ goto invalid;
9493+
9494+ domain->malloced = mem;
9495+ inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
9496+ mem += n_inmem_sysdep_strings
9497+ * sizeof (struct sysdep_string_desc);
9498+ inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
9499+ mem += n_inmem_sysdep_strings
9500+ * sizeof (struct sysdep_string_desc);
9501+ inmem_hash_tab = (nls_uint32 *) mem;
9502+ mem += domain->hash_size * sizeof (nls_uint32);
9503+
9504+ /* Compute the system dependent strings. */
9505+ k = 0;
9506+ for (i = 0; i < n_sysdep_strings; i++)
9507+ {
9508+ int valid = 1;
9509+
9510+ for (j = 0; j < 2; j++)
9511+ {
9512+ const struct sysdep_string *sysdep_string =
9513+ (const struct sysdep_string *)
9514+ ((char *) data
9515+ + W (domain->must_swap,
9516+ j == 0
9517+ ? orig_sysdep_tab[i]
9518+ : trans_sysdep_tab[i]));
9519+ const struct segment_pair *p =
9520+ sysdep_string->segments;
9521+
9522+ if (W (domain->must_swap, p->sysdepref)
9523+ != SEGMENTS_END)
9524+ for (p = sysdep_string->segments;; p++)
9525+ {
9526+ nls_uint32 sysdepref;
9527+
9528+ sysdepref =
9529+ W (domain->must_swap, p->sysdepref);
9530+ if (sysdepref == SEGMENTS_END)
9531+ break;
9532+
9533+ if (sysdep_segment_values[sysdepref] == NULL)
9534+ {
9535+ /* This particular string pair is
9536+ invalid. */
9537+ valid = 0;
9538+ break;
9539+ }
9540+ }
9541+
9542+ if (!valid)
9543+ break;
9544+ }
9545+
9546+ if (valid)
9547+ {
9548+ for (j = 0; j < 2; j++)
9549+ {
9550+ const struct sysdep_string *sysdep_string =
9551+ (const struct sysdep_string *)
9552+ ((char *) data
9553+ + W (domain->must_swap,
9554+ j == 0
9555+ ? orig_sysdep_tab[i]
9556+ : trans_sysdep_tab[i]));
9557+ const char *static_segments =
9558+ (char *) data
9559+ + W (domain->must_swap, sysdep_string->offset);
9560+ const struct segment_pair *p =
9561+ sysdep_string->segments;
9562+
9563+ /* Concatenate the segments, and fill
9564+ inmem_orig_sysdep_tab[k] (for j == 0) and
9565+ inmem_trans_sysdep_tab[k] (for j == 1). */
9566+
9567+ struct sysdep_string_desc *inmem_tab_entry =
9568+ (j == 0
9569+ ? inmem_orig_sysdep_tab
9570+ : inmem_trans_sysdep_tab)
9571+ + k;
9572+
9573+ if (W (domain->must_swap, p->sysdepref)
9574+ == SEGMENTS_END)
9575+ {
9576+ /* Only one static segment. */
9577+ inmem_tab_entry->length =
9578+ W (domain->must_swap, p->segsize);
9579+ inmem_tab_entry->pointer = static_segments;
9580+ }
9581+ else
9582+ {
9583+ inmem_tab_entry->pointer = mem;
9584+
9585+ for (p = sysdep_string->segments;; p++)
9586+ {
9587+ nls_uint32 segsize =
9588+ W (domain->must_swap, p->segsize);
9589+ nls_uint32 sysdepref =
9590+ W (domain->must_swap, p->sysdepref);
9591+ size_t n;
9592+
9593+ if (segsize > 0)
9594+ {
9595+ memcpy (mem, static_segments, segsize);
9596+ mem += segsize;
9597+ static_segments += segsize;
9598+ }
9599+
9600+ if (sysdepref == SEGMENTS_END)
9601+ break;
9602+
9603+ n = strlen (sysdep_segment_values[sysdepref]);
9604+ memcpy (mem, sysdep_segment_values[sysdepref], n);
9605+ mem += n;
9606+ }
9607+
9608+ inmem_tab_entry->length =
9609+ mem - inmem_tab_entry->pointer;
9610+ }
9611+ }
9612+
9613+ k++;
9614+ }
9615+ }
9616+ if (k != n_inmem_sysdep_strings)
9617+ abort ();
9618+
9619+ /* Compute the augmented hash table. */
9620+ for (i = 0; i < domain->hash_size; i++)
9621+ inmem_hash_tab[i] =
9622+ W (domain->must_swap_hash_tab, domain->hash_tab[i]);
9623+ for (i = 0; i < n_inmem_sysdep_strings; i++)
9624+ {
9625+ const char *msgid = inmem_orig_sysdep_tab[i].pointer;
9626+ nls_uint32 hash_val = hash_string (msgid);
9627+ nls_uint32 idx = hash_val % domain->hash_size;
9628+ nls_uint32 incr =
9629+ 1 + (hash_val % (domain->hash_size - 2));
9630+
9631+ for (;;)
9632+ {
9633+ if (inmem_hash_tab[idx] == 0)
9634+ {
9635+ /* Hash table entry is empty. Use it. */
9636+ inmem_hash_tab[idx] = 1 + domain->nstrings + i;
9637+ break;
9638+ }
9639+
9640+ if (idx >= domain->hash_size - incr)
9641+ idx -= domain->hash_size - incr;
9642+ else
9643+ idx += incr;
9644+ }
9645+ }
9646+
9647+ domain->n_sysdep_strings = n_inmem_sysdep_strings;
9648+ domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
9649+ domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
9650+
9651+ domain->hash_tab = inmem_hash_tab;
9652+ domain->must_swap_hash_tab = 0;
9653+ }
9654+ else
9655+ {
9656+ domain->n_sysdep_strings = 0;
9657+ domain->orig_sysdep_tab = NULL;
9658+ domain->trans_sysdep_tab = NULL;
9659+ }
9660+
9661+ freea (sysdep_segment_values);
9662+ }
9663+ else
9664+ {
9665+ domain->n_sysdep_strings = 0;
9666+ domain->orig_sysdep_tab = NULL;
9667+ domain->trans_sysdep_tab = NULL;
9668+ }
9669+ }
9670+ break;
9671+ }
9672 break;
9673 default:
9674- /* This is an illegal revision. */
9675-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
9676- || defined _LIBC
9677+ /* This is an invalid revision. */
9678+ invalid:
9679+ /* This is an invalid .mo file. */
9680+ if (domain->malloced)
9681+ free (domain->malloced);
9682+#ifdef HAVE_MMAP
9683 if (use_mmap)
9684- munmap ((caddr_t) data, st.st_size);
9685+ munmap ((caddr_t) data, size);
9686 else
9687 #endif
9688 free (data);
9689@@ -193,7 +1385,36 @@
9690 return;
9691 }
9692
9693- /* Show that one domain is changed. This might make some cached
9694- translations invalid. */
9695- ++_nl_msg_cat_cntr;
9696+ /* Now initialize the character set converter from the character set
9697+ the file is encoded with (found in the header entry) to the domain's
9698+ specified character set or the locale's character set. */
9699+ nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
9700+
9701+ /* Also look for a plural specification. */
9702+ EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
9703 }
9704+
9705+
9706+#ifdef _LIBC
9707+void
9708+internal_function
9709+_nl_unload_domain (struct loaded_domain *domain)
9710+{
9711+ if (domain->plural != &__gettext_germanic_plural)
9712+ __gettext_free_exp (domain->plural);
9713+
9714+ _nl_free_domain_conv (domain);
9715+
9716+ if (domain->malloced)
9717+ free (domain->malloced);
9718+
9719+# ifdef _POSIX_MAPPED_FILES
9720+ if (domain->use_mmap)
9721+ munmap ((caddr_t) domain->data, domain->mmap_size);
9722+ else
9723+# endif /* _POSIX_MAPPED_FILES */
9724+ free ((void *) domain->data);
9725+
9726+ free (domain);
9727+}
9728+#endif
9729--- lrzsz-0.12.20.safe/intl/localcharset.c 1969-12-31 19:00:00.000000000 -0500
9730+++ lrzsz-0.12.20/intl/localcharset.c 2004-09-12 14:40:34.478729392 -0400
9731@@ -0,0 +1,398 @@
9732+/* Determine a canonical name for the current locale's character encoding.
9733+
9734+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
9735+
9736+ This program is free software; you can redistribute it and/or modify it
9737+ under the terms of the GNU Library General Public License as published
9738+ by the Free Software Foundation; either version 2, or (at your option)
9739+ any later version.
9740+
9741+ This program is distributed in the hope that it will be useful,
9742+ but WITHOUT ANY WARRANTY; without even the implied warranty of
9743+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9744+ Library General Public License for more details.
9745+
9746+ You should have received a copy of the GNU Library General Public
9747+ License along with this program; if not, write to the Free Software
9748+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
9749+ USA. */
9750+
9751+/* Written by Bruno Haible <bruno@clisp.org>. */
9752+
9753+#ifdef HAVE_CONFIG_H
9754+# include <config.h>
9755+#endif
9756+
9757+/* Specification. */
9758+#include "localcharset.h"
9759+
9760+#if HAVE_STDDEF_H
9761+# include <stddef.h>
9762+#endif
9763+
9764+#include <stdio.h>
9765+#if HAVE_STRING_H
9766+# include <string.h>
9767+#else
9768+# include <strings.h>
9769+#endif
9770+#if HAVE_STDLIB_H
9771+# include <stdlib.h>
9772+#endif
9773+
9774+#if defined _WIN32 || defined __WIN32__
9775+# undef WIN32 /* avoid warning on mingw32 */
9776+# define WIN32
9777+#endif
9778+
9779+#if defined __EMX__
9780+/* Assume EMX program runs on OS/2, even if compiled under DOS. */
9781+# define OS2
9782+#endif
9783+
9784+#if !defined WIN32
9785+# if HAVE_LANGINFO_CODESET
9786+# include <langinfo.h>
9787+# else
9788+# if HAVE_SETLOCALE
9789+# include <locale.h>
9790+# endif
9791+# endif
9792+#elif defined WIN32
9793+# define WIN32_LEAN_AND_MEAN
9794+# include <windows.h>
9795+#endif
9796+#if defined OS2
9797+# define INCL_DOS
9798+# include <os2.h>
9799+#endif
9800+
9801+#if ENABLE_RELOCATABLE
9802+# include "relocatable.h"
9803+#else
9804+# define relocate(pathname) (pathname)
9805+#endif
9806+
9807+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
9808+ /* Win32, OS/2, DOS */
9809+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
9810+#endif
9811+
9812+#ifndef DIRECTORY_SEPARATOR
9813+# define DIRECTORY_SEPARATOR '/'
9814+#endif
9815+
9816+#ifndef ISSLASH
9817+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
9818+#endif
9819+
9820+#if HAVE_DECL_GETC_UNLOCKED
9821+# undef getc
9822+# define getc getc_unlocked
9823+#endif
9824+
9825+/* The following static variable is declared 'volatile' to avoid a
9826+ possible multithread problem in the function get_charset_aliases. If we
9827+ are running in a threaded environment, and if two threads initialize
9828+ 'charset_aliases' simultaneously, both will produce the same value,
9829+ and everything will be ok if the two assignments to 'charset_aliases'
9830+ are atomic. But I don't know what will happen if the two assignments mix. */
9831+#if __STDC__ != 1
9832+# define volatile /* empty */
9833+#endif
9834+/* Pointer to the contents of the charset.alias file, if it has already been
9835+ read, else NULL. Its format is:
9836+ ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */
9837+static const char * volatile charset_aliases;
9838+
9839+/* Return a pointer to the contents of the charset.alias file. */
9840+static const char *
9841+get_charset_aliases ()
9842+{
9843+ const char *cp;
9844+
9845+ cp = charset_aliases;
9846+ if (cp == NULL)
9847+ {
9848+#if !(defined VMS || defined WIN32)
9849+ FILE *fp;
9850+ const char *dir = relocate (LIBDIR);
9851+ const char *base = "charset.alias";
9852+ char *file_name;
9853+
9854+ /* Concatenate dir and base into freshly allocated file_name. */
9855+ {
9856+ size_t dir_len = strlen (dir);
9857+ size_t base_len = strlen (base);
9858+ int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
9859+ file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
9860+ if (file_name != NULL)
9861+ {
9862+ memcpy (file_name, dir, dir_len);
9863+ if (add_slash)
9864+ file_name[dir_len] = DIRECTORY_SEPARATOR;
9865+ memcpy (file_name + dir_len + add_slash, base, base_len + 1);
9866+ }
9867+ }
9868+
9869+ if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
9870+ /* Out of memory or file not found, treat it as empty. */
9871+ cp = "";
9872+ else
9873+ {
9874+ /* Parse the file's contents. */
9875+ int c;
9876+ char buf1[50+1];
9877+ char buf2[50+1];
9878+ char *res_ptr = NULL;
9879+ size_t res_size = 0;
9880+ size_t l1, l2;
9881+
9882+ for (;;)
9883+ {
9884+ c = getc (fp);
9885+ if (c == EOF)
9886+ break;
9887+ if (c == '\n' || c == ' ' || c == '\t')
9888+ continue;
9889+ if (c == '#')
9890+ {
9891+ /* Skip comment, to end of line. */
9892+ do
9893+ c = getc (fp);
9894+ while (!(c == EOF || c == '\n'));
9895+ if (c == EOF)
9896+ break;
9897+ continue;
9898+ }
9899+ ungetc (c, fp);
9900+ if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
9901+ break;
9902+ l1 = strlen (buf1);
9903+ l2 = strlen (buf2);
9904+ if (res_size == 0)
9905+ {
9906+ res_size = l1 + 1 + l2 + 1;
9907+ res_ptr = (char *) malloc (res_size + 1);
9908+ }
9909+ else
9910+ {
9911+ res_size += l1 + 1 + l2 + 1;
9912+ res_ptr = (char *) realloc (res_ptr, res_size + 1);
9913+ }
9914+ if (res_ptr == NULL)
9915+ {
9916+ /* Out of memory. */
9917+ res_size = 0;
9918+ break;
9919+ }
9920+ strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
9921+ strcpy (res_ptr + res_size - (l2 + 1), buf2);
9922+ }
9923+ fclose (fp);
9924+ if (res_size == 0)
9925+ cp = "";
9926+ else
9927+ {
9928+ *(res_ptr + res_size) = '\0';
9929+ cp = res_ptr;
9930+ }
9931+ }
9932+
9933+ if (file_name != NULL)
9934+ free (file_name);
9935+
9936+#else
9937+
9938+# if defined VMS
9939+ /* To avoid the troubles of an extra file charset.alias_vms in the
9940+ sources of many GNU packages, simply inline the aliases here. */
9941+ /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
9942+ "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
9943+ section 10.7 "Handling Different Character Sets". */
9944+ cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
9945+ "ISO8859-2" "\0" "ISO-8859-2" "\0"
9946+ "ISO8859-5" "\0" "ISO-8859-5" "\0"
9947+ "ISO8859-7" "\0" "ISO-8859-7" "\0"
9948+ "ISO8859-8" "\0" "ISO-8859-8" "\0"
9949+ "ISO8859-9" "\0" "ISO-8859-9" "\0"
9950+ /* Japanese */
9951+ "eucJP" "\0" "EUC-JP" "\0"
9952+ "SJIS" "\0" "SHIFT_JIS" "\0"
9953+ "DECKANJI" "\0" "DEC-KANJI" "\0"
9954+ "SDECKANJI" "\0" "EUC-JP" "\0"
9955+ /* Chinese */
9956+ "eucTW" "\0" "EUC-TW" "\0"
9957+ "DECHANYU" "\0" "DEC-HANYU" "\0"
9958+ "DECHANZI" "\0" "GB2312" "\0"
9959+ /* Korean */
9960+ "DECKOREAN" "\0" "EUC-KR" "\0";
9961+# endif
9962+
9963+# if defined WIN32
9964+ /* To avoid the troubles of installing a separate file in the same
9965+ directory as the DLL and of retrieving the DLL's directory at
9966+ runtime, simply inline the aliases here. */
9967+
9968+ cp = "CP936" "\0" "GBK" "\0"
9969+ "CP1361" "\0" "JOHAB" "\0"
9970+ "CP20127" "\0" "ASCII" "\0"
9971+ "CP20866" "\0" "KOI8-R" "\0"
9972+ "CP21866" "\0" "KOI8-RU" "\0"
9973+ "CP28591" "\0" "ISO-8859-1" "\0"
9974+ "CP28592" "\0" "ISO-8859-2" "\0"
9975+ "CP28593" "\0" "ISO-8859-3" "\0"
9976+ "CP28594" "\0" "ISO-8859-4" "\0"
9977+ "CP28595" "\0" "ISO-8859-5" "\0"
9978+ "CP28596" "\0" "ISO-8859-6" "\0"
9979+ "CP28597" "\0" "ISO-8859-7" "\0"
9980+ "CP28598" "\0" "ISO-8859-8" "\0"
9981+ "CP28599" "\0" "ISO-8859-9" "\0"
9982+ "CP28605" "\0" "ISO-8859-15" "\0";
9983+# endif
9984+#endif
9985+
9986+ charset_aliases = cp;
9987+ }
9988+
9989+ return cp;
9990+}
9991+
9992+/* Determine the current locale's character encoding, and canonicalize it
9993+ into one of the canonical names listed in config.charset.
9994+ The result must not be freed; it is statically allocated.
9995+ If the canonical name cannot be determined, the result is a non-canonical
9996+ name. */
9997+
9998+#ifdef STATIC
9999+STATIC
10000+#endif
10001+const char *
10002+locale_charset ()
10003+{
10004+ const char *codeset;
10005+ const char *aliases;
10006+
10007+#if !(defined WIN32 || defined OS2)
10008+
10009+# if HAVE_LANGINFO_CODESET
10010+
10011+ /* Most systems support nl_langinfo (CODESET) nowadays. */
10012+ codeset = nl_langinfo (CODESET);
10013+
10014+# else
10015+
10016+ /* On old systems which lack it, use setlocale or getenv. */
10017+ const char *locale = NULL;
10018+
10019+ /* But most old systems don't have a complete set of locales. Some
10020+ (like SunOS 4 or DJGPP) have only the C locale. Therefore we don't
10021+ use setlocale here; it would return "C" when it doesn't support the
10022+ locale name the user has set. */
10023+# if HAVE_SETLOCALE && 0
10024+ locale = setlocale (LC_CTYPE, NULL);
10025+# endif
10026+ if (locale == NULL || locale[0] == '\0')
10027+ {
10028+ locale = getenv ("LC_ALL");
10029+ if (locale == NULL || locale[0] == '\0')
10030+ {
10031+ locale = getenv ("LC_CTYPE");
10032+ if (locale == NULL || locale[0] == '\0')
10033+ locale = getenv ("LANG");
10034+ }
10035+ }
10036+
10037+ /* On some old systems, one used to set locale = "iso8859_1". On others,
10038+ you set it to "language_COUNTRY.charset". In any case, we resolve it
10039+ through the charset.alias file. */
10040+ codeset = locale;
10041+
10042+# endif
10043+
10044+#elif defined WIN32
10045+
10046+ static char buf[2 + 10 + 1];
10047+
10048+ /* Woe32 has a function returning the locale's codepage as a number. */
10049+ sprintf (buf, "CP%u", GetACP ());
10050+ codeset = buf;
10051+
10052+#elif defined OS2
10053+
10054+ const char *locale;
10055+ static char buf[2 + 10 + 1];
10056+ ULONG cp[3];
10057+ ULONG cplen;
10058+
10059+ /* Allow user to override the codeset, as set in the operating system,
10060+ with standard language environment variables. */
10061+ locale = getenv ("LC_ALL");
10062+ if (locale == NULL || locale[0] == '\0')
10063+ {
10064+ locale = getenv ("LC_CTYPE");
10065+ if (locale == NULL || locale[0] == '\0')
10066+ locale = getenv ("LANG");
10067+ }
10068+ if (locale != NULL && locale[0] != '\0')
10069+ {
10070+ /* If the locale name contains an encoding after the dot, return it. */
10071+ const char *dot = strchr (locale, '.');
10072+
10073+ if (dot != NULL)
10074+ {
10075+ const char *modifier;
10076+
10077+ dot++;
10078+ /* Look for the possible @... trailer and remove it, if any. */
10079+ modifier = strchr (dot, '@');
10080+ if (modifier == NULL)
10081+ return dot;
10082+ if (modifier - dot < sizeof (buf))
10083+ {
10084+ memcpy (buf, dot, modifier - dot);
10085+ buf [modifier - dot] = '\0';
10086+ return buf;
10087+ }
10088+ }
10089+
10090+ /* Resolve through the charset.alias file. */
10091+ codeset = locale;
10092+ }
10093+ else
10094+ {
10095+ /* OS/2 has a function returning the locale's codepage as a number. */
10096+ if (DosQueryCp (sizeof (cp), cp, &cplen))
10097+ codeset = "";
10098+ else
10099+ {
10100+ sprintf (buf, "CP%u", cp[0]);
10101+ codeset = buf;
10102+ }
10103+ }
10104+
10105+#endif
10106+
10107+ if (codeset == NULL)
10108+ /* The canonical name cannot be determined. */
10109+ codeset = "";
10110+
10111+ /* Resolve alias. */
10112+ for (aliases = get_charset_aliases ();
10113+ *aliases != '\0';
10114+ aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
10115+ if (strcmp (codeset, aliases) == 0
10116+ || (aliases[0] == '*' && aliases[1] == '\0'))
10117+ {
10118+ codeset = aliases + strlen (aliases) + 1;
10119+ break;
10120+ }
10121+
10122+ /* Don't return an empty string. GNU libc and GNU libiconv interpret
10123+ the empty string as denoting "the locale's character encoding",
10124+ thus GNU libiconv would call this function a second time. */
10125+ if (codeset[0] == '\0')
10126+ codeset = "ASCII";
10127+
10128+ return codeset;
10129+}
10130--- lrzsz-0.12.20.safe/intl/localcharset.h 1969-12-31 19:00:00.000000000 -0500
10131+++ lrzsz-0.12.20/intl/localcharset.h 2004-09-12 14:40:34.483728632 -0400
10132@@ -0,0 +1,42 @@
10133+/* Determine a canonical name for the current locale's character encoding.
10134+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
10135+ This file is part of the GNU CHARSET Library.
10136+
10137+ This program is free software; you can redistribute it and/or modify it
10138+ under the terms of the GNU Library General Public License as published
10139+ by the Free Software Foundation; either version 2, or (at your option)
10140+ any later version.
10141+
10142+ This program is distributed in the hope that it will be useful,
10143+ but WITHOUT ANY WARRANTY; without even the implied warranty of
10144+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10145+ Library General Public License for more details.
10146+
10147+ You should have received a copy of the GNU Library General Public
10148+ License along with this program; if not, write to the Free Software
10149+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
10150+ USA. */
10151+
10152+#ifndef _LOCALCHARSET_H
10153+#define _LOCALCHARSET_H
10154+
10155+
10156+#ifdef __cplusplus
10157+extern "C" {
10158+#endif
10159+
10160+
10161+/* Determine the current locale's character encoding, and canonicalize it
10162+ into one of the canonical names listed in config.charset.
10163+ The result must not be freed; it is statically allocated.
10164+ If the canonical name cannot be determined, the result is a non-canonical
10165+ name. */
10166+extern const char * locale_charset (void);
10167+
10168+
10169+#ifdef __cplusplus
10170+}
10171+#endif
10172+
10173+
10174+#endif /* _LOCALCHARSET_H */
10175--- lrzsz-0.12.20.safe/intl/locale.alias 1969-12-31 19:00:00.000000000 -0500
10176+++ lrzsz-0.12.20/intl/locale.alias 2004-09-12 14:40:34.499726200 -0400
10177@@ -0,0 +1,78 @@
10178+# Locale name alias data base.
10179+# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
10180+#
10181+# This program is free software; you can redistribute it and/or modify it
10182+# under the terms of the GNU Library General Public License as published
10183+# by the Free Software Foundation; either version 2, or (at your option)
10184+# any later version.
10185+#
10186+# This program is distributed in the hope that it will be useful,
10187+# but WITHOUT ANY WARRANTY; without even the implied warranty of
10188+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10189+# Library General Public License for more details.
10190+#
10191+# You should have received a copy of the GNU Library General Public
10192+# License along with this program; if not, write to the Free Software
10193+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
10194+# USA.
10195+
10196+# The format of this file is the same as for the corresponding file of
10197+# the X Window System, which normally can be found in
10198+# /usr/lib/X11/locale/locale.alias
10199+# A single line contains two fields: an alias and a substitution value.
10200+# All entries are case independent.
10201+
10202+# Note: This file is far from being complete. If you have a value for
10203+# your own site which you think might be useful for others too, share
10204+# it with the rest of us. Send it using the `glibcbug' script to
10205+# bugs@gnu.org.
10206+
10207+# Packages using this file:
10208+
10209+bokmal nb_NO.ISO-8859-1
10210+bokml nb_NO.ISO-8859-1
10211+catalan ca_ES.ISO-8859-1
10212+croatian hr_HR.ISO-8859-2
10213+czech cs_CZ.ISO-8859-2
10214+danish da_DK.ISO-8859-1
10215+dansk da_DK.ISO-8859-1
10216+deutsch de_DE.ISO-8859-1
10217+dutch nl_NL.ISO-8859-1
10218+eesti et_EE.ISO-8859-1
10219+estonian et_EE.ISO-8859-1
10220+finnish fi_FI.ISO-8859-1
10221+franais fr_FR.ISO-8859-1
10222+french fr_FR.ISO-8859-1
10223+galego gl_ES.ISO-8859-1
10224+galician gl_ES.ISO-8859-1
10225+german de_DE.ISO-8859-1
10226+greek el_GR.ISO-8859-7
10227+hebrew he_IL.ISO-8859-8
10228+hrvatski hr_HR.ISO-8859-2
10229+hungarian hu_HU.ISO-8859-2
10230+icelandic is_IS.ISO-8859-1
10231+italian it_IT.ISO-8859-1
10232+japanese ja_JP.eucJP
10233+japanese.euc ja_JP.eucJP
10234+ja_JP ja_JP.eucJP
10235+ja_JP.ujis ja_JP.eucJP
10236+japanese.sjis ja_JP.SJIS
10237+korean ko_KR.eucKR
10238+korean.euc ko_KR.eucKR
10239+ko_KR ko_KR.eucKR
10240+lithuanian lt_LT.ISO-8859-13
10241+no_NO nb_NO.ISO-8859-1
10242+no_NO.ISO-8859-1 nb_NO.ISO-8859-1
10243+norwegian nb_NO.ISO-8859-1
10244+nynorsk nn_NO.ISO-8859-1
10245+polish pl_PL.ISO-8859-2
10246+portuguese pt_PT.ISO-8859-1
10247+romanian ro_RO.ISO-8859-2
10248+russian ru_RU.ISO-8859-5
10249+slovak sk_SK.ISO-8859-2
10250+slovene sl_SI.ISO-8859-2
10251+slovenian sl_SI.ISO-8859-2
10252+spanish es_ES.ISO-8859-1
10253+swedish sv_SE.ISO-8859-1
10254+thai th_TH.TIS-620
10255+turkish tr_TR.ISO-8859-9
10256--- lrzsz-0.12.20.safe/intl/localealias.c 1998-04-26 09:22:37.000000000 -0400
10257+++ lrzsz-0.12.20/intl/localealias.c 2004-09-12 14:40:34.505725288 -0400
10258@@ -1,20 +1,27 @@
10259-/* Handle aliases for locale names
10260- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
10261- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
10262+/* Handle aliases for locale names.
10263+ Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
10264
10265- This program is free software; you can redistribute it and/or modify
10266- it under the terms of the GNU General Public License as published by
10267- the Free Software Foundation; either version 2, or (at your option)
10268+ This program is free software; you can redistribute it and/or modify it
10269+ under the terms of the GNU Library General Public License as published
10270+ by the Free Software Foundation; either version 2, or (at your option)
10271 any later version.
10272
10273 This program is distributed in the hope that it will be useful,
10274 but WITHOUT ANY WARRANTY; without even the implied warranty of
10275- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10276- GNU General Public License for more details.
10277+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10278+ Library General Public License for more details.
10279
10280- You should have received a copy of the GNU General Public License
10281- along with this program; if not, write to the Free Software Foundation,
10282- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
10283+ You should have received a copy of the GNU Library General Public
10284+ License along with this program; if not, write to the Free Software
10285+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
10286+ USA. */
10287+
10288+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
10289+ This must come before <config.h> because <config.h> may include
10290+ <features.h>, and once <features.h> has been included, it's too late. */
10291+#ifndef _GNU_SOURCE
10292+# define _GNU_SOURCE 1
10293+#endif
10294
10295 #ifdef HAVE_CONFIG_H
10296 # include <config.h>
10297@@ -22,56 +29,45 @@
10298
10299 #include <ctype.h>
10300 #include <stdio.h>
10301+#if defined _LIBC || defined HAVE___FSETLOCKING
10302+# include <stdio_ext.h>
10303+#endif
10304 #include <sys/types.h>
10305
10306 #ifdef __GNUC__
10307+# undef alloca
10308 # define alloca __builtin_alloca
10309 # define HAVE_ALLOCA 1
10310 #else
10311-# if defined HAVE_ALLOCA_H || defined _LIBC
10312-# include <alloca.h>
10313+# ifdef _MSC_VER
10314+# include <malloc.h>
10315+# define alloca _alloca
10316 # else
10317-# ifdef _AIX
10318- #pragma alloca
10319+# if defined HAVE_ALLOCA_H || defined _LIBC
10320+# include <alloca.h>
10321 # else
10322-# ifndef alloca
10323+# ifdef _AIX
10324+ #pragma alloca
10325+# else
10326+# ifndef alloca
10327 char *alloca ();
10328+# endif
10329 # endif
10330 # endif
10331 # endif
10332 #endif
10333
10334-#if defined STDC_HEADERS || defined _LIBC
10335-# include <stdlib.h>
10336-#else
10337-char *getenv ();
10338-# ifdef HAVE_MALLOC_H
10339-# include <malloc.h>
10340-# else
10341-void free ();
10342-# endif
10343-#endif
10344+#include <stdlib.h>
10345+#include <string.h>
10346
10347-#if defined HAVE_STRING_H || defined _LIBC
10348-# ifndef _GNU_SOURCE
10349-# define _GNU_SOURCE 1
10350-# endif
10351-# include <string.h>
10352+#include "gettextP.h"
10353+
10354+#if ENABLE_RELOCATABLE
10355+# include "relocatable.h"
10356 #else
10357-# include <strings.h>
10358-# ifndef memcpy
10359-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
10360-# endif
10361-#endif
10362-#if !HAVE_STRCHR && !defined _LIBC
10363-# ifndef strchr
10364-# define strchr index
10365-# endif
10366+# define relocate(pathname) (pathname)
10367 #endif
10368
10369-#include "gettext.h"
10370-#include "gettextP.h"
10371-
10372 /* @@ end of prolog @@ */
10373
10374 #ifdef _LIBC
10375@@ -79,43 +75,49 @@
10376 because some ANSI C functions will require linking with this object
10377 file and the name space must not be polluted. */
10378 # define strcasecmp __strcasecmp
10379+
10380+# ifndef mempcpy
10381+# define mempcpy __mempcpy
10382+# endif
10383+# define HAVE_MEMPCPY 1
10384+# define HAVE___FSETLOCKING 1
10385+
10386+/* We need locking here since we can be called from different places. */
10387+# include <bits/libc-lock.h>
10388+
10389+__libc_lock_define_initialized (static, lock);
10390+#endif
10391+
10392+#ifndef internal_function
10393+# define internal_function
10394 #endif
10395
10396+/* Some optimizations for glibc. */
10397+#ifdef _LIBC
10398+# define FEOF(fp) feof_unlocked (fp)
10399+# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp)
10400+#else
10401+# define FEOF(fp) feof (fp)
10402+# define FGETS(buf, n, fp) fgets (buf, n, fp)
10403+#endif
10404
10405-/* For those loosing systems which don't have `alloca' we have to add
10406+/* For those losing systems which don't have `alloca' we have to add
10407 some additional code emulating it. */
10408 #ifdef HAVE_ALLOCA
10409-/* Nothing has to be done. */
10410-# define ADD_BLOCK(list, address) /* nothing */
10411-# define FREE_BLOCKS(list) /* nothing */
10412+# define freea(p) /* nothing */
10413 #else
10414-struct block_list
10415-{
10416- void *address;
10417- struct block_list *next;
10418-};
10419-# define ADD_BLOCK(list, addr) \
10420- do { \
10421- struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \
10422- /* If we cannot get a free block we cannot add the new element to \
10423- the list. */ \
10424- if (newp != NULL) { \
10425- newp->address = (addr); \
10426- newp->next = (list); \
10427- (list) = newp; \
10428- } \
10429- } while (0)
10430-# define FREE_BLOCKS(list) \
10431- do { \
10432- while (list != NULL) { \
10433- struct block_list *old = list; \
10434- list = list->next; \
10435- free (old); \
10436- } \
10437- } while (0)
10438-# undef alloca
10439-# define alloca(size) (malloc (size))
10440-#endif /* have alloca */
10441+# define alloca(n) malloc (n)
10442+# define freea(p) free (p)
10443+#endif
10444+
10445+#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
10446+# undef fgets
10447+# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
10448+#endif
10449+#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
10450+# undef feof
10451+# define feof(s) feof_unlocked (s)
10452+#endif
10453
10454
10455 struct alias_map
10456@@ -125,26 +127,41 @@
10457 };
10458
10459
10460-static struct alias_map *map;
10461-static size_t nmap = 0;
10462-static size_t maxmap = 0;
10463+#ifndef _LIBC
10464+# define libc_freeres_ptr(decl) decl
10465+#endif
10466+
10467+libc_freeres_ptr (static char *string_space);
10468+static size_t string_space_act;
10469+static size_t string_space_max;
10470+libc_freeres_ptr (static struct alias_map *map);
10471+static size_t nmap;
10472+static size_t maxmap;
10473
10474
10475 /* Prototypes for local functions. */
10476-static size_t read_alias_file PARAMS ((const char *fname, int fname_len));
10477-static void extend_alias_table PARAMS ((void));
10478-static int alias_compare PARAMS ((const struct alias_map *map1,
10479- const struct alias_map *map2));
10480+static size_t read_alias_file (const char *fname, int fname_len)
10481+ internal_function;
10482+static int extend_alias_table (void);
10483+static int alias_compare (const struct alias_map *map1,
10484+ const struct alias_map *map2);
10485
10486
10487 const char *
10488-_nl_expand_alias (name)
10489- const char *name;
10490+_nl_expand_alias (const char *name)
10491 {
10492- static const char *locale_alias_path = LOCALE_ALIAS_PATH;
10493+ static const char *locale_alias_path;
10494 struct alias_map *retval;
10495+ const char *result = NULL;
10496 size_t added;
10497
10498+#ifdef _LIBC
10499+ __libc_lock_lock (lock);
10500+#endif
10501+
10502+ if (locale_alias_path == NULL)
10503+ locale_alias_path = LOCALE_ALIAS_PATH;
10504+
10505 do
10506 {
10507 struct alias_map item;
10508@@ -154,15 +171,18 @@
10509 if (nmap > 0)
10510 retval = (struct alias_map *) bsearch (&item, map, nmap,
10511 sizeof (struct alias_map),
10512- (int (*) PARAMS ((const void *,
10513- const void *))
10514+ (int (*) (const void *,
10515+ const void *)
10516 ) alias_compare);
10517 else
10518 retval = NULL;
10519
10520 /* We really found an alias. Return the value. */
10521 if (retval != NULL)
10522- return retval->value;
10523+ {
10524+ result = retval->value;
10525+ break;
10526+ }
10527
10528 /* Perhaps we can find another alias file. */
10529 added = 0;
10530@@ -170,11 +190,12 @@
10531 {
10532 const char *start;
10533
10534- while (locale_alias_path[0] == ':')
10535+ while (locale_alias_path[0] == PATH_SEPARATOR)
10536 ++locale_alias_path;
10537 start = locale_alias_path;
10538
10539- while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
10540+ while (locale_alias_path[0] != '\0'
10541+ && locale_alias_path[0] != PATH_SEPARATOR)
10542 ++locale_alias_path;
10543
10544 if (start < locale_alias_path)
10545@@ -183,78 +204,87 @@
10546 }
10547 while (added != 0);
10548
10549- return NULL;
10550+#ifdef _LIBC
10551+ __libc_lock_unlock (lock);
10552+#endif
10553+
10554+ return result;
10555 }
10556
10557
10558 static size_t
10559-read_alias_file (fname, fname_len)
10560- const char *fname;
10561- int fname_len;
10562+internal_function
10563+read_alias_file (const char *fname, int fname_len)
10564 {
10565-#ifndef HAVE_ALLOCA
10566- struct block_list *block_list = NULL;
10567-#endif
10568 FILE *fp;
10569 char *full_fname;
10570 size_t added;
10571 static const char aliasfile[] = "/locale.alias";
10572
10573 full_fname = (char *) alloca (fname_len + sizeof aliasfile);
10574- ADD_BLOCK (block_list, full_fname);
10575+#ifdef HAVE_MEMPCPY
10576+ mempcpy (mempcpy (full_fname, fname, fname_len),
10577+ aliasfile, sizeof aliasfile);
10578+#else
10579 memcpy (full_fname, fname, fname_len);
10580 memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
10581+#endif
10582
10583- fp = fopen (full_fname, "r");
10584+ fp = fopen (relocate (full_fname), "r");
10585+ freea (full_fname);
10586 if (fp == NULL)
10587- {
10588- FREE_BLOCKS (block_list);
10589- return 0;
10590- }
10591+ return 0;
10592+
10593+#ifdef HAVE___FSETLOCKING
10594+ /* No threads present. */
10595+ __fsetlocking (fp, FSETLOCKING_BYCALLER);
10596+#endif
10597
10598 added = 0;
10599- while (!feof (fp))
10600+ while (!FEOF (fp))
10601 {
10602 /* It is a reasonable approach to use a fix buffer here because
10603 a) we are only interested in the first two fields
10604 b) these fields must be usable as file names and so must not
10605 be that long
10606- */
10607- char buf[BUFSIZ];
10608+ We avoid a multi-kilobyte buffer here since this would use up
10609+ stack space which we might not have if the program ran out of
10610+ memory. */
10611+ char buf[400];
10612 char *alias;
10613 char *value;
10614 char *cp;
10615
10616- if (fgets (buf, BUFSIZ, fp) == NULL)
10617+ if (FGETS (buf, sizeof buf, fp) == NULL)
10618 /* EOF reached. */
10619 break;
10620
10621 cp = buf;
10622 /* Ignore leading white space. */
10623- while (isspace (cp[0]))
10624+ while (isspace ((unsigned char) cp[0]))
10625 ++cp;
10626
10627 /* A leading '#' signals a comment line. */
10628 if (cp[0] != '\0' && cp[0] != '#')
10629 {
10630 alias = cp++;
10631- while (cp[0] != '\0' && !isspace (cp[0]))
10632+ while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
10633 ++cp;
10634 /* Terminate alias name. */
10635 if (cp[0] != '\0')
10636 *cp++ = '\0';
10637
10638 /* Now look for the beginning of the value. */
10639- while (isspace (cp[0]))
10640+ while (isspace ((unsigned char) cp[0]))
10641 ++cp;
10642
10643 if (cp[0] != '\0')
10644 {
10645- char *tp;
10646- size_t len;
10647+ size_t alias_len;
10648+ size_t value_len;
10649
10650 value = cp++;
10651- while (cp[0] != '\0' && !isspace (cp[0]))
10652+ while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
10653 ++cp;
10654 /* Terminate value. */
10655 if (cp[0] == '\n')
10656@@ -269,28 +299,44 @@
10657 *cp++ = '\0';
10658
10659 if (nmap >= maxmap)
10660- extend_alias_table ();
10661-
10662- /* We cannot depend on strdup available in the libc. Sigh! */
10663- len = strlen (alias) + 1;
10664- tp = (char *) malloc (len);
10665- if (tp == NULL)
10666- {
10667- FREE_BLOCKS (block_list);
10668+ if (__builtin_expect (extend_alias_table (), 0))
10669 return added;
10670- }
10671- memcpy (tp, alias, len);
10672- map[nmap].alias = tp;
10673
10674- len = strlen (value) + 1;
10675- tp = (char *) malloc (len);
10676- if (tp == NULL)
10677+ alias_len = strlen (alias) + 1;
10678+ value_len = strlen (value) + 1;
10679+
10680+ if (string_space_act + alias_len + value_len > string_space_max)
10681 {
10682- FREE_BLOCKS (block_list);
10683- return added;
10684+ /* Increase size of memory pool. */
10685+ size_t new_size = (string_space_max
10686+ + (alias_len + value_len > 1024
10687+ ? alias_len + value_len : 1024));
10688+ char *new_pool = (char *) realloc (string_space, new_size);
10689+ if (new_pool == NULL)
10690+ return added;
10691+
10692+ if (__builtin_expect (string_space != new_pool, 0))
10693+ {
10694+ size_t i;
10695+
10696+ for (i = 0; i < nmap; i++)
10697+ {
10698+ map[i].alias += new_pool - string_space;
10699+ map[i].value += new_pool - string_space;
10700+ }
10701+ }
10702+
10703+ string_space = new_pool;
10704+ string_space_max = new_size;
10705 }
10706- memcpy (tp, value, len);
10707- map[nmap].value = tp;
10708+
10709+ map[nmap].alias = memcpy (&string_space[string_space_act],
10710+ alias, alias_len);
10711+ string_space_act += alias_len;
10712+
10713+ map[nmap].value = memcpy (&string_space[string_space_act],
10714+ value, value_len);
10715+ string_space_act += value_len;
10716
10717 ++nmap;
10718 ++added;
10719@@ -299,14 +345,11 @@
10720
10721 /* Possibly not the whole line fits into the buffer. Ignore
10722 the rest of the line. */
10723- while (strchr (cp, '\n') == NULL)
10724- {
10725- cp = buf;
10726- if (fgets (buf, BUFSIZ, fp) == NULL)
10727- /* Make sure the inner loop will be left. The outer loop
10728- will exit at the `feof' test. */
10729- *cp = '\n';
10730- }
10731+ while (strchr (buf, '\n') == NULL)
10732+ if (FGETS (buf, sizeof buf, fp) == NULL)
10733+ /* Make sure the inner loop will be left. The outer loop
10734+ will exit at the `feof' test. */
10735+ break;
10736 }
10737
10738 /* Should we test for ferror()? I think we have to silently ignore
10739@@ -315,40 +358,33 @@
10740
10741 if (added > 0)
10742 qsort (map, nmap, sizeof (struct alias_map),
10743- (int (*) PARAMS ((const void *, const void *))) alias_compare);
10744+ (int (*) (const void *, const void *)) alias_compare);
10745
10746- FREE_BLOCKS (block_list);
10747 return added;
10748 }
10749
10750
10751-static void
10752+static int
10753 extend_alias_table ()
10754 {
10755 size_t new_size;
10756 struct alias_map *new_map;
10757
10758 new_size = maxmap == 0 ? 100 : 2 * maxmap;
10759- new_map = (struct alias_map *) malloc (new_size
10760- * sizeof (struct alias_map));
10761+ new_map = (struct alias_map *) realloc (map, (new_size
10762+ * sizeof (struct alias_map)));
10763 if (new_map == NULL)
10764 /* Simply don't extend: we don't have any more core. */
10765- return;
10766-
10767- memcpy (new_map, map, nmap * sizeof (struct alias_map));
10768-
10769- if (maxmap != 0)
10770- free (map);
10771+ return -1;
10772
10773 map = new_map;
10774 maxmap = new_size;
10775+ return 0;
10776 }
10777
10778
10779 static int
10780-alias_compare (map1, map2)
10781- const struct alias_map *map1;
10782- const struct alias_map *map2;
10783+alias_compare (const struct alias_map *map1, const struct alias_map *map2)
10784 {
10785 #if defined _LIBC || defined HAVE_STRCASECMP
10786 return strcasecmp (map1->alias, map2->alias);
10787--- lrzsz-0.12.20.safe/intl/localename.c 1969-12-31 19:00:00.000000000 -0500
10788+++ lrzsz-0.12.20/intl/localename.c 2004-09-12 14:40:34.510724528 -0400
10789@@ -0,0 +1,1142 @@
10790+/* Determine the current selected locale.
10791+ Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
10792+
10793+ This program is free software; you can redistribute it and/or modify it
10794+ under the terms of the GNU Library General Public License as published
10795+ by the Free Software Foundation; either version 2, or (at your option)
10796+ any later version.
10797+
10798+ This program is distributed in the hope that it will be useful,
10799+ but WITHOUT ANY WARRANTY; without even the implied warranty of
10800+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10801+ Library General Public License for more details.
10802+
10803+ You should have received a copy of the GNU Library General Public
10804+ License along with this program; if not, write to the Free Software
10805+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
10806+ USA. */
10807+
10808+/* Written by Ulrich Drepper <drepper@gnu.org>, 1995. */
10809+/* Win32 code written by Tor Lillqvist <tml@iki.fi>. */
10810+
10811+#ifdef HAVE_CONFIG_H
10812+# include <config.h>
10813+#endif
10814+
10815+#include <stdlib.h>
10816+#include <locale.h>
10817+
10818+#if defined _WIN32 || defined __WIN32__
10819+# undef WIN32 /* avoid warning on mingw32 */
10820+# define WIN32
10821+#endif
10822+
10823+#ifdef WIN32
10824+# define WIN32_LEAN_AND_MEAN
10825+# include <windows.h>
10826+/* List of language codes, sorted by value:
10827+ 0x01 LANG_ARABIC
10828+ 0x02 LANG_BULGARIAN
10829+ 0x03 LANG_CATALAN
10830+ 0x04 LANG_CHINESE
10831+ 0x05 LANG_CZECH
10832+ 0x06 LANG_DANISH
10833+ 0x07 LANG_GERMAN
10834+ 0x08 LANG_GREEK
10835+ 0x09 LANG_ENGLISH
10836+ 0x0a LANG_SPANISH
10837+ 0x0b LANG_FINNISH
10838+ 0x0c LANG_FRENCH
10839+ 0x0d LANG_HEBREW
10840+ 0x0e LANG_HUNGARIAN
10841+ 0x0f LANG_ICELANDIC
10842+ 0x10 LANG_ITALIAN
10843+ 0x11 LANG_JAPANESE
10844+ 0x12 LANG_KOREAN
10845+ 0x13 LANG_DUTCH
10846+ 0x14 LANG_NORWEGIAN
10847+ 0x15 LANG_POLISH
10848+ 0x16 LANG_PORTUGUESE
10849+ 0x17 LANG_RHAETO_ROMANCE
10850+ 0x18 LANG_ROMANIAN
10851+ 0x19 LANG_RUSSIAN
10852+ 0x1a LANG_CROATIAN == LANG_SERBIAN
10853+ 0x1b LANG_SLOVAK
10854+ 0x1c LANG_ALBANIAN
10855+ 0x1d LANG_SWEDISH
10856+ 0x1e LANG_THAI
10857+ 0x1f LANG_TURKISH
10858+ 0x20 LANG_URDU
10859+ 0x21 LANG_INDONESIAN
10860+ 0x22 LANG_UKRAINIAN
10861+ 0x23 LANG_BELARUSIAN
10862+ 0x24 LANG_SLOVENIAN
10863+ 0x25 LANG_ESTONIAN
10864+ 0x26 LANG_LATVIAN
10865+ 0x27 LANG_LITHUANIAN
10866+ 0x28 LANG_TAJIK
10867+ 0x29 LANG_FARSI
10868+ 0x2a LANG_VIETNAMESE
10869+ 0x2b LANG_ARMENIAN
10870+ 0x2c LANG_AZERI
10871+ 0x2d LANG_BASQUE
10872+ 0x2e LANG_SORBIAN
10873+ 0x2f LANG_MACEDONIAN
10874+ 0x30 LANG_SUTU
10875+ 0x31 LANG_TSONGA
10876+ 0x32 LANG_TSWANA
10877+ 0x33 LANG_VENDA
10878+ 0x34 LANG_XHOSA
10879+ 0x35 LANG_ZULU
10880+ 0x36 LANG_AFRIKAANS
10881+ 0x37 LANG_GEORGIAN
10882+ 0x38 LANG_FAEROESE
10883+ 0x39 LANG_HINDI
10884+ 0x3a LANG_MALTESE
10885+ 0x3b LANG_SAAMI
10886+ 0x3c LANG_GAELIC
10887+ 0x3d LANG_YIDDISH
10888+ 0x3e LANG_MALAY
10889+ 0x3f LANG_KAZAK
10890+ 0x40 LANG_KYRGYZ
10891+ 0x41 LANG_SWAHILI
10892+ 0x42 LANG_TURKMEN
10893+ 0x43 LANG_UZBEK
10894+ 0x44 LANG_TATAR
10895+ 0x45 LANG_BENGALI
10896+ 0x46 LANG_PUNJABI
10897+ 0x47 LANG_GUJARATI
10898+ 0x48 LANG_ORIYA
10899+ 0x49 LANG_TAMIL
10900+ 0x4a LANG_TELUGU
10901+ 0x4b LANG_KANNADA
10902+ 0x4c LANG_MALAYALAM
10903+ 0x4d LANG_ASSAMESE
10904+ 0x4e LANG_MARATHI
10905+ 0x4f LANG_SANSKRIT
10906+ 0x50 LANG_MONGOLIAN
10907+ 0x51 LANG_TIBETAN
10908+ 0x52 LANG_WELSH
10909+ 0x53 LANG_CAMBODIAN
10910+ 0x54 LANG_LAO
10911+ 0x55 LANG_BURMESE
10912+ 0x56 LANG_GALICIAN
10913+ 0x57 LANG_KONKANI
10914+ 0x58 LANG_MANIPURI
10915+ 0x59 LANG_SINDHI
10916+ 0x5a LANG_SYRIAC
10917+ 0x5b LANG_SINHALESE
10918+ 0x5c LANG_CHEROKEE
10919+ 0x5d LANG_INUKTITUT
10920+ 0x5e LANG_AMHARIC
10921+ 0x5f LANG_TAMAZIGHT
10922+ 0x60 LANG_KASHMIRI
10923+ 0x61 LANG_NEPALI
10924+ 0x62 LANG_FRISIAN
10925+ 0x63 LANG_PASHTO
10926+ 0x64 LANG_TAGALOG
10927+ 0x65 LANG_DIVEHI
10928+ 0x66 LANG_EDO
10929+ 0x67 LANG_FULFULDE
10930+ 0x68 LANG_HAUSA
10931+ 0x69 LANG_IBIBIO
10932+ 0x6a LANG_YORUBA
10933+ 0x70 LANG_IGBO
10934+ 0x71 LANG_KANURI
10935+ 0x72 LANG_OROMO
10936+ 0x73 LANG_TIGRINYA
10937+ 0x74 LANG_GUARANI
10938+ 0x75 LANG_HAWAIIAN
10939+ 0x76 LANG_LATIN
10940+ 0x77 LANG_SOMALI
10941+ 0x78 LANG_YI
10942+ 0x79 LANG_PAPIAMENTU
10943+*/
10944+/* Mingw headers don't have latest language and sublanguage codes. */
10945+# ifndef LANG_AFRIKAANS
10946+# define LANG_AFRIKAANS 0x36
10947+# endif
10948+# ifndef LANG_ALBANIAN
10949+# define LANG_ALBANIAN 0x1c
10950+# endif
10951+# ifndef LANG_AMHARIC
10952+# define LANG_AMHARIC 0x5e
10953+# endif
10954+# ifndef LANG_ARABIC
10955+# define LANG_ARABIC 0x01
10956+# endif
10957+# ifndef LANG_ARMENIAN
10958+# define LANG_ARMENIAN 0x2b
10959+# endif
10960+# ifndef LANG_ASSAMESE
10961+# define LANG_ASSAMESE 0x4d
10962+# endif
10963+# ifndef LANG_AZERI
10964+# define LANG_AZERI 0x2c
10965+# endif
10966+# ifndef LANG_BASQUE
10967+# define LANG_BASQUE 0x2d
10968+# endif
10969+# ifndef LANG_BELARUSIAN
10970+# define LANG_BELARUSIAN 0x23
10971+# endif
10972+# ifndef LANG_BENGALI
10973+# define LANG_BENGALI 0x45
10974+# endif
10975+# ifndef LANG_BURMESE
10976+# define LANG_BURMESE 0x55
10977+# endif
10978+# ifndef LANG_CAMBODIAN
10979+# define LANG_CAMBODIAN 0x53
10980+# endif
10981+# ifndef LANG_CATALAN
10982+# define LANG_CATALAN 0x03
10983+# endif
10984+# ifndef LANG_CHEROKEE
10985+# define LANG_CHEROKEE 0x5c
10986+# endif
10987+# ifndef LANG_DIVEHI
10988+# define LANG_DIVEHI 0x65
10989+# endif
10990+# ifndef LANG_EDO
10991+# define LANG_EDO 0x66
10992+# endif
10993+# ifndef LANG_ESTONIAN
10994+# define LANG_ESTONIAN 0x25
10995+# endif
10996+# ifndef LANG_FAEROESE
10997+# define LANG_FAEROESE 0x38
10998+# endif
10999+# ifndef LANG_FARSI
11000+# define LANG_FARSI 0x29
11001+# endif
11002+# ifndef LANG_FRISIAN
11003+# define LANG_FRISIAN 0x62
11004+# endif
11005+# ifndef LANG_FULFULDE
11006+# define LANG_FULFULDE 0x67
11007+# endif
11008+# ifndef LANG_GAELIC
11009+# define LANG_GAELIC 0x3c
11010+# endif
11011+# ifndef LANG_GALICIAN
11012+# define LANG_GALICIAN 0x56
11013+# endif
11014+# ifndef LANG_GEORGIAN
11015+# define LANG_GEORGIAN 0x37
11016+# endif
11017+# ifndef LANG_GUARANI
11018+# define LANG_GUARANI 0x74
11019+# endif
11020+# ifndef LANG_GUJARATI
11021+# define LANG_GUJARATI 0x47
11022+# endif
11023+# ifndef LANG_HAUSA
11024+# define LANG_HAUSA 0x68
11025+# endif
11026+# ifndef LANG_HAWAIIAN
11027+# define LANG_HAWAIIAN 0x75
11028+# endif
11029+# ifndef LANG_HEBREW
11030+# define LANG_HEBREW 0x0d
11031+# endif
11032+# ifndef LANG_HINDI
11033+# define LANG_HINDI 0x39
11034+# endif
11035+# ifndef LANG_IBIBIO
11036+# define LANG_IBIBIO 0x69
11037+# endif
11038+# ifndef LANG_IGBO
11039+# define LANG_IGBO 0x70
11040+# endif
11041+# ifndef LANG_INDONESIAN
11042+# define LANG_INDONESIAN 0x21
11043+# endif
11044+# ifndef LANG_INUKTITUT
11045+# define LANG_INUKTITUT 0x5d
11046+# endif
11047+# ifndef LANG_KANNADA
11048+# define LANG_KANNADA 0x4b
11049+# endif
11050+# ifndef LANG_KANURI
11051+# define LANG_KANURI 0x71
11052+# endif
11053+# ifndef LANG_KASHMIRI
11054+# define LANG_KASHMIRI 0x60
11055+# endif
11056+# ifndef LANG_KAZAK
11057+# define LANG_KAZAK 0x3f
11058+# endif
11059+# ifndef LANG_KONKANI
11060+# define LANG_KONKANI 0x57
11061+# endif
11062+# ifndef LANG_KYRGYZ
11063+# define LANG_KYRGYZ 0x40
11064+# endif
11065+# ifndef LANG_LAO
11066+# define LANG_LAO 0x54
11067+# endif
11068+# ifndef LANG_LATIN
11069+# define LANG_LATIN 0x76
11070+# endif
11071+# ifndef LANG_LATVIAN
11072+# define LANG_LATVIAN 0x26
11073+# endif
11074+# ifndef LANG_LITHUANIAN
11075+# define LANG_LITHUANIAN 0x27
11076+# endif
11077+# ifndef LANG_MACEDONIAN
11078+# define LANG_MACEDONIAN 0x2f
11079+# endif
11080+# ifndef LANG_MALAY
11081+# define LANG_MALAY 0x3e
11082+# endif
11083+# ifndef LANG_MALAYALAM
11084+# define LANG_MALAYALAM 0x4c
11085+# endif
11086+# ifndef LANG_MALTESE
11087+# define LANG_MALTESE 0x3a
11088+# endif
11089+# ifndef LANG_MANIPURI
11090+# define LANG_MANIPURI 0x58
11091+# endif
11092+# ifndef LANG_MARATHI
11093+# define LANG_MARATHI 0x4e
11094+# endif
11095+# ifndef LANG_MONGOLIAN
11096+# define LANG_MONGOLIAN 0x50
11097+# endif
11098+# ifndef LANG_NEPALI
11099+# define LANG_NEPALI 0x61
11100+# endif
11101+# ifndef LANG_ORIYA
11102+# define LANG_ORIYA 0x48
11103+# endif
11104+# ifndef LANG_OROMO
11105+# define LANG_OROMO 0x72
11106+# endif
11107+# ifndef LANG_PAPIAMENTU
11108+# define LANG_PAPIAMENTU 0x79
11109+# endif
11110+# ifndef LANG_PASHTO
11111+# define LANG_PASHTO 0x63
11112+# endif
11113+# ifndef LANG_PUNJABI
11114+# define LANG_PUNJABI 0x46
11115+# endif
11116+# ifndef LANG_RHAETO_ROMANCE
11117+# define LANG_RHAETO_ROMANCE 0x17
11118+# endif
11119+# ifndef LANG_SAAMI
11120+# define LANG_SAAMI 0x3b
11121+# endif
11122+# ifndef LANG_SANSKRIT
11123+# define LANG_SANSKRIT 0x4f
11124+# endif
11125+# ifndef LANG_SERBIAN
11126+# define LANG_SERBIAN 0x1a
11127+# endif
11128+# ifndef LANG_SINDHI
11129+# define LANG_SINDHI 0x59
11130+# endif
11131+# ifndef LANG_SINHALESE
11132+# define LANG_SINHALESE 0x5b
11133+# endif
11134+# ifndef LANG_SLOVAK
11135+# define LANG_SLOVAK 0x1b
11136+# endif
11137+# ifndef LANG_SOMALI
11138+# define LANG_SOMALI 0x77
11139+# endif
11140+# ifndef LANG_SORBIAN
11141+# define LANG_SORBIAN 0x2e
11142+# endif
11143+# ifndef LANG_SUTU
11144+# define LANG_SUTU 0x30
11145+# endif
11146+# ifndef LANG_SWAHILI
11147+# define LANG_SWAHILI 0x41
11148+# endif
11149+# ifndef LANG_SYRIAC
11150+# define LANG_SYRIAC 0x5a
11151+# endif
11152+# ifndef LANG_TAGALOG
11153+# define LANG_TAGALOG 0x64
11154+# endif
11155+# ifndef LANG_TAJIK
11156+# define LANG_TAJIK 0x28
11157+# endif
11158+# ifndef LANG_TAMAZIGHT
11159+# define LANG_TAMAZIGHT 0x5f
11160+# endif
11161+# ifndef LANG_TAMIL
11162+# define LANG_TAMIL 0x49
11163+# endif
11164+# ifndef LANG_TATAR
11165+# define LANG_TATAR 0x44
11166+# endif
11167+# ifndef LANG_TELUGU
11168+# define LANG_TELUGU 0x4a
11169+# endif
11170+# ifndef LANG_THAI
11171+# define LANG_THAI 0x1e
11172+# endif
11173+# ifndef LANG_TIBETAN
11174+# define LANG_TIBETAN 0x51
11175+# endif
11176+# ifndef LANG_TIGRINYA
11177+# define LANG_TIGRINYA 0x73
11178+# endif
11179+# ifndef LANG_TSONGA
11180+# define LANG_TSONGA 0x31
11181+# endif
11182+# ifndef LANG_TSWANA
11183+# define LANG_TSWANA 0x32
11184+# endif
11185+# ifndef LANG_TURKMEN
11186+# define LANG_TURKMEN 0x42
11187+# endif
11188+# ifndef LANG_UKRAINIAN
11189+# define LANG_UKRAINIAN 0x22
11190+# endif
11191+# ifndef LANG_URDU
11192+# define LANG_URDU 0x20
11193+# endif
11194+# ifndef LANG_UZBEK
11195+# define LANG_UZBEK 0x43
11196+# endif
11197+# ifndef LANG_VENDA
11198+# define LANG_VENDA 0x33
11199+# endif
11200+# ifndef LANG_VIETNAMESE
11201+# define LANG_VIETNAMESE 0x2a
11202+# endif
11203+# ifndef LANG_WELSH
11204+# define LANG_WELSH 0x52
11205+# endif
11206+# ifndef LANG_XHOSA
11207+# define LANG_XHOSA 0x34
11208+# endif
11209+# ifndef LANG_YI
11210+# define LANG_YI 0x78
11211+# endif
11212+# ifndef LANG_YIDDISH
11213+# define LANG_YIDDISH 0x3d
11214+# endif
11215+# ifndef LANG_YORUBA
11216+# define LANG_YORUBA 0x6a
11217+# endif
11218+# ifndef LANG_ZULU
11219+# define LANG_ZULU 0x35
11220+# endif
11221+# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
11222+# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
11223+# endif
11224+# ifndef SUBLANG_ARABIC_IRAQ
11225+# define SUBLANG_ARABIC_IRAQ 0x02
11226+# endif
11227+# ifndef SUBLANG_ARABIC_EGYPT
11228+# define SUBLANG_ARABIC_EGYPT 0x03
11229+# endif
11230+# ifndef SUBLANG_ARABIC_LIBYA
11231+# define SUBLANG_ARABIC_LIBYA 0x04
11232+# endif
11233+# ifndef SUBLANG_ARABIC_ALGERIA
11234+# define SUBLANG_ARABIC_ALGERIA 0x05
11235+# endif
11236+# ifndef SUBLANG_ARABIC_MOROCCO
11237+# define SUBLANG_ARABIC_MOROCCO 0x06
11238+# endif
11239+# ifndef SUBLANG_ARABIC_TUNISIA
11240+# define SUBLANG_ARABIC_TUNISIA 0x07
11241+# endif
11242+# ifndef SUBLANG_ARABIC_OMAN
11243+# define SUBLANG_ARABIC_OMAN 0x08
11244+# endif
11245+# ifndef SUBLANG_ARABIC_YEMEN
11246+# define SUBLANG_ARABIC_YEMEN 0x09
11247+# endif
11248+# ifndef SUBLANG_ARABIC_SYRIA
11249+# define SUBLANG_ARABIC_SYRIA 0x0a
11250+# endif
11251+# ifndef SUBLANG_ARABIC_JORDAN
11252+# define SUBLANG_ARABIC_JORDAN 0x0b
11253+# endif
11254+# ifndef SUBLANG_ARABIC_LEBANON
11255+# define SUBLANG_ARABIC_LEBANON 0x0c
11256+# endif
11257+# ifndef SUBLANG_ARABIC_KUWAIT
11258+# define SUBLANG_ARABIC_KUWAIT 0x0d
11259+# endif
11260+# ifndef SUBLANG_ARABIC_UAE
11261+# define SUBLANG_ARABIC_UAE 0x0e
11262+# endif
11263+# ifndef SUBLANG_ARABIC_BAHRAIN
11264+# define SUBLANG_ARABIC_BAHRAIN 0x0f
11265+# endif
11266+# ifndef SUBLANG_ARABIC_QATAR
11267+# define SUBLANG_ARABIC_QATAR 0x10
11268+# endif
11269+# ifndef SUBLANG_AZERI_LATIN
11270+# define SUBLANG_AZERI_LATIN 0x01
11271+# endif
11272+# ifndef SUBLANG_AZERI_CYRILLIC
11273+# define SUBLANG_AZERI_CYRILLIC 0x02
11274+# endif
11275+# ifndef SUBLANG_BENGALI_INDIA
11276+# define SUBLANG_BENGALI_INDIA 0x00
11277+# endif
11278+# ifndef SUBLANG_BENGALI_BANGLADESH
11279+# define SUBLANG_BENGALI_BANGLADESH 0x01
11280+# endif
11281+# ifndef SUBLANG_CHINESE_MACAU
11282+# define SUBLANG_CHINESE_MACAU 0x05
11283+# endif
11284+# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
11285+# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
11286+# endif
11287+# ifndef SUBLANG_ENGLISH_JAMAICA
11288+# define SUBLANG_ENGLISH_JAMAICA 0x08
11289+# endif
11290+# ifndef SUBLANG_ENGLISH_CARIBBEAN
11291+# define SUBLANG_ENGLISH_CARIBBEAN 0x09
11292+# endif
11293+# ifndef SUBLANG_ENGLISH_BELIZE
11294+# define SUBLANG_ENGLISH_BELIZE 0x0a
11295+# endif
11296+# ifndef SUBLANG_ENGLISH_TRINIDAD
11297+# define SUBLANG_ENGLISH_TRINIDAD 0x0b
11298+# endif
11299+# ifndef SUBLANG_ENGLISH_ZIMBABWE
11300+# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
11301+# endif
11302+# ifndef SUBLANG_ENGLISH_PHILIPPINES
11303+# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
11304+# endif
11305+# ifndef SUBLANG_ENGLISH_INDONESIA
11306+# define SUBLANG_ENGLISH_INDONESIA 0x0e
11307+# endif
11308+# ifndef SUBLANG_ENGLISH_HONGKONG
11309+# define SUBLANG_ENGLISH_HONGKONG 0x0f
11310+# endif
11311+# ifndef SUBLANG_ENGLISH_INDIA
11312+# define SUBLANG_ENGLISH_INDIA 0x10
11313+# endif
11314+# ifndef SUBLANG_ENGLISH_MALAYSIA
11315+# define SUBLANG_ENGLISH_MALAYSIA 0x11
11316+# endif
11317+# ifndef SUBLANG_ENGLISH_SINGAPORE
11318+# define SUBLANG_ENGLISH_SINGAPORE 0x12
11319+# endif
11320+# ifndef SUBLANG_FRENCH_LUXEMBOURG
11321+# define SUBLANG_FRENCH_LUXEMBOURG 0x05
11322+# endif
11323+# ifndef SUBLANG_FRENCH_MONACO
11324+# define SUBLANG_FRENCH_MONACO 0x06
11325+# endif
11326+# ifndef SUBLANG_FRENCH_WESTINDIES
11327+# define SUBLANG_FRENCH_WESTINDIES 0x07
11328+# endif
11329+# ifndef SUBLANG_FRENCH_REUNION
11330+# define SUBLANG_FRENCH_REUNION 0x08
11331+# endif
11332+# ifndef SUBLANG_FRENCH_CONGO
11333+# define SUBLANG_FRENCH_CONGO 0x09
11334+# endif
11335+# ifndef SUBLANG_FRENCH_SENEGAL
11336+# define SUBLANG_FRENCH_SENEGAL 0x0a
11337+# endif
11338+# ifndef SUBLANG_FRENCH_CAMEROON
11339+# define SUBLANG_FRENCH_CAMEROON 0x0b
11340+# endif
11341+# ifndef SUBLANG_FRENCH_COTEDIVOIRE
11342+# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
11343+# endif
11344+# ifndef SUBLANG_FRENCH_MALI
11345+# define SUBLANG_FRENCH_MALI 0x0d
11346+# endif
11347+# ifndef SUBLANG_FRENCH_MOROCCO
11348+# define SUBLANG_FRENCH_MOROCCO 0x0e
11349+# endif
11350+# ifndef SUBLANG_FRENCH_HAITI
11351+# define SUBLANG_FRENCH_HAITI 0x0f
11352+# endif
11353+# ifndef SUBLANG_GERMAN_LUXEMBOURG
11354+# define SUBLANG_GERMAN_LUXEMBOURG 0x04
11355+# endif
11356+# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
11357+# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
11358+# endif
11359+# ifndef SUBLANG_KASHMIRI_INDIA
11360+# define SUBLANG_KASHMIRI_INDIA 0x02
11361+# endif
11362+# ifndef SUBLANG_MALAY_MALAYSIA
11363+# define SUBLANG_MALAY_MALAYSIA 0x01
11364+# endif
11365+# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
11366+# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
11367+# endif
11368+# ifndef SUBLANG_NEPALI_INDIA
11369+# define SUBLANG_NEPALI_INDIA 0x02
11370+# endif
11371+# ifndef SUBLANG_PUNJABI_INDIA
11372+# define SUBLANG_PUNJABI_INDIA 0x00
11373+# endif
11374+# ifndef SUBLANG_PUNJABI_PAKISTAN
11375+# define SUBLANG_PUNJABI_PAKISTAN 0x01
11376+# endif
11377+# ifndef SUBLANG_ROMANIAN_ROMANIA
11378+# define SUBLANG_ROMANIAN_ROMANIA 0x00
11379+# endif
11380+# ifndef SUBLANG_ROMANIAN_MOLDOVA
11381+# define SUBLANG_ROMANIAN_MOLDOVA 0x01
11382+# endif
11383+# ifndef SUBLANG_SERBIAN_LATIN
11384+# define SUBLANG_SERBIAN_LATIN 0x02
11385+# endif
11386+# ifndef SUBLANG_SERBIAN_CYRILLIC
11387+# define SUBLANG_SERBIAN_CYRILLIC 0x03
11388+# endif
11389+# ifndef SUBLANG_SINDHI_INDIA
11390+# define SUBLANG_SINDHI_INDIA 0x00
11391+# endif
11392+# ifndef SUBLANG_SINDHI_PAKISTAN
11393+# define SUBLANG_SINDHI_PAKISTAN 0x01
11394+# endif
11395+# ifndef SUBLANG_SPANISH_GUATEMALA
11396+# define SUBLANG_SPANISH_GUATEMALA 0x04
11397+# endif
11398+# ifndef SUBLANG_SPANISH_COSTA_RICA
11399+# define SUBLANG_SPANISH_COSTA_RICA 0x05
11400+# endif
11401+# ifndef SUBLANG_SPANISH_PANAMA
11402+# define SUBLANG_SPANISH_PANAMA 0x06
11403+# endif
11404+# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
11405+# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
11406+# endif
11407+# ifndef SUBLANG_SPANISH_VENEZUELA
11408+# define SUBLANG_SPANISH_VENEZUELA 0x08
11409+# endif
11410+# ifndef SUBLANG_SPANISH_COLOMBIA
11411+# define SUBLANG_SPANISH_COLOMBIA 0x09
11412+# endif
11413+# ifndef SUBLANG_SPANISH_PERU
11414+# define SUBLANG_SPANISH_PERU 0x0a
11415+# endif
11416+# ifndef SUBLANG_SPANISH_ARGENTINA
11417+# define SUBLANG_SPANISH_ARGENTINA 0x0b
11418+# endif
11419+# ifndef SUBLANG_SPANISH_ECUADOR
11420+# define SUBLANG_SPANISH_ECUADOR 0x0c
11421+# endif
11422+# ifndef SUBLANG_SPANISH_CHILE
11423+# define SUBLANG_SPANISH_CHILE 0x0d
11424+# endif
11425+# ifndef SUBLANG_SPANISH_URUGUAY
11426+# define SUBLANG_SPANISH_URUGUAY 0x0e
11427+# endif
11428+# ifndef SUBLANG_SPANISH_PARAGUAY
11429+# define SUBLANG_SPANISH_PARAGUAY 0x0f
11430+# endif
11431+# ifndef SUBLANG_SPANISH_BOLIVIA
11432+# define SUBLANG_SPANISH_BOLIVIA 0x10
11433+# endif
11434+# ifndef SUBLANG_SPANISH_EL_SALVADOR
11435+# define SUBLANG_SPANISH_EL_SALVADOR 0x11
11436+# endif
11437+# ifndef SUBLANG_SPANISH_HONDURAS
11438+# define SUBLANG_SPANISH_HONDURAS 0x12
11439+# endif
11440+# ifndef SUBLANG_SPANISH_NICARAGUA
11441+# define SUBLANG_SPANISH_NICARAGUA 0x13
11442+# endif
11443+# ifndef SUBLANG_SPANISH_PUERTO_RICO
11444+# define SUBLANG_SPANISH_PUERTO_RICO 0x14
11445+# endif
11446+# ifndef SUBLANG_SWEDISH_FINLAND
11447+# define SUBLANG_SWEDISH_FINLAND 0x02
11448+# endif
11449+# ifndef SUBLANG_TAMAZIGHT_ARABIC
11450+# define SUBLANG_TAMAZIGHT_ARABIC 0x01
11451+# endif
11452+# ifndef SUBLANG_TAMAZIGHT_LATIN
11453+# define SUBLANG_TAMAZIGHT_LATIN 0x02
11454+# endif
11455+# ifndef SUBLANG_TIGRINYA_ETHIOPIA
11456+# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
11457+# endif
11458+# ifndef SUBLANG_TIGRINYA_ERITREA
11459+# define SUBLANG_TIGRINYA_ERITREA 0x01
11460+# endif
11461+# ifndef SUBLANG_URDU_PAKISTAN
11462+# define SUBLANG_URDU_PAKISTAN 0x01
11463+# endif
11464+# ifndef SUBLANG_URDU_INDIA
11465+# define SUBLANG_URDU_INDIA 0x02
11466+# endif
11467+# ifndef SUBLANG_UZBEK_LATIN
11468+# define SUBLANG_UZBEK_LATIN 0x01
11469+# endif
11470+# ifndef SUBLANG_UZBEK_CYRILLIC
11471+# define SUBLANG_UZBEK_CYRILLIC 0x02
11472+# endif
11473+#endif
11474+
11475+/* XPG3 defines the result of 'setlocale (category, NULL)' as:
11476+ "Directs 'setlocale()' to query 'category' and return the current
11477+ setting of 'local'."
11478+ However it does not specify the exact format. Neither do SUSV2 and
11479+ ISO C 99. So we can use this feature only on selected systems (e.g.
11480+ those using GNU C Library). */
11481+#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
11482+# define HAVE_LOCALE_NULL
11483+#endif
11484+
11485+/* Determine the current locale's name, and canonicalize it into XPG syntax
11486+ language[_territory[.codeset]][@modifier]
11487+ The codeset part in the result is not reliable; the locale_charset()
11488+ should be used for codeset information instead.
11489+ The result must not be freed; it is statically allocated. */
11490+
11491+const char *
11492+_nl_locale_name (int category, const char *categoryname)
11493+{
11494+ const char *retval;
11495+
11496+#ifndef WIN32
11497+
11498+ /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
11499+ On some systems this can be done by the 'setlocale' function itself. */
11500+# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
11501+ retval = setlocale (category, NULL);
11502+# else
11503+ /* Setting of LC_ALL overwrites all other. */
11504+ retval = getenv ("LC_ALL");
11505+ if (retval == NULL || retval[0] == '\0')
11506+ {
11507+ /* Next comes the name of the desired category. */
11508+ retval = getenv (categoryname);
11509+ if (retval == NULL || retval[0] == '\0')
11510+ {
11511+ /* Last possibility is the LANG environment variable. */
11512+ retval = getenv ("LANG");
11513+ if (retval == NULL || retval[0] == '\0')
11514+ /* We use C as the default domain. POSIX says this is
11515+ implementation defined. */
11516+ retval = "C";
11517+ }
11518+ }
11519+# endif
11520+
11521+ return retval;
11522+
11523+#else /* WIN32 */
11524+
11525+ /* Return an XPG style locale name language[_territory][@modifier].
11526+ Don't even bother determining the codeset; it's not useful in this
11527+ context, because message catalogs are not specific to a single
11528+ codeset. */
11529+
11530+ LCID lcid;
11531+ LANGID langid;
11532+ int primary, sub;
11533+
11534+ /* Let the user override the system settings through environment
11535+ variables, as on POSIX systems. */
11536+ retval = getenv ("LC_ALL");
11537+ if (retval != NULL && retval[0] != '\0')
11538+ return retval;
11539+ retval = getenv (categoryname);
11540+ if (retval != NULL && retval[0] != '\0')
11541+ return retval;
11542+ retval = getenv ("LANG");
11543+ if (retval != NULL && retval[0] != '\0')
11544+ return retval;
11545+
11546+ /* Use native Win32 API locale ID. */
11547+ lcid = GetThreadLocale ();
11548+
11549+ /* Strip off the sorting rules, keep only the language part. */
11550+ langid = LANGIDFROMLCID (lcid);
11551+
11552+ /* Split into language and territory part. */
11553+ primary = PRIMARYLANGID (langid);
11554+ sub = SUBLANGID (langid);
11555+
11556+ /* Dispatch on language.
11557+ See also http://www.unicode.org/unicode/onlinedat/languages.html .
11558+ For details about languages, see http://www.ethnologue.com/ . */
11559+ switch (primary)
11560+ {
11561+ case LANG_AFRIKAANS: return "af_ZA";
11562+ case LANG_ALBANIAN: return "sq_AL";
11563+ case LANG_AMHARIC: return "am_ET";
11564+ case LANG_ARABIC:
11565+ switch (sub)
11566+ {
11567+ case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
11568+ case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
11569+ case SUBLANG_ARABIC_EGYPT: return "ar_EG";
11570+ case SUBLANG_ARABIC_LIBYA: return "ar_LY";
11571+ case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
11572+ case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
11573+ case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
11574+ case SUBLANG_ARABIC_OMAN: return "ar_OM";
11575+ case SUBLANG_ARABIC_YEMEN: return "ar_YE";
11576+ case SUBLANG_ARABIC_SYRIA: return "ar_SY";
11577+ case SUBLANG_ARABIC_JORDAN: return "ar_JO";
11578+ case SUBLANG_ARABIC_LEBANON: return "ar_LB";
11579+ case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
11580+ case SUBLANG_ARABIC_UAE: return "ar_AE";
11581+ case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
11582+ case SUBLANG_ARABIC_QATAR: return "ar_QA";
11583+ }
11584+ return "ar";
11585+ case LANG_ARMENIAN: return "hy_AM";
11586+ case LANG_ASSAMESE: return "as_IN";
11587+ case LANG_AZERI:
11588+ switch (sub)
11589+ {
11590+ /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */
11591+ case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
11592+ case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
11593+ }
11594+ return "az";
11595+ case LANG_BASQUE:
11596+ return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
11597+ case LANG_BELARUSIAN: return "be_BY";
11598+ case LANG_BENGALI:
11599+ switch (sub)
11600+ {
11601+ case SUBLANG_BENGALI_INDIA: return "bn_IN";
11602+ case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
11603+ }
11604+ return "bn";
11605+ case LANG_BULGARIAN: return "bg_BG";
11606+ case LANG_BURMESE: return "my_MM";
11607+ case LANG_CAMBODIAN: return "km_KH";
11608+ case LANG_CATALAN: return "ca_ES";
11609+ case LANG_CHEROKEE: return "chr_US";
11610+ case LANG_CHINESE:
11611+ switch (sub)
11612+ {
11613+ case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
11614+ case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
11615+ case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
11616+ case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
11617+ case SUBLANG_CHINESE_MACAU: return "zh_MO";
11618+ }
11619+ return "zh";
11620+ case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN
11621+ * What used to be called Serbo-Croatian
11622+ * should really now be two separate
11623+ * languages because of political reasons.
11624+ * (Says tml, who knows nothing about Serbian
11625+ * or Croatian.)
11626+ * (I can feel those flames coming already.)
11627+ */
11628+ switch (sub)
11629+ {
11630+ case SUBLANG_DEFAULT: return "hr_HR";
11631+ case SUBLANG_SERBIAN_LATIN: return "sr_CS";
11632+ case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
11633+ }
11634+ return "hr";
11635+ case LANG_CZECH: return "cs_CZ";
11636+ case LANG_DANISH: return "da_DK";
11637+ case LANG_DIVEHI: return "dv_MV";
11638+ case LANG_DUTCH:
11639+ switch (sub)
11640+ {
11641+ case SUBLANG_DUTCH: return "nl_NL";
11642+ case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
11643+ }
11644+ return "nl";
11645+ case LANG_EDO: return "bin_NG";
11646+ case LANG_ENGLISH:
11647+ switch (sub)
11648+ {
11649+ /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
11650+ * English was the language spoken in England.
11651+ * Oh well.
11652+ */
11653+ case SUBLANG_ENGLISH_US: return "en_US";
11654+ case SUBLANG_ENGLISH_UK: return "en_GB";
11655+ case SUBLANG_ENGLISH_AUS: return "en_AU";
11656+ case SUBLANG_ENGLISH_CAN: return "en_CA";
11657+ case SUBLANG_ENGLISH_NZ: return "en_NZ";
11658+ case SUBLANG_ENGLISH_EIRE: return "en_IE";
11659+ case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
11660+ case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
11661+ case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
11662+ case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
11663+ case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
11664+ case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
11665+ case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
11666+ case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
11667+ case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
11668+ case SUBLANG_ENGLISH_INDIA: return "en_IN";
11669+ case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
11670+ case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
11671+ }
11672+ return "en";
11673+ case LANG_ESTONIAN: return "et_EE";
11674+ case LANG_FAEROESE: return "fo_FO";
11675+ case LANG_FARSI: return "fa_IR";
11676+ case LANG_FINNISH: return "fi_FI";
11677+ case LANG_FRENCH:
11678+ switch (sub)
11679+ {
11680+ case SUBLANG_FRENCH: return "fr_FR";
11681+ case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
11682+ case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
11683+ case SUBLANG_FRENCH_SWISS: return "fr_CH";
11684+ case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
11685+ case SUBLANG_FRENCH_MONACO: return "fr_MC";
11686+ case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
11687+ case SUBLANG_FRENCH_REUNION: return "fr_RE";
11688+ case SUBLANG_FRENCH_CONGO: return "fr_CG";
11689+ case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
11690+ case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
11691+ case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
11692+ case SUBLANG_FRENCH_MALI: return "fr_ML";
11693+ case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
11694+ case SUBLANG_FRENCH_HAITI: return "fr_HT";
11695+ }
11696+ return "fr";
11697+ case LANG_FRISIAN: return "fy_NL";
11698+ case LANG_FULFULDE:
11699+ /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
11700+ return "ff_NG";
11701+ case LANG_GAELIC:
11702+ switch (sub)
11703+ {
11704+ case 0x01: /* SCOTTISH */ return "gd_GB";
11705+ case 0x02: /* IRISH */ return "ga_IE";
11706+ }
11707+ return "C";
11708+ case LANG_GALICIAN: return "gl_ES";
11709+ case LANG_GEORGIAN: return "ka_GE";
11710+ case LANG_GERMAN:
11711+ switch (sub)
11712+ {
11713+ case SUBLANG_GERMAN: return "de_DE";
11714+ case SUBLANG_GERMAN_SWISS: return "de_CH";
11715+ case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
11716+ case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
11717+ case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
11718+ }
11719+ return "de";
11720+ case LANG_GREEK: return "el_GR";
11721+ case LANG_GUARANI: return "gn_PY";
11722+ case LANG_GUJARATI: return "gu_IN";
11723+ case LANG_HAUSA: return "ha_NG";
11724+ case LANG_HAWAIIAN:
11725+ /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
11726+ or Hawaii Creole English ("cpe_US", 600000 speakers)? */
11727+ return "cpe_US";
11728+ case LANG_HEBREW: return "he_IL";
11729+ case LANG_HINDI: return "hi_IN";
11730+ case LANG_HUNGARIAN: return "hu_HU";
11731+ case LANG_IBIBIO: return "nic_NG";
11732+ case LANG_ICELANDIC: return "is_IS";
11733+ case LANG_IGBO: return "ig_NG";
11734+ case LANG_INDONESIAN: return "id_ID";
11735+ case LANG_INUKTITUT: return "iu_CA";
11736+ case LANG_ITALIAN:
11737+ switch (sub)
11738+ {
11739+ case SUBLANG_ITALIAN: return "it_IT";
11740+ case SUBLANG_ITALIAN_SWISS: return "it_CH";
11741+ }
11742+ return "it";
11743+ case LANG_JAPANESE: return "ja_JP";
11744+ case LANG_KANNADA: return "kn_IN";
11745+ case LANG_KANURI: return "kr_NG";
11746+ case LANG_KASHMIRI:
11747+ switch (sub)
11748+ {
11749+ case SUBLANG_DEFAULT: return "ks_PK";
11750+ case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
11751+ }
11752+ return "ks";
11753+ case LANG_KAZAK: return "kk_KZ";
11754+ case LANG_KONKANI:
11755+ /* FIXME: Adjust this when such locales appear on Unix. */
11756+ return "kok_IN";
11757+ case LANG_KOREAN: return "ko_KR";
11758+ case LANG_KYRGYZ: return "ky_KG";
11759+ case LANG_LAO: return "lo_LA";
11760+ case LANG_LATIN: return "la_VA";
11761+ case LANG_LATVIAN: return "lv_LV";
11762+ case LANG_LITHUANIAN: return "lt_LT";
11763+ case LANG_MACEDONIAN: return "mk_MK";
11764+ case LANG_MALAY:
11765+ switch (sub)
11766+ {
11767+ case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
11768+ case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
11769+ }
11770+ return "ms";
11771+ case LANG_MALAYALAM: return "ml_IN";
11772+ case LANG_MALTESE: return "mt_MT";
11773+ case LANG_MANIPURI:
11774+ /* FIXME: Adjust this when such locales appear on Unix. */
11775+ return "mni_IN";
11776+ case LANG_MARATHI: return "mr_IN";
11777+ case LANG_MONGOLIAN:
11778+ return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */
11779+ case LANG_NEPALI:
11780+ switch (sub)
11781+ {
11782+ case SUBLANG_DEFAULT: return "ne_NP";
11783+ case SUBLANG_NEPALI_INDIA: return "ne_IN";
11784+ }
11785+ return "ne";
11786+ case LANG_NORWEGIAN:
11787+ switch (sub)
11788+ {
11789+ case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
11790+ case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
11791+ }
11792+ return "no";
11793+ case LANG_ORIYA: return "or_IN";
11794+ case LANG_OROMO: return "om_ET";
11795+ case LANG_PAPIAMENTU: return "pap_AN";
11796+ case LANG_PASHTO:
11797+ return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
11798+ case LANG_POLISH: return "pl_PL";
11799+ case LANG_PORTUGUESE:
11800+ switch (sub)
11801+ {
11802+ case SUBLANG_PORTUGUESE: return "pt_PT";
11803+ /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
11804+ Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
11805+ case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
11806+ }
11807+ return "pt";
11808+ case LANG_PUNJABI:
11809+ switch (sub)
11810+ {
11811+ case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
11812+ case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
11813+ }
11814+ return "pa";
11815+ case LANG_RHAETO_ROMANCE: return "rm_CH";
11816+ case LANG_ROMANIAN:
11817+ switch (sub)
11818+ {
11819+ case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
11820+ case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
11821+ }
11822+ return "ro";
11823+ case LANG_RUSSIAN:
11824+ return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
11825+ case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
11826+ case LANG_SANSKRIT: return "sa_IN";
11827+ case LANG_SINDHI:
11828+ switch (sub)
11829+ {
11830+ case SUBLANG_SINDHI_INDIA: return "sd_IN";
11831+ case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
11832+ }
11833+ return "sd";
11834+ case LANG_SINHALESE: return "si_LK";
11835+ case LANG_SLOVAK: return "sk_SK";
11836+ case LANG_SLOVENIAN: return "sl_SI";
11837+ case LANG_SOMALI: return "so_SO";
11838+ case LANG_SORBIAN:
11839+ /* FIXME: Adjust this when such locales appear on Unix. */
11840+ return "wen_DE";
11841+ case LANG_SPANISH:
11842+ switch (sub)
11843+ {
11844+ case SUBLANG_SPANISH: return "es_ES";
11845+ case SUBLANG_SPANISH_MEXICAN: return "es_MX";
11846+ case SUBLANG_SPANISH_MODERN:
11847+ return "es_ES@modern"; /* not seen on Unix */
11848+ case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
11849+ case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
11850+ case SUBLANG_SPANISH_PANAMA: return "es_PA";
11851+ case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
11852+ case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
11853+ case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
11854+ case SUBLANG_SPANISH_PERU: return "es_PE";
11855+ case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
11856+ case SUBLANG_SPANISH_ECUADOR: return "es_EC";
11857+ case SUBLANG_SPANISH_CHILE: return "es_CL";
11858+ case SUBLANG_SPANISH_URUGUAY: return "es_UY";
11859+ case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
11860+ case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
11861+ case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
11862+ case SUBLANG_SPANISH_HONDURAS: return "es_HN";
11863+ case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
11864+ case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
11865+ }
11866+ return "es";
11867+ case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
11868+ case LANG_SWAHILI: return "sw_KE";
11869+ case LANG_SWEDISH:
11870+ switch (sub)
11871+ {
11872+ case SUBLANG_DEFAULT: return "sv_SE";
11873+ case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
11874+ }
11875+ return "sv";
11876+ case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
11877+ case LANG_TAGALOG: return "tl_PH";
11878+ case LANG_TAJIK: return "tg_TJ";
11879+ case LANG_TAMAZIGHT:
11880+ switch (sub)
11881+ {
11882+ /* FIXME: Adjust this when Tamazight locales appear on Unix. */
11883+ case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
11884+ case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
11885+ }
11886+ return "ber_MA";
11887+ case LANG_TAMIL:
11888+ return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
11889+ case LANG_TATAR: return "tt_RU";
11890+ case LANG_TELUGU: return "te_IN";
11891+ case LANG_THAI: return "th_TH";
11892+ case LANG_TIBETAN: return "bo_CN";
11893+ case LANG_TIGRINYA:
11894+ switch (sub)
11895+ {
11896+ case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
11897+ case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
11898+ }
11899+ return "ti";
11900+ case LANG_TSONGA: return "ts_ZA";
11901+ case LANG_TSWANA: return "tn_BW";
11902+ case LANG_TURKISH: return "tr_TR";
11903+ case LANG_TURKMEN: return "tk_TM";
11904+ case LANG_UKRAINIAN: return "uk_UA";
11905+ case LANG_URDU:
11906+ switch (sub)
11907+ {
11908+ case SUBLANG_URDU_PAKISTAN: return "ur_PK";
11909+ case SUBLANG_URDU_INDIA: return "ur_IN";
11910+ }
11911+ return "ur";
11912+ case LANG_UZBEK:
11913+ switch (sub)
11914+ {
11915+ case SUBLANG_UZBEK_LATIN: return "uz_UZ";
11916+ case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
11917+ }
11918+ return "uz";
11919+ case LANG_VENDA: return "ve_ZA";
11920+ case LANG_VIETNAMESE: return "vi_VN";
11921+ case LANG_WELSH: return "cy_GB";
11922+ case LANG_XHOSA: return "xh_ZA";
11923+ case LANG_YI: return "sit_CN";
11924+ case LANG_YIDDISH: return "yi_IL";
11925+ case LANG_YORUBA: return "yo_NG";
11926+ case LANG_ZULU: return "zu_ZA";
11927+ default: return "C";
11928+ }
11929+
11930+#endif
11931+}
11932--- lrzsz-0.12.20.safe/intl/log.c 1969-12-31 19:00:00.000000000 -0500
11933+++ lrzsz-0.12.20/intl/log.c 2004-09-12 14:40:34.515723768 -0400
11934@@ -0,0 +1,98 @@
11935+/* Log file output.
11936+ Copyright (C) 2003 Free Software Foundation, Inc.
11937+
11938+ This program is free software; you can redistribute it and/or modify it
11939+ under the terms of the GNU Library General Public License as published
11940+ by the Free Software Foundation; either version 2, or (at your option)
11941+ any later version.
11942+
11943+ This program is distributed in the hope that it will be useful,
11944+ but WITHOUT ANY WARRANTY; without even the implied warranty of
11945+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11946+ Library General Public License for more details.
11947+
11948+ You should have received a copy of the GNU Library General Public
11949+ License along with this program; if not, write to the Free Software
11950+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
11951+ USA. */
11952+
11953+/* Written by Bruno Haible <bruno@clisp.org>. */
11954+
11955+#ifdef HAVE_CONFIG_H
11956+# include <config.h>
11957+#endif
11958+
11959+#include <stdio.h>
11960+#include <stdlib.h>
11961+#include <string.h>
11962+
11963+/* Print an ASCII string with quotes and escape sequences where needed. */
11964+static void
11965+print_escaped (FILE *stream, const char *str)
11966+{
11967+ putc ('"', stream);
11968+ for (; *str != '\0'; str++)
11969+ if (*str == '\n')
11970+ {
11971+ fputs ("\\n\"", stream);
11972+ if (str[1] == '\0')
11973+ return;
11974+ fputs ("\n\"", stream);
11975+ }
11976+ else
11977+ {
11978+ if (*str == '"' || *str == '\\')
11979+ putc ('\\', stream);
11980+ putc (*str, stream);
11981+ }
11982+ putc ('"', stream);
11983+}
11984+
11985+/* Add to the log file an entry denoting a failed translation. */
11986+void
11987+_nl_log_untranslated (const char *logfilename, const char *domainname,
11988+ const char *msgid1, const char *msgid2, int plural)
11989+{
11990+ static char *last_logfilename = NULL;
11991+ static FILE *last_logfile = NULL;
11992+ FILE *logfile;
11993+
11994+ /* Can we reuse the last opened logfile? */
11995+ if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
11996+ {
11997+ /* Close the last used logfile. */
11998+ if (last_logfilename != NULL)
11999+ {
12000+ if (last_logfile != NULL)
12001+ {
12002+ fclose (last_logfile);
12003+ last_logfile = NULL;
12004+ }
12005+ free (last_logfilename);
12006+ last_logfilename = NULL;
12007+ }
12008+ /* Open the logfile. */
12009+ last_logfilename = (char *) malloc (strlen (logfilename) + 1);
12010+ if (last_logfilename == NULL)
12011+ return;
12012+ strcpy (last_logfilename, logfilename);
12013+ last_logfile = fopen (logfilename, "a");
12014+ if (last_logfile == NULL)
12015+ return;
12016+ }
12017+ logfile = last_logfile;
12018+
12019+ fprintf (logfile, "domain ");
12020+ print_escaped (logfile, domainname);
12021+ fprintf (logfile, "\nmsgid ");
12022+ print_escaped (logfile, msgid1);
12023+ if (plural)
12024+ {
12025+ fprintf (logfile, "\nmsgid_plural ");
12026+ print_escaped (logfile, msgid2);
12027+ fprintf (logfile, "\nmsgstr[0] \"\"\n");
12028+ }
12029+ else
12030+ fprintf (logfile, "\nmsgstr \"\"\n");
12031+ putc ('\n', logfile);
12032+}
12033--- lrzsz-0.12.20.safe/intl/Makefile.in 1998-04-26 09:22:35.000000000 -0400
12034+++ lrzsz-0.12.20/intl/Makefile.in 2004-09-12 14:40:34.521722856 -0400
12035@@ -1,19 +1,20 @@
12036-# Makefile for directory with message catalog handling in GNU NLS Utilities.
12037-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
12038+# Makefile for directory with message catalog handling library of GNU gettext
12039+# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
12040 #
12041-# This program is free software; you can redistribute it and/or modify
12042-# it under the terms of the GNU General Public License as published by
12043-# the Free Software Foundation; either version 2, or (at your option)
12044+# This program is free software; you can redistribute it and/or modify it
12045+# under the terms of the GNU Library General Public License as published
12046+# by the Free Software Foundation; either version 2, or (at your option)
12047 # any later version.
12048 #
12049 # This program is distributed in the hope that it will be useful,
12050 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12051-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12052-# GNU General Public License for more details.
12053+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12054+# Library General Public License for more details.
12055 #
12056-# You should have received a copy of the GNU General Public License
12057-# along with this program; if not, write to the Free Software
12058-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
12059+# You should have received a copy of the GNU Library General Public
12060+# License along with this program; if not, write to the Free Software
12061+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12062+# USA.
12063
12064 PACKAGE = @PACKAGE@
12065 VERSION = @VERSION@
12066@@ -23,118 +24,341 @@
12067 srcdir = @srcdir@
12068 top_srcdir = @top_srcdir@
12069 top_builddir = ..
12070-VPATH = @srcdir@
12071+#VPATH = $(srcdir)
12072
12073 prefix = @prefix@
12074 exec_prefix = @exec_prefix@
12075 transform = @program_transform_name@
12076-libdir = $(exec_prefix)/lib
12077-includedir = $(prefix)/include
12078-datadir = $(prefix)/@DATADIRNAME@
12079+libdir = @libdir@
12080+includedir = @includedir@
12081+datadir = @datadir@
12082 localedir = $(datadir)/locale
12083-gnulocaledir = $(prefix)/share/locale
12084-gettextsrcdir = @datadir@/gettext/intl
12085-aliaspath = $(localedir):.
12086+gettextsrcdir = $(datadir)/gettext/intl
12087+aliaspath = $(localedir)
12088 subdir = intl
12089
12090 INSTALL = @INSTALL@
12091 INSTALL_DATA = @INSTALL_DATA@
12092 MKINSTALLDIRS = @MKINSTALLDIRS@
12093+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
12094
12095-l = @l@
12096+l = @INTL_LIBTOOL_SUFFIX_PREFIX@
12097
12098 AR = ar
12099 CC = @CC@
12100 LIBTOOL = @LIBTOOL@
12101 RANLIB = @RANLIB@
12102+YACC = @INTLBISON@ -y -d
12103+YFLAGS = --name-prefix=__gettext
12104
12105-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
12106--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
12107+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
12108+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
12109+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
12110+-Dset_relocation_prefix=libintl_set_relocation_prefix \
12111+-Drelocate=libintl_relocate \
12112+-DDEPENDS_ON_LIBICONV=1 @DEFS@
12113 CPPFLAGS = @CPPFLAGS@
12114 CFLAGS = @CFLAGS@
12115 LDFLAGS = @LDFLAGS@
12116+LIBS = @LIBS@
12117
12118 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
12119
12120-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
12121-COMHDRS = gettext.h gettextP.h hash-string.h
12122-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
12123-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
12124-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
12125-explodename.c
12126-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
12127-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
12128-explodename.$lo
12129-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
12130-GETTOBJS = intl-compat.$lo
12131-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
12132-xopen-msg.sed $(HEADERS) $(SOURCES)
12133+HEADERS = \
12134+ gmo.h \
12135+ gettextP.h \
12136+ hash-string.h \
12137+ loadinfo.h \
12138+ plural-exp.h \
12139+ eval-plural.h \
12140+ localcharset.h \
12141+ relocatable.h \
12142+ xsize.h \
12143+ printf-args.h printf-args.c \
12144+ printf-parse.h wprintf-parse.h printf-parse.c \
12145+ vasnprintf.h vasnwprintf.h vasnprintf.c \
12146+ os2compat.h \
12147+ libgnuintl.h.in
12148+SOURCES = \
12149+ bindtextdom.c \
12150+ dcgettext.c \
12151+ dgettext.c \
12152+ gettext.c \
12153+ finddomain.c \
12154+ loadmsgcat.c \
12155+ localealias.c \
12156+ textdomain.c \
12157+ l10nflist.c \
12158+ explodename.c \
12159+ dcigettext.c \
12160+ dcngettext.c \
12161+ dngettext.c \
12162+ ngettext.c \
12163+ plural.y \
12164+ plural-exp.c \
12165+ localcharset.c \
12166+ relocatable.c \
12167+ localename.c \
12168+ log.c \
12169+ printf.c \
12170+ osdep.c \
12171+ os2compat.c \
12172+ intl-compat.c
12173+OBJECTS = \
12174+ bindtextdom.$lo \
12175+ dcgettext.$lo \
12176+ dgettext.$lo \
12177+ gettext.$lo \
12178+ finddomain.$lo \
12179+ loadmsgcat.$lo \
12180+ localealias.$lo \
12181+ textdomain.$lo \
12182+ l10nflist.$lo \
12183+ explodename.$lo \
12184+ dcigettext.$lo \
12185+ dcngettext.$lo \
12186+ dngettext.$lo \
12187+ ngettext.$lo \
12188+ plural.$lo \
12189+ plural-exp.$lo \
12190+ localcharset.$lo \
12191+ relocatable.$lo \
12192+ localename.$lo \
12193+ log.$lo \
12194+ printf.$lo \
12195+ osdep.$lo \
12196+ intl-compat.$lo
12197+DISTFILES.common = Makefile.in \
12198+config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
12199+DISTFILES.generated = plural.c
12200 DISTFILES.normal = VERSION
12201-DISTFILES.gettext = libintl.glibc intlh.inst.in
12202+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
12203+libgnuintl.h_vms Makefile.vms \
12204+libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
12205+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
12206+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
12207+
12208+all: all-@USE_INCLUDED_LIBINTL@
12209+all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
12210+all-no: all-no-@BUILD_INCLUDED_LIBINTL@
12211+all-no-yes: libgnuintl.$la
12212+all-no-no:
12213+
12214+libintl.a libgnuintl.a: $(OBJECTS)
12215+ rm -f $@
12216+ $(AR) cru $@ $(OBJECTS)
12217+ $(RANLIB) $@
12218+
12219+libintl.la libgnuintl.la: $(OBJECTS)
12220+ $(LIBTOOL) --mode=link \
12221+ $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
12222+ $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
12223+ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
12224+ -rpath $(libdir) \
12225+ -no-undefined
12226+
12227+# Libtool's library version information for libintl.
12228+# Before making a gettext release, the gettext maintainer must change this
12229+# according to the libtool documentation, section "Library interface versions".
12230+# Maintainers of other packages that include the intl directory must *not*
12231+# change these values.
12232+LTV_CURRENT=7
12233+LTV_REVISION=0
12234+LTV_AGE=4
12235
12236 .SUFFIXES:
12237-.SUFFIXES: .c .o .lo
12238+.SUFFIXES: .c .y .o .lo .sin .sed
12239+
12240 .c.o:
12241 $(COMPILE) $<
12242-.c.lo:
12243- $(LIBTOOL) --mode=compile $(COMPILE) $<
12244
12245-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
12246+.y.c:
12247+ $(YACC) $(YFLAGS) --output $@ $<
12248+ rm -f $*.h
12249
12250-all: all-@USE_INCLUDED_LIBINTL@
12251+bindtextdom.lo: $(srcdir)/bindtextdom.c
12252+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
12253+dcgettext.lo: $(srcdir)/dcgettext.c
12254+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
12255+dgettext.lo: $(srcdir)/dgettext.c
12256+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
12257+gettext.lo: $(srcdir)/gettext.c
12258+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
12259+finddomain.lo: $(srcdir)/finddomain.c
12260+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
12261+loadmsgcat.lo: $(srcdir)/loadmsgcat.c
12262+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
12263+localealias.lo: $(srcdir)/localealias.c
12264+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
12265+textdomain.lo: $(srcdir)/textdomain.c
12266+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
12267+l10nflist.lo: $(srcdir)/l10nflist.c
12268+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
12269+explodename.lo: $(srcdir)/explodename.c
12270+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
12271+dcigettext.lo: $(srcdir)/dcigettext.c
12272+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
12273+dcngettext.lo: $(srcdir)/dcngettext.c
12274+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
12275+dngettext.lo: $(srcdir)/dngettext.c
12276+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
12277+ngettext.lo: $(srcdir)/ngettext.c
12278+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
12279+plural.lo: $(srcdir)/plural.c
12280+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
12281+plural-exp.lo: $(srcdir)/plural-exp.c
12282+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
12283+localcharset.lo: $(srcdir)/localcharset.c
12284+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
12285+relocatable.lo: $(srcdir)/relocatable.c
12286+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
12287+localename.lo: $(srcdir)/localename.c
12288+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
12289+log.lo: $(srcdir)/log.c
12290+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
12291+printf.lo: $(srcdir)/printf.c
12292+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
12293+osdep.lo: $(srcdir)/osdep.c
12294+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
12295+intl-compat.lo: $(srcdir)/intl-compat.c
12296+ $(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
12297
12298-all-yes: libintl.$la intlh.inst
12299-all-no:
12300+ref-add.sed: $(srcdir)/ref-add.sin
12301+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
12302+ mv t-ref-add.sed ref-add.sed
12303+ref-del.sed: $(srcdir)/ref-del.sin
12304+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
12305+ mv t-ref-del.sed ref-del.sed
12306
12307-libintl.a: $(OBJECTS)
12308- rm -f $@
12309- $(AR) cru $@ $(OBJECTS)
12310- $(RANLIB) $@
12311+INCLUDES = -I. -I$(srcdir) -I..
12312
12313-libintl.la: $(OBJECTS)
12314- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
12315- -version-info 1:0 -rpath $(libdir)
12316+libgnuintl.h: $(srcdir)/libgnuintl.h.in
12317+ sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
12318+ -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
12319+ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
12320+ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
12321+ < $(srcdir)/libgnuintl.h.in > libgnuintl.h
12322
12323-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
12324- cd ../po && $(MAKE) cat-id-tbl.$lo
12325+libintl.h: libgnuintl.h
12326+ cp libgnuintl.h libintl.h
12327
12328-check: all
12329+charset.alias: $(srcdir)/config.charset
12330+ $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
12331+ mv t-$@ $@
12332
12333-# This installation goal is only used in GNU gettext. Packages which
12334-# only use the library should use install instead.
12335+check: all
12336
12337 # We must not install the libintl.h/libintl.a files if we are on a
12338-# system which has the gettext() function in its C library or in a
12339-# separate library or use the catgets interface. A special case is
12340-# where configure found a previously installed GNU gettext library.
12341+# system which has the GNU gettext() function in its C library or in a
12342+# separate library.
12343 # If you want to use the one which comes with this version of the
12344 # package, you have to use `configure --with-included-gettext'.
12345 install: install-exec install-data
12346 install-exec: all
12347- if test "$(PACKAGE)" = "gettext" \
12348- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
12349- if test -r $(MKINSTALLDIRS); then \
12350- $(MKINSTALLDIRS) $(libdir) $(includedir); \
12351- else \
12352- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
12353+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
12354+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
12355+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
12356+ $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
12357+ $(LIBTOOL) --mode=install \
12358+ $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
12359+ if test "@RELOCATABLE@" = yes; then \
12360+ dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
12361+ if test -n "$$dependencies"; then \
12362+ rm -f $(DESTDIR)$(libdir)/libintl.la; \
12363+ fi; \
12364 fi; \
12365- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
12366- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
12367 else \
12368 : ; \
12369 fi
12370-install-data: all
12371- if test "$(PACKAGE)" = "gettext"; then \
12372- if test -r $(MKINSTALLDIRS); then \
12373- $(MKINSTALLDIRS) $(gettextsrcdir); \
12374+ if test "$(PACKAGE)" = "gettext-tools" \
12375+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
12376+ $(mkinstalldirs) $(DESTDIR)$(libdir); \
12377+ $(LIBTOOL) --mode=install \
12378+ $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
12379+ rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
12380+ $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
12381+ $(LIBTOOL) --mode=uninstall \
12382+ rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
12383+ else \
12384+ : ; \
12385+ fi
12386+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
12387+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
12388+ temp=$(DESTDIR)$(libdir)/t-charset.alias; \
12389+ dest=$(DESTDIR)$(libdir)/charset.alias; \
12390+ if test -f $(DESTDIR)$(libdir)/charset.alias; then \
12391+ orig=$(DESTDIR)$(libdir)/charset.alias; \
12392+ sed -f ref-add.sed $$orig > $$temp; \
12393+ $(INSTALL_DATA) $$temp $$dest; \
12394+ rm -f $$temp; \
12395 else \
12396- $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
12397+ if test @GLIBC21@ = no; then \
12398+ orig=charset.alias; \
12399+ sed -f ref-add.sed $$orig > $$temp; \
12400+ $(INSTALL_DATA) $$temp $$dest; \
12401+ rm -f $$temp; \
12402+ fi; \
12403 fi; \
12404- $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
12405- dists="$(DISTFILES.common)"; \
12406+ $(mkinstalldirs) $(DESTDIR)$(localedir); \
12407+ test -f $(DESTDIR)$(localedir)/locale.alias \
12408+ && orig=$(DESTDIR)$(localedir)/locale.alias \
12409+ || orig=$(srcdir)/locale.alias; \
12410+ temp=$(DESTDIR)$(localedir)/t-locale.alias; \
12411+ dest=$(DESTDIR)$(localedir)/locale.alias; \
12412+ sed -f ref-add.sed $$orig > $$temp; \
12413+ $(INSTALL_DATA) $$temp $$dest; \
12414+ rm -f $$temp; \
12415+ else \
12416+ : ; \
12417+ fi
12418+install-data: all
12419+ if test "$(PACKAGE)" = "gettext-tools"; then \
12420+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
12421+ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
12422+ $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
12423+ dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
12424 for file in $$dists; do \
12425- $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
12426+ $(INSTALL_DATA) $(srcdir)/$$file \
12427+ $(DESTDIR)$(gettextsrcdir)/$$file; \
12428 done; \
12429+ chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
12430+ dists="$(DISTFILES.generated)"; \
12431+ for file in $$dists; do \
12432+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
12433+ $(INSTALL_DATA) $$dir/$$file \
12434+ $(DESTDIR)$(gettextsrcdir)/$$file; \
12435+ done; \
12436+ dists="$(DISTFILES.obsolete)"; \
12437+ for file in $$dists; do \
12438+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
12439+ done; \
12440+ else \
12441+ : ; \
12442+ fi
12443+
12444+install-strip: install
12445+
12446+installdirs:
12447+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
12448+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
12449+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
12450+ else \
12451+ : ; \
12452+ fi
12453+ if test "$(PACKAGE)" = "gettext-tools" \
12454+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
12455+ $(mkinstalldirs) $(DESTDIR)$(libdir); \
12456+ else \
12457+ : ; \
12458+ fi
12459+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
12460+ test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
12461+ $(mkinstalldirs) $(DESTDIR)$(localedir); \
12462+ else \
12463+ : ; \
12464+ fi
12465+ if test "$(PACKAGE)" = "gettext-tools"; then \
12466+ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
12467 else \
12468 : ; \
12469 fi
12470@@ -143,22 +367,76 @@
12471 installcheck:
12472
12473 uninstall:
12474- dists="$(DISTFILES.common)"; \
12475- for file in $$dists; do \
12476- rm -f $(gettextsrcdir)/$$file; \
12477- done
12478+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
12479+ && test '@USE_INCLUDED_LIBINTL@' = yes; then \
12480+ rm -f $(DESTDIR)$(includedir)/libintl.h; \
12481+ $(LIBTOOL) --mode=uninstall \
12482+ rm -f $(DESTDIR)$(libdir)/libintl.$la; \
12483+ else \
12484+ : ; \
12485+ fi
12486+ if test "$(PACKAGE)" = "gettext-tools" \
12487+ && test '@USE_INCLUDED_LIBINTL@' = no; then \
12488+ rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
12489+ else \
12490+ : ; \
12491+ fi
12492+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
12493+ if test -f $(DESTDIR)$(libdir)/charset.alias; then \
12494+ temp=$(DESTDIR)$(libdir)/t-charset.alias; \
12495+ dest=$(DESTDIR)$(libdir)/charset.alias; \
12496+ sed -f ref-del.sed $$dest > $$temp; \
12497+ if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
12498+ rm -f $$dest; \
12499+ else \
12500+ $(INSTALL_DATA) $$temp $$dest; \
12501+ fi; \
12502+ rm -f $$temp; \
12503+ fi; \
12504+ if test -f $(DESTDIR)$(localedir)/locale.alias; then \
12505+ temp=$(DESTDIR)$(localedir)/t-locale.alias; \
12506+ dest=$(DESTDIR)$(localedir)/locale.alias; \
12507+ sed -f ref-del.sed $$dest > $$temp; \
12508+ if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
12509+ rm -f $$dest; \
12510+ else \
12511+ $(INSTALL_DATA) $$temp $$dest; \
12512+ fi; \
12513+ rm -f $$temp; \
12514+ fi; \
12515+ else \
12516+ : ; \
12517+ fi
12518+ if test "$(PACKAGE)" = "gettext-tools"; then \
12519+ for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
12520+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
12521+ done; \
12522+ else \
12523+ : ; \
12524+ fi
12525
12526-info dvi:
12527+info dvi ps pdf html:
12528
12529-$(OBJECTS): ../config.h libgettext.h
12530-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
12531-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
12532+$(OBJECTS): ../config.h libgnuintl.h
12533+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
12534+dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
12535+explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
12536+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
12537+dcigettext.$lo: $(srcdir)/eval-plural.h
12538+localcharset.$lo: $(srcdir)/localcharset.h
12539+localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
12540+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
12541
12542 tags: TAGS
12543
12544 TAGS: $(HEADERS) $(SOURCES)
12545 here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
12546
12547+ctags: CTAGS
12548+
12549+CTAGS: $(HEADERS) $(SOURCES)
12550+ here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
12551+
12552 id: ID
12553
12554 ID: $(HEADERS) $(SOURCES)
12555@@ -166,12 +444,19 @@
12556
12557
12558 mostlyclean:
12559- rm -f *.a *.o *.lo core core.*
12560+ rm -f *.a *.la *.o *.obj *.lo core core.*
12561+ rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
12562+ rm -f -r .libs _libs
12563
12564 clean: mostlyclean
12565
12566 distclean: clean
12567- rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h
12568+ rm -f Makefile ID TAGS
12569+ if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
12570+ rm -f ChangeLog.inst $(DISTFILES.normal); \
12571+ else \
12572+ : ; \
12573+ fi
12574
12575 maintainer-clean: distclean
12576 @echo "This command is intended for maintainers to use;"
12577@@ -181,33 +466,27 @@
12578 # GNU gettext needs not contain the file `VERSION' but contains some
12579 # other files which should not be distributed in other packages.
12580 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
12581-dist distdir: Makefile $(DISTFILES)
12582- if test "$(PACKAGE)" = gettext; then \
12583- additional="$(DISTFILES.gettext)"; \
12584+dist distdir: Makefile
12585+ if test "$(PACKAGE)" = "gettext-tools"; then \
12586+ : ; \
12587 else \
12588- additional="$(DISTFILES.normal)"; \
12589- fi; \
12590- for file in $(DISTFILES.common) $$additional; do \
12591- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
12592- || cp -p $(srcdir)/$$file $(distdir); \
12593- done
12594-
12595-dist-libc:
12596- tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
12597-
12598-Makefile: Makefile.in ../config.status
12599- cd .. \
12600- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
12601+ if test "$(PACKAGE)" = "gettext-runtime"; then \
12602+ additional="$(DISTFILES.gettext)"; \
12603+ else \
12604+ additional="$(DISTFILES.normal)"; \
12605+ fi; \
12606+ $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
12607+ for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
12608+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
12609+ cp -p $$dir/$$file $(distdir); \
12610+ done; \
12611+ fi
12612
12613-# The dependency for intlh.inst is different in gettext and all other
12614-# packages. Because we cannot you GNU make features we have to solve
12615-# the problem while rewriting Makefile.in.
12616-@GT_YES@intlh.inst: intlh.inst.in ../config.status
12617-@GT_YES@ cd .. \
12618-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
12619-@GT_YES@ $(SHELL) ./config.status
12620-@GT_NO@.PHONY: intlh.inst
12621-@GT_NO@intlh.inst:
12622+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12623+ cd $(top_builddir) && $(SHELL) ./config.status
12624+# This would be more efficient, but doesn't work any more with autoconf-2.57,
12625+# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
12626+# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
12627
12628 # Tell versions [3.59,3.63) of GNU make not to export all variables.
12629 # Otherwise a system limit (for SysV at least) may be exceeded.
12630--- lrzsz-0.12.20.safe/intl/ngettext.c 1969-12-31 19:00:00.000000000 -0500
12631+++ lrzsz-0.12.20/intl/ngettext.c 2004-09-12 14:40:34.533721032 -0400
12632@@ -0,0 +1,65 @@
12633+/* Implementation of ngettext(3) function.
12634+ Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
12635+
12636+ This program is free software; you can redistribute it and/or modify it
12637+ under the terms of the GNU Library General Public License as published
12638+ by the Free Software Foundation; either version 2, or (at your option)
12639+ any later version.
12640+
12641+ This program is distributed in the hope that it will be useful,
12642+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12643+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12644+ Library General Public License for more details.
12645+
12646+ You should have received a copy of the GNU Library General Public
12647+ License along with this program; if not, write to the Free Software
12648+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12649+ USA. */
12650+
12651+#ifdef HAVE_CONFIG_H
12652+# include <config.h>
12653+#endif
12654+
12655+#ifdef _LIBC
12656+# define __need_NULL
12657+# include <stddef.h>
12658+#else
12659+# include <stdlib.h> /* Just for NULL. */
12660+#endif
12661+
12662+#include "gettextP.h"
12663+#ifdef _LIBC
12664+# include <libintl.h>
12665+#else
12666+# include "libgnuintl.h"
12667+#endif
12668+
12669+#include <locale.h>
12670+
12671+/* @@ end of prolog @@ */
12672+
12673+/* Names for the libintl functions are a problem. They must not clash
12674+ with existing names and they should follow ANSI C. But this source
12675+ code is also used in GNU C Library where the names have a __
12676+ prefix. So we have to make a difference here. */
12677+#ifdef _LIBC
12678+# define NGETTEXT __ngettext
12679+# define DCNGETTEXT __dcngettext
12680+#else
12681+# define NGETTEXT libintl_ngettext
12682+# define DCNGETTEXT libintl_dcngettext
12683+#endif
12684+
12685+/* Look up MSGID in the current default message catalog for the current
12686+ LC_MESSAGES locale. If not found, returns MSGID itself (the default
12687+ text). */
12688+char *
12689+NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
12690+{
12691+ return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
12692+}
12693+
12694+#ifdef _LIBC
12695+/* Alias for function name in GNU C Library. */
12696+weak_alias (__ngettext, ngettext);
12697+#endif
12698--- lrzsz-0.12.20.safe/intl/os2compat.c 1969-12-31 19:00:00.000000000 -0500
12699+++ lrzsz-0.12.20/intl/os2compat.c 2004-09-12 14:40:34.539720120 -0400
12700@@ -0,0 +1,98 @@
12701+/* OS/2 compatibility functions.
12702+ Copyright (C) 2001-2002 Free Software Foundation, Inc.
12703+
12704+ This program is free software; you can redistribute it and/or modify it
12705+ under the terms of the GNU Library General Public License as published
12706+ by the Free Software Foundation; either version 2, or (at your option)
12707+ any later version.
12708+
12709+ This program is distributed in the hope that it will be useful,
12710+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12711+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12712+ Library General Public License for more details.
12713+
12714+ You should have received a copy of the GNU Library General Public
12715+ License along with this program; if not, write to the Free Software
12716+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12717+ USA. */
12718+
12719+#define OS2_AWARE
12720+#ifdef HAVE_CONFIG_H
12721+#include <config.h>
12722+#endif
12723+
12724+#include <stdlib.h>
12725+#include <string.h>
12726+#include <sys/param.h>
12727+
12728+/* A version of getenv() that works from DLLs */
12729+extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
12730+
12731+char *
12732+_nl_getenv (const char *name)
12733+{
12734+ unsigned char *value;
12735+ if (DosScanEnv (name, &value))
12736+ return NULL;
12737+ else
12738+ return value;
12739+}
12740+
12741+/* A fixed size buffer. */
12742+char libintl_nl_default_dirname[MAXPATHLEN+1];
12743+
12744+char *_nlos2_libdir = NULL;
12745+char *_nlos2_localealiaspath = NULL;
12746+char *_nlos2_localedir = NULL;
12747+
12748+static __attribute__((constructor)) void
12749+nlos2_initialize ()
12750+{
12751+ char *root = getenv ("UNIXROOT");
12752+ char *gnulocaledir = getenv ("GNULOCALEDIR");
12753+
12754+ _nlos2_libdir = gnulocaledir;
12755+ if (!_nlos2_libdir)
12756+ {
12757+ if (root)
12758+ {
12759+ size_t sl = strlen (root);
12760+ _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
12761+ memcpy (_nlos2_libdir, root, sl);
12762+ memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
12763+ }
12764+ else
12765+ _nlos2_libdir = LIBDIR;
12766+ }
12767+
12768+ _nlos2_localealiaspath = gnulocaledir;
12769+ if (!_nlos2_localealiaspath)
12770+ {
12771+ if (root)
12772+ {
12773+ size_t sl = strlen (root);
12774+ _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
12775+ memcpy (_nlos2_localealiaspath, root, sl);
12776+ memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
12777+ }
12778+ else
12779+ _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
12780+ }
12781+
12782+ _nlos2_localedir = gnulocaledir;
12783+ if (!_nlos2_localedir)
12784+ {
12785+ if (root)
12786+ {
12787+ size_t sl = strlen (root);
12788+ _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
12789+ memcpy (_nlos2_localedir, root, sl);
12790+ memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
12791+ }
12792+ else
12793+ _nlos2_localedir = LOCALEDIR;
12794+ }
12795+
12796+ if (strlen (_nlos2_localedir) <= MAXPATHLEN)
12797+ strcpy (libintl_nl_default_dirname, _nlos2_localedir);
12798+}
12799--- lrzsz-0.12.20.safe/intl/os2compat.h 1969-12-31 19:00:00.000000000 -0500
12800+++ lrzsz-0.12.20/intl/os2compat.h 2004-09-12 14:40:34.544719360 -0400
12801@@ -0,0 +1,46 @@
12802+/* OS/2 compatibility defines.
12803+ This file is intended to be included from config.h
12804+ Copyright (C) 2001-2002 Free Software Foundation, Inc.
12805+
12806+ This program is free software; you can redistribute it and/or modify it
12807+ under the terms of the GNU Library General Public License as published
12808+ by the Free Software Foundation; either version 2, or (at your option)
12809+ any later version.
12810+
12811+ This program is distributed in the hope that it will be useful,
12812+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12813+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12814+ Library General Public License for more details.
12815+
12816+ You should have received a copy of the GNU Library General Public
12817+ License along with this program; if not, write to the Free Software
12818+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12819+ USA. */
12820+
12821+/* When included from os2compat.h we need all the original definitions */
12822+#ifndef OS2_AWARE
12823+
12824+#undef LIBDIR
12825+#define LIBDIR _nlos2_libdir
12826+extern char *_nlos2_libdir;
12827+
12828+#undef LOCALEDIR
12829+#define LOCALEDIR _nlos2_localedir
12830+extern char *_nlos2_localedir;
12831+
12832+#undef LOCALE_ALIAS_PATH
12833+#define LOCALE_ALIAS_PATH _nlos2_localealiaspath
12834+extern char *_nlos2_localealiaspath;
12835+
12836+#endif
12837+
12838+#undef HAVE_STRCASECMP
12839+#define HAVE_STRCASECMP 1
12840+#define strcasecmp stricmp
12841+#define strncasecmp strnicmp
12842+
12843+/* We have our own getenv() which works even if library is compiled as DLL */
12844+#define getenv _nl_getenv
12845+
12846+/* Older versions of gettext used -1 as the value of LC_MESSAGES */
12847+#define LC_MESSAGES_COMPAT (-1)
12848--- lrzsz-0.12.20.safe/intl/osdep.c 1969-12-31 19:00:00.000000000 -0500
12849+++ lrzsz-0.12.20/intl/osdep.c 2004-09-12 14:40:34.550718448 -0400
12850@@ -0,0 +1,24 @@
12851+/* OS dependent parts of libintl.
12852+ Copyright (C) 2001-2002 Free Software Foundation, Inc.
12853+
12854+ This program is free software; you can redistribute it and/or modify it
12855+ under the terms of the GNU Library General Public License as published
12856+ by the Free Software Foundation; either version 2, or (at your option)
12857+ any later version.
12858+
12859+ This program is distributed in the hope that it will be useful,
12860+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12861+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12862+ Library General Public License for more details.
12863+
12864+ You should have received a copy of the GNU Library General Public
12865+ License along with this program; if not, write to the Free Software
12866+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12867+ USA. */
12868+
12869+#if defined __EMX__
12870+# include "os2compat.c"
12871+#else
12872+/* Avoid AIX compiler warning. */
12873+typedef int dummy;
12874+#endif
12875--- lrzsz-0.12.20.safe/intl/plural.c 1969-12-31 19:00:00.000000000 -0500
12876+++ lrzsz-0.12.20/intl/plural.c 2004-09-12 14:40:36.571411256 -0400
12877@@ -0,0 +1,1490 @@
12878+/* A Bison parser, made from plural.y
12879+ by GNU bison 1.35. */
12880+
12881+#define YYBISON 1 /* Identify Bison output. */
12882+
12883+#define yyparse __gettextparse
12884+#define yylex __gettextlex
12885+#define yyerror __gettexterror
12886+#define yylval __gettextlval
12887+#define yychar __gettextchar
12888+#define yydebug __gettextdebug
12889+#define yynerrs __gettextnerrs
12890+# define EQUOP2 257
12891+# define CMPOP2 258
12892+# define ADDOP2 259
12893+# define MULOP2 260
12894+# define NUMBER 261
12895+
12896+#line 1 "plural.y"
12897+
12898+/* Expression parsing for plural form selection.
12899+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
12900+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
12901+
12902+ This program is free software; you can redistribute it and/or modify it
12903+ under the terms of the GNU Library General Public License as published
12904+ by the Free Software Foundation; either version 2, or (at your option)
12905+ any later version.
12906+
12907+ This program is distributed in the hope that it will be useful,
12908+ but WITHOUT ANY WARRANTY; without even the implied warranty of
12909+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12910+ Library General Public License for more details.
12911+
12912+ You should have received a copy of the GNU Library General Public
12913+ License along with this program; if not, write to the Free Software
12914+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
12915+ USA. */
12916+
12917+/* The bison generated parser uses alloca. AIX 3 forces us to put this
12918+ declaration at the beginning of the file. The declaration in bison's
12919+ skeleton file comes too late. This must come before <config.h>
12920+ because <config.h> may include arbitrary system headers. */
12921+#if defined _AIX && !defined __GNUC__
12922+ #pragma alloca
12923+#endif
12924+
12925+#ifdef HAVE_CONFIG_H
12926+# include <config.h>
12927+#endif
12928+
12929+#include <stddef.h>
12930+#include <stdlib.h>
12931+#include "plural-exp.h"
12932+
12933+/* The main function generated by the parser is called __gettextparse,
12934+ but we want it to be called PLURAL_PARSE. */
12935+#ifndef _LIBC
12936+# define __gettextparse PLURAL_PARSE
12937+#endif
12938+
12939+#define YYLEX_PARAM &((struct parse_args *) arg)->cp
12940+#define YYPARSE_PARAM arg
12941+
12942+#line 49 "plural.y"
12943+#ifndef YYSTYPE
12944+typedef union {
12945+ unsigned long int num;
12946+ enum operator op;
12947+ struct expression *exp;
12948+} yystype;
12949+# define YYSTYPE yystype
12950+# define YYSTYPE_IS_TRIVIAL 1
12951+#endif
12952+#line 55 "plural.y"
12953+
12954+/* Prototypes for local functions. */
12955+static int yylex (YYSTYPE *lval, const char **pexp);
12956+static void yyerror (const char *str);
12957+
12958+/* Allocation of expressions. */
12959+
12960+static struct expression *
12961+new_exp (int nargs, enum operator op, struct expression * const *args)
12962+{
12963+ int i;
12964+ struct expression *newp;
12965+
12966+ /* If any of the argument could not be malloc'ed, just return NULL. */
12967+ for (i = nargs - 1; i >= 0; i--)
12968+ if (args[i] == NULL)
12969+ goto fail;
12970+
12971+ /* Allocate a new expression. */
12972+ newp = (struct expression *) malloc (sizeof (*newp));
12973+ if (newp != NULL)
12974+ {
12975+ newp->nargs = nargs;
12976+ newp->operation = op;
12977+ for (i = nargs - 1; i >= 0; i--)
12978+ newp->val.args[i] = args[i];
12979+ return newp;
12980+ }
12981+
12982+ fail:
12983+ for (i = nargs - 1; i >= 0; i--)
12984+ FREE_EXPRESSION (args[i]);
12985+
12986+ return NULL;
12987+}
12988+
12989+static inline struct expression *
12990+new_exp_0 (enum operator op)
12991+{
12992+ return new_exp (0, op, NULL);
12993+}
12994+
12995+static inline struct expression *
12996+new_exp_1 (enum operator op, struct expression *right)
12997+{
12998+ struct expression *args[1];
12999+
13000+ args[0] = right;
13001+ return new_exp (1, op, args);
13002+}
13003+
13004+static struct expression *
13005+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
13006+{
13007+ struct expression *args[2];
13008+
13009+ args[0] = left;
13010+ args[1] = right;
13011+ return new_exp (2, op, args);
13012+}
13013+
13014+static inline struct expression *
13015+new_exp_3 (enum operator op, struct expression *bexp,
13016+ struct expression *tbranch, struct expression *fbranch)
13017+{
13018+ struct expression *args[3];
13019+
13020+ args[0] = bexp;
13021+ args[1] = tbranch;
13022+ args[2] = fbranch;
13023+ return new_exp (3, op, args);
13024+}
13025+
13026+#ifndef YYDEBUG
13027+# define YYDEBUG 0
13028+#endif
13029+
13030+
13031+
13032+#define YYFINAL 27
13033+#define YYFLAG -32768
13034+#define YYNTBASE 16
13035+
13036+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
13037+#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
13038+
13039+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
13040+static const char yytranslate[] =
13041+{
13042+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13043+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13044+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13045+ 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
13046+ 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
13047+ 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
13048+ 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
13049+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13050+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13051+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13052+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13053+ 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13054+ 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
13055+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13056+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13057+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13058+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13059+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13060+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13061+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13062+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13063+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13064+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13065+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13066+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
13067+ 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
13068+ 9, 11
13069+};
13070+
13071+#if YYDEBUG
13072+static const short yyprhs[] =
13073+{
13074+ 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
13075+ 35, 37, 39
13076+};
13077+static const short yyrhs[] =
13078+{
13079+ 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
13080+ 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
13081+ 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
13082+ 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
13083+ 17, 15, 0
13084+};
13085+
13086+#endif
13087+
13088+#if YYDEBUG
13089+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
13090+static const short yyrline[] =
13091+{
13092+ 0, 150, 158, 162, 166, 170, 174, 178, 182, 186,
13093+ 190, 194, 199
13094+};
13095+#endif
13096+
13097+
13098+#if (YYDEBUG) || defined YYERROR_VERBOSE
13099+
13100+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
13101+static const char *const yytname[] =
13102+{
13103+ "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
13104+ "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
13105+ "start", "exp", 0
13106+};
13107+#endif
13108+
13109+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
13110+static const short yyr1[] =
13111+{
13112+ 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
13113+ 17, 17, 17
13114+};
13115+
13116+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
13117+static const short yyr2[] =
13118+{
13119+ 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
13120+ 1, 1, 3
13121+};
13122+
13123+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
13124+ doesn't specify something else to do. Zero means the default is an
13125+ error. */
13126+static const short yydefact[] =
13127+{
13128+ 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
13129+ 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
13130+ 6, 7, 8, 0, 2, 0, 0, 0
13131+};
13132+
13133+static const short yydefgoto[] =
13134+{
13135+ 25, 5
13136+};
13137+
13138+static const short yypact[] =
13139+{
13140+ -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
13141+ -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
13142+ 26, -3,-32768, -9, 34, 21, 53,-32768
13143+};
13144+
13145+static const short yypgoto[] =
13146+{
13147+ -32768, -1
13148+};
13149+
13150+
13151+#define YYLAST 53
13152+
13153+
13154+static const short yytable[] =
13155+{
13156+ 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
13157+ 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
13158+ 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
13159+ 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
13160+ 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
13161+ 12, 13, 14, 27
13162+};
13163+
13164+static const short yycheck[] =
13165+{
13166+ 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
13167+ 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
13168+ 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
13169+ 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
13170+ 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
13171+ 7, 8, 9, 0
13172+};
13173+#define YYPURE 1
13174+
13175+/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
13176+#line 3 "/usr/local/share/bison/bison.simple"
13177+
13178+/* Skeleton output parser for bison,
13179+
13180+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
13181+ Foundation, Inc.
13182+
13183+ This program is free software; you can redistribute it and/or modify
13184+ it under the terms of the GNU General Public License as published by
13185+ the Free Software Foundation; either version 2, or (at your option)
13186+ any later version.
13187+
13188+ This program is distributed in the hope that it will be useful,
13189+ but WITHOUT ANY WARRANTY; without even the implied warranty of
13190+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13191+ GNU General Public License for more details.
13192+
13193+ You should have received a copy of the GNU General Public License
13194+ along with this program; if not, write to the Free Software
13195+ Foundation, Inc., 59 Temple Place - Suite 330,
13196+ Boston, MA 02111-1307, USA. */
13197+
13198+/* As a special exception, when this file is copied by Bison into a
13199+ Bison output file, you may use that output file without restriction.
13200+ This special exception was added by the Free Software Foundation
13201+ in version 1.24 of Bison. */
13202+
13203+/* This is the parser code that is written into each bison parser when
13204+ the %semantic_parser declaration is not specified in the grammar.
13205+ It was written by Richard Stallman by simplifying the hairy parser
13206+ used when %semantic_parser is specified. */
13207+
13208+/* All symbols defined below should begin with yy or YY, to avoid
13209+ infringing on user name space. This should be done even for local
13210+ variables, as they might otherwise be expanded by user macros.
13211+ There are some unavoidable exceptions within include files to
13212+ define necessary library symbols; they are noted "INFRINGES ON
13213+ USER NAME SPACE" below. */
13214+
13215+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
13216+
13217+/* The parser invokes alloca or malloc; define the necessary symbols. */
13218+
13219+# if YYSTACK_USE_ALLOCA
13220+# define YYSTACK_ALLOC alloca
13221+# else
13222+# ifndef YYSTACK_USE_ALLOCA
13223+# if defined (alloca) || defined (_ALLOCA_H)
13224+# define YYSTACK_ALLOC alloca
13225+# else
13226+# ifdef __GNUC__
13227+# define YYSTACK_ALLOC __builtin_alloca
13228+# endif
13229+# endif
13230+# endif
13231+# endif
13232+
13233+# ifdef YYSTACK_ALLOC
13234+ /* Pacify GCC's `empty if-body' warning. */
13235+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
13236+# else
13237+# if defined (__STDC__) || defined (__cplusplus)
13238+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
13239+# define YYSIZE_T size_t
13240+# endif
13241+# define YYSTACK_ALLOC malloc
13242+# define YYSTACK_FREE free
13243+# endif
13244+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
13245+
13246+
13247+#if (! defined (yyoverflow) \
13248+ && (! defined (__cplusplus) \
13249+ || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
13250+
13251+/* A type that is properly aligned for any stack member. */
13252+union yyalloc
13253+{
13254+ short yyss;
13255+ YYSTYPE yyvs;
13256+# if YYLSP_NEEDED
13257+ YYLTYPE yyls;
13258+# endif
13259+};
13260+
13261+/* The size of the maximum gap between one aligned stack and the next. */
13262+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
13263+
13264+/* The size of an array large to enough to hold all stacks, each with
13265+ N elements. */
13266+# if YYLSP_NEEDED
13267+# define YYSTACK_BYTES(N) \
13268+ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
13269+ + 2 * YYSTACK_GAP_MAX)
13270+# else
13271+# define YYSTACK_BYTES(N) \
13272+ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
13273+ + YYSTACK_GAP_MAX)
13274+# endif
13275+
13276+/* Copy COUNT objects from FROM to TO. The source and destination do
13277+ not overlap. */
13278+# ifndef YYCOPY
13279+# if 1 < __GNUC__
13280+# define YYCOPY(To, From, Count) \
13281+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
13282+# else
13283+# define YYCOPY(To, From, Count) \
13284+ do \
13285+ { \
13286+ register YYSIZE_T yyi; \
13287+ for (yyi = 0; yyi < (Count); yyi++) \
13288+ (To)[yyi] = (From)[yyi]; \
13289+ } \
13290+ while (0)
13291+# endif
13292+# endif
13293+
13294+/* Relocate STACK from its old location to the new one. The
13295+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
13296+ elements in the stack, and YYPTR gives the new location of the
13297+ stack. Advance YYPTR to a properly aligned location for the next
13298+ stack. */
13299+# define YYSTACK_RELOCATE(Stack) \
13300+ do \
13301+ { \
13302+ YYSIZE_T yynewbytes; \
13303+ YYCOPY (&yyptr->Stack, Stack, yysize); \
13304+ Stack = &yyptr->Stack; \
13305+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
13306+ yyptr += yynewbytes / sizeof (*yyptr); \
13307+ } \
13308+ while (0)
13309+
13310+#endif
13311+
13312+
13313+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
13314+# define YYSIZE_T __SIZE_TYPE__
13315+#endif
13316+#if ! defined (YYSIZE_T) && defined (size_t)
13317+# define YYSIZE_T size_t
13318+#endif
13319+#if ! defined (YYSIZE_T)
13320+# if defined (__STDC__) || defined (__cplusplus)
13321+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
13322+# define YYSIZE_T size_t
13323+# endif
13324+#endif
13325+#if ! defined (YYSIZE_T)
13326+# define YYSIZE_T unsigned int
13327+#endif
13328+
13329+#define yyerrok (yyerrstatus = 0)
13330+#define yyclearin (yychar = YYEMPTY)
13331+#define YYEMPTY -2
13332+#define YYEOF 0
13333+#define YYACCEPT goto yyacceptlab
13334+#define YYABORT goto yyabortlab
13335+#define YYERROR goto yyerrlab1
13336+/* Like YYERROR except do call yyerror. This remains here temporarily
13337+ to ease the transition to the new meaning of YYERROR, for GCC.
13338+ Once GCC version 2 has supplanted version 1, this can go. */
13339+#define YYFAIL goto yyerrlab
13340+#define YYRECOVERING() (!!yyerrstatus)
13341+#define YYBACKUP(Token, Value) \
13342+do \
13343+ if (yychar == YYEMPTY && yylen == 1) \
13344+ { \
13345+ yychar = (Token); \
13346+ yylval = (Value); \
13347+ yychar1 = YYTRANSLATE (yychar); \
13348+ YYPOPSTACK; \
13349+ goto yybackup; \
13350+ } \
13351+ else \
13352+ { \
13353+ yyerror ("syntax error: cannot back up"); \
13354+ YYERROR; \
13355+ } \
13356+while (0)
13357+
13358+#define YYTERROR 1
13359+#define YYERRCODE 256
13360+
13361+
13362+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
13363+ are run).
13364+
13365+ When YYLLOC_DEFAULT is run, CURRENT is set the location of the
13366+ first token. By default, to implement support for ranges, extend
13367+ its range to the last symbol. */
13368+
13369+#ifndef YYLLOC_DEFAULT
13370+# define YYLLOC_DEFAULT(Current, Rhs, N) \
13371+ Current.last_line = Rhs[N].last_line; \
13372+ Current.last_column = Rhs[N].last_column;
13373+#endif
13374+
13375+
13376+/* YYLEX -- calling `yylex' with the right arguments. */
13377+
13378+#if YYPURE
13379+# if YYLSP_NEEDED
13380+# ifdef YYLEX_PARAM
13381+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
13382+# else
13383+# define YYLEX yylex (&yylval, &yylloc)
13384+# endif
13385+# else /* !YYLSP_NEEDED */
13386+# ifdef YYLEX_PARAM
13387+# define YYLEX yylex (&yylval, YYLEX_PARAM)
13388+# else
13389+# define YYLEX yylex (&yylval)
13390+# endif
13391+# endif /* !YYLSP_NEEDED */
13392+#else /* !YYPURE */
13393+# define YYLEX yylex ()
13394+#endif /* !YYPURE */
13395+
13396+
13397+/* Enable debugging if requested. */
13398+#if YYDEBUG
13399+
13400+# ifndef YYFPRINTF
13401+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
13402+# define YYFPRINTF fprintf
13403+# endif
13404+
13405+# define YYDPRINTF(Args) \
13406+do { \
13407+ if (yydebug) \
13408+ YYFPRINTF Args; \
13409+} while (0)
13410+/* Nonzero means print parse trace. It is left uninitialized so that
13411+ multiple parsers can coexist. */
13412+int yydebug;
13413+#else /* !YYDEBUG */
13414+# define YYDPRINTF(Args)
13415+#endif /* !YYDEBUG */
13416+
13417+/* YYINITDEPTH -- initial size of the parser's stacks. */
13418+#ifndef YYINITDEPTH
13419+# define YYINITDEPTH 200
13420+#endif
13421+
13422+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
13423+ if the built-in stack extension method is used).
13424+
13425+ Do not make this value too large; the results are undefined if
13426+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
13427+ evaluated with infinite-precision integer arithmetic. */
13428+
13429+#if YYMAXDEPTH == 0
13430+# undef YYMAXDEPTH
13431+#endif
13432+
13433+#ifndef YYMAXDEPTH
13434+# define YYMAXDEPTH 10000
13435+#endif
13436+
13437+#ifdef YYERROR_VERBOSE
13438+
13439+# ifndef yystrlen
13440+# if defined (__GLIBC__) && defined (_STRING_H)
13441+# define yystrlen strlen
13442+# else
13443+/* Return the length of YYSTR. */
13444+static YYSIZE_T
13445+# if defined (__STDC__) || defined (__cplusplus)
13446+yystrlen (const char *yystr)
13447+# else
13448+yystrlen (yystr)
13449+ const char *yystr;
13450+# endif
13451+{
13452+ register const char *yys = yystr;
13453+
13454+ while (*yys++ != '\0')
13455+ continue;
13456+
13457+ return yys - yystr - 1;
13458+}
13459+# endif
13460+# endif
13461+
13462+# ifndef yystpcpy
13463+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
13464+# define yystpcpy stpcpy
13465+# else
13466+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
13467+ YYDEST. */
13468+static char *
13469+# if defined (__STDC__) || defined (__cplusplus)
13470+yystpcpy (char *yydest, const char *yysrc)
13471+# else
13472+yystpcpy (yydest, yysrc)
13473+ char *yydest;
13474+ const char *yysrc;
13475+# endif
13476+{
13477+ register char *yyd = yydest;
13478+ register const char *yys = yysrc;
13479+
13480+ while ((*yyd++ = *yys++) != '\0')
13481+ continue;
13482+
13483+ return yyd - 1;
13484+}
13485+# endif
13486+# endif
13487+#endif
13488+
13489+#line 315 "/usr/local/share/bison/bison.simple"
13490+
13491+
13492+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
13493+ into yyparse. The argument should have type void *.
13494+ It should actually point to an object.
13495+ Grammar actions can access the variable by casting it
13496+ to the proper pointer type. */
13497+
13498+#ifdef YYPARSE_PARAM
13499+# if defined (__STDC__) || defined (__cplusplus)
13500+# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
13501+# define YYPARSE_PARAM_DECL
13502+# else
13503+# define YYPARSE_PARAM_ARG YYPARSE_PARAM
13504+# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
13505+# endif
13506+#else /* !YYPARSE_PARAM */
13507+# define YYPARSE_PARAM_ARG
13508+# define YYPARSE_PARAM_DECL
13509+#endif /* !YYPARSE_PARAM */
13510+
13511+/* Prevent warning if -Wstrict-prototypes. */
13512+#ifdef __GNUC__
13513+# ifdef YYPARSE_PARAM
13514+int yyparse (void *);
13515+# else
13516+int yyparse (void);
13517+# endif
13518+#endif
13519+
13520+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
13521+ variables are global, or local to YYPARSE. */
13522+
13523+#define YY_DECL_NON_LSP_VARIABLES \
13524+/* The lookahead symbol. */ \
13525+int yychar; \
13526+ \
13527+/* The semantic value of the lookahead symbol. */ \
13528+YYSTYPE yylval; \
13529+ \
13530+/* Number of parse errors so far. */ \
13531+int yynerrs;
13532+
13533+#if YYLSP_NEEDED
13534+# define YY_DECL_VARIABLES \
13535+YY_DECL_NON_LSP_VARIABLES \
13536+ \
13537+/* Location data for the lookahead symbol. */ \
13538+YYLTYPE yylloc;
13539+#else
13540+# define YY_DECL_VARIABLES \
13541+YY_DECL_NON_LSP_VARIABLES
13542+#endif
13543+
13544+
13545+/* If nonreentrant, generate the variables here. */
13546+
13547+#if !YYPURE
13548+YY_DECL_VARIABLES
13549+#endif /* !YYPURE */
13550+
13551+int
13552+yyparse (YYPARSE_PARAM_ARG)
13553+ YYPARSE_PARAM_DECL
13554+{
13555+ /* If reentrant, generate the variables here. */
13556+#if YYPURE
13557+ YY_DECL_VARIABLES
13558+#endif /* !YYPURE */
13559+
13560+ register int yystate;
13561+ register int yyn;
13562+ int yyresult;
13563+ /* Number of tokens to shift before error messages enabled. */
13564+ int yyerrstatus;
13565+ /* Lookahead token as an internal (translated) token number. */
13566+ int yychar1 = 0;
13567+
13568+ /* Three stacks and their tools:
13569+ `yyss': related to states,
13570+ `yyvs': related to semantic values,
13571+ `yyls': related to locations.
13572+
13573+ Refer to the stacks thru separate pointers, to allow yyoverflow
13574+ to reallocate them elsewhere. */
13575+
13576+ /* The state stack. */
13577+ short yyssa[YYINITDEPTH];
13578+ short *yyss = yyssa;
13579+ register short *yyssp;
13580+
13581+ /* The semantic value stack. */
13582+ YYSTYPE yyvsa[YYINITDEPTH];
13583+ YYSTYPE *yyvs = yyvsa;
13584+ register YYSTYPE *yyvsp;
13585+
13586+#if YYLSP_NEEDED
13587+ /* The location stack. */
13588+ YYLTYPE yylsa[YYINITDEPTH];
13589+ YYLTYPE *yyls = yylsa;
13590+ YYLTYPE *yylsp;
13591+#endif
13592+
13593+#if YYLSP_NEEDED
13594+# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
13595+#else
13596+# define YYPOPSTACK (yyvsp--, yyssp--)
13597+#endif
13598+
13599+ YYSIZE_T yystacksize = YYINITDEPTH;
13600+
13601+
13602+ /* The variables used to return semantic value and location from the
13603+ action routines. */
13604+ YYSTYPE yyval;
13605+#if YYLSP_NEEDED
13606+ YYLTYPE yyloc;
13607+#endif
13608+
13609+ /* When reducing, the number of symbols on the RHS of the reduced
13610+ rule. */
13611+ int yylen;
13612+
13613+ YYDPRINTF ((stderr, "Starting parse\n"));
13614+
13615+ yystate = 0;
13616+ yyerrstatus = 0;
13617+ yynerrs = 0;
13618+ yychar = YYEMPTY; /* Cause a token to be read. */
13619+
13620+ /* Initialize stack pointers.
13621+ Waste one element of value and location stack
13622+ so that they stay on the same level as the state stack.
13623+ The wasted elements are never initialized. */
13624+
13625+ yyssp = yyss;
13626+ yyvsp = yyvs;
13627+#if YYLSP_NEEDED
13628+ yylsp = yyls;
13629+#endif
13630+ goto yysetstate;
13631+
13632+/*------------------------------------------------------------.
13633+| yynewstate -- Push a new state, which is found in yystate. |
13634+`------------------------------------------------------------*/
13635+ yynewstate:
13636+ /* In all cases, when you get here, the value and location stacks
13637+ have just been pushed. so pushing a state here evens the stacks.
13638+ */
13639+ yyssp++;
13640+
13641+ yysetstate:
13642+ *yyssp = yystate;
13643+
13644+ if (yyssp >= yyss + yystacksize - 1)
13645+ {
13646+ /* Get the current used size of the three stacks, in elements. */
13647+ YYSIZE_T yysize = yyssp - yyss + 1;
13648+
13649+#ifdef yyoverflow
13650+ {
13651+ /* Give user a chance to reallocate the stack. Use copies of
13652+ these so that the &'s don't force the real ones into
13653+ memory. */
13654+ YYSTYPE *yyvs1 = yyvs;
13655+ short *yyss1 = yyss;
13656+
13657+ /* Each stack pointer address is followed by the size of the
13658+ data in use in that stack, in bytes. */
13659+# if YYLSP_NEEDED
13660+ YYLTYPE *yyls1 = yyls;
13661+ /* This used to be a conditional around just the two extra args,
13662+ but that might be undefined if yyoverflow is a macro. */
13663+ yyoverflow ("parser stack overflow",
13664+ &yyss1, yysize * sizeof (*yyssp),
13665+ &yyvs1, yysize * sizeof (*yyvsp),
13666+ &yyls1, yysize * sizeof (*yylsp),
13667+ &yystacksize);
13668+ yyls = yyls1;
13669+# else
13670+ yyoverflow ("parser stack overflow",
13671+ &yyss1, yysize * sizeof (*yyssp),
13672+ &yyvs1, yysize * sizeof (*yyvsp),
13673+ &yystacksize);
13674+# endif
13675+ yyss = yyss1;
13676+ yyvs = yyvs1;
13677+ }
13678+#else /* no yyoverflow */
13679+# ifndef YYSTACK_RELOCATE
13680+ goto yyoverflowlab;
13681+# else
13682+ /* Extend the stack our own way. */
13683+ if (yystacksize >= YYMAXDEPTH)
13684+ goto yyoverflowlab;
13685+ yystacksize *= 2;
13686+ if (yystacksize > YYMAXDEPTH)
13687+ yystacksize = YYMAXDEPTH;
13688+
13689+ {
13690+ short *yyss1 = yyss;
13691+ union yyalloc *yyptr =
13692+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
13693+ if (! yyptr)
13694+ goto yyoverflowlab;
13695+ YYSTACK_RELOCATE (yyss);
13696+ YYSTACK_RELOCATE (yyvs);
13697+# if YYLSP_NEEDED
13698+ YYSTACK_RELOCATE (yyls);
13699+# endif
13700+# undef YYSTACK_RELOCATE
13701+ if (yyss1 != yyssa)
13702+ YYSTACK_FREE (yyss1);
13703+ }
13704+# endif
13705+#endif /* no yyoverflow */
13706+
13707+ yyssp = yyss + yysize - 1;
13708+ yyvsp = yyvs + yysize - 1;
13709+#if YYLSP_NEEDED
13710+ yylsp = yyls + yysize - 1;
13711+#endif
13712+
13713+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
13714+ (unsigned long int) yystacksize));
13715+
13716+ if (yyssp >= yyss + yystacksize - 1)
13717+ YYABORT;
13718+ }
13719+
13720+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
13721+
13722+ goto yybackup;
13723+
13724+
13725+/*-----------.
13726+| yybackup. |
13727+`-----------*/
13728+yybackup:
13729+
13730+/* Do appropriate processing given the current state. */
13731+/* Read a lookahead token if we need one and don't already have one. */
13732+/* yyresume: */
13733+
13734+ /* First try to decide what to do without reference to lookahead token. */
13735+
13736+ yyn = yypact[yystate];
13737+ if (yyn == YYFLAG)
13738+ goto yydefault;
13739+
13740+ /* Not known => get a lookahead token if don't already have one. */
13741+
13742+ /* yychar is either YYEMPTY or YYEOF
13743+ or a valid token in external form. */
13744+
13745+ if (yychar == YYEMPTY)
13746+ {
13747+ YYDPRINTF ((stderr, "Reading a token: "));
13748+ yychar = YYLEX;
13749+ }
13750+
13751+ /* Convert token to internal form (in yychar1) for indexing tables with */
13752+
13753+ if (yychar <= 0) /* This means end of input. */
13754+ {
13755+ yychar1 = 0;
13756+ yychar = YYEOF; /* Don't call YYLEX any more */
13757+
13758+ YYDPRINTF ((stderr, "Now at end of input.\n"));
13759+ }
13760+ else
13761+ {
13762+ yychar1 = YYTRANSLATE (yychar);
13763+
13764+#if YYDEBUG
13765+ /* We have to keep this `#if YYDEBUG', since we use variables
13766+ which are defined only if `YYDEBUG' is set. */
13767+ if (yydebug)
13768+ {
13769+ YYFPRINTF (stderr, "Next token is %d (%s",
13770+ yychar, yytname[yychar1]);
13771+ /* Give the individual parser a way to print the precise
13772+ meaning of a token, for further debugging info. */
13773+# ifdef YYPRINT
13774+ YYPRINT (stderr, yychar, yylval);
13775+# endif
13776+ YYFPRINTF (stderr, ")\n");
13777+ }
13778+#endif
13779+ }
13780+
13781+ yyn += yychar1;
13782+ if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
13783+ goto yydefault;
13784+
13785+ yyn = yytable[yyn];
13786+
13787+ /* yyn is what to do for this token type in this state.
13788+ Negative => reduce, -yyn is rule number.
13789+ Positive => shift, yyn is new state.
13790+ New state is final state => don't bother to shift,
13791+ just return success.
13792+ 0, or most negative number => error. */
13793+
13794+ if (yyn < 0)
13795+ {
13796+ if (yyn == YYFLAG)
13797+ goto yyerrlab;
13798+ yyn = -yyn;
13799+ goto yyreduce;
13800+ }
13801+ else if (yyn == 0)
13802+ goto yyerrlab;
13803+
13804+ if (yyn == YYFINAL)
13805+ YYACCEPT;
13806+
13807+ /* Shift the lookahead token. */
13808+ YYDPRINTF ((stderr, "Shifting token %d (%s), ",
13809+ yychar, yytname[yychar1]));
13810+
13811+ /* Discard the token being shifted unless it is eof. */
13812+ if (yychar != YYEOF)
13813+ yychar = YYEMPTY;
13814+
13815+ *++yyvsp = yylval;
13816+#if YYLSP_NEEDED
13817+ *++yylsp = yylloc;
13818+#endif
13819+
13820+ /* Count tokens shifted since error; after three, turn off error
13821+ status. */
13822+ if (yyerrstatus)
13823+ yyerrstatus--;
13824+
13825+ yystate = yyn;
13826+ goto yynewstate;
13827+
13828+
13829+/*-----------------------------------------------------------.
13830+| yydefault -- do the default action for the current state. |
13831+`-----------------------------------------------------------*/
13832+yydefault:
13833+ yyn = yydefact[yystate];
13834+ if (yyn == 0)
13835+ goto yyerrlab;
13836+ goto yyreduce;
13837+
13838+
13839+/*-----------------------------.
13840+| yyreduce -- Do a reduction. |
13841+`-----------------------------*/
13842+yyreduce:
13843+ /* yyn is the number of a rule to reduce with. */
13844+ yylen = yyr2[yyn];
13845+
13846+ /* If YYLEN is nonzero, implement the default value of the action:
13847+ `$$ = $1'.
13848+
13849+ Otherwise, the following line sets YYVAL to the semantic value of
13850+ the lookahead token. This behavior is undocumented and Bison
13851+ users should not rely upon it. Assigning to YYVAL
13852+ unconditionally makes the parser a bit smaller, and it avoids a
13853+ GCC warning that YYVAL may be used uninitialized. */
13854+ yyval = yyvsp[1-yylen];
13855+
13856+#if YYLSP_NEEDED
13857+ /* Similarly for the default location. Let the user run additional
13858+ commands if for instance locations are ranges. */
13859+ yyloc = yylsp[1-yylen];
13860+ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
13861+#endif
13862+
13863+#if YYDEBUG
13864+ /* We have to keep this `#if YYDEBUG', since we use variables which
13865+ are defined only if `YYDEBUG' is set. */
13866+ if (yydebug)
13867+ {
13868+ int yyi;
13869+
13870+ YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
13871+ yyn, yyrline[yyn]);
13872+
13873+ /* Print the symbols being reduced, and their result. */
13874+ for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
13875+ YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
13876+ YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
13877+ }
13878+#endif
13879+
13880+ switch (yyn) {
13881+
13882+case 1:
13883+#line 151 "plural.y"
13884+{
13885+ if (yyvsp[0].exp == NULL)
13886+ YYABORT;
13887+ ((struct parse_args *) arg)->res = yyvsp[0].exp;
13888+ }
13889+ break;
13890+case 2:
13891+#line 159 "plural.y"
13892+{
13893+ yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
13894+ }
13895+ break;
13896+case 3:
13897+#line 163 "plural.y"
13898+{
13899+ yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
13900+ }
13901+ break;
13902+case 4:
13903+#line 167 "plural.y"
13904+{
13905+ yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
13906+ }
13907+ break;
13908+case 5:
13909+#line 171 "plural.y"
13910+{
13911+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
13912+ }
13913+ break;
13914+case 6:
13915+#line 175 "plural.y"
13916+{
13917+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
13918+ }
13919+ break;
13920+case 7:
13921+#line 179 "plural.y"
13922+{
13923+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
13924+ }
13925+ break;
13926+case 8:
13927+#line 183 "plural.y"
13928+{
13929+ yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
13930+ }
13931+ break;
13932+case 9:
13933+#line 187 "plural.y"
13934+{
13935+ yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
13936+ }
13937+ break;
13938+case 10:
13939+#line 191 "plural.y"
13940+{
13941+ yyval.exp = new_exp_0 (var);
13942+ }
13943+ break;
13944+case 11:
13945+#line 195 "plural.y"
13946+{
13947+ if ((yyval.exp = new_exp_0 (num)) != NULL)
13948+ yyval.exp->val.num = yyvsp[0].num;
13949+ }
13950+ break;
13951+case 12:
13952+#line 200 "plural.y"
13953+{
13954+ yyval.exp = yyvsp[-1].exp;
13955+ }
13956+ break;
13957+}
13958+
13959+#line 705 "/usr/local/share/bison/bison.simple"
13960+
13961+
13962+ yyvsp -= yylen;
13963+ yyssp -= yylen;
13964+#if YYLSP_NEEDED
13965+ yylsp -= yylen;
13966+#endif
13967+
13968+#if YYDEBUG
13969+ if (yydebug)
13970+ {
13971+ short *yyssp1 = yyss - 1;
13972+ YYFPRINTF (stderr, "state stack now");
13973+ while (yyssp1 != yyssp)
13974+ YYFPRINTF (stderr, " %d", *++yyssp1);
13975+ YYFPRINTF (stderr, "\n");
13976+ }
13977+#endif
13978+
13979+ *++yyvsp = yyval;
13980+#if YYLSP_NEEDED
13981+ *++yylsp = yyloc;
13982+#endif
13983+
13984+ /* Now `shift' the result of the reduction. Determine what state
13985+ that goes to, based on the state we popped back to and the rule
13986+ number reduced by. */
13987+
13988+ yyn = yyr1[yyn];
13989+
13990+ yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
13991+ if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
13992+ yystate = yytable[yystate];
13993+ else
13994+ yystate = yydefgoto[yyn - YYNTBASE];
13995+
13996+ goto yynewstate;
13997+
13998+
13999+/*------------------------------------.
14000+| yyerrlab -- here on detecting error |
14001+`------------------------------------*/
14002+yyerrlab:
14003+ /* If not already recovering from an error, report this error. */
14004+ if (!yyerrstatus)
14005+ {
14006+ ++yynerrs;
14007+
14008+#ifdef YYERROR_VERBOSE
14009+ yyn = yypact[yystate];
14010+
14011+ if (yyn > YYFLAG && yyn < YYLAST)
14012+ {
14013+ YYSIZE_T yysize = 0;
14014+ char *yymsg;
14015+ int yyx, yycount;
14016+
14017+ yycount = 0;
14018+ /* Start YYX at -YYN if negative to avoid negative indexes in
14019+ YYCHECK. */
14020+ for (yyx = yyn < 0 ? -yyn : 0;
14021+ yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
14022+ if (yycheck[yyx + yyn] == yyx)
14023+ yysize += yystrlen (yytname[yyx]) + 15, yycount++;
14024+ yysize += yystrlen ("parse error, unexpected ") + 1;
14025+ yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
14026+ yymsg = (char *) YYSTACK_ALLOC (yysize);
14027+ if (yymsg != 0)
14028+ {
14029+ char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
14030+ yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
14031+
14032+ if (yycount < 5)
14033+ {
14034+ yycount = 0;
14035+ for (yyx = yyn < 0 ? -yyn : 0;
14036+ yyx < (int) (sizeof (yytname) / sizeof (char *));
14037+ yyx++)
14038+ if (yycheck[yyx + yyn] == yyx)
14039+ {
14040+ const char *yyq = ! yycount ? ", expecting " : " or ";
14041+ yyp = yystpcpy (yyp, yyq);
14042+ yyp = yystpcpy (yyp, yytname[yyx]);
14043+ yycount++;
14044+ }
14045+ }
14046+ yyerror (yymsg);
14047+ YYSTACK_FREE (yymsg);
14048+ }
14049+ else
14050+ yyerror ("parse error; also virtual memory exhausted");
14051+ }
14052+ else
14053+#endif /* defined (YYERROR_VERBOSE) */
14054+ yyerror ("parse error");
14055+ }
14056+ goto yyerrlab1;
14057+
14058+
14059+/*--------------------------------------------------.
14060+| yyerrlab1 -- error raised explicitly by an action |
14061+`--------------------------------------------------*/
14062+yyerrlab1:
14063+ if (yyerrstatus == 3)
14064+ {
14065+ /* If just tried and failed to reuse lookahead token after an
14066+ error, discard it. */
14067+
14068+ /* return failure if at end of input */
14069+ if (yychar == YYEOF)
14070+ YYABORT;
14071+ YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
14072+ yychar, yytname[yychar1]));
14073+ yychar = YYEMPTY;
14074+ }
14075+
14076+ /* Else will try to reuse lookahead token after shifting the error
14077+ token. */
14078+
14079+ yyerrstatus = 3; /* Each real token shifted decrements this */
14080+
14081+ goto yyerrhandle;
14082+
14083+
14084+/*-------------------------------------------------------------------.
14085+| yyerrdefault -- current state does not do anything special for the |
14086+| error token. |
14087+`-------------------------------------------------------------------*/
14088+yyerrdefault:
14089+#if 0
14090+ /* This is wrong; only states that explicitly want error tokens
14091+ should shift them. */
14092+
14093+ /* If its default is to accept any token, ok. Otherwise pop it. */
14094+ yyn = yydefact[yystate];
14095+ if (yyn)
14096+ goto yydefault;
14097+#endif
14098+
14099+
14100+/*---------------------------------------------------------------.
14101+| yyerrpop -- pop the current state because it cannot handle the |
14102+| error token |
14103+`---------------------------------------------------------------*/
14104+yyerrpop:
14105+ if (yyssp == yyss)
14106+ YYABORT;
14107+ yyvsp--;
14108+ yystate = *--yyssp;
14109+#if YYLSP_NEEDED
14110+ yylsp--;
14111+#endif
14112+
14113+#if YYDEBUG
14114+ if (yydebug)
14115+ {
14116+ short *yyssp1 = yyss - 1;
14117+ YYFPRINTF (stderr, "Error: state stack now");
14118+ while (yyssp1 != yyssp)
14119+ YYFPRINTF (stderr, " %d", *++yyssp1);
14120+ YYFPRINTF (stderr, "\n");
14121+ }
14122+#endif
14123+
14124+/*--------------.
14125+| yyerrhandle. |
14126+`--------------*/
14127+yyerrhandle:
14128+ yyn = yypact[yystate];
14129+ if (yyn == YYFLAG)
14130+ goto yyerrdefault;
14131+
14132+ yyn += YYTERROR;
14133+ if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
14134+ goto yyerrdefault;
14135+
14136+ yyn = yytable[yyn];
14137+ if (yyn < 0)
14138+ {
14139+ if (yyn == YYFLAG)
14140+ goto yyerrpop;
14141+ yyn = -yyn;
14142+ goto yyreduce;
14143+ }
14144+ else if (yyn == 0)
14145+ goto yyerrpop;
14146+
14147+ if (yyn == YYFINAL)
14148+ YYACCEPT;
14149+
14150+ YYDPRINTF ((stderr, "Shifting error token, "));
14151+
14152+ *++yyvsp = yylval;
14153+#if YYLSP_NEEDED
14154+ *++yylsp = yylloc;
14155+#endif
14156+
14157+ yystate = yyn;
14158+ goto yynewstate;
14159+
14160+
14161+/*-------------------------------------.
14162+| yyacceptlab -- YYACCEPT comes here. |
14163+`-------------------------------------*/
14164+yyacceptlab:
14165+ yyresult = 0;
14166+ goto yyreturn;
14167+
14168+/*-----------------------------------.
14169+| yyabortlab -- YYABORT comes here. |
14170+`-----------------------------------*/
14171+yyabortlab:
14172+ yyresult = 1;
14173+ goto yyreturn;
14174+
14175+/*---------------------------------------------.
14176+| yyoverflowab -- parser overflow comes here. |
14177+`---------------------------------------------*/
14178+yyoverflowlab:
14179+ yyerror ("parser stack overflow");
14180+ yyresult = 2;
14181+ /* Fall through. */
14182+
14183+yyreturn:
14184+#ifndef yyoverflow
14185+ if (yyss != yyssa)
14186+ YYSTACK_FREE (yyss);
14187+#endif
14188+ return yyresult;
14189+}
14190+#line 205 "plural.y"
14191+
14192+
14193+void
14194+internal_function
14195+FREE_EXPRESSION (struct expression *exp)
14196+{
14197+ if (exp == NULL)
14198+ return;
14199+
14200+ /* Handle the recursive case. */
14201+ switch (exp->nargs)
14202+ {
14203+ case 3:
14204+ FREE_EXPRESSION (exp->val.args[2]);
14205+ /* FALLTHROUGH */
14206+ case 2:
14207+ FREE_EXPRESSION (exp->val.args[1]);
14208+ /* FALLTHROUGH */
14209+ case 1:
14210+ FREE_EXPRESSION (exp->val.args[0]);
14211+ /* FALLTHROUGH */
14212+ default:
14213+ break;
14214+ }
14215+
14216+ free (exp);
14217+}
14218+
14219+
14220+static int
14221+yylex (YYSTYPE *lval, const char **pexp)
14222+{
14223+ const char *exp = *pexp;
14224+ int result;
14225+
14226+ while (1)
14227+ {
14228+ if (exp[0] == '\0')
14229+ {
14230+ *pexp = exp;
14231+ return YYEOF;
14232+ }
14233+
14234+ if (exp[0] != ' ' && exp[0] != '\t')
14235+ break;
14236+
14237+ ++exp;
14238+ }
14239+
14240+ result = *exp++;
14241+ switch (result)
14242+ {
14243+ case '0': case '1': case '2': case '3': case '4':
14244+ case '5': case '6': case '7': case '8': case '9':
14245+ {
14246+ unsigned long int n = result - '0';
14247+ while (exp[0] >= '0' && exp[0] <= '9')
14248+ {
14249+ n *= 10;
14250+ n += exp[0] - '0';
14251+ ++exp;
14252+ }
14253+ lval->num = n;
14254+ result = NUMBER;
14255+ }
14256+ break;
14257+
14258+ case '=':
14259+ if (exp[0] == '=')
14260+ {
14261+ ++exp;
14262+ lval->op = equal;
14263+ result = EQUOP2;
14264+ }
14265+ else
14266+ result = YYERRCODE;
14267+ break;
14268+
14269+ case '!':
14270+ if (exp[0] == '=')
14271+ {
14272+ ++exp;
14273+ lval->op = not_equal;
14274+ result = EQUOP2;
14275+ }
14276+ break;
14277+
14278+ case '&':
14279+ case '|':
14280+ if (exp[0] == result)
14281+ ++exp;
14282+ else
14283+ result = YYERRCODE;
14284+ break;
14285+
14286+ case '<':
14287+ if (exp[0] == '=')
14288+ {
14289+ ++exp;
14290+ lval->op = less_or_equal;
14291+ }
14292+ else
14293+ lval->op = less_than;
14294+ result = CMPOP2;
14295+ break;
14296+
14297+ case '>':
14298+ if (exp[0] == '=')
14299+ {
14300+ ++exp;
14301+ lval->op = greater_or_equal;
14302+ }
14303+ else
14304+ lval->op = greater_than;
14305+ result = CMPOP2;
14306+ break;
14307+
14308+ case '*':
14309+ lval->op = mult;
14310+ result = MULOP2;
14311+ break;
14312+
14313+ case '/':
14314+ lval->op = divide;
14315+ result = MULOP2;
14316+ break;
14317+
14318+ case '%':
14319+ lval->op = module;
14320+ result = MULOP2;
14321+ break;
14322+
14323+ case '+':
14324+ lval->op = plus;
14325+ result = ADDOP2;
14326+ break;
14327+
14328+ case '-':
14329+ lval->op = minus;
14330+ result = ADDOP2;
14331+ break;
14332+
14333+ case 'n':
14334+ case '?':
14335+ case ':':
14336+ case '(':
14337+ case ')':
14338+ /* Nothing, just return the character. */
14339+ break;
14340+
14341+ case ';':
14342+ case '\n':
14343+ case '\0':
14344+ /* Be safe and let the user call this function again. */
14345+ --exp;
14346+ result = YYEOF;
14347+ break;
14348+
14349+ default:
14350+ result = YYERRCODE;
14351+#if YYDEBUG != 0
14352+ --exp;
14353+#endif
14354+ break;
14355+ }
14356+
14357+ *pexp = exp;
14358+
14359+ return result;
14360+}
14361+
14362+
14363+static void
14364+yyerror (const char *str)
14365+{
14366+ /* Do nothing. We don't print error messages here. */
14367+}
14368--- lrzsz-0.12.20.safe/intl/plural-exp.c 1969-12-31 19:00:00.000000000 -0500
14369+++ lrzsz-0.12.20/intl/plural-exp.c 2004-09-12 14:40:34.578714192 -0400
14370@@ -0,0 +1,154 @@
14371+/* Expression parsing for plural form selection.
14372+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
14373+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
14374+
14375+ This program is free software; you can redistribute it and/or modify it
14376+ under the terms of the GNU Library General Public License as published
14377+ by the Free Software Foundation; either version 2, or (at your option)
14378+ any later version.
14379+
14380+ This program is distributed in the hope that it will be useful,
14381+ but WITHOUT ANY WARRANTY; without even the implied warranty of
14382+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14383+ Library General Public License for more details.
14384+
14385+ You should have received a copy of the GNU Library General Public
14386+ License along with this program; if not, write to the Free Software
14387+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
14388+ USA. */
14389+
14390+#ifdef HAVE_CONFIG_H
14391+# include <config.h>
14392+#endif
14393+
14394+#include <ctype.h>
14395+#include <stdlib.h>
14396+#include <string.h>
14397+
14398+#include "plural-exp.h"
14399+
14400+#if (defined __GNUC__ && !defined __APPLE_CC__) \
14401+ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
14402+
14403+/* These structs are the constant expression for the germanic plural
14404+ form determination. It represents the expression "n != 1". */
14405+static const struct expression plvar =
14406+{
14407+ .nargs = 0,
14408+ .operation = var,
14409+};
14410+static const struct expression plone =
14411+{
14412+ .nargs = 0,
14413+ .operation = num,
14414+ .val =
14415+ {
14416+ .num = 1
14417+ }
14418+};
14419+struct expression GERMANIC_PLURAL =
14420+{
14421+ .nargs = 2,
14422+ .operation = not_equal,
14423+ .val =
14424+ {
14425+ .args =
14426+ {
14427+ [0] = (struct expression *) &plvar,
14428+ [1] = (struct expression *) &plone
14429+ }
14430+ }
14431+};
14432+
14433+# define INIT_GERMANIC_PLURAL()
14434+
14435+#else
14436+
14437+/* For compilers without support for ISO C 99 struct/union initializers:
14438+ Initialization at run-time. */
14439+
14440+static struct expression plvar;
14441+static struct expression plone;
14442+struct expression GERMANIC_PLURAL;
14443+
14444+static void
14445+init_germanic_plural ()
14446+{
14447+ if (plone.val.num == 0)
14448+ {
14449+ plvar.nargs = 0;
14450+ plvar.operation = var;
14451+
14452+ plone.nargs = 0;
14453+ plone.operation = num;
14454+ plone.val.num = 1;
14455+
14456+ GERMANIC_PLURAL.nargs = 2;
14457+ GERMANIC_PLURAL.operation = not_equal;
14458+ GERMANIC_PLURAL.val.args[0] = &plvar;
14459+ GERMANIC_PLURAL.val.args[1] = &plone;
14460+ }
14461+}
14462+
14463+# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
14464+
14465+#endif
14466+
14467+void
14468+internal_function
14469+EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
14470+ unsigned long int *npluralsp)
14471+{
14472+ if (nullentry != NULL)
14473+ {
14474+ const char *plural;
14475+ const char *nplurals;
14476+
14477+ plural = strstr (nullentry, "plural=");
14478+ nplurals = strstr (nullentry, "nplurals=");
14479+ if (plural == NULL || nplurals == NULL)
14480+ goto no_plural;
14481+ else
14482+ {
14483+ char *endp;
14484+ unsigned long int n;
14485+ struct parse_args args;
14486+
14487+ /* First get the number. */
14488+ nplurals += 9;
14489+ while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
14490+ ++nplurals;
14491+ if (!(*nplurals >= '0' && *nplurals <= '9'))
14492+ goto no_plural;
14493+#if defined HAVE_STRTOUL || defined _LIBC
14494+ n = strtoul (nplurals, &endp, 10);
14495+#else
14496+ for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
14497+ n = n * 10 + (*endp - '0');
14498+#endif
14499+ if (nplurals == endp)
14500+ goto no_plural;
14501+ *npluralsp = n;
14502+
14503+ /* Due to the restrictions bison imposes onto the interface of the
14504+ scanner function we have to put the input string and the result
14505+ passed up from the parser into the same structure which address
14506+ is passed down to the parser. */
14507+ plural += 7;
14508+ args.cp = plural;
14509+ if (PLURAL_PARSE (&args) != 0)
14510+ goto no_plural;
14511+ *pluralp = args.res;
14512+ }
14513+ }
14514+ else
14515+ {
14516+ /* By default we are using the Germanic form: singular form only
14517+ for `one', the plural form otherwise. Yes, this is also what
14518+ English is using since English is a Germanic language. */
14519+ no_plural:
14520+ INIT_GERMANIC_PLURAL ();
14521+ *pluralp = &GERMANIC_PLURAL;
14522+ *npluralsp = 2;
14523+ }
14524+}
14525--- lrzsz-0.12.20.safe/intl/plural-exp.h 1969-12-31 19:00:00.000000000 -0500
14526+++ lrzsz-0.12.20/intl/plural-exp.h 2004-09-12 14:40:34.584713280 -0400
14527@@ -0,0 +1,118 @@
14528+/* Expression parsing and evaluation for plural form selection.
14529+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
14530+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
14531+
14532+ This program is free software; you can redistribute it and/or modify it
14533+ under the terms of the GNU Library General Public License as published
14534+ by the Free Software Foundation; either version 2, or (at your option)
14535+ any later version.
14536+
14537+ This program is distributed in the hope that it will be useful,
14538+ but WITHOUT ANY WARRANTY; without even the implied warranty of
14539+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14540+ Library General Public License for more details.
14541+
14542+ You should have received a copy of the GNU Library General Public
14543+ License along with this program; if not, write to the Free Software
14544+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
14545+ USA. */
14546+
14547+#ifndef _PLURAL_EXP_H
14548+#define _PLURAL_EXP_H
14549+
14550+#ifndef internal_function
14551+# define internal_function
14552+#endif
14553+
14554+#ifndef attribute_hidden
14555+# define attribute_hidden
14556+#endif
14557+
14558+
14559+/* This is the representation of the expressions to determine the
14560+ plural form. */
14561+struct expression
14562+{
14563+ int nargs; /* Number of arguments. */
14564+ enum operator
14565+ {
14566+ /* Without arguments: */
14567+ var, /* The variable "n". */
14568+ num, /* Decimal number. */
14569+ /* Unary operators: */
14570+ lnot, /* Logical NOT. */
14571+ /* Binary operators: */
14572+ mult, /* Multiplication. */
14573+ divide, /* Division. */
14574+ module, /* Modulo operation. */
14575+ plus, /* Addition. */
14576+ minus, /* Subtraction. */
14577+ less_than, /* Comparison. */
14578+ greater_than, /* Comparison. */
14579+ less_or_equal, /* Comparison. */
14580+ greater_or_equal, /* Comparison. */
14581+ equal, /* Comparison for equality. */
14582+ not_equal, /* Comparison for inequality. */
14583+ land, /* Logical AND. */
14584+ lor, /* Logical OR. */
14585+ /* Ternary operators: */
14586+ qmop /* Question mark operator. */
14587+ } operation;
14588+ union
14589+ {
14590+ unsigned long int num; /* Number value for `num'. */
14591+ struct expression *args[3]; /* Up to three arguments. */
14592+ } val;
14593+};
14594+
14595+/* This is the data structure to pass information to the parser and get
14596+ the result in a thread-safe way. */
14597+struct parse_args
14598+{
14599+ const char *cp;
14600+ struct expression *res;
14601+};
14602+
14603+
14604+/* Names for the libintl functions are a problem. This source code is used
14605+ 1. in the GNU C Library library,
14606+ 2. in the GNU libintl library,
14607+ 3. in the GNU gettext tools.
14608+ The function names in each situation must be different, to allow for
14609+ binary incompatible changes in 'struct expression'. Furthermore,
14610+ 1. in the GNU C Library library, the names have a __ prefix,
14611+ 2.+3. in the GNU libintl library and in the GNU gettext tools, the names
14612+ must follow ANSI C and not start with __.
14613+ So we have to distinguish the three cases. */
14614+#ifdef _LIBC
14615+# define FREE_EXPRESSION __gettext_free_exp
14616+# define PLURAL_PARSE __gettextparse
14617+# define GERMANIC_PLURAL __gettext_germanic_plural
14618+# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
14619+#elif defined (IN_LIBINTL)
14620+# define FREE_EXPRESSION libintl_gettext_free_exp
14621+# define PLURAL_PARSE libintl_gettextparse
14622+# define GERMANIC_PLURAL libintl_gettext_germanic_plural
14623+# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
14624+#else
14625+# define FREE_EXPRESSION free_plural_expression
14626+# define PLURAL_PARSE parse_plural_expression
14627+# define GERMANIC_PLURAL germanic_plural
14628+# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
14629+#endif
14630+
14631+extern void FREE_EXPRESSION (struct expression *exp)
14632+ internal_function;
14633+extern int PLURAL_PARSE (void *arg);
14634+extern struct expression GERMANIC_PLURAL attribute_hidden;
14635+extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
14636+ struct expression **pluralp,
14637+ unsigned long int *npluralsp)
14638+ internal_function;
14639+
14640+#if !defined (_LIBC) && !defined (IN_LIBINTL)
14641+extern unsigned long int plural_eval (struct expression *pexp,
14642+ unsigned long int n);
14643+#endif
14644+
14645+#endif /* _PLURAL_EXP_H */
14646--- lrzsz-0.12.20.safe/intl/plural.y 1969-12-31 19:00:00.000000000 -0500
14647+++ lrzsz-0.12.20/intl/plural.y 2004-09-12 14:40:34.589712520 -0400
14648@@ -0,0 +1,381 @@
14649+%{
14650+/* Expression parsing for plural form selection.
14651+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
14652+ Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
14653+
14654+ This program is free software; you can redistribute it and/or modify it
14655+ under the terms of the GNU Library General Public License as published
14656+ by the Free Software Foundation; either version 2, or (at your option)
14657+ any later version.
14658+
14659+ This program is distributed in the hope that it will be useful,
14660+ but WITHOUT ANY WARRANTY; without even the implied warranty of
14661+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14662+ Library General Public License for more details.
14663+
14664+ You should have received a copy of the GNU Library General Public
14665+ License along with this program; if not, write to the Free Software
14666+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
14667+ USA. */
14668+
14669+/* The bison generated parser uses alloca. AIX 3 forces us to put this
14670+ declaration at the beginning of the file. The declaration in bison's
14671+ skeleton file comes too late. This must come before <config.h>
14672+ because <config.h> may include arbitrary system headers. */
14673+#if defined _AIX && !defined __GNUC__
14674+ #pragma alloca
14675+#endif
14676+
14677+#ifdef HAVE_CONFIG_H
14678+# include <config.h>
14679+#endif
14680+
14681+#include <stddef.h>
14682+#include <stdlib.h>
14683+#include "plural-exp.h"
14684+
14685+/* The main function generated by the parser is called __gettextparse,
14686+ but we want it to be called PLURAL_PARSE. */
14687+#ifndef _LIBC
14688+# define __gettextparse PLURAL_PARSE
14689+#endif
14690+
14691+#define YYLEX_PARAM &((struct parse_args *) arg)->cp
14692+#define YYPARSE_PARAM arg
14693+%}
14694+%pure_parser
14695+%expect 7
14696+
14697+%union {
14698+ unsigned long int num;
14699+ enum operator op;
14700+ struct expression *exp;
14701+}
14702+
14703+%{
14704+/* Prototypes for local functions. */
14705+static int yylex (YYSTYPE *lval, const char **pexp);
14706+static void yyerror (const char *str);
14707+
14708+/* Allocation of expressions. */
14709+
14710+static struct expression *
14711+new_exp (int nargs, enum operator op, struct expression * const *args)
14712+{
14713+ int i;
14714+ struct expression *newp;
14715+
14716+ /* If any of the argument could not be malloc'ed, just return NULL. */
14717+ for (i = nargs - 1; i >= 0; i--)
14718+ if (args[i] == NULL)
14719+ goto fail;
14720+
14721+ /* Allocate a new expression. */
14722+ newp = (struct expression *) malloc (sizeof (*newp));
14723+ if (newp != NULL)
14724+ {
14725+ newp->nargs = nargs;
14726+ newp->operation = op;
14727+ for (i = nargs - 1; i >= 0; i--)
14728+ newp->val.args[i] = args[i];
14729+ return newp;
14730+ }
14731+
14732+ fail:
14733+ for (i = nargs - 1; i >= 0; i--)
14734+ FREE_EXPRESSION (args[i]);
14735+
14736+ return NULL;
14737+}
14738+
14739+static inline struct expression *
14740+new_exp_0 (enum operator op)
14741+{
14742+ return new_exp (0, op, NULL);
14743+}
14744+
14745+static inline struct expression *
14746+new_exp_1 (enum operator op, struct expression *right)
14747+{
14748+ struct expression *args[1];
14749+
14750+ args[0] = right;
14751+ return new_exp (1, op, args);
14752+}
14753+
14754+static struct expression *
14755+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
14756+{
14757+ struct expression *args[2];
14758+
14759+ args[0] = left;
14760+ args[1] = right;
14761+ return new_exp (2, op, args);
14762+}
14763+
14764+static inline struct expression *
14765+new_exp_3 (enum operator op, struct expression *bexp,
14766+ struct expression *tbranch, struct expression *fbranch)
14767+{
14768+ struct expression *args[3];
14769+
14770+ args[0] = bexp;
14771+ args[1] = tbranch;
14772+ args[2] = fbranch;
14773+ return new_exp (3, op, args);
14774+}
14775+
14776+%}
14777+
14778+/* This declares that all operators have the same associativity and the
14779+ precedence order as in C. See [Harbison, Steele: C, A Reference Manual].
14780+ There is no unary minus and no bitwise operators.
14781+ Operators with the same syntactic behaviour have been merged into a single
14782+ token, to save space in the array generated by bison. */
14783+%right '?' /* ? */
14784+%left '|' /* || */
14785+%left '&' /* && */
14786+%left EQUOP2 /* == != */
14787+%left CMPOP2 /* < > <= >= */
14788+%left ADDOP2 /* + - */
14789+%left MULOP2 /* * / % */
14790+%right '!' /* ! */
14791+
14792+%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
14793+%token <num> NUMBER
14794+%type <exp> exp
14795+
14796+%%
14797+
14798+start: exp
14799+ {
14800+ if ($1 == NULL)
14801+ YYABORT;
14802+ ((struct parse_args *) arg)->res = $1;
14803+ }
14804+ ;
14805+
14806+exp: exp '?' exp ':' exp
14807+ {
14808+ $$ = new_exp_3 (qmop, $1, $3, $5);
14809+ }
14810+ | exp '|' exp
14811+ {
14812+ $$ = new_exp_2 (lor, $1, $3);
14813+ }
14814+ | exp '&' exp
14815+ {
14816+ $$ = new_exp_2 (land, $1, $3);
14817+ }
14818+ | exp EQUOP2 exp
14819+ {
14820+ $$ = new_exp_2 ($2, $1, $3);
14821+ }
14822+ | exp CMPOP2 exp
14823+ {
14824+ $$ = new_exp_2 ($2, $1, $3);
14825+ }
14826+ | exp ADDOP2 exp
14827+ {
14828+ $$ = new_exp_2 ($2, $1, $3);
14829+ }
14830+ | exp MULOP2 exp
14831+ {
14832+ $$ = new_exp_2 ($2, $1, $3);
14833+ }
14834+ | '!' exp
14835+ {
14836+ $$ = new_exp_1 (lnot, $2);
14837+ }
14838+ | 'n'
14839+ {
14840+ $$ = new_exp_0 (var);
14841+ }
14842+ | NUMBER
14843+ {
14844+ if (($$ = new_exp_0 (num)) != NULL)
14845+ $$->val.num = $1;
14846+ }
14847+ | '(' exp ')'
14848+ {
14849+ $$ = $2;
14850+ }
14851+ ;
14852+
14853+%%
14854+
14855+void
14856+internal_function
14857+FREE_EXPRESSION (struct expression *exp)
14858+{
14859+ if (exp == NULL)
14860+ return;
14861+
14862+ /* Handle the recursive case. */
14863+ switch (exp->nargs)
14864+ {
14865+ case 3:
14866+ FREE_EXPRESSION (exp->val.args[2]);
14867+ /* FALLTHROUGH */
14868+ case 2:
14869+ FREE_EXPRESSION (exp->val.args[1]);
14870+ /* FALLTHROUGH */
14871+ case 1:
14872+ FREE_EXPRESSION (exp->val.args[0]);
14873+ /* FALLTHROUGH */
14874+ default:
14875+ break;
14876+ }
14877+
14878+ free (exp);
14879+}
14880+
14881+
14882+static int
14883+yylex (YYSTYPE *lval, const char **pexp)
14884+{
14885+ const char *exp = *pexp;
14886+ int result;
14887+
14888+ while (1)
14889+ {
14890+ if (exp[0] == '\0')
14891+ {
14892+ *pexp = exp;
14893+ return YYEOF;
14894+ }
14895+
14896+ if (exp[0] != ' ' && exp[0] != '\t')
14897+ break;
14898+
14899+ ++exp;
14900+ }
14901+
14902+ result = *exp++;
14903+ switch (result)
14904+ {
14905+ case '0': case '1': case '2': case '3': case '4':
14906+ case '5': case '6': case '7': case '8': case '9':
14907+ {
14908+ unsigned long int n = result - '0';
14909+ while (exp[0] >= '0' && exp[0] <= '9')
14910+ {
14911+ n *= 10;
14912+ n += exp[0] - '0';
14913+ ++exp;
14914+ }
14915+ lval->num = n;
14916+ result = NUMBER;
14917+ }
14918+ break;
14919+
14920+ case '=':
14921+ if (exp[0] == '=')
14922+ {
14923+ ++exp;
14924+ lval->op = equal;
14925+ result = EQUOP2;
14926+ }
14927+ else
14928+ result = YYERRCODE;
14929+ break;
14930+
14931+ case '!':
14932+ if (exp[0] == '=')
14933+ {
14934+ ++exp;
14935+ lval->op = not_equal;
14936+ result = EQUOP2;
14937+ }
14938+ break;
14939+
14940+ case '&':
14941+ case '|':
14942+ if (exp[0] == result)
14943+ ++exp;
14944+ else
14945+ result = YYERRCODE;
14946+ break;
14947+
14948+ case '<':
14949+ if (exp[0] == '=')
14950+ {
14951+ ++exp;
14952+ lval->op = less_or_equal;
14953+ }
14954+ else
14955+ lval->op = less_than;
14956+ result = CMPOP2;
14957+ break;
14958+
14959+ case '>':
14960+ if (exp[0] == '=')
14961+ {
14962+ ++exp;
14963+ lval->op = greater_or_equal;
14964+ }
14965+ else
14966+ lval->op = greater_than;
14967+ result = CMPOP2;
14968+ break;
14969+
14970+ case '*':
14971+ lval->op = mult;
14972+ result = MULOP2;
14973+ break;
14974+
14975+ case '/':
14976+ lval->op = divide;
14977+ result = MULOP2;
14978+ break;
14979+
14980+ case '%':
14981+ lval->op = module;
14982+ result = MULOP2;
14983+ break;
14984+
14985+ case '+':
14986+ lval->op = plus;
14987+ result = ADDOP2;
14988+ break;
14989+
14990+ case '-':
14991+ lval->op = minus;
14992+ result = ADDOP2;
14993+ break;
14994+
14995+ case 'n':
14996+ case '?':
14997+ case ':':
14998+ case '(':
14999+ case ')':
15000+ /* Nothing, just return the character. */
15001+ break;
15002+
15003+ case ';':
15004+ case '\n':
15005+ case '\0':
15006+ /* Be safe and let the user call this function again. */
15007+ --exp;
15008+ result = YYEOF;
15009+ break;
15010+
15011+ default:
15012+ result = YYERRCODE;
15013+#if YYDEBUG != 0
15014+ --exp;
15015+#endif
15016+ break;
15017+ }
15018+
15019+ *pexp = exp;
15020+
15021+ return result;
15022+}
15023+
15024+
15025+static void
15026+yyerror (const char *str)
15027+{
15028+ /* Do nothing. We don't print error messages here. */
15029+}
15030--- lrzsz-0.12.20.safe/intl/po2tbl.sed.in 1998-04-26 09:20:52.000000000 -0400
15031+++ lrzsz-0.12.20/intl/po2tbl.sed.in 1969-12-31 19:00:00.000000000 -0500
15032@@ -1,102 +0,0 @@
15033-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
15034-# Copyright (C) 1995 Free Software Foundation, Inc.
15035-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
15036-#
15037-# This program is free software; you can redistribute it and/or modify
15038-# it under the terms of the GNU General Public License as published by
15039-# the Free Software Foundation; either version 2, or (at your option)
15040-# any later version.
15041-#
15042-# This program is distributed in the hope that it will be useful,
15043-# but WITHOUT ANY WARRANTY; without even the implied warranty of
15044-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15045-# GNU General Public License for more details.
15046-#
15047-# You should have received a copy of the GNU General Public License
15048-# along with this program; if not, write to the Free Software
15049-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
15050-#
15051-1 {
15052- i\
15053-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\
15054-\
15055-#if HAVE_CONFIG_H\
15056-# include <config.h>\
15057-#endif\
15058-\
15059-#include "libgettext.h"\
15060-\
15061-const struct _msg_ent _msg_tbl[] = {
15062- h
15063- s/.*/0/
15064- x
15065-}
15066-#
15067-# Write msgid entries in C array form.
15068-#
15069-/^msgid/ {
15070- s/msgid[ ]*\(".*"\)/ {\1/
15071- tb
15072-# Append the next line
15073- :b
15074- N
15075-# Look whether second part is continuation line.
15076- s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
15077-# Yes, then branch.
15078- ta
15079-# Because we assume that the input file correctly formed the line
15080-# just read cannot be again be a msgid line. So it's safe to ignore
15081-# it.
15082- s/\(.*\)\n.*/\1/
15083- bc
15084-# We found a continuation line. But before printing insert '\'.
15085- :a
15086- s/\(.*\)\(\n.*\)/\1\\\2/
15087- P
15088-# We cannot use D here.
15089- s/.*\n\(.*\)/\1/
15090-# Some buggy seds do not clear the `successful substitution since last ``t'''
15091-# flag on `N', so we do a `t' here to clear it.
15092- tb
15093-# Not reached
15094- :c
15095- x
15096-# The following nice solution is by
15097-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
15098- td
15099-# Increment a decimal number in pattern space.
15100-# First hide trailing `9' digits.
15101- :d
15102- s/9\(_*\)$/_\1/
15103- td
15104-# Assure at least one digit is available.
15105- s/^\(_*\)$/0\1/
15106-# Increment the last digit.
15107- s/8\(_*\)$/9\1/
15108- s/7\(_*\)$/8\1/
15109- s/6\(_*\)$/7\1/
15110- s/5\(_*\)$/6\1/
15111- s/4\(_*\)$/5\1/
15112- s/3\(_*\)$/4\1/
15113- s/2\(_*\)$/3\1/
15114- s/1\(_*\)$/2\1/
15115- s/0\(_*\)$/1\1/
15116-# Convert the hidden `9' digits to `0's.
15117- s/_/0/g
15118- x
15119- G
15120- s/\(.*\)\n\([0-9]*\)/\1, \2},/
15121- s/\(.*\)"$/\1/
15122- p
15123-}
15124-#
15125-# Last line.
15126-#
15127-$ {
15128- i\
15129-};\
15130-
15131- g
15132- s/0*\(.*\)/int _msg_tbl_length = \1;/p
15133-}
15134-d
15135--- lrzsz-0.12.20.safe/intl/printf-args.c 1969-12-31 19:00:00.000000000 -0500
15136+++ lrzsz-0.12.20/intl/printf-args.c 2004-09-12 14:40:34.595711608 -0400
15137@@ -0,0 +1,119 @@
15138+/* Decomposed printf argument list.
15139+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
15140+
15141+ This program is free software; you can redistribute it and/or modify it
15142+ under the terms of the GNU Library General Public License as published
15143+ by the Free Software Foundation; either version 2, or (at your option)
15144+ any later version.
15145+
15146+ This program is distributed in the hope that it will be useful,
15147+ but WITHOUT ANY WARRANTY; without even the implied warranty of
15148+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15149+ Library General Public License for more details.
15150+
15151+ You should have received a copy of the GNU Library General Public
15152+ License along with this program; if not, write to the Free Software
15153+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15154+ USA. */
15155+
15156+#ifdef HAVE_CONFIG_H
15157+# include <config.h>
15158+#endif
15159+
15160+/* Specification. */
15161+#include "printf-args.h"
15162+
15163+#ifdef STATIC
15164+STATIC
15165+#endif
15166+int
15167+printf_fetchargs (va_list args, arguments *a)
15168+{
15169+ size_t i;
15170+ argument *ap;
15171+
15172+ for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
15173+ switch (ap->type)
15174+ {
15175+ case TYPE_SCHAR:
15176+ ap->a.a_schar = va_arg (args, /*signed char*/ int);
15177+ break;
15178+ case TYPE_UCHAR:
15179+ ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
15180+ break;
15181+ case TYPE_SHORT:
15182+ ap->a.a_short = va_arg (args, /*short*/ int);
15183+ break;
15184+ case TYPE_USHORT:
15185+ ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
15186+ break;
15187+ case TYPE_INT:
15188+ ap->a.a_int = va_arg (args, int);
15189+ break;
15190+ case TYPE_UINT:
15191+ ap->a.a_uint = va_arg (args, unsigned int);
15192+ break;
15193+ case TYPE_LONGINT:
15194+ ap->a.a_longint = va_arg (args, long int);
15195+ break;
15196+ case TYPE_ULONGINT:
15197+ ap->a.a_ulongint = va_arg (args, unsigned long int);
15198+ break;
15199+#ifdef HAVE_LONG_LONG
15200+ case TYPE_LONGLONGINT:
15201+ ap->a.a_longlongint = va_arg (args, long long int);
15202+ break;
15203+ case TYPE_ULONGLONGINT:
15204+ ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
15205+ break;
15206+#endif
15207+ case TYPE_DOUBLE:
15208+ ap->a.a_double = va_arg (args, double);
15209+ break;
15210+#ifdef HAVE_LONG_DOUBLE
15211+ case TYPE_LONGDOUBLE:
15212+ ap->a.a_longdouble = va_arg (args, long double);
15213+ break;
15214+#endif
15215+ case TYPE_CHAR:
15216+ ap->a.a_char = va_arg (args, int);
15217+ break;
15218+#ifdef HAVE_WINT_T
15219+ case TYPE_WIDE_CHAR:
15220+ ap->a.a_wide_char = va_arg (args, wint_t);
15221+ break;
15222+#endif
15223+ case TYPE_STRING:
15224+ ap->a.a_string = va_arg (args, const char *);
15225+ break;
15226+#ifdef HAVE_WCHAR_T
15227+ case TYPE_WIDE_STRING:
15228+ ap->a.a_wide_string = va_arg (args, const wchar_t *);
15229+ break;
15230+#endif
15231+ case TYPE_POINTER:
15232+ ap->a.a_pointer = va_arg (args, void *);
15233+ break;
15234+ case TYPE_COUNT_SCHAR_POINTER:
15235+ ap->a.a_count_schar_pointer = va_arg (args, signed char *);
15236+ break;
15237+ case TYPE_COUNT_SHORT_POINTER:
15238+ ap->a.a_count_short_pointer = va_arg (args, short *);
15239+ break;
15240+ case TYPE_COUNT_INT_POINTER:
15241+ ap->a.a_count_int_pointer = va_arg (args, int *);
15242+ break;
15243+ case TYPE_COUNT_LONGINT_POINTER:
15244+ ap->a.a_count_longint_pointer = va_arg (args, long int *);
15245+ break;
15246+#ifdef HAVE_LONG_LONG
15247+ case TYPE_COUNT_LONGLONGINT_POINTER:
15248+ ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
15249+ break;
15250+#endif
15251+ default:
15252+ /* Unknown type. */
15253+ return -1;
15254+ }
15255+ return 0;
15256+}
15257--- lrzsz-0.12.20.safe/intl/printf-args.h 1969-12-31 19:00:00.000000000 -0500
15258+++ lrzsz-0.12.20/intl/printf-args.h 2004-09-12 14:40:34.601710696 -0400
15259@@ -0,0 +1,137 @@
15260+/* Decomposed printf argument list.
15261+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
15262+
15263+ This program is free software; you can redistribute it and/or modify it
15264+ under the terms of the GNU Library General Public License as published
15265+ by the Free Software Foundation; either version 2, or (at your option)
15266+ any later version.
15267+
15268+ This program is distributed in the hope that it will be useful,
15269+ but WITHOUT ANY WARRANTY; without even the implied warranty of
15270+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15271+ Library General Public License for more details.
15272+
15273+ You should have received a copy of the GNU Library General Public
15274+ License along with this program; if not, write to the Free Software
15275+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15276+ USA. */
15277+
15278+#ifndef _PRINTF_ARGS_H
15279+#define _PRINTF_ARGS_H
15280+
15281+/* Get size_t. */
15282+#include <stddef.h>
15283+
15284+/* Get wchar_t. */
15285+#ifdef HAVE_WCHAR_T
15286+# include <stddef.h>
15287+#endif
15288+
15289+/* Get wint_t. */
15290+#ifdef HAVE_WINT_T
15291+# include <wchar.h>
15292+#endif
15293+
15294+/* Get va_list. */
15295+#include <stdarg.h>
15296+
15297+
15298+/* Argument types */
15299+typedef enum
15300+{
15301+ TYPE_NONE,
15302+ TYPE_SCHAR,
15303+ TYPE_UCHAR,
15304+ TYPE_SHORT,
15305+ TYPE_USHORT,
15306+ TYPE_INT,
15307+ TYPE_UINT,
15308+ TYPE_LONGINT,
15309+ TYPE_ULONGINT,
15310+#ifdef HAVE_LONG_LONG
15311+ TYPE_LONGLONGINT,
15312+ TYPE_ULONGLONGINT,
15313+#endif
15314+ TYPE_DOUBLE,
15315+#ifdef HAVE_LONG_DOUBLE
15316+ TYPE_LONGDOUBLE,
15317+#endif
15318+ TYPE_CHAR,
15319+#ifdef HAVE_WINT_T
15320+ TYPE_WIDE_CHAR,
15321+#endif
15322+ TYPE_STRING,
15323+#ifdef HAVE_WCHAR_T
15324+ TYPE_WIDE_STRING,
15325+#endif
15326+ TYPE_POINTER,
15327+ TYPE_COUNT_SCHAR_POINTER,
15328+ TYPE_COUNT_SHORT_POINTER,
15329+ TYPE_COUNT_INT_POINTER,
15330+ TYPE_COUNT_LONGINT_POINTER
15331+#ifdef HAVE_LONG_LONG
15332+, TYPE_COUNT_LONGLONGINT_POINTER
15333+#endif
15334+} arg_type;
15335+
15336+/* Polymorphic argument */
15337+typedef struct
15338+{
15339+ arg_type type;
15340+ union
15341+ {
15342+ signed char a_schar;
15343+ unsigned char a_uchar;
15344+ short a_short;
15345+ unsigned short a_ushort;
15346+ int a_int;
15347+ unsigned int a_uint;
15348+ long int a_longint;
15349+ unsigned long int a_ulongint;
15350+#ifdef HAVE_LONG_LONG
15351+ long long int a_longlongint;
15352+ unsigned long long int a_ulonglongint;
15353+#endif
15354+ float a_float;
15355+ double a_double;
15356+#ifdef HAVE_LONG_DOUBLE
15357+ long double a_longdouble;
15358+#endif
15359+ int a_char;
15360+#ifdef HAVE_WINT_T
15361+ wint_t a_wide_char;
15362+#endif
15363+ const char* a_string;
15364+#ifdef HAVE_WCHAR_T
15365+ const wchar_t* a_wide_string;
15366+#endif
15367+ void* a_pointer;
15368+ signed char * a_count_schar_pointer;
15369+ short * a_count_short_pointer;
15370+ int * a_count_int_pointer;
15371+ long int * a_count_longint_pointer;
15372+#ifdef HAVE_LONG_LONG
15373+ long long int * a_count_longlongint_pointer;
15374+#endif
15375+ }
15376+ a;
15377+}
15378+argument;
15379+
15380+typedef struct
15381+{
15382+ size_t count;
15383+ argument *arg;
15384+}
15385+arguments;
15386+
15387+
15388+/* Fetch the arguments, putting them into a. */
15389+#ifdef STATIC
15390+STATIC
15391+#else
15392+extern
15393+#endif
15394+int printf_fetchargs (va_list args, arguments *a);
15395+
15396+#endif /* _PRINTF_ARGS_H */
15397--- lrzsz-0.12.20.safe/intl/printf.c 1969-12-31 19:00:00.000000000 -0500
15398+++ lrzsz-0.12.20/intl/printf.c 2004-09-12 14:40:34.607709784 -0400
15399@@ -0,0 +1,371 @@
15400+/* Formatted output to strings, using POSIX/XSI format strings with positions.
15401+ Copyright (C) 2003 Free Software Foundation, Inc.
15402+ Written by Bruno Haible <bruno@clisp.org>, 2003.
15403+
15404+ This program is free software; you can redistribute it and/or modify it
15405+ under the terms of the GNU Library General Public License as published
15406+ by the Free Software Foundation; either version 2, or (at your option)
15407+ any later version.
15408+
15409+ This program is distributed in the hope that it will be useful,
15410+ but WITHOUT ANY WARRANTY; without even the implied warranty of
15411+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15412+ Library General Public License for more details.
15413+
15414+ You should have received a copy of the GNU Library General Public
15415+ License along with this program; if not, write to the Free Software
15416+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15417+ USA. */
15418+
15419+#ifdef HAVE_CONFIG_H
15420+# include <config.h>
15421+#endif
15422+
15423+#ifdef __GNUC__
15424+# define alloca __builtin_alloca
15425+# define HAVE_ALLOCA 1
15426+#else
15427+# ifdef _MSC_VER
15428+# include <malloc.h>
15429+# define alloca _alloca
15430+# else
15431+# if defined HAVE_ALLOCA_H || defined _LIBC
15432+# include <alloca.h>
15433+# else
15434+# ifdef _AIX
15435+ #pragma alloca
15436+# else
15437+# ifndef alloca
15438+char *alloca ();
15439+# endif
15440+# endif
15441+# endif
15442+# endif
15443+#endif
15444+
15445+#include <stdio.h>
15446+
15447+#if !HAVE_POSIX_PRINTF
15448+
15449+#include <stdlib.h>
15450+#include <string.h>
15451+
15452+/* When building a DLL, we must export some functions. Note that because
15453+ the functions are only defined for binary backward compatibility, we
15454+ don't need to use __declspec(dllimport) in any case. */
15455+#if defined _MSC_VER && BUILDING_DLL
15456+# define DLL_EXPORTED __declspec(dllexport)
15457+#else
15458+# define DLL_EXPORTED
15459+#endif
15460+
15461+#define STATIC static
15462+
15463+/* Define auxiliary functions declared in "printf-args.h". */
15464+#include "printf-args.c"
15465+
15466+/* Define auxiliary functions declared in "printf-parse.h". */
15467+#include "printf-parse.c"
15468+
15469+/* Define functions declared in "vasnprintf.h". */
15470+#define vasnprintf libintl_vasnprintf
15471+#include "vasnprintf.c"
15472+#if 0 /* not needed */
15473+#define asnprintf libintl_asnprintf
15474+#include "asnprintf.c"
15475+#endif
15476+
15477+DLL_EXPORTED
15478+int
15479+libintl_vfprintf (FILE *stream, const char *format, va_list args)
15480+{
15481+ if (strchr (format, '$') == NULL)
15482+ return vfprintf (stream, format, args);
15483+ else
15484+ {
15485+ size_t length;
15486+ char *result = libintl_vasnprintf (NULL, &length, format, args);
15487+ int retval = -1;
15488+ if (result != NULL)
15489+ {
15490+ if (fwrite (result, 1, length, stream) == length)
15491+ retval = length;
15492+ free (result);
15493+ }
15494+ return retval;
15495+ }
15496+}
15497+
15498+DLL_EXPORTED
15499+int
15500+libintl_fprintf (FILE *stream, const char *format, ...)
15501+{
15502+ va_list args;
15503+ int retval;
15504+
15505+ va_start (args, format);
15506+ retval = libintl_vfprintf (stream, format, args);
15507+ va_end (args);
15508+ return retval;
15509+}
15510+
15511+DLL_EXPORTED
15512+int
15513+libintl_vprintf (const char *format, va_list args)
15514+{
15515+ return libintl_vfprintf (stdout, format, args);
15516+}
15517+
15518+DLL_EXPORTED
15519+int
15520+libintl_printf (const char *format, ...)
15521+{
15522+ va_list args;
15523+ int retval;
15524+
15525+ va_start (args, format);
15526+ retval = libintl_vprintf (format, args);
15527+ va_end (args);
15528+ return retval;
15529+}
15530+
15531+DLL_EXPORTED
15532+int
15533+libintl_vsprintf (char *resultbuf, const char *format, va_list args)
15534+{
15535+ if (strchr (format, '$') == NULL)
15536+ return vsprintf (resultbuf, format, args);
15537+ else
15538+ {
15539+ size_t length = (size_t) ~0 / (4 * sizeof (char));
15540+ char *result = libintl_vasnprintf (resultbuf, &length, format, args);
15541+ if (result != resultbuf)
15542+ {
15543+ free (result);
15544+ return -1;
15545+ }
15546+ else
15547+ return length;
15548+ }
15549+}
15550+
15551+DLL_EXPORTED
15552+int
15553+libintl_sprintf (char *resultbuf, const char *format, ...)
15554+{
15555+ va_list args;
15556+ int retval;
15557+
15558+ va_start (args, format);
15559+ retval = libintl_vsprintf (resultbuf, format, args);
15560+ va_end (args);
15561+ return retval;
15562+}
15563+
15564+#if HAVE_SNPRINTF
15565+
15566+# if HAVE_DECL__SNPRINTF
15567+ /* Windows. */
15568+# define system_vsnprintf _vsnprintf
15569+# else
15570+ /* Unix. */
15571+# define system_vsnprintf vsnprintf
15572+# endif
15573+
15574+DLL_EXPORTED
15575+int
15576+libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
15577+{
15578+ if (strchr (format, '$') == NULL)
15579+ return system_vsnprintf (resultbuf, length, format, args);
15580+ else
15581+ {
15582+ size_t maxlength = length;
15583+ char *result = libintl_vasnprintf (resultbuf, &length, format, args);
15584+ if (result != resultbuf)
15585+ {
15586+ if (maxlength > 0)
15587+ {
15588+ if (length < maxlength)
15589+ abort ();
15590+ memcpy (resultbuf, result, maxlength - 1);
15591+ resultbuf[maxlength - 1] = '\0';
15592+ }
15593+ free (result);
15594+ return -1;
15595+ }
15596+ else
15597+ return length;
15598+ }
15599+}
15600+
15601+DLL_EXPORTED
15602+int
15603+libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
15604+{
15605+ va_list args;
15606+ int retval;
15607+
15608+ va_start (args, format);
15609+ retval = libintl_vsnprintf (resultbuf, length, format, args);
15610+ va_end (args);
15611+ return retval;
15612+}
15613+
15614+#endif
15615+
15616+#if HAVE_ASPRINTF
15617+
15618+DLL_EXPORTED
15619+int
15620+libintl_vasprintf (char **resultp, const char *format, va_list args)
15621+{
15622+ size_t length;
15623+ char *result = libintl_vasnprintf (NULL, &length, format, args);
15624+ if (result == NULL)
15625+ return -1;
15626+ *resultp = result;
15627+ return length;
15628+}
15629+
15630+DLL_EXPORTED
15631+int
15632+libintl_asprintf (char **resultp, const char *format, ...)
15633+{
15634+ va_list args;
15635+ int retval;
15636+
15637+ va_start (args, format);
15638+ retval = libintl_vasprintf (resultp, format, args);
15639+ va_end (args);
15640+ return retval;
15641+}
15642+
15643+#endif
15644+
15645+#if HAVE_FWPRINTF
15646+
15647+#include <wchar.h>
15648+
15649+#define WIDE_CHAR_VERSION 1
15650+
15651+/* Define auxiliary functions declared in "wprintf-parse.h". */
15652+#include "printf-parse.c"
15653+
15654+/* Define functions declared in "vasnprintf.h". */
15655+#define vasnwprintf libintl_vasnwprintf
15656+#include "vasnprintf.c"
15657+#if 0 /* not needed */
15658+#define asnwprintf libintl_asnwprintf
15659+#include "asnprintf.c"
15660+#endif
15661+
15662+# if HAVE_DECL__SNWPRINTF
15663+ /* Windows. */
15664+# define system_vswprintf _vsnwprintf
15665+# else
15666+ /* Unix. */
15667+# define system_vswprintf vswprintf
15668+# endif
15669+
15670+DLL_EXPORTED
15671+int
15672+libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
15673+{
15674+ if (wcschr (format, '$') == NULL)
15675+ return vfwprintf (stream, format, args);
15676+ else
15677+ {
15678+ size_t length;
15679+ wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
15680+ int retval = -1;
15681+ if (result != NULL)
15682+ {
15683+ size_t i;
15684+ for (i = 0; i < length; i++)
15685+ if (fputwc (result[i], stream) == WEOF)
15686+ break;
15687+ if (i == length)
15688+ retval = length;
15689+ free (result);
15690+ }
15691+ return retval;
15692+ }
15693+}
15694+
15695+DLL_EXPORTED
15696+int
15697+libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
15698+{
15699+ va_list args;
15700+ int retval;
15701+
15702+ va_start (args, format);
15703+ retval = libintl_vfwprintf (stream, format, args);
15704+ va_end (args);
15705+ return retval;
15706+}
15707+
15708+DLL_EXPORTED
15709+int
15710+libintl_vwprintf (const wchar_t *format, va_list args)
15711+{
15712+ return libintl_vfwprintf (stdout, format, args);
15713+}
15714+
15715+DLL_EXPORTED
15716+int
15717+libintl_wprintf (const wchar_t *format, ...)
15718+{
15719+ va_list args;
15720+ int retval;
15721+
15722+ va_start (args, format);
15723+ retval = libintl_vwprintf (format, args);
15724+ va_end (args);
15725+ return retval;
15726+}
15727+
15728+DLL_EXPORTED
15729+int
15730+libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
15731+{
15732+ if (wcschr (format, '$') == NULL)
15733+ return system_vswprintf (resultbuf, length, format, args);
15734+ else
15735+ {
15736+ size_t maxlength = length;
15737+ wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
15738+ if (result != resultbuf)
15739+ {
15740+ if (maxlength > 0)
15741+ {
15742+ if (length < maxlength)
15743+ abort ();
15744+ memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
15745+ resultbuf[maxlength - 1] = 0;
15746+ }
15747+ free (result);
15748+ return -1;
15749+ }
15750+ else
15751+ return length;
15752+ }
15753+}
15754+
15755+DLL_EXPORTED
15756+int
15757+libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
15758+{
15759+ va_list args;
15760+ int retval;
15761+
15762+ va_start (args, format);
15763+ retval = libintl_vswprintf (resultbuf, length, format, args);
15764+ va_end (args);
15765+ return retval;
15766+}
15767+
15768+#endif
15769+
15770+#endif
15771--- lrzsz-0.12.20.safe/intl/printf-parse.c 1969-12-31 19:00:00.000000000 -0500
15772+++ lrzsz-0.12.20/intl/printf-parse.c 2004-09-12 14:40:34.622707504 -0400
15773@@ -0,0 +1,537 @@
15774+/* Formatted output to strings.
15775+ Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
15776+
15777+ This program is free software; you can redistribute it and/or modify it
15778+ under the terms of the GNU Library General Public License as published
15779+ by the Free Software Foundation; either version 2, or (at your option)
15780+ any later version.
15781+
15782+ This program is distributed in the hope that it will be useful,
15783+ but WITHOUT ANY WARRANTY; without even the implied warranty of
15784+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15785+ Library General Public License for more details.
15786+
15787+ You should have received a copy of the GNU Library General Public
15788+ License along with this program; if not, write to the Free Software
15789+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
15790+ USA. */
15791+
15792+#ifdef HAVE_CONFIG_H
15793+# include <config.h>
15794+#endif
15795+
15796+/* Specification. */
15797+#if WIDE_CHAR_VERSION
15798+# include "wprintf-parse.h"
15799+#else
15800+# include "printf-parse.h"
15801+#endif
15802+
15803+/* Get size_t, NULL. */
15804+#include <stddef.h>
15805+
15806+/* Get intmax_t. */
15807+#if HAVE_STDINT_H_WITH_UINTMAX
15808+# include <stdint.h>
15809+#endif
15810+#if HAVE_INTTYPES_H_WITH_UINTMAX
15811+# include <inttypes.h>
15812+#endif
15813+
15814+/* malloc(), realloc(), free(). */
15815+#include <stdlib.h>
15816+
15817+/* Checked size_t computations. */
15818+#include "xsize.h"
15819+
15820+#if WIDE_CHAR_VERSION
15821+# define PRINTF_PARSE wprintf_parse
15822+# define CHAR_T wchar_t
15823+# define DIRECTIVE wchar_t_directive
15824+# define DIRECTIVES wchar_t_directives
15825+#else
15826+# define PRINTF_PARSE printf_parse
15827+# define CHAR_T char
15828+# define DIRECTIVE char_directive
15829+# define DIRECTIVES char_directives
15830+#endif
15831+
15832+#ifdef STATIC
15833+STATIC
15834+#endif
15835+int
15836+PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
15837+{
15838+ const CHAR_T *cp = format; /* pointer into format */
15839+ size_t arg_posn = 0; /* number of regular arguments consumed */
15840+ size_t d_allocated; /* allocated elements of d->dir */
15841+ size_t a_allocated; /* allocated elements of a->arg */
15842+ size_t max_width_length = 0;
15843+ size_t max_precision_length = 0;
15844+
15845+ d->count = 0;
15846+ d_allocated = 1;
15847+ d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
15848+ if (d->dir == NULL)
15849+ /* Out of memory. */
15850+ return -1;
15851+
15852+ a->count = 0;
15853+ a_allocated = 0;
15854+ a->arg = NULL;
15855+
15856+#define REGISTER_ARG(_index_,_type_) \
15857+ { \
15858+ size_t n = (_index_); \
15859+ if (n >= a_allocated) \
15860+ { \
15861+ size_t memory_size; \
15862+ argument *memory; \
15863+ \
15864+ a_allocated = xtimes (a_allocated, 2); \
15865+ if (a_allocated <= n) \
15866+ a_allocated = xsum (n, 1); \
15867+ memory_size = xtimes (a_allocated, sizeof (argument)); \
15868+ if (size_overflow_p (memory_size)) \
15869+ /* Overflow, would lead to out of memory. */ \
15870+ goto error; \
15871+ memory = (a->arg \
15872+ ? realloc (a->arg, memory_size) \
15873+ : malloc (memory_size)); \
15874+ if (memory == NULL) \
15875+ /* Out of memory. */ \
15876+ goto error; \
15877+ a->arg = memory; \
15878+ } \
15879+ while (a->count <= n) \
15880+ a->arg[a->count++].type = TYPE_NONE; \
15881+ if (a->arg[n].type == TYPE_NONE) \
15882+ a->arg[n].type = (_type_); \
15883+ else if (a->arg[n].type != (_type_)) \
15884+ /* Ambiguous type for positional argument. */ \
15885+ goto error; \
15886+ }
15887+
15888+ while (*cp != '\0')
15889+ {
15890+ CHAR_T c = *cp++;
15891+ if (c == '%')
15892+ {
15893+ size_t arg_index = ARG_NONE;
15894+ DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
15895+
15896+ /* Initialize the next directive. */
15897+ dp->dir_start = cp - 1;
15898+ dp->flags = 0;
15899+ dp->width_start = NULL;
15900+ dp->width_end = NULL;
15901+ dp->width_arg_index = ARG_NONE;
15902+ dp->precision_start = NULL;
15903+ dp->precision_end = NULL;
15904+ dp->precision_arg_index = ARG_NONE;
15905+ dp->arg_index = ARG_NONE;
15906+
15907+ /* Test for positional argument. */
15908+ if (*cp >= '0' && *cp <= '9')
15909+ {
15910+ const CHAR_T *np;
15911+
15912+ for (np = cp; *np >= '0' && *np <= '9'; np++)
15913+ ;
15914+ if (*np == '$')
15915+ {
15916+ size_t n = 0;
15917+
15918+ for (np = cp; *np >= '0' && *np <= '9'; np++)
15919+ n = xsum (xtimes (n, 10), *np - '0');
15920+ if (n == 0)
15921+ /* Positional argument 0. */
15922+ goto error;
15923+ if (size_overflow_p (n))
15924+ /* n too large, would lead to out of memory later. */
15925+ goto error;
15926+ arg_index = n - 1;
15927+ cp = np + 1;
15928+ }
15929+ }
15930+
15931+ /* Read the flags. */
15932+ for (;;)
15933+ {
15934+ if (*cp == '\'')
15935+ {
15936+ dp->flags |= FLAG_GROUP;
15937+ cp++;
15938+ }
15939+ else if (*cp == '-')
15940+ {
15941+ dp->flags |= FLAG_LEFT;
15942+ cp++;
15943+ }
15944+ else if (*cp == '+')
15945+ {
15946+ dp->flags |= FLAG_SHOWSIGN;
15947+ cp++;
15948+ }
15949+ else if (*cp == ' ')
15950+ {
15951+ dp->flags |= FLAG_SPACE;
15952+ cp++;
15953+ }
15954+ else if (*cp == '#')
15955+ {
15956+ dp->flags |= FLAG_ALT;
15957+ cp++;
15958+ }
15959+ else if (*cp == '0')
15960+ {
15961+ dp->flags |= FLAG_ZERO;
15962+ cp++;
15963+ }
15964+ else
15965+ break;
15966+ }
15967+
15968+ /* Parse the field width. */
15969+ if (*cp == '*')
15970+ {
15971+ dp->width_start = cp;
15972+ cp++;
15973+ dp->width_end = cp;
15974+ if (max_width_length < 1)
15975+ max_width_length = 1;
15976+
15977+ /* Test for positional argument. */
15978+ if (*cp >= '0' && *cp <= '9')
15979+ {
15980+ const CHAR_T *np;
15981+
15982+ for (np = cp; *np >= '0' && *np <= '9'; np++)
15983+ ;
15984+ if (*np == '$')
15985+ {
15986+ size_t n = 0;
15987+
15988+ for (np = cp; *np >= '0' && *np <= '9'; np++)
15989+ n = xsum (xtimes (n, 10), *np - '0');
15990+ if (n == 0)
15991+ /* Positional argument 0. */
15992+ goto error;
15993+ if (size_overflow_p (n))
15994+ /* n too large, would lead to out of memory later. */
15995+ goto error;
15996+ dp->width_arg_index = n - 1;
15997+ cp = np + 1;
15998+ }
15999+ }
16000+ if (dp->width_arg_index == ARG_NONE)
16001+ {
16002+ dp->width_arg_index = arg_posn++;
16003+ if (dp->width_arg_index == ARG_NONE)
16004+ /* arg_posn wrapped around. */
16005+ goto error;
16006+ }
16007+ REGISTER_ARG (dp->width_arg_index, TYPE_INT);
16008+ }
16009+ else if (*cp >= '0' && *cp <= '9')
16010+ {
16011+ size_t width_length;
16012+
16013+ dp->width_start = cp;
16014+ for (; *cp >= '0' && *cp <= '9'; cp++)
16015+ ;
16016+ dp->width_end = cp;
16017+ width_length = dp->width_end - dp->width_start;
16018+ if (max_width_length < width_length)
16019+ max_width_length = width_length;
16020+ }
16021+
16022+ /* Parse the precision. */
16023+ if (*cp == '.')
16024+ {
16025+ cp++;
16026+ if (*cp == '*')
16027+ {
16028+ dp->precision_start = cp - 1;
16029+ cp++;
16030+ dp->precision_end = cp;
16031+ if (max_precision_length < 2)
16032+ max_precision_length = 2;
16033+
16034+ /* Test for positional argument. */
16035+ if (*cp >= '0' && *cp <= '9')
16036+ {
16037+ const CHAR_T *np;
16038+
16039+ for (np = cp; *np >= '0' && *np <= '9'; np++)
16040+ ;
16041+ if (*np == '$')
16042+ {
16043+ size_t n = 0;
16044+
16045+ for (np = cp; *np >= '0' && *np <= '9'; np++)
16046+ n = xsum (xtimes (n, 10), *np - '0');
16047+ if (n == 0)
16048+ /* Positional argument 0. */
16049+ goto error;
16050+ if (size_overflow_p (n))
16051+ /* n too large, would lead to out of memory
16052+ later. */
16053+ goto error;
16054+ dp->precision_arg_index = n - 1;
16055+ cp = np + 1;
16056+ }
16057+ }
16058+ if (dp->precision_arg_index == ARG_NONE)
16059+ {
16060+ dp->precision_arg_index = arg_posn++;
16061+ if (dp->precision_arg_index == ARG_NONE)
16062+ /* arg_posn wrapped around. */
16063+ goto error;
16064+ }
16065+ REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
16066+ }
16067+ else
16068+ {
16069+ size_t precision_length;
16070+
16071+ dp->precision_start = cp - 1;
16072+ for (; *cp >= '0' && *cp <= '9'; cp++)
16073+ ;
16074+ dp->precision_end = cp;
16075+ precision_length = dp->precision_end - dp->precision_start;
16076+ if (max_precision_length < precision_length)
16077+ max_precision_length = precision_length;
16078+ }
16079+ }
16080+
16081+ {
16082+ arg_type type;
16083+
16084+ /* Parse argument type/size specifiers. */
16085+ {
16086+ int flags = 0;
16087+
16088+ for (;;)
16089+ {
16090+ if (*cp == 'h')
16091+ {
16092+ flags |= (1 << (flags & 1));
16093+ cp++;
16094+ }
16095+ else if (*cp == 'L')
16096+ {
16097+ flags |= 4;
16098+ cp++;
16099+ }
16100+ else if (*cp == 'l')
16101+ {
16102+ flags += 8;
16103+ cp++;
16104+ }
16105+#ifdef HAVE_INTMAX_T
16106+ else if (*cp == 'j')
16107+ {
16108+ if (sizeof (intmax_t) > sizeof (long))
16109+ {
16110+ /* intmax_t = long long */
16111+ flags += 16;
16112+ }
16113+ else if (sizeof (intmax_t) > sizeof (int))
16114+ {
16115+ /* intmax_t = long */
16116+ flags += 8;
16117+ }
16118+ cp++;
16119+ }
16120+#endif
16121+ else if (*cp == 'z' || *cp == 'Z')
16122+ {
16123+ /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
16124+ because the warning facility in gcc-2.95.2 understands
16125+ only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
16126+ if (sizeof (size_t) > sizeof (long))
16127+ {
16128+ /* size_t = long long */
16129+ flags += 16;
16130+ }
16131+ else if (sizeof (size_t) > sizeof (int))
16132+ {
16133+ /* size_t = long */
16134+ flags += 8;
16135+ }
16136+ cp++;
16137+ }
16138+ else if (*cp == 't')
16139+ {
16140+ if (sizeof (ptrdiff_t) > sizeof (long))
16141+ {
16142+ /* ptrdiff_t = long long */
16143+ flags += 16;
16144+ }
16145+ else if (sizeof (ptrdiff_t) > sizeof (int))
16146+ {
16147+ /* ptrdiff_t = long */
16148+ flags += 8;
16149+ }
16150+ cp++;
16151+ }
16152+ else
16153+ break;
16154+ }
16155+
16156+ /* Read the conversion character. */
16157+ c = *cp++;
16158+ switch (c)
16159+ {
16160+ case 'd': case 'i':
16161+#ifdef HAVE_LONG_LONG
16162+ if (flags >= 16 || (flags & 4))
16163+ type = TYPE_LONGLONGINT;
16164+ else
16165+#endif
16166+ if (flags >= 8)
16167+ type = TYPE_LONGINT;
16168+ else if (flags & 2)
16169+ type = TYPE_SCHAR;
16170+ else if (flags & 1)
16171+ type = TYPE_SHORT;
16172+ else
16173+ type = TYPE_INT;
16174+ break;
16175+ case 'o': case 'u': case 'x': case 'X':
16176+#ifdef HAVE_LONG_LONG
16177+ if (flags >= 16 || (flags & 4))
16178+ type = TYPE_ULONGLONGINT;
16179+ else
16180+#endif
16181+ if (flags >= 8)
16182+ type = TYPE_ULONGINT;
16183+ else if (flags & 2)
16184+ type = TYPE_UCHAR;
16185+ else if (flags & 1)
16186+ type = TYPE_USHORT;
16187+ else
16188+ type = TYPE_UINT;
16189+ break;
16190+ case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
16191+ case 'a': case 'A':
16192+#ifdef HAVE_LONG_DOUBLE
16193+ if (flags >= 16 || (flags & 4))
16194+ type = TYPE_LONGDOUBLE;
16195+ else
16196+#endif
16197+ type = TYPE_DOUBLE;
16198+ break;
16199+ case 'c':
16200+ if (flags >= 8)
16201+#ifdef HAVE_WINT_T
16202+ type = TYPE_WIDE_CHAR;
16203+#else
16204+ goto error;
16205+#endif
16206+ else
16207+ type = TYPE_CHAR;
16208+ break;
16209+#ifdef HAVE_WINT_T
16210+ case 'C':
16211+ type = TYPE_WIDE_CHAR;
16212+ c = 'c';
16213+ break;
16214+#endif
16215+ case 's':
16216+ if (flags >= 8)
16217+#ifdef HAVE_WCHAR_T
16218+ type = TYPE_WIDE_STRING;
16219+#else
16220+ goto error;
16221+#endif
16222+ else
16223+ type = TYPE_STRING;
16224+ break;
16225+#ifdef HAVE_WCHAR_T
16226+ case 'S':
16227+ type = TYPE_WIDE_STRING;
16228+ c = 's';
16229+ break;
16230+#endif
16231+ case 'p':
16232+ type = TYPE_POINTER;
16233+ break;
16234+ case 'n':
16235+#ifdef HAVE_LONG_LONG
16236+ if (flags >= 16 || (flags & 4))
16237+ type = TYPE_COUNT_LONGLONGINT_POINTER;
16238+ else
16239+#endif
16240+ if (flags >= 8)
16241+ type = TYPE_COUNT_LONGINT_POINTER;
16242+ else if (flags & 2)
16243+ type = TYPE_COUNT_SCHAR_POINTER;
16244+ else if (flags & 1)
16245+ type = TYPE_COUNT_SHORT_POINTER;
16246+ else
16247+ type = TYPE_COUNT_INT_POINTER;
16248+ break;
16249+ case '%':
16250+ type = TYPE_NONE;
16251+ break;
16252+ default:
16253+ /* Unknown conversion character. */
16254+ goto error;
16255+ }
16256+ }
16257+
16258+ if (type != TYPE_NONE)
16259+ {
16260+ dp->arg_index = arg_index;
16261+ if (dp->arg_index == ARG_NONE)
16262+ {
16263+ dp->arg_index = arg_posn++;
16264+ if (dp->arg_index == ARG_NONE)
16265+ /* arg_posn wrapped around. */
16266+ goto error;
16267+ }
16268+ REGISTER_ARG (dp->arg_index, type);
16269+ }
16270+ dp->conversion = c;
16271+ dp->dir_end = cp;
16272+ }
16273+
16274+ d->count++;
16275+ if (d->count >= d_allocated)
16276+ {
16277+ size_t memory_size;
16278+ DIRECTIVE *memory;
16279+
16280+ d_allocated = xtimes (d_allocated, 2);
16281+ memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
16282+ if (size_overflow_p (memory_size))
16283+ /* Overflow, would lead to out of memory. */
16284+ goto error;
16285+ memory = realloc (d->dir, memory_size);
16286+ if (memory == NULL)
16287+ /* Out of memory. */
16288+ goto error;
16289+ d->dir = memory;
16290+ }
16291+ }
16292+ }
16293+ d->dir[d->count].dir_start = cp;
16294+
16295+ d->max_width_length = max_width_length;
16296+ d->max_precision_length = max_precision_length;
16297+ return 0;
16298+
16299+error:
16300+ if (a->arg)
16301+ free (a->arg);
16302+ if (d->dir)
16303+ free (d->dir);
16304+ return -1;
16305+}
16306+
16307+#undef DIRECTIVES
16308+#undef DIRECTIVE
16309+#undef CHAR_T
16310+#undef PRINTF_PARSE
16311--- lrzsz-0.12.20.safe/intl/printf-parse.h 1969-12-31 19:00:00.000000000 -0500
16312+++ lrzsz-0.12.20/intl/printf-parse.h 2004-09-12 14:40:34.628706592 -0400
16313@@ -0,0 +1,75 @@
16314+/* Parse printf format string.
16315+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
16316+
16317+ This program is free software; you can redistribute it and/or modify it
16318+ under the terms of the GNU Library General Public License as published
16319+ by the Free Software Foundation; either version 2, or (at your option)
16320+ any later version.
16321+
16322+ This program is distributed in the hope that it will be useful,
16323+ but WITHOUT ANY WARRANTY; without even the implied warranty of
16324+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16325+ Library General Public License for more details.
16326+
16327+ You should have received a copy of the GNU Library General Public
16328+ License along with this program; if not, write to the Free Software
16329+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16330+ USA. */
16331+
16332+#ifndef _PRINTF_PARSE_H
16333+#define _PRINTF_PARSE_H
16334+
16335+#include "printf-args.h"
16336+
16337+
16338+/* Flags */
16339+#define FLAG_GROUP 1 /* ' flag */
16340+#define FLAG_LEFT 2 /* - flag */
16341+#define FLAG_SHOWSIGN 4 /* + flag */
16342+#define FLAG_SPACE 8 /* space flag */
16343+#define FLAG_ALT 16 /* # flag */
16344+#define FLAG_ZERO 32
16345+
16346+/* arg_index value indicating that no argument is consumed. */
16347+#define ARG_NONE (~(size_t)0)
16348+
16349+/* A parsed directive. */
16350+typedef struct
16351+{
16352+ const char* dir_start;
16353+ const char* dir_end;
16354+ int flags;
16355+ const char* width_start;
16356+ const char* width_end;
16357+ size_t width_arg_index;
16358+ const char* precision_start;
16359+ const char* precision_end;
16360+ size_t precision_arg_index;
16361+ char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
16362+ size_t arg_index;
16363+}
16364+char_directive;
16365+
16366+/* A parsed format string. */
16367+typedef struct
16368+{
16369+ size_t count;
16370+ char_directive *dir;
16371+ size_t max_width_length;
16372+ size_t max_precision_length;
16373+}
16374+char_directives;
16375+
16376+
16377+/* Parses the format string. Fills in the number N of directives, and fills
16378+ in directives[0], ..., directives[N-1], and sets directives[N].dir_start
16379+ to the end of the format string. Also fills in the arg_type fields of the
16380+ arguments and the needed count of arguments. */
16381+#ifdef STATIC
16382+STATIC
16383+#else
16384+extern
16385+#endif
16386+int printf_parse (const char *format, char_directives *d, arguments *a);
16387+
16388+#endif /* _PRINTF_PARSE_H */
16389--- lrzsz-0.12.20.safe/intl/ref-add.sin 1969-12-31 19:00:00.000000000 -0500
16390+++ lrzsz-0.12.20/intl/ref-add.sin 2004-09-12 14:40:34.633705832 -0400
16391@@ -0,0 +1,31 @@
16392+# Add this package to a list of references stored in a text file.
16393+#
16394+# Copyright (C) 2000 Free Software Foundation, Inc.
16395+#
16396+# This program is free software; you can redistribute it and/or modify it
16397+# under the terms of the GNU Library General Public License as published
16398+# by the Free Software Foundation; either version 2, or (at your option)
16399+# any later version.
16400+#
16401+# This program is distributed in the hope that it will be useful,
16402+# but WITHOUT ANY WARRANTY; without even the implied warranty of
16403+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16404+# Library General Public License for more details.
16405+#
16406+# You should have received a copy of the GNU Library General Public
16407+# License along with this program; if not, write to the Free Software
16408+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16409+# USA.
16410+#
16411+# Written by Bruno Haible <haible@clisp.cons.org>.
16412+#
16413+/^# Packages using this file: / {
16414+ s/# Packages using this file://
16415+ ta
16416+ :a
16417+ s/ @PACKAGE@ / @PACKAGE@ /
16418+ tb
16419+ s/ $/ @PACKAGE@ /
16420+ :b
16421+ s/^/# Packages using this file:/
16422+}
16423--- lrzsz-0.12.20.safe/intl/ref-del.sin 1969-12-31 19:00:00.000000000 -0500
16424+++ lrzsz-0.12.20/intl/ref-del.sin 2004-09-12 14:40:34.638705072 -0400
16425@@ -0,0 +1,26 @@
16426+# Remove this package from a list of references stored in a text file.
16427+#
16428+# Copyright (C) 2000 Free Software Foundation, Inc.
16429+#
16430+# This program is free software; you can redistribute it and/or modify it
16431+# under the terms of the GNU Library General Public License as published
16432+# by the Free Software Foundation; either version 2, or (at your option)
16433+# any later version.
16434+#
16435+# This program is distributed in the hope that it will be useful,
16436+# but WITHOUT ANY WARRANTY; without even the implied warranty of
16437+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16438+# Library General Public License for more details.
16439+#
16440+# You should have received a copy of the GNU Library General Public
16441+# License along with this program; if not, write to the Free Software
16442+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16443+# USA.
16444+#
16445+# Written by Bruno Haible <haible@clisp.cons.org>.
16446+#
16447+/^# Packages using this file: / {
16448+ s/# Packages using this file://
16449+ s/ @PACKAGE@ / /
16450+ s/^/# Packages using this file:/
16451+}
16452--- lrzsz-0.12.20.safe/intl/relocatable.c 1969-12-31 19:00:00.000000000 -0500
16453+++ lrzsz-0.12.20/intl/relocatable.c 2004-09-12 14:40:34.644704160 -0400
16454@@ -0,0 +1,449 @@
16455+/* Provide relocatable packages.
16456+ Copyright (C) 2003 Free Software Foundation, Inc.
16457+ Written by Bruno Haible <bruno@clisp.org>, 2003.
16458+
16459+ This program is free software; you can redistribute it and/or modify it
16460+ under the terms of the GNU Library General Public License as published
16461+ by the Free Software Foundation; either version 2, or (at your option)
16462+ any later version.
16463+
16464+ This program is distributed in the hope that it will be useful,
16465+ but WITHOUT ANY WARRANTY; without even the implied warranty of
16466+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16467+ Library General Public License for more details.
16468+
16469+ You should have received a copy of the GNU Library General Public
16470+ License along with this program; if not, write to the Free Software
16471+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16472+ USA. */
16473+
16474+
16475+/* Tell glibc's <stdio.h> to provide a prototype for getline().
16476+ This must come before <config.h> because <config.h> may include
16477+ <features.h>, and once <features.h> has been included, it's too late. */
16478+#ifndef _GNU_SOURCE
16479+# define _GNU_SOURCE 1
16480+#endif
16481+
16482+#ifdef HAVE_CONFIG_H
16483+# include "config.h"
16484+#endif
16485+
16486+/* Specification. */
16487+#include "relocatable.h"
16488+
16489+#if ENABLE_RELOCATABLE
16490+
16491+#include <stddef.h>
16492+#include <stdio.h>
16493+#include <stdlib.h>
16494+#include <string.h>
16495+
16496+#ifdef NO_XMALLOC
16497+# define xmalloc malloc
16498+#else
16499+# include "xalloc.h"
16500+#endif
16501+
16502+#if defined _WIN32 || defined __WIN32__
16503+# define WIN32_LEAN_AND_MEAN
16504+# include <windows.h>
16505+#endif
16506+
16507+#if DEPENDS_ON_LIBCHARSET
16508+# include <libcharset.h>
16509+#endif
16510+#if DEPENDS_ON_LIBICONV && HAVE_ICONV
16511+# include <iconv.h>
16512+#endif
16513+#if DEPENDS_ON_LIBINTL && ENABLE_NLS
16514+# include <libintl.h>
16515+#endif
16516+
16517+/* Faked cheap 'bool'. */
16518+#undef bool
16519+#undef false
16520+#undef true
16521+#define bool int
16522+#define false 0
16523+#define true 1
16524+
16525+/* Pathname support.
16526+ ISSLASH(C) tests whether C is a directory separator character.
16527+ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
16528+ */
16529+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
16530+ /* Win32, OS/2, DOS */
16531+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
16532+# define HAS_DEVICE(P) \
16533+ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
16534+ && (P)[1] == ':')
16535+# define IS_PATH_WITH_DIR(P) \
16536+ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
16537+# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
16538+#else
16539+ /* Unix */
16540+# define ISSLASH(C) ((C) == '/')
16541+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
16542+# define FILESYSTEM_PREFIX_LEN(P) 0
16543+#endif
16544+
16545+/* Original installation prefix. */
16546+static char *orig_prefix;
16547+static size_t orig_prefix_len;
16548+/* Current installation prefix. */
16549+static char *curr_prefix;
16550+static size_t curr_prefix_len;
16551+/* These prefixes do not end in a slash. Anything that will be concatenated
16552+ to them must start with a slash. */
16553+
16554+/* Sets the original and the current installation prefix of this module.
16555+ Relocation simply replaces a pathname starting with the original prefix
16556+ by the corresponding pathname with the current prefix instead. Both
16557+ prefixes should be directory names without trailing slash (i.e. use ""
16558+ instead of "/"). */
16559+static void
16560+set_this_relocation_prefix (const char *orig_prefix_arg,
16561+ const char *curr_prefix_arg)
16562+{
16563+ if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
16564+ /* Optimization: if orig_prefix and curr_prefix are equal, the
16565+ relocation is a nop. */
16566+ && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
16567+ {
16568+ /* Duplicate the argument strings. */
16569+ char *memory;
16570+
16571+ orig_prefix_len = strlen (orig_prefix_arg);
16572+ curr_prefix_len = strlen (curr_prefix_arg);
16573+ memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
16574+#ifdef NO_XMALLOC
16575+ if (memory != NULL)
16576+#endif
16577+ {
16578+ memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
16579+ orig_prefix = memory;
16580+ memory += orig_prefix_len + 1;
16581+ memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
16582+ curr_prefix = memory;
16583+ return;
16584+ }
16585+ }
16586+ orig_prefix = NULL;
16587+ curr_prefix = NULL;
16588+ /* Don't worry about wasted memory here - this function is usually only
16589+ called once. */
16590+}
16591+
16592+/* Sets the original and the current installation prefix of the package.
16593+ Relocation simply replaces a pathname starting with the original prefix
16594+ by the corresponding pathname with the current prefix instead. Both
16595+ prefixes should be directory names without trailing slash (i.e. use ""
16596+ instead of "/"). */
16597+void
16598+set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
16599+{
16600+ set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
16601+
16602+ /* Now notify all dependent libraries. */
16603+#if DEPENDS_ON_LIBCHARSET
16604+ libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
16605+#endif
16606+#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
16607+ libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
16608+#endif
16609+#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
16610+ libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
16611+#endif
16612+}
16613+
16614+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
16615+
16616+/* Convenience function:
16617+ Computes the current installation prefix, based on the original
16618+ installation prefix, the original installation directory of a particular
16619+ file, and the current pathname of this file. Returns NULL upon failure. */
16620+#ifdef IN_LIBRARY
16621+#define compute_curr_prefix local_compute_curr_prefix
16622+static
16623+#endif
16624+const char *
16625+compute_curr_prefix (const char *orig_installprefix,
16626+ const char *orig_installdir,
16627+ const char *curr_pathname)
16628+{
16629+ const char *curr_installdir;
16630+ const char *rel_installdir;
16631+
16632+ if (curr_pathname == NULL)
16633+ return NULL;
16634+
16635+ /* Determine the relative installation directory, relative to the prefix.
16636+ This is simply the difference between orig_installprefix and
16637+ orig_installdir. */
16638+ if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
16639+ != 0)
16640+ /* Shouldn't happen - nothing should be installed outside $(prefix). */
16641+ return NULL;
16642+ rel_installdir = orig_installdir + strlen (orig_installprefix);
16643+
16644+ /* Determine the current installation directory. */
16645+ {
16646+ const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
16647+ const char *p = curr_pathname + strlen (curr_pathname);
16648+ char *q;
16649+
16650+ while (p > p_base)
16651+ {
16652+ p--;
16653+ if (ISSLASH (*p))
16654+ break;
16655+ }
16656+
16657+ q = (char *) xmalloc (p - curr_pathname + 1);
16658+#ifdef NO_XMALLOC
16659+ if (q == NULL)
16660+ return NULL;
16661+#endif
16662+ memcpy (q, curr_pathname, p - curr_pathname);
16663+ q[p - curr_pathname] = '\0';
16664+ curr_installdir = q;
16665+ }
16666+
16667+ /* Compute the current installation prefix by removing the trailing
16668+ rel_installdir from it. */
16669+ {
16670+ const char *rp = rel_installdir + strlen (rel_installdir);
16671+ const char *cp = curr_installdir + strlen (curr_installdir);
16672+ const char *cp_base =
16673+ curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
16674+
16675+ while (rp > rel_installdir && cp > cp_base)
16676+ {
16677+ bool same = false;
16678+ const char *rpi = rp;
16679+ const char *cpi = cp;
16680+
16681+ while (rpi > rel_installdir && cpi > cp_base)
16682+ {
16683+ rpi--;
16684+ cpi--;
16685+ if (ISSLASH (*rpi) || ISSLASH (*cpi))
16686+ {
16687+ if (ISSLASH (*rpi) && ISSLASH (*cpi))
16688+ same = true;
16689+ break;
16690+ }
16691+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
16692+ /* Win32, OS/2, DOS - case insignificant filesystem */
16693+ if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
16694+ != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
16695+ break;
16696+#else
16697+ if (*rpi != *cpi)
16698+ break;
16699+#endif
16700+ }
16701+ if (!same)
16702+ break;
16703+ /* The last pathname component was the same. opi and cpi now point
16704+ to the slash before it. */
16705+ rp = rpi;
16706+ cp = cpi;
16707+ }
16708+
16709+ if (rp > rel_installdir)
16710+ /* Unexpected: The curr_installdir does not end with rel_installdir. */
16711+ return NULL;
16712+
16713+ {
16714+ size_t curr_prefix_len = cp - curr_installdir;
16715+ char *curr_prefix;
16716+
16717+ curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
16718+#ifdef NO_XMALLOC
16719+ if (curr_prefix == NULL)
16720+ return NULL;
16721+#endif
16722+ memcpy (curr_prefix, curr_installdir, curr_prefix_len);
16723+ curr_prefix[curr_prefix_len] = '\0';
16724+
16725+ return curr_prefix;
16726+ }
16727+ }
16728+}
16729+
16730+#endif /* !IN_LIBRARY || PIC */
16731+
16732+#if defined PIC && defined INSTALLDIR
16733+
16734+/* Full pathname of shared library, or NULL. */
16735+static char *shared_library_fullname;
16736+
16737+#if defined _WIN32 || defined __WIN32__
16738+
16739+/* Determine the full pathname of the shared library when it is loaded. */
16740+
16741+BOOL WINAPI
16742+DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
16743+{
16744+ (void) reserved;
16745+
16746+ if (event == DLL_PROCESS_ATTACH)
16747+ {
16748+ /* The DLL is being loaded into an application's address range. */
16749+ static char location[MAX_PATH];
16750+
16751+ if (!GetModuleFileName (module_handle, location, sizeof (location)))
16752+ /* Shouldn't happen. */
16753+ return FALSE;
16754+
16755+ if (!IS_PATH_WITH_DIR (location))
16756+ /* Shouldn't happen. */
16757+ return FALSE;
16758+
16759+ shared_library_fullname = strdup (location);
16760+ }
16761+
16762+ return TRUE;
16763+}
16764+
16765+#else /* Unix */
16766+
16767+static void
16768+find_shared_library_fullname ()
16769+{
16770+#if defined __linux__ && __GLIBC__ >= 2
16771+ /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
16772+ FILE *fp;
16773+
16774+ /* Open the current process' maps file. It describes one VMA per line. */
16775+ fp = fopen ("/proc/self/maps", "r");
16776+ if (fp)
16777+ {
16778+ unsigned long address = (unsigned long) &find_shared_library_fullname;
16779+ for (;;)
16780+ {
16781+ unsigned long start, end;
16782+ int c;
16783+
16784+ if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
16785+ break;
16786+ if (address >= start && address <= end - 1)
16787+ {
16788+ /* Found it. Now see if this line contains a filename. */
16789+ while (c = getc (fp), c != EOF && c != '\n' && c != '/')
16790+ continue;
16791+ if (c == '/')
16792+ {
16793+ size_t size;
16794+ int len;
16795+
16796+ ungetc (c, fp);
16797+ shared_library_fullname = NULL; size = 0;
16798+ len = getline (&shared_library_fullname, &size, fp);
16799+ if (len >= 0)
16800+ {
16801+ /* Success: filled shared_library_fullname. */
16802+ if (len > 0 && shared_library_fullname[len - 1] == '\n')
16803+ shared_library_fullname[len - 1] = '\0';
16804+ }
16805+ }
16806+ break;
16807+ }
16808+ while (c = getc (fp), c != EOF && c != '\n')
16809+ continue;
16810+ }
16811+ fclose (fp);
16812+ }
16813+#endif
16814+}
16815+
16816+#endif /* WIN32 / Unix */
16817+
16818+/* Return the full pathname of the current shared library.
16819+ Return NULL if unknown.
16820+ Guaranteed to work only on Linux and Woe32. */
16821+static char *
16822+get_shared_library_fullname ()
16823+{
16824+#if !(defined _WIN32 || defined __WIN32__)
16825+ static bool tried_find_shared_library_fullname;
16826+ if (!tried_find_shared_library_fullname)
16827+ {
16828+ find_shared_library_fullname ();
16829+ tried_find_shared_library_fullname = true;
16830+ }
16831+#endif
16832+ return shared_library_fullname;
16833+}
16834+
16835+#endif /* PIC */
16836+
16837+/* Returns the pathname, relocated according to the current installation
16838+ directory. */
16839+const char *
16840+relocate (const char *pathname)
16841+{
16842+#if defined PIC && defined INSTALLDIR
16843+ static int initialized;
16844+
16845+ /* Initialization code for a shared library. */
16846+ if (!initialized)
16847+ {
16848+ /* At this point, orig_prefix and curr_prefix likely have already been
16849+ set through the main program's set_program_name_and_installdir
16850+ function. This is sufficient in the case that the library has
16851+ initially been installed in the same orig_prefix. But we can do
16852+ better, to also cover the cases that 1. it has been installed
16853+ in a different prefix before being moved to orig_prefix and (later)
16854+ to curr_prefix, 2. unlike the program, it has not moved away from
16855+ orig_prefix. */
16856+ const char *orig_installprefix = INSTALLPREFIX;
16857+ const char *orig_installdir = INSTALLDIR;
16858+ const char *curr_prefix_better;
16859+
16860+ curr_prefix_better =
16861+ compute_curr_prefix (orig_installprefix, orig_installdir,
16862+ get_shared_library_fullname ());
16863+ if (curr_prefix_better == NULL)
16864+ curr_prefix_better = curr_prefix;
16865+
16866+ set_relocation_prefix (orig_installprefix, curr_prefix_better);
16867+
16868+ initialized = 1;
16869+ }
16870+#endif
16871+
16872+ /* Note: It is not necessary to perform case insensitive comparison here,
16873+ even for DOS-like filesystems, because the pathname argument was
16874+ typically created from the same Makefile variable as orig_prefix came
16875+ from. */
16876+ if (orig_prefix != NULL && curr_prefix != NULL
16877+ && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
16878+ {
16879+ if (pathname[orig_prefix_len] == '\0')
16880+ /* pathname equals orig_prefix. */
16881+ return curr_prefix;
16882+ if (ISSLASH (pathname[orig_prefix_len]))
16883+ {
16884+ /* pathname starts with orig_prefix. */
16885+ const char *pathname_tail = &pathname[orig_prefix_len];
16886+ char *result =
16887+ (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
16888+
16889+#ifdef NO_XMALLOC
16890+ if (result != NULL)
16891+#endif
16892+ {
16893+ memcpy (result, curr_prefix, curr_prefix_len);
16894+ strcpy (result + curr_prefix_len, pathname_tail);
16895+ return result;
16896+ }
16897+ }
16898+ }
16899+ /* Nothing to relocate. */
16900+ return pathname;
16901+}
16902+
16903+#endif
16904--- lrzsz-0.12.20.safe/intl/relocatable.h 1969-12-31 19:00:00.000000000 -0500
16905+++ lrzsz-0.12.20/intl/relocatable.h 2004-09-12 14:40:34.651703096 -0400
16906@@ -0,0 +1,77 @@
16907+/* Provide relocatable packages.
16908+ Copyright (C) 2003 Free Software Foundation, Inc.
16909+ Written by Bruno Haible <bruno@clisp.org>, 2003.
16910+
16911+ This program is free software; you can redistribute it and/or modify it
16912+ under the terms of the GNU Library General Public License as published
16913+ by the Free Software Foundation; either version 2, or (at your option)
16914+ any later version.
16915+
16916+ This program is distributed in the hope that it will be useful,
16917+ but WITHOUT ANY WARRANTY; without even the implied warranty of
16918+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16919+ Library General Public License for more details.
16920+
16921+ You should have received a copy of the GNU Library General Public
16922+ License along with this program; if not, write to the Free Software
16923+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
16924+ USA. */
16925+
16926+#ifndef _RELOCATABLE_H
16927+#define _RELOCATABLE_H
16928+
16929+#ifdef __cplusplus
16930+extern "C" {
16931+#endif
16932+
16933+
16934+/* This can be enabled through the configure --enable-relocatable option. */
16935+#if ENABLE_RELOCATABLE
16936+
16937+/* When building a DLL, we must export some functions. Note that because
16938+ this is a private .h file, we don't need to use __declspec(dllimport)
16939+ in any case. */
16940+#if defined _MSC_VER && BUILDING_DLL
16941+# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
16942+#else
16943+# define RELOCATABLE_DLL_EXPORTED
16944+#endif
16945+
16946+/* Sets the original and the current installation prefix of the package.
16947+ Relocation simply replaces a pathname starting with the original prefix
16948+ by the corresponding pathname with the current prefix instead. Both
16949+ prefixes should be directory names without trailing slash (i.e. use ""
16950+ instead of "/"). */
16951+extern RELOCATABLE_DLL_EXPORTED void
16952+ set_relocation_prefix (const char *orig_prefix,
16953+ const char *curr_prefix);
16954+
16955+/* Returns the pathname, relocated according to the current installation
16956+ directory. */
16957+extern const char * relocate (const char *pathname);
16958+
16959+/* Memory management: relocate() leaks memory, because it has to construct
16960+ a fresh pathname. If this is a problem because your program calls
16961+ relocate() frequently, think about caching the result. */
16962+
16963+/* Convenience function:
16964+ Computes the current installation prefix, based on the original
16965+ installation prefix, the original installation directory of a particular
16966+ file, and the current pathname of this file. Returns NULL upon failure. */
16967+extern const char * compute_curr_prefix (const char *orig_installprefix,
16968+ const char *orig_installdir,
16969+ const char *curr_pathname);
16970+
16971+#else
16972+
16973+/* By default, we use the hardwired pathnames. */
16974+#define relocate(pathname) (pathname)
16975+
16976+#endif
16977+
16978+
16979+#ifdef __cplusplus
16980+}
16981+#endif
16982+
16983+#endif /* _RELOCATABLE_H */
16984--- lrzsz-0.12.20.safe/intl/textdomain.c 1998-04-26 09:22:37.000000000 -0400
16985+++ lrzsz-0.12.20/intl/textdomain.c 2004-09-12 14:40:34.656702336 -0400
16986@@ -1,51 +1,60 @@
16987-/* Implementation of the textdomain(3) function
16988- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
16989- Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
16990+/* Implementation of the textdomain(3) function.
16991+ Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
16992
16993- This program is free software; you can redistribute it and/or modify
16994- it under the terms of the GNU General Public License as published by
16995- the Free Software Foundation; either version 2, or (at your option)
16996+ This program is free software; you can redistribute it and/or modify it
16997+ under the terms of the GNU Library General Public License as published
16998+ by the Free Software Foundation; either version 2, or (at your option)
16999 any later version.
17000
17001 This program is distributed in the hope that it will be useful,
17002 but WITHOUT ANY WARRANTY; without even the implied warranty of
17003- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17004- GNU General Public License for more details.
17005+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17006+ Library General Public License for more details.
17007
17008- You should have received a copy of the GNU General Public License
17009- along with this program; if not, write to the Free Software Foundation,
17010- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
17011+ You should have received a copy of the GNU Library General Public
17012+ License along with this program; if not, write to the Free Software
17013+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
17014+ USA. */
17015
17016 #ifdef HAVE_CONFIG_H
17017 # include <config.h>
17018 #endif
17019
17020-#if defined STDC_HEADERS || defined _LIBC
17021-# include <stdlib.h>
17022-#endif
17023+#include <stdlib.h>
17024+#include <string.h>
17025
17026-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
17027-# include <string.h>
17028+#ifdef _LIBC
17029+# include <libintl.h>
17030 #else
17031-# include <strings.h>
17032-# ifndef memcpy
17033-# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
17034-# endif
17035+# include "libgnuintl.h"
17036 #endif
17037+#include "gettextP.h"
17038
17039 #ifdef _LIBC
17040-# include <libintl.h>
17041+/* We have to handle multi-threaded applications. */
17042+# include <bits/libc-lock.h>
17043 #else
17044-# include "libgettext.h"
17045+/* Provide dummy implementation if this is outside glibc. */
17046+# define __libc_rwlock_define(CLASS, NAME)
17047+# define __libc_rwlock_wrlock(NAME)
17048+# define __libc_rwlock_unlock(NAME)
17049+#endif
17050+
17051+/* The internal variables in the standalone libintl.a must have different
17052+ names than the internal variables in GNU libc, otherwise programs
17053+ using libintl.a cannot be linked statically. */
17054+#if !defined _LIBC
17055+# define _nl_default_default_domain libintl_nl_default_default_domain
17056+# define _nl_current_default_domain libintl_nl_current_default_domain
17057 #endif
17058
17059 /* @@ end of prolog @@ */
17060
17061 /* Name of the default text domain. */
17062-extern const char _nl_default_default_domain[];
17063+extern const char _nl_default_default_domain[] attribute_hidden;
17064
17065 /* Default text domain in which entries for gettext(3) are to be found. */
17066-extern const char *_nl_current_default_domain;
17067+extern const char *_nl_current_default_domain attribute_hidden;
17068
17069
17070 /* Names for the libintl functions are a problem. They must not clash
17071@@ -54,50 +63,76 @@
17072 prefix. So we have to make a difference here. */
17073 #ifdef _LIBC
17074 # define TEXTDOMAIN __textdomain
17075-# define strdup(str) __strdup (str)
17076+# ifndef strdup
17077+# define strdup(str) __strdup (str)
17078+# endif
17079 #else
17080-# define TEXTDOMAIN textdomain__
17081+# define TEXTDOMAIN libintl_textdomain
17082 #endif
17083
17084+/* Lock variable to protect the global data in the gettext implementation. */
17085+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
17086+
17087 /* Set the current default message catalog to DOMAINNAME.
17088 If DOMAINNAME is null, return the current default.
17089 If DOMAINNAME is "", reset to the default of "messages". */
17090 char *
17091-TEXTDOMAIN (domainname)
17092- const char *domainname;
17093+TEXTDOMAIN (const char *domainname)
17094 {
17095- char *old;
17096+ char *new_domain;
17097+ char *old_domain;
17098
17099 /* A NULL pointer requests the current setting. */
17100 if (domainname == NULL)
17101 return (char *) _nl_current_default_domain;
17102
17103- old = (char *) _nl_current_default_domain;
17104+ __libc_rwlock_wrlock (_nl_state_lock);
17105+
17106+ old_domain = (char *) _nl_current_default_domain;
17107
17108 /* If domain name is the null string set to default domain "messages". */
17109 if (domainname[0] == '\0'
17110 || strcmp (domainname, _nl_default_default_domain) == 0)
17111- _nl_current_default_domain = _nl_default_default_domain;
17112+ {
17113+ _nl_current_default_domain = _nl_default_default_domain;
17114+ new_domain = (char *) _nl_current_default_domain;
17115+ }
17116+ else if (strcmp (domainname, old_domain) == 0)
17117+ /* This can happen and people will use it to signal that some
17118+ environment variable changed. */
17119+ new_domain = old_domain;
17120 else
17121 {
17122 /* If the following malloc fails `_nl_current_default_domain'
17123 will be NULL. This value will be returned and so signals we
17124 are out of core. */
17125 #if defined _LIBC || defined HAVE_STRDUP
17126- _nl_current_default_domain = strdup (domainname);
17127+ new_domain = strdup (domainname);
17128 #else
17129 size_t len = strlen (domainname) + 1;
17130- char *cp = (char *) malloc (len);
17131- if (cp != NULL)
17132- memcpy (cp, domainname, len);
17133- _nl_current_default_domain = cp;
17134+ new_domain = (char *) malloc (len);
17135+ if (new_domain != NULL)
17136+ memcpy (new_domain, domainname, len);
17137 #endif
17138+
17139+ if (new_domain != NULL)
17140+ _nl_current_default_domain = new_domain;
17141 }
17142
17143- if (old != _nl_default_default_domain)
17144- free (old);
17145+ /* We use this possibility to signal a change of the loaded catalogs
17146+ since this is most likely the case and there is no other easy we
17147+ to do it. Do it only when the call was successful. */
17148+ if (new_domain != NULL)
17149+ {
17150+ ++_nl_msg_cat_cntr;
17151
17152- return (char *) _nl_current_default_domain;
17153+ if (old_domain != new_domain && old_domain != _nl_default_default_domain)
17154+ free (old_domain);
17155+ }
17156+
17157+ __libc_rwlock_unlock (_nl_state_lock);
17158+
17159+ return new_domain;
17160 }
17161
17162 #ifdef _LIBC
17163--- lrzsz-0.12.20.safe/intl/vasnprintf.c 1969-12-31 19:00:00.000000000 -0500
17164+++ lrzsz-0.12.20/intl/vasnprintf.c 2004-09-12 14:40:34.662701424 -0400
17165@@ -0,0 +1,887 @@
17166+/* vsprintf with automatic memory allocation.
17167+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
17168+
17169+ This program is free software; you can redistribute it and/or modify it
17170+ under the terms of the GNU Library General Public License as published
17171+ by the Free Software Foundation; either version 2, or (at your option)
17172+ any later version.
17173+
17174+ This program is distributed in the hope that it will be useful,
17175+ but WITHOUT ANY WARRANTY; without even the implied warranty of
17176+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17177+ Library General Public License for more details.
17178+
17179+ You should have received a copy of the GNU Library General Public
17180+ License along with this program; if not, write to the Free Software
17181+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
17182+ USA. */
17183+
17184+/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
17185+ This must come before <config.h> because <config.h> may include
17186+ <features.h>, and once <features.h> has been included, it's too late. */
17187+#ifndef _GNU_SOURCE
17188+# define _GNU_SOURCE 1
17189+#endif
17190+
17191+#ifdef HAVE_CONFIG_H
17192+# include <config.h>
17193+#endif
17194+#ifndef IN_LIBINTL
17195+# include <alloca.h>
17196+#endif
17197+
17198+/* Specification. */
17199+#if WIDE_CHAR_VERSION
17200+# include "vasnwprintf.h"
17201+#else
17202+# include "vasnprintf.h"
17203+#endif
17204+
17205+#include <stdio.h> /* snprintf(), sprintf() */
17206+#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
17207+#include <string.h> /* memcpy(), strlen() */
17208+#include <errno.h> /* errno */
17209+#include <limits.h> /* CHAR_BIT */
17210+#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
17211+#if WIDE_CHAR_VERSION
17212+# include "wprintf-parse.h"
17213+#else
17214+# include "printf-parse.h"
17215+#endif
17216+
17217+/* Checked size_t computations. */
17218+#include "xsize.h"
17219+
17220+#ifdef HAVE_WCHAR_T
17221+# ifdef HAVE_WCSLEN
17222+# define local_wcslen wcslen
17223+# else
17224+ /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
17225+ a dependency towards this library, here is a local substitute.
17226+ Define this substitute only once, even if this file is included
17227+ twice in the same compilation unit. */
17228+# ifndef local_wcslen_defined
17229+# define local_wcslen_defined 1
17230+static size_t
17231+local_wcslen (const wchar_t *s)
17232+{
17233+ const wchar_t *ptr;
17234+
17235+ for (ptr = s; *ptr != (wchar_t) 0; ptr++)
17236+ ;
17237+ return ptr - s;
17238+}
17239+# endif
17240+# endif
17241+#endif
17242+
17243+#if WIDE_CHAR_VERSION
17244+# define VASNPRINTF vasnwprintf
17245+# define CHAR_T wchar_t
17246+# define DIRECTIVE wchar_t_directive
17247+# define DIRECTIVES wchar_t_directives
17248+# define PRINTF_PARSE wprintf_parse
17249+# define USE_SNPRINTF 1
17250+# if HAVE_DECL__SNWPRINTF
17251+ /* On Windows, the function swprintf() has a different signature than
17252+ on Unix; we use the _snwprintf() function instead. */
17253+# define SNPRINTF _snwprintf
17254+# else
17255+ /* Unix. */
17256+# define SNPRINTF swprintf
17257+# endif
17258+#else
17259+# define VASNPRINTF vasnprintf
17260+# define CHAR_T char
17261+# define DIRECTIVE char_directive
17262+# define DIRECTIVES char_directives
17263+# define PRINTF_PARSE printf_parse
17264+# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
17265+# if HAVE_DECL__SNPRINTF
17266+ /* Windows. */
17267+# define SNPRINTF _snprintf
17268+# else
17269+ /* Unix. */
17270+# define SNPRINTF snprintf
17271+# endif
17272+#endif
17273+
17274+CHAR_T *
17275+VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
17276+{
17277+ DIRECTIVES d;
17278+ arguments a;
17279+
17280+ if (PRINTF_PARSE (format, &d, &a) < 0)
17281+ {
17282+ errno = EINVAL;
17283+ return NULL;
17284+ }
17285+
17286+#define CLEANUP() \
17287+ free (d.dir); \
17288+ if (a.arg) \
17289+ free (a.arg);
17290+
17291+ if (printf_fetchargs (args, &a) < 0)
17292+ {
17293+ CLEANUP ();
17294+ errno = EINVAL;
17295+ return NULL;
17296+ }
17297+
17298+ {
17299+ size_t buf_neededlength;
17300+ CHAR_T *buf;
17301+ CHAR_T *buf_malloced;
17302+ const CHAR_T *cp;
17303+ size_t i;
17304+ DIRECTIVE *dp;
17305+ /* Output string accumulator. */
17306+ CHAR_T *result;
17307+ size_t allocated;
17308+ size_t length;
17309+
17310+ /* Allocate a small buffer that will hold a directive passed to
17311+ sprintf or snprintf. */
17312+ buf_neededlength =
17313+ xsum4 (7, d.max_width_length, d.max_precision_length, 6);
17314+#if HAVE_ALLOCA
17315+ if (buf_neededlength < 4000 / sizeof (CHAR_T))
17316+ {
17317+ buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
17318+ buf_malloced = NULL;
17319+ }
17320+ else
17321+#endif
17322+ {
17323+ size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
17324+ if (size_overflow_p (buf_memsize))
17325+ goto out_of_memory_1;
17326+ buf = (CHAR_T *) malloc (buf_memsize);
17327+ if (buf == NULL)
17328+ goto out_of_memory_1;
17329+ buf_malloced = buf;
17330+ }
17331+
17332+ if (resultbuf != NULL)
17333+ {
17334+ result = resultbuf;
17335+ allocated = *lengthp;
17336+ }
17337+ else
17338+ {
17339+ result = NULL;
17340+ allocated = 0;
17341+ }
17342+ length = 0;
17343+ /* Invariants:
17344+ result is either == resultbuf or == NULL or malloc-allocated.
17345+ If length > 0, then result != NULL. */
17346+
17347+ /* Ensures that allocated >= needed. Aborts through a jump to
17348+ out_of_memory if needed is SIZE_MAX or otherwise too big. */
17349+#define ENSURE_ALLOCATION(needed) \
17350+ if ((needed) > allocated) \
17351+ { \
17352+ size_t memory_size; \
17353+ CHAR_T *memory; \
17354+ \
17355+ allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
17356+ if ((needed) > allocated) \
17357+ allocated = (needed); \
17358+ memory_size = xtimes (allocated, sizeof (CHAR_T)); \
17359+ if (size_overflow_p (memory_size)) \
17360+ goto out_of_memory; \
17361+ if (result == resultbuf || result == NULL) \
17362+ memory = (CHAR_T *) malloc (memory_size); \
17363+ else \
17364+ memory = (CHAR_T *) realloc (result, memory_size); \
17365+ if (memory == NULL) \
17366+ goto out_of_memory; \
17367+ if (result == resultbuf && length > 0) \
17368+ memcpy (memory, result, length * sizeof (CHAR_T)); \
17369+ result = memory; \
17370+ }
17371+
17372+ for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
17373+ {
17374+ if (cp != dp->dir_start)
17375+ {
17376+ size_t n = dp->dir_start - cp;
17377+ size_t augmented_length = xsum (length, n);
17378+
17379+ ENSURE_ALLOCATION (augmented_length);
17380+ memcpy (result + length, cp, n * sizeof (CHAR_T));
17381+ length = augmented_length;
17382+ }
17383+ if (i == d.count)
17384+ break;
17385+
17386+ /* Execute a single directive. */
17387+ if (dp->conversion == '%')
17388+ {
17389+ size_t augmented_length;
17390+
17391+ if (!(dp->arg_index == ARG_NONE))
17392+ abort ();
17393+ augmented_length = xsum (length, 1);
17394+ ENSURE_ALLOCATION (augmented_length);
17395+ result[length] = '%';
17396+ length = augmented_length;
17397+ }
17398+ else
17399+ {
17400+ if (!(dp->arg_index != ARG_NONE))
17401+ abort ();
17402+
17403+ if (dp->conversion == 'n')
17404+ {
17405+ switch (a.arg[dp->arg_index].type)
17406+ {
17407+ case TYPE_COUNT_SCHAR_POINTER:
17408+ *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
17409+ break;
17410+ case TYPE_COUNT_SHORT_POINTER:
17411+ *a.arg[dp->arg_index].a.a_count_short_pointer = length;
17412+ break;
17413+ case TYPE_COUNT_INT_POINTER:
17414+ *a.arg[dp->arg_index].a.a_count_int_pointer = length;
17415+ break;
17416+ case TYPE_COUNT_LONGINT_POINTER:
17417+ *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
17418+ break;
17419+#ifdef HAVE_LONG_LONG
17420+ case TYPE_COUNT_LONGLONGINT_POINTER:
17421+ *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
17422+ break;
17423+#endif
17424+ default:
17425+ abort ();
17426+ }
17427+ }
17428+ else
17429+ {
17430+ arg_type type = a.arg[dp->arg_index].type;
17431+ CHAR_T *p;
17432+ unsigned int prefix_count;
17433+ int prefixes[2];
17434+#if !USE_SNPRINTF
17435+ size_t tmp_length;
17436+ CHAR_T tmpbuf[700];
17437+ CHAR_T *tmp;
17438+
17439+ /* Allocate a temporary buffer of sufficient size for calling
17440+ sprintf. */
17441+ {
17442+ size_t width;
17443+ size_t precision;
17444+
17445+ width = 0;
17446+ if (dp->width_start != dp->width_end)
17447+ {
17448+ if (dp->width_arg_index != ARG_NONE)
17449+ {
17450+ int arg;
17451+
17452+ if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
17453+ abort ();
17454+ arg = a.arg[dp->width_arg_index].a.a_int;
17455+ width = (arg < 0 ? (unsigned int) (-arg) : arg);
17456+ }
17457+ else
17458+ {
17459+ const CHAR_T *digitp = dp->width_start;
17460+
17461+ do
17462+ width = xsum (xtimes (width, 10), *digitp++ - '0');
17463+ while (digitp != dp->width_end);
17464+ }
17465+ }
17466+
17467+ precision = 6;
17468+ if (dp->precision_start != dp->precision_end)
17469+ {
17470+ if (dp->precision_arg_index != ARG_NONE)
17471+ {
17472+ int arg;
17473+
17474+ if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
17475+ abort ();
17476+ arg = a.arg[dp->precision_arg_index].a.a_int;
17477+ precision = (arg < 0 ? 0 : arg);
17478+ }
17479+ else
17480+ {
17481+ const CHAR_T *digitp = dp->precision_start + 1;
17482+
17483+ precision = 0;
17484+ do
17485+ precision = xsum (xtimes (precision, 10), *digitp++ - '0');
17486+ while (digitp != dp->precision_end);
17487+ }
17488+ }
17489+
17490+ switch (dp->conversion)
17491+ {
17492+
17493+ case 'd': case 'i': case 'u':
17494+# ifdef HAVE_LONG_LONG
17495+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
17496+ tmp_length =
17497+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
17498+ * 0.30103 /* binary -> decimal */
17499+ * 2 /* estimate for FLAG_GROUP */
17500+ )
17501+ + 1 /* turn floor into ceil */
17502+ + 1; /* account for leading sign */
17503+ else
17504+# endif
17505+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
17506+ tmp_length =
17507+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
17508+ * 0.30103 /* binary -> decimal */
17509+ * 2 /* estimate for FLAG_GROUP */
17510+ )
17511+ + 1 /* turn floor into ceil */
17512+ + 1; /* account for leading sign */
17513+ else
17514+ tmp_length =
17515+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
17516+ * 0.30103 /* binary -> decimal */
17517+ * 2 /* estimate for FLAG_GROUP */
17518+ )
17519+ + 1 /* turn floor into ceil */
17520+ + 1; /* account for leading sign */
17521+ break;
17522+
17523+ case 'o':
17524+# ifdef HAVE_LONG_LONG
17525+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
17526+ tmp_length =
17527+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
17528+ * 0.333334 /* binary -> octal */
17529+ )
17530+ + 1 /* turn floor into ceil */
17531+ + 1; /* account for leading sign */
17532+ else
17533+# endif
17534+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
17535+ tmp_length =
17536+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
17537+ * 0.333334 /* binary -> octal */
17538+ )
17539+ + 1 /* turn floor into ceil */
17540+ + 1; /* account for leading sign */
17541+ else
17542+ tmp_length =
17543+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
17544+ * 0.333334 /* binary -> octal */
17545+ )
17546+ + 1 /* turn floor into ceil */
17547+ + 1; /* account for leading sign */
17548+ break;
17549+
17550+ case 'x': case 'X':
17551+# ifdef HAVE_LONG_LONG
17552+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
17553+ tmp_length =
17554+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
17555+ * 0.25 /* binary -> hexadecimal */
17556+ )
17557+ + 1 /* turn floor into ceil */
17558+ + 2; /* account for leading sign or alternate form */
17559+ else
17560+# endif
17561+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
17562+ tmp_length =
17563+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
17564+ * 0.25 /* binary -> hexadecimal */
17565+ )
17566+ + 1 /* turn floor into ceil */
17567+ + 2; /* account for leading sign or alternate form */
17568+ else
17569+ tmp_length =
17570+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
17571+ * 0.25 /* binary -> hexadecimal */
17572+ )
17573+ + 1 /* turn floor into ceil */
17574+ + 2; /* account for leading sign or alternate form */
17575+ break;
17576+
17577+ case 'f': case 'F':
17578+# ifdef HAVE_LONG_DOUBLE
17579+ if (type == TYPE_LONGDOUBLE)
17580+ tmp_length =
17581+ (unsigned int) (LDBL_MAX_EXP
17582+ * 0.30103 /* binary -> decimal */
17583+ * 2 /* estimate for FLAG_GROUP */
17584+ )
17585+ + 1 /* turn floor into ceil */
17586+ + 10; /* sign, decimal point etc. */
17587+ else
17588+# endif
17589+ tmp_length =
17590+ (unsigned int) (DBL_MAX_EXP
17591+ * 0.30103 /* binary -> decimal */
17592+ * 2 /* estimate for FLAG_GROUP */
17593+ )
17594+ + 1 /* turn floor into ceil */
17595+ + 10; /* sign, decimal point etc. */
17596+ tmp_length = xsum (tmp_length, precision);
17597+ break;
17598+
17599+ case 'e': case 'E': case 'g': case 'G':
17600+ case 'a': case 'A':
17601+ tmp_length =
17602+ 12; /* sign, decimal point, exponent etc. */
17603+ tmp_length = xsum (tmp_length, precision);
17604+ break;
17605+
17606+ case 'c':
17607+# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
17608+ if (type == TYPE_WIDE_CHAR)
17609+ tmp_length = MB_CUR_MAX;
17610+ else
17611+# endif
17612+ tmp_length = 1;
17613+ break;
17614+
17615+ case 's':
17616+# ifdef HAVE_WCHAR_T
17617+ if (type == TYPE_WIDE_STRING)
17618+ {
17619+ tmp_length =
17620+ local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
17621+
17622+# if !WIDE_CHAR_VERSION
17623+ tmp_length = xtimes (tmp_length, MB_CUR_MAX);
17624+# endif
17625+ }
17626+ else
17627+# endif
17628+ tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
17629+ break;
17630+
17631+ case 'p':
17632+ tmp_length =
17633+ (unsigned int) (sizeof (void *) * CHAR_BIT
17634+ * 0.25 /* binary -> hexadecimal */
17635+ )
17636+ + 1 /* turn floor into ceil */
17637+ + 2; /* account for leading 0x */
17638+ break;
17639+
17640+ default:
17641+ abort ();
17642+ }
17643+
17644+ if (tmp_length < width)
17645+ tmp_length = width;
17646+
17647+ tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
17648+ }
17649+
17650+ if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
17651+ tmp = tmpbuf;
17652+ else
17653+ {
17654+ size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
17655+
17656+ if (size_overflow_p (tmp_memsize))
17657+ /* Overflow, would lead to out of memory. */
17658+ goto out_of_memory;
17659+ tmp = (CHAR_T *) malloc (tmp_memsize);
17660+ if (tmp == NULL)
17661+ /* Out of memory. */
17662+ goto out_of_memory;
17663+ }
17664+#endif
17665+
17666+ /* Construct the format string for calling snprintf or
17667+ sprintf. */
17668+ p = buf;
17669+ *p++ = '%';
17670+ if (dp->flags & FLAG_GROUP)
17671+ *p++ = '\'';
17672+ if (dp->flags & FLAG_LEFT)
17673+ *p++ = '-';
17674+ if (dp->flags & FLAG_SHOWSIGN)
17675+ *p++ = '+';
17676+ if (dp->flags & FLAG_SPACE)
17677+ *p++ = ' ';
17678+ if (dp->flags & FLAG_ALT)
17679+ *p++ = '#';
17680+ if (dp->flags & FLAG_ZERO)
17681+ *p++ = '0';
17682+ if (dp->width_start != dp->width_end)
17683+ {
17684+ size_t n = dp->width_end - dp->width_start;
17685+ memcpy (p, dp->width_start, n * sizeof (CHAR_T));
17686+ p += n;
17687+ }
17688+ if (dp->precision_start != dp->precision_end)
17689+ {
17690+ size_t n = dp->precision_end - dp->precision_start;
17691+ memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
17692+ p += n;
17693+ }
17694+
17695+ switch (type)
17696+ {
17697+#ifdef HAVE_LONG_LONG
17698+ case TYPE_LONGLONGINT:
17699+ case TYPE_ULONGLONGINT:
17700+ *p++ = 'l';
17701+ /*FALLTHROUGH*/
17702+#endif
17703+ case TYPE_LONGINT:
17704+ case TYPE_ULONGINT:
17705+#ifdef HAVE_WINT_T
17706+ case TYPE_WIDE_CHAR:
17707+#endif
17708+#ifdef HAVE_WCHAR_T
17709+ case TYPE_WIDE_STRING:
17710+#endif
17711+ *p++ = 'l';
17712+ break;
17713+#ifdef HAVE_LONG_DOUBLE
17714+ case TYPE_LONGDOUBLE:
17715+ *p++ = 'L';
17716+ break;
17717+#endif
17718+ default:
17719+ break;
17720+ }
17721+ *p = dp->conversion;
17722+#if USE_SNPRINTF
17723+ p[1] = '%';
17724+ p[2] = 'n';
17725+ p[3] = '\0';
17726+#else
17727+ p[1] = '\0';
17728+#endif
17729+
17730+ /* Construct the arguments for calling snprintf or sprintf. */
17731+ prefix_count = 0;
17732+ if (dp->width_arg_index != ARG_NONE)
17733+ {
17734+ if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
17735+ abort ();
17736+ prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
17737+ }
17738+ if (dp->precision_arg_index != ARG_NONE)
17739+ {
17740+ if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
17741+ abort ();
17742+ prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
17743+ }
17744+
17745+#if USE_SNPRINTF
17746+ /* Prepare checking whether snprintf returns the count
17747+ via %n. */
17748+ ENSURE_ALLOCATION (xsum (length, 1));
17749+ result[length] = '\0';
17750+#endif
17751+
17752+ for (;;)
17753+ {
17754+ size_t maxlen;
17755+ int count;
17756+ int retcount;
17757+
17758+ maxlen = allocated - length;
17759+ count = -1;
17760+ retcount = 0;
17761+
17762+#if USE_SNPRINTF
17763+# define SNPRINTF_BUF(arg) \
17764+ switch (prefix_count) \
17765+ { \
17766+ case 0: \
17767+ retcount = SNPRINTF (result + length, maxlen, buf, \
17768+ arg, &count); \
17769+ break; \
17770+ case 1: \
17771+ retcount = SNPRINTF (result + length, maxlen, buf, \
17772+ prefixes[0], arg, &count); \
17773+ break; \
17774+ case 2: \
17775+ retcount = SNPRINTF (result + length, maxlen, buf, \
17776+ prefixes[0], prefixes[1], arg, \
17777+ &count); \
17778+ break; \
17779+ default: \
17780+ abort (); \
17781+ }
17782+#else
17783+# define SNPRINTF_BUF(arg) \
17784+ switch (prefix_count) \
17785+ { \
17786+ case 0: \
17787+ count = sprintf (tmp, buf, arg); \
17788+ break; \
17789+ case 1: \
17790+ count = sprintf (tmp, buf, prefixes[0], arg); \
17791+ break; \
17792+ case 2: \
17793+ count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
17794+ arg); \
17795+ break; \
17796+ default: \
17797+ abort (); \
17798+ }
17799+#endif
17800+
17801+ switch (type)
17802+ {
17803+ case TYPE_SCHAR:
17804+ {
17805+ int arg = a.arg[dp->arg_index].a.a_schar;
17806+ SNPRINTF_BUF (arg);
17807+ }
17808+ break;
17809+ case TYPE_UCHAR:
17810+ {
17811+ unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
17812+ SNPRINTF_BUF (arg);
17813+ }
17814+ break;
17815+ case TYPE_SHORT:
17816+ {
17817+ int arg = a.arg[dp->arg_index].a.a_short;
17818+ SNPRINTF_BUF (arg);
17819+ }
17820+ break;
17821+ case TYPE_USHORT:
17822+ {
17823+ unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
17824+ SNPRINTF_BUF (arg);
17825+ }
17826+ break;
17827+ case TYPE_INT:
17828+ {
17829+ int arg = a.arg[dp->arg_index].a.a_int;
17830+ SNPRINTF_BUF (arg);
17831+ }
17832+ break;
17833+ case TYPE_UINT:
17834+ {
17835+ unsigned int arg = a.arg[dp->arg_index].a.a_uint;
17836+ SNPRINTF_BUF (arg);
17837+ }
17838+ break;
17839+ case TYPE_LONGINT:
17840+ {
17841+ long int arg = a.arg[dp->arg_index].a.a_longint;
17842+ SNPRINTF_BUF (arg);
17843+ }
17844+ break;
17845+ case TYPE_ULONGINT:
17846+ {
17847+ unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
17848+ SNPRINTF_BUF (arg);
17849+ }
17850+ break;
17851+#ifdef HAVE_LONG_LONG
17852+ case TYPE_LONGLONGINT:
17853+ {
17854+ long long int arg = a.arg[dp->arg_index].a.a_longlongint;
17855+ SNPRINTF_BUF (arg);
17856+ }
17857+ break;
17858+ case TYPE_ULONGLONGINT:
17859+ {
17860+ unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
17861+ SNPRINTF_BUF (arg);
17862+ }
17863+ break;
17864+#endif
17865+ case TYPE_DOUBLE:
17866+ {
17867+ double arg = a.arg[dp->arg_index].a.a_double;
17868+ SNPRINTF_BUF (arg);
17869+ }
17870+ break;
17871+#ifdef HAVE_LONG_DOUBLE
17872+ case TYPE_LONGDOUBLE:
17873+ {
17874+ long double arg = a.arg[dp->arg_index].a.a_longdouble;
17875+ SNPRINTF_BUF (arg);
17876+ }
17877+ break;
17878+#endif
17879+ case TYPE_CHAR:
17880+ {
17881+ int arg = a.arg[dp->arg_index].a.a_char;
17882+ SNPRINTF_BUF (arg);
17883+ }
17884+ break;
17885+#ifdef HAVE_WINT_T
17886+ case TYPE_WIDE_CHAR:
17887+ {
17888+ wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
17889+ SNPRINTF_BUF (arg);
17890+ }
17891+ break;
17892+#endif
17893+ case TYPE_STRING:
17894+ {
17895+ const char *arg = a.arg[dp->arg_index].a.a_string;
17896+ SNPRINTF_BUF (arg);
17897+ }
17898+ break;
17899+#ifdef HAVE_WCHAR_T
17900+ case TYPE_WIDE_STRING:
17901+ {
17902+ const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
17903+ SNPRINTF_BUF (arg);
17904+ }
17905+ break;
17906+#endif
17907+ case TYPE_POINTER:
17908+ {
17909+ void *arg = a.arg[dp->arg_index].a.a_pointer;
17910+ SNPRINTF_BUF (arg);
17911+ }
17912+ break;
17913+ default:
17914+ abort ();
17915+ }
17916+
17917+#if USE_SNPRINTF
17918+ /* Portability: Not all implementations of snprintf()
17919+ are ISO C 99 compliant. Determine the number of
17920+ bytes that snprintf() has produced or would have
17921+ produced. */
17922+ if (count >= 0)
17923+ {
17924+ /* Verify that snprintf() has NUL-terminated its
17925+ result. */
17926+ if (count < maxlen && result[length + count] != '\0')
17927+ abort ();
17928+ /* Portability hack. */
17929+ if (retcount > count)
17930+ count = retcount;
17931+ }
17932+ else
17933+ {
17934+ /* snprintf() doesn't understand the '%n'
17935+ directive. */
17936+ if (p[1] != '\0')
17937+ {
17938+ /* Don't use the '%n' directive; instead, look
17939+ at the snprintf() return value. */
17940+ p[1] = '\0';
17941+ continue;
17942+ }
17943+ else
17944+ {
17945+ /* Look at the snprintf() return value. */
17946+ if (retcount < 0)
17947+ {
17948+ /* HP-UX 10.20 snprintf() is doubly deficient:
17949+ It doesn't understand the '%n' directive,
17950+ *and* it returns -1 (rather than the length
17951+ that would have been required) when the
17952+ buffer is too small. */
17953+ size_t bigger_need =
17954+ xsum (xtimes (allocated, 2), 12);
17955+ ENSURE_ALLOCATION (bigger_need);
17956+ continue;
17957+ }
17958+ else
17959+ count = retcount;
17960+ }
17961+ }
17962+#endif
17963+
17964+ /* Attempt to handle failure. */
17965+ if (count < 0)
17966+ {
17967+ if (!(result == resultbuf || result == NULL))
17968+ free (result);
17969+ if (buf_malloced != NULL)
17970+ free (buf_malloced);
17971+ CLEANUP ();
17972+ errno = EINVAL;
17973+ return NULL;
17974+ }
17975+
17976+#if !USE_SNPRINTF
17977+ if (count >= tmp_length)
17978+ /* tmp_length was incorrectly calculated - fix the
17979+ code above! */
17980+ abort ();
17981+#endif
17982+
17983+ /* Make room for the result. */
17984+ if (count >= maxlen)
17985+ {
17986+ /* Need at least count bytes. But allocate
17987+ proportionally, to avoid looping eternally if
17988+ snprintf() reports a too small count. */
17989+ size_t n =
17990+ xmax (xsum (length, count), xtimes (allocated, 2));
17991+
17992+ ENSURE_ALLOCATION (n);
17993+#if USE_SNPRINTF
17994+ continue;
17995+#endif
17996+ }
17997+
17998+#if USE_SNPRINTF
17999+ /* The snprintf() result did fit. */
18000+#else
18001+ /* Append the sprintf() result. */
18002+ memcpy (result + length, tmp, count * sizeof (CHAR_T));
18003+ if (tmp != tmpbuf)
18004+ free (tmp);
18005+#endif
18006+
18007+ length += count;
18008+ break;
18009+ }
18010+ }
18011+ }
18012+ }
18013+
18014+ /* Add the final NUL. */
18015+ ENSURE_ALLOCATION (xsum (length, 1));
18016+ result[length] = '\0';
18017+
18018+ if (result != resultbuf && length + 1 < allocated)
18019+ {
18020+ /* Shrink the allocated memory if possible. */
18021+ CHAR_T *memory;
18022+
18023+ memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
18024+ if (memory != NULL)
18025+ result = memory;
18026+ }
18027+
18028+ if (buf_malloced != NULL)
18029+ free (buf_malloced);
18030+ CLEANUP ();
18031+ *lengthp = length;
18032+ return result;
18033+
18034+ out_of_memory:
18035+ if (!(result == resultbuf || result == NULL))
18036+ free (result);
18037+ if (buf_malloced != NULL)
18038+ free (buf_malloced);
18039+ out_of_memory_1:
18040+ CLEANUP ();
18041+ errno = ENOMEM;
18042+ return NULL;
18043+ }
18044+}
18045+
18046+#undef SNPRINTF
18047+#undef USE_SNPRINTF
18048+#undef PRINTF_PARSE
18049+#undef DIRECTIVES
18050+#undef DIRECTIVE
18051+#undef CHAR_T
18052+#undef VASNPRINTF
18053--- lrzsz-0.12.20.safe/intl/vasnprintf.h 1969-12-31 19:00:00.000000000 -0500
18054+++ lrzsz-0.12.20/intl/vasnprintf.h 2004-09-12 14:40:34.667700664 -0400
18055@@ -0,0 +1,61 @@
18056+/* vsprintf with automatic memory allocation.
18057+ Copyright (C) 2002-2003 Free Software Foundation, Inc.
18058+
18059+ This program is free software; you can redistribute it and/or modify it
18060+ under the terms of the GNU Library General Public License as published
18061+ by the Free Software Foundation; either version 2, or (at your option)
18062+ any later version.
18063+
18064+ This program is distributed in the hope that it will be useful,
18065+ but WITHOUT ANY WARRANTY; without even the implied warranty of
18066+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18067+ Library General Public License for more details.
18068+
18069+ You should have received a copy of the GNU Library General Public
18070+ License along with this program; if not, write to the Free Software
18071+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18072+ USA. */
18073+
18074+#ifndef _VASNPRINTF_H
18075+#define _VASNPRINTF_H
18076+
18077+/* Get va_list. */
18078+#include <stdarg.h>
18079+
18080+/* Get size_t. */
18081+#include <stddef.h>
18082+
18083+#ifndef __attribute__
18084+/* This feature is available in gcc versions 2.5 and later. */
18085+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
18086+# define __attribute__(Spec) /* empty */
18087+# endif
18088+/* The __-protected variants of `format' and `printf' attributes
18089+ are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
18090+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
18091+# define __format__ format
18092+# define __printf__ printf
18093+# endif
18094+#endif
18095+
18096+#ifdef __cplusplus
18097+extern "C" {
18098+#endif
18099+
18100+/* Write formatted output to a string dynamically allocated with malloc().
18101+ You can pass a preallocated buffer for the result in RESULTBUF and its
18102+ size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
18103+ If successful, return the address of the string (this may be = RESULTBUF
18104+ if no dynamic memory allocation was necessary) and set *LENGTHP to the
18105+ number of resulting bytes, excluding the trailing NUL. Upon error, set
18106+ errno and return NULL. */
18107+extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
18108+ __attribute__ ((__format__ (__printf__, 3, 4)));
18109+extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
18110+ __attribute__ ((__format__ (__printf__, 3, 0)));
18111+
18112+#ifdef __cplusplus
18113+}
18114+#endif
18115+
18116+#endif /* _VASNPRINTF_H */
18117--- lrzsz-0.12.20.safe/intl/vasnwprintf.h 1969-12-31 19:00:00.000000000 -0500
18118+++ lrzsz-0.12.20/intl/vasnwprintf.h 2004-09-12 14:40:34.673699752 -0400
18119@@ -0,0 +1,46 @@
18120+/* vswprintf with automatic memory allocation.
18121+ Copyright (C) 2002-2003 Free Software Foundation, Inc.
18122+
18123+ This program is free software; you can redistribute it and/or modify it
18124+ under the terms of the GNU Library General Public License as published
18125+ by the Free Software Foundation; either version 2, or (at your option)
18126+ any later version.
18127+
18128+ This program is distributed in the hope that it will be useful,
18129+ but WITHOUT ANY WARRANTY; without even the implied warranty of
18130+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18131+ Library General Public License for more details.
18132+
18133+ You should have received a copy of the GNU Library General Public
18134+ License along with this program; if not, write to the Free Software
18135+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18136+ USA. */
18137+
18138+#ifndef _VASNWPRINTF_H
18139+#define _VASNWPRINTF_H
18140+
18141+/* Get va_list. */
18142+#include <stdarg.h>
18143+
18144+/* Get wchar_t, size_t. */
18145+#include <stddef.h>
18146+
18147+#ifdef __cplusplus
18148+extern "C" {
18149+#endif
18150+
18151+/* Write formatted output to a string dynamically allocated with malloc().
18152+ You can pass a preallocated buffer for the result in RESULTBUF and its
18153+ size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
18154+ If successful, return the address of the string (this may be = RESULTBUF
18155+ if no dynamic memory allocation was necessary) and set *LENGTHP to the
18156+ number of resulting bytes, excluding the trailing NUL. Upon error, set
18157+ errno and return NULL. */
18158+extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
18159+extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
18160+
18161+#ifdef __cplusplus
18162+}
18163+#endif
18164+
18165+#endif /* _VASNWPRINTF_H */
18166--- lrzsz-0.12.20.safe/intl/VERSION 1998-04-26 09:22:37.000000000 -0400
18167+++ lrzsz-0.12.20/intl/VERSION 2004-09-12 14:40:34.679698840 -0400
18168@@ -1 +1 @@
18169-GNU gettext library from gettext-0.10.32
18170+GNU gettext library from gettext-0.14.1
18171--- lrzsz-0.12.20.safe/intl/wprintf-parse.h 1969-12-31 19:00:00.000000000 -0500
18172+++ lrzsz-0.12.20/intl/wprintf-parse.h 2004-09-12 14:40:34.695696408 -0400
18173@@ -0,0 +1,75 @@
18174+/* Parse printf format string.
18175+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
18176+
18177+ This program is free software; you can redistribute it and/or modify it
18178+ under the terms of the GNU Library General Public License as published
18179+ by the Free Software Foundation; either version 2, or (at your option)
18180+ any later version.
18181+
18182+ This program is distributed in the hope that it will be useful,
18183+ but WITHOUT ANY WARRANTY; without even the implied warranty of
18184+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18185+ Library General Public License for more details.
18186+
18187+ You should have received a copy of the GNU Library General Public
18188+ License along with this program; if not, write to the Free Software
18189+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18190+ USA. */
18191+
18192+#ifndef _WPRINTF_PARSE_H
18193+#define _WPRINTF_PARSE_H
18194+
18195+#include "printf-args.h"
18196+
18197+
18198+/* Flags */
18199+#define FLAG_GROUP 1 /* ' flag */
18200+#define FLAG_LEFT 2 /* - flag */
18201+#define FLAG_SHOWSIGN 4 /* + flag */
18202+#define FLAG_SPACE 8 /* space flag */
18203+#define FLAG_ALT 16 /* # flag */
18204+#define FLAG_ZERO 32
18205+
18206+/* arg_index value indicating that no argument is consumed. */
18207+#define ARG_NONE (~(size_t)0)
18208+
18209+/* A parsed directive. */
18210+typedef struct
18211+{
18212+ const wchar_t* dir_start;
18213+ const wchar_t* dir_end;
18214+ int flags;
18215+ const wchar_t* width_start;
18216+ const wchar_t* width_end;
18217+ size_t width_arg_index;
18218+ const wchar_t* precision_start;
18219+ const wchar_t* precision_end;
18220+ size_t precision_arg_index;
18221+ wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
18222+ size_t arg_index;
18223+}
18224+wchar_t_directive;
18225+
18226+/* A parsed format string. */
18227+typedef struct
18228+{
18229+ size_t count;
18230+ wchar_t_directive *dir;
18231+ size_t max_width_length;
18232+ size_t max_precision_length;
18233+}
18234+wchar_t_directives;
18235+
18236+
18237+/* Parses the format string. Fills in the number N of directives, and fills
18238+ in directives[0], ..., directives[N-1], and sets directives[N].dir_start
18239+ to the end of the format string. Also fills in the arg_type fields of the
18240+ arguments and the needed count of arguments. */
18241+#ifdef STATIC
18242+STATIC
18243+#else
18244+extern
18245+#endif
18246+int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
18247+
18248+#endif /* _WPRINTF_PARSE_H */
18249--- lrzsz-0.12.20.safe/intl/xopen-msg.sed 1998-04-26 09:20:52.000000000 -0400
18250+++ lrzsz-0.12.20/intl/xopen-msg.sed 1969-12-31 19:00:00.000000000 -0500
18251@@ -1,104 +0,0 @@
18252-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
18253-# Copyright (C) 1995 Free Software Foundation, Inc.
18254-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
18255-#
18256-# This program is free software; you can redistribute it and/or modify
18257-# it under the terms of the GNU General Public License as published by
18258-# the Free Software Foundation; either version 2, or (at your option)
18259-# any later version.
18260-#
18261-# This program is distributed in the hope that it will be useful,
18262-# but WITHOUT ANY WARRANTY; without even the implied warranty of
18263-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18264-# GNU General Public License for more details.
18265-#
18266-# You should have received a copy of the GNU General Public License
18267-# along with this program; if not, write to the Free Software
18268-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18269-#
18270-#
18271-# The first directive in the .msg should be the definition of the
18272-# message set number. We use always set number 1.
18273-#
18274-1 {
18275- i\
18276-$set 1 # Automatically created by po2msg.sed
18277- h
18278- s/.*/0/
18279- x
18280-}
18281-#
18282-# We copy all comments into the .msg file. Perhaps they can help.
18283-#
18284-/^#/ s/^#[ ]*/$ /p
18285-#
18286-# We copy the original message as a comment into the .msg file.
18287-#
18288-/^msgid/ {
18289-# Does not work now
18290-# /"$/! {
18291-# s/\\$//
18292-# s/$/ ... (more lines following)"/
18293-# }
18294- s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/
18295- p
18296-}
18297-#
18298-# The .msg file contains, other then the .po file, only the translations
18299-# but each given a unique ID. Starting from 1 and incrementing by 1 for
18300-# each message we assign them to the messages.
18301-# It is important that the .po file used to generate the cat-id-tbl.c file
18302-# (with po-to-tbl) is the same as the one used here. (At least the order
18303-# of declarations must not be changed.)
18304-#
18305-/^msgstr/ {
18306- s/msgstr[ ]*"\(.*\)"/\1/
18307- x
18308-# The following nice solution is by
18309-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
18310- td
18311-# Increment a decimal number in pattern space.
18312-# First hide trailing `9' digits.
18313- :d
18314- s/9\(_*\)$/_\1/
18315- td
18316-# Assure at least one digit is available.
18317- s/^\(_*\)$/0\1/
18318-# Increment the last digit.
18319- s/8\(_*\)$/9\1/
18320- s/7\(_*\)$/8\1/
18321- s/6\(_*\)$/7\1/
18322- s/5\(_*\)$/6\1/
18323- s/4\(_*\)$/5\1/
18324- s/3\(_*\)$/4\1/
18325- s/2\(_*\)$/3\1/
18326- s/1\(_*\)$/2\1/
18327- s/0\(_*\)$/1\1/
18328-# Convert the hidden `9' digits to `0's.
18329- s/_/0/g
18330- x
18331-# Bring the line in the format `<number> <message>'
18332- G
18333- s/^[^\n]*$/& /
18334- s/\(.*\)\n\([0-9]*\)/\2 \1/
18335-# Clear flag from last substitution.
18336- tb
18337-# Append the next line.
18338- :b
18339- N
18340-# Look whether second part is a continuation line.
18341- s/\(.*\n\)"\(.*\)"/\1\2/
18342-# Yes, then branch.
18343- ta
18344- P
18345- D
18346-# Note that `D' includes a jump to the start!!
18347-# We found a continuation line. But before printing insert '\'.
18348- :a
18349- s/\(.*\)\(\n.*\)/\1\\\2/
18350- P
18351-# We cannot use the sed command `D' here
18352- s/.*\n\(.*\)/\1/
18353- tb
18354-}
18355-d
18356--- lrzsz-0.12.20.safe/intl/xsize.h 1969-12-31 19:00:00.000000000 -0500
18357+++ lrzsz-0.12.20/intl/xsize.h 2004-09-12 14:40:34.700695648 -0400
18358@@ -0,0 +1,109 @@
18359+/* xsize.h -- Checked size_t computations.
18360+
18361+ Copyright (C) 2003 Free Software Foundation, Inc.
18362+
18363+ This program is free software; you can redistribute it and/or modify it
18364+ under the terms of the GNU Library General Public License as published
18365+ by the Free Software Foundation; either version 2, or (at your option)
18366+ any later version.
18367+
18368+ This program is distributed in the hope that it will be useful,
18369+ but WITHOUT ANY WARRANTY; without even the implied warranty of
18370+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18371+ Library General Public License for more details.
18372+
18373+ You should have received a copy of the GNU Library General Public
18374+ License along with this program; if not, write to the Free Software
18375+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18376+ USA. */
18377+
18378+#ifndef _XSIZE_H
18379+#define _XSIZE_H
18380+
18381+/* Get size_t. */
18382+#include <stddef.h>
18383+
18384+/* Get SIZE_MAX. */
18385+#include <limits.h>
18386+#if HAVE_STDINT_H
18387+# include <stdint.h>
18388+#endif
18389+
18390+/* The size of memory objects is often computed through expressions of
18391+ type size_t. Example:
18392+ void* p = malloc (header_size + n * element_size).
18393+ These computations can lead to overflow. When this happens, malloc()
18394+ returns a piece of memory that is way too small, and the program then
18395+ crashes while attempting to fill the memory.
18396+ To avoid this, the functions and macros in this file check for overflow.
18397+ The convention is that SIZE_MAX represents overflow.
18398+ malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
18399+ implementation that uses mmap --, it's recommended to use size_overflow_p()
18400+ or size_in_bounds_p() before invoking malloc().
18401+ The example thus becomes:
18402+ size_t size = xsum (header_size, xtimes (n, element_size));
18403+ void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
18404+*/
18405+
18406+/* Convert an arbitrary value >= 0 to type size_t. */
18407+#define xcast_size_t(N) \
18408+ ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
18409+
18410+/* Sum of two sizes, with overflow check. */
18411+static inline size_t
18412+#if __GNUC__ >= 3
18413+__attribute__ ((__pure__))
18414+#endif
18415+xsum (size_t size1, size_t size2)
18416+{
18417+ size_t sum = size1 + size2;
18418+ return (sum >= size1 ? sum : SIZE_MAX);
18419+}
18420+
18421+/* Sum of three sizes, with overflow check. */
18422+static inline size_t
18423+#if __GNUC__ >= 3
18424+__attribute__ ((__pure__))
18425+#endif
18426+xsum3 (size_t size1, size_t size2, size_t size3)
18427+{
18428+ return xsum (xsum (size1, size2), size3);
18429+}
18430+
18431+/* Sum of four sizes, with overflow check. */
18432+static inline size_t
18433+#if __GNUC__ >= 3
18434+__attribute__ ((__pure__))
18435+#endif
18436+xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
18437+{
18438+ return xsum (xsum (xsum (size1, size2), size3), size4);
18439+}
18440+
18441+/* Maximum of two sizes, with overflow check. */
18442+static inline size_t
18443+#if __GNUC__ >= 3
18444+__attribute__ ((__pure__))
18445+#endif
18446+xmax (size_t size1, size_t size2)
18447+{
18448+ /* No explicit check is needed here, because for any n:
18449+ max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
18450+ return (size1 >= size2 ? size1 : size2);
18451+}
18452+
18453+/* Multiplication of a count with an element size, with overflow check.
18454+ The count must be >= 0 and the element size must be > 0.
18455+ This is a macro, not an inline function, so that it works correctly even
18456+ when N is of a wider tupe and N > SIZE_MAX. */
18457+#define xtimes(N, ELSIZE) \
18458+ ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
18459+
18460+/* Check for overflow. */
18461+#define size_overflow_p(SIZE) \
18462+ ((SIZE) == SIZE_MAX)
18463+/* Check against overflow. */
18464+#define size_in_bounds_p(SIZE) \
18465+ ((SIZE) != SIZE_MAX)
18466+
18467+#endif /* _XSIZE_H */
18468--- lrzsz-0.12.20.safe/m4/ChangeLog 1969-12-31 19:00:00.000000000 -0500
18469+++ lrzsz-0.12.20/m4/ChangeLog 2004-09-12 14:40:35.054641840 -0400
18470@@ -0,0 +1,32 @@
18471+2004-09-12 gettextize <bug-gnu-gettext@gnu.org>
18472+
18473+ * codeset.m4: New file, from gettext-0.14.1.
18474+ * gettext.m4: New file, from gettext-0.14.1.
18475+ * glibc21.m4: New file, from gettext-0.14.1.
18476+ * iconv.m4: New file, from gettext-0.14.1.
18477+ * intdiv0.m4: New file, from gettext-0.14.1.
18478+ * intmax.m4: New file, from gettext-0.14.1.
18479+ * inttypes.m4: New file, from gettext-0.14.1.
18480+ * inttypes_h.m4: New file, from gettext-0.14.1.
18481+ * inttypes-pri.m4: New file, from gettext-0.14.1.
18482+ * isc-posix.m4: New file, from gettext-0.14.1.
18483+ * lcmessage.m4: New file, from gettext-0.14.1.
18484+ * lib-ld.m4: New file, from gettext-0.14.1.
18485+ * lib-link.m4: New file, from gettext-0.14.1.
18486+ * lib-prefix.m4: New file, from gettext-0.14.1.
18487+ * longdouble.m4: New file, from gettext-0.14.1.
18488+ * longlong.m4: New file, from gettext-0.14.1.
18489+ * nls.m4: New file, from gettext-0.14.1.
18490+ * po.m4: New file, from gettext-0.14.1.
18491+ * printf-posix.m4: New file, from gettext-0.14.1.
18492+ * progtest.m4: New file, from gettext-0.14.1.
18493+ * signed.m4: New file, from gettext-0.14.1.
18494+ * size_max.m4: New file, from gettext-0.14.1.
18495+ * stdint_h.m4: New file, from gettext-0.14.1.
18496+ * uintmax_t.m4: New file, from gettext-0.14.1.
18497+ * ulonglong.m4: New file, from gettext-0.14.1.
18498+ * wchar_t.m4: New file, from gettext-0.14.1.
18499+ * wint_t.m4: New file, from gettext-0.14.1.
18500+ * xsize.m4: New file, from gettext-0.14.1.
18501+ * Makefile.am: New file.
18502+
18503--- lrzsz-0.12.20.safe/m4/codeset.m4 1969-12-31 19:00:00.000000000 -0500
18504+++ lrzsz-0.12.20/m4/codeset.m4 2004-09-12 14:40:34.820677408 -0400
18505@@ -0,0 +1,23 @@
18506+# codeset.m4 serial AM1 (gettext-0.10.40)
18507+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
18508+dnl This file is free software, distributed under the terms of the GNU
18509+dnl General Public License. As a special exception to the GNU General
18510+dnl Public License, this file may be distributed as part of a program
18511+dnl that contains a configuration script generated by Autoconf, under
18512+dnl the same distribution terms as the rest of that program.
18513+
18514+dnl From Bruno Haible.
18515+
18516+AC_DEFUN([AM_LANGINFO_CODESET],
18517+[
18518+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
18519+ [AC_TRY_LINK([#include <langinfo.h>],
18520+ [char* cs = nl_langinfo(CODESET);],
18521+ am_cv_langinfo_codeset=yes,
18522+ am_cv_langinfo_codeset=no)
18523+ ])
18524+ if test $am_cv_langinfo_codeset = yes; then
18525+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
18526+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
18527+ fi
18528+])
18529--- lrzsz-0.12.20.safe/m4/gettext.m4 1969-12-31 19:00:00.000000000 -0500
18530+++ lrzsz-0.12.20/m4/gettext.m4 2004-09-12 14:40:34.826676496 -0400
18531@@ -0,0 +1,487 @@
18532+# gettext.m4 serial 28 (gettext-0.13)
18533+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
18534+dnl This file is free software, distributed under the terms of the GNU
18535+dnl General Public License. As a special exception to the GNU General
18536+dnl Public License, this file may be distributed as part of a program
18537+dnl that contains a configuration script generated by Autoconf, under
18538+dnl the same distribution terms as the rest of that program.
18539+dnl
18540+dnl This file can can be used in projects which are not available under
18541+dnl the GNU General Public License or the GNU Library General Public
18542+dnl License but which still want to provide support for the GNU gettext
18543+dnl functionality.
18544+dnl Please note that the actual code of the GNU gettext library is covered
18545+dnl by the GNU Library General Public License, and the rest of the GNU
18546+dnl gettext package package is covered by the GNU General Public License.
18547+dnl They are *not* in the public domain.
18548+
18549+dnl Authors:
18550+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18551+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
18552+
18553+dnl Macro to add for using GNU gettext.
18554+
18555+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
18556+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
18557+dnl default (if it is not specified or empty) is 'no-libtool'.
18558+dnl INTLSYMBOL should be 'external' for packages with no intl directory,
18559+dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
18560+dnl If INTLSYMBOL is 'use-libtool', then a libtool library
18561+dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
18562+dnl depending on --{enable,disable}-{shared,static} and on the presence of
18563+dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
18564+dnl $(top_builddir)/intl/libintl.a will be created.
18565+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
18566+dnl implementations (in libc or libintl) without the ngettext() function
18567+dnl will be ignored. If NEEDSYMBOL is specified and is
18568+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
18569+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
18570+dnl INTLDIR is used to find the intl libraries. If empty,
18571+dnl the value `$(top_builddir)/intl/' is used.
18572+dnl
18573+dnl The result of the configuration is one of three cases:
18574+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
18575+dnl and used.
18576+dnl Catalog format: GNU --> install in $(datadir)
18577+dnl Catalog extension: .mo after installation, .gmo in source tree
18578+dnl 2) GNU gettext has been found in the system's C library.
18579+dnl Catalog format: GNU --> install in $(datadir)
18580+dnl Catalog extension: .mo after installation, .gmo in source tree
18581+dnl 3) No internationalization, always use English msgid.
18582+dnl Catalog format: none
18583+dnl Catalog extension: none
18584+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
18585+dnl The use of .gmo is historical (it was needed to avoid overwriting the
18586+dnl GNU format catalogs when building on a platform with an X/Open gettext),
18587+dnl but we keep it in order not to force irrelevant filename changes on the
18588+dnl maintainers.
18589+dnl
18590+AC_DEFUN([AM_GNU_GETTEXT],
18591+[
18592+ dnl Argument checking.
18593+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
18594+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
18595+])])])])])
18596+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
18597+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
18598+])])])])
18599+ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
18600+ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
18601+
18602+ AC_REQUIRE([AM_PO_SUBDIRS])dnl
18603+ ifelse(gt_included_intl, yes, [
18604+ AC_REQUIRE([AM_INTL_SUBDIR])dnl
18605+ ])
18606+
18607+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
18608+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
18609+ AC_REQUIRE([AC_LIB_RPATH])
18610+
18611+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
18612+ dnl Ideally we would do this search only after the
18613+ dnl if test "$USE_NLS" = "yes"; then
18614+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
18615+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
18616+ dnl the configure script would need to contain the same shell code
18617+ dnl again, outside any 'if'. There are two solutions:
18618+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
18619+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
18620+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
18621+ dnl documented, we avoid it.
18622+ ifelse(gt_included_intl, yes, , [
18623+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
18624+ ])
18625+
18626+ dnl Set USE_NLS.
18627+ AM_NLS
18628+
18629+ ifelse(gt_included_intl, yes, [
18630+ BUILD_INCLUDED_LIBINTL=no
18631+ USE_INCLUDED_LIBINTL=no
18632+ ])
18633+ LIBINTL=
18634+ LTLIBINTL=
18635+ POSUB=
18636+
18637+ dnl If we use NLS figure out what method
18638+ if test "$USE_NLS" = "yes"; then
18639+ gt_use_preinstalled_gnugettext=no
18640+ ifelse(gt_included_intl, yes, [
18641+ AC_MSG_CHECKING([whether included gettext is requested])
18642+ AC_ARG_WITH(included-gettext,
18643+ [ --with-included-gettext use the GNU gettext library included here],
18644+ nls_cv_force_use_gnu_gettext=$withval,
18645+ nls_cv_force_use_gnu_gettext=no)
18646+ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
18647+
18648+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
18649+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
18650+ ])
18651+ dnl User does not insist on using GNU NLS library. Figure out what
18652+ dnl to use. If GNU gettext is available we use this. Else we have
18653+ dnl to fall back to GNU NLS library.
18654+
18655+ dnl Add a version number to the cache macros.
18656+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
18657+ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
18658+ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
18659+
18660+ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
18661+ [AC_TRY_LINK([#include <libintl.h>
18662+]ifelse([$2], [need-formatstring-macros],
18663+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
18664+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
18665+#endif
18666+changequote(,)dnl
18667+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
18668+changequote([,])dnl
18669+], [])[extern int _nl_msg_cat_cntr;
18670+extern int *_nl_domain_bindings;],
18671+ [bindtextdomain ("", "");
18672+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
18673+ gt_cv_func_gnugettext_libc=yes,
18674+ gt_cv_func_gnugettext_libc=no)])
18675+
18676+ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
18677+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
18678+ ifelse(gt_included_intl, yes, , [
18679+ AM_ICONV_LINK
18680+ ])
18681+ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
18682+ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
18683+ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
18684+ dnl even if libiconv doesn't exist.
18685+ AC_LIB_LINKFLAGS_BODY([intl])
18686+ AC_CACHE_CHECK([for GNU gettext in libintl],
18687+ gt_cv_func_gnugettext_libintl,
18688+ [gt_save_CPPFLAGS="$CPPFLAGS"
18689+ CPPFLAGS="$CPPFLAGS $INCINTL"
18690+ gt_save_LIBS="$LIBS"
18691+ LIBS="$LIBS $LIBINTL"
18692+ dnl Now see whether libintl exists and does not depend on libiconv.
18693+ AC_TRY_LINK([#include <libintl.h>
18694+]ifelse([$2], [need-formatstring-macros],
18695+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
18696+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
18697+#endif
18698+changequote(,)dnl
18699+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
18700+changequote([,])dnl
18701+], [])[extern int _nl_msg_cat_cntr;
18702+extern
18703+#ifdef __cplusplus
18704+"C"
18705+#endif
18706+const char *_nl_expand_alias ();],
18707+ [bindtextdomain ("", "");
18708+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
18709+ gt_cv_func_gnugettext_libintl=yes,
18710+ gt_cv_func_gnugettext_libintl=no)
18711+ dnl Now see whether libintl exists and depends on libiconv.
18712+ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
18713+ LIBS="$LIBS $LIBICONV"
18714+ AC_TRY_LINK([#include <libintl.h>
18715+]ifelse([$2], [need-formatstring-macros],
18716+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
18717+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
18718+#endif
18719+changequote(,)dnl
18720+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
18721+changequote([,])dnl
18722+], [])[extern int _nl_msg_cat_cntr;
18723+extern
18724+#ifdef __cplusplus
18725+"C"
18726+#endif
18727+const char *_nl_expand_alias ();],
18728+ [bindtextdomain ("", "");
18729+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
18730+ [LIBINTL="$LIBINTL $LIBICONV"
18731+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
18732+ gt_cv_func_gnugettext_libintl=yes
18733+ ])
18734+ fi
18735+ CPPFLAGS="$gt_save_CPPFLAGS"
18736+ LIBS="$gt_save_LIBS"])
18737+ fi
18738+
18739+ dnl If an already present or preinstalled GNU gettext() is found,
18740+ dnl use it. But if this macro is used in GNU gettext, and GNU
18741+ dnl gettext is already preinstalled in libintl, we update this
18742+ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
18743+ if test "$gt_cv_func_gnugettext_libc" = "yes" \
18744+ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
18745+ && test "$PACKAGE" != gettext-runtime \
18746+ && test "$PACKAGE" != gettext-tools; }; then
18747+ gt_use_preinstalled_gnugettext=yes
18748+ else
18749+ dnl Reset the values set by searching for libintl.
18750+ LIBINTL=
18751+ LTLIBINTL=
18752+ INCINTL=
18753+ fi
18754+
18755+ ifelse(gt_included_intl, yes, [
18756+ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
18757+ dnl GNU gettext is not found in the C library.
18758+ dnl Fall back on included GNU gettext library.
18759+ nls_cv_use_gnu_gettext=yes
18760+ fi
18761+ fi
18762+
18763+ if test "$nls_cv_use_gnu_gettext" = "yes"; then
18764+ dnl Mark actions used to generate GNU NLS library.
18765+ BUILD_INCLUDED_LIBINTL=yes
18766+ USE_INCLUDED_LIBINTL=yes
18767+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
18768+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
18769+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
18770+ fi
18771+
18772+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
18773+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
18774+ dnl Mark actions to use GNU gettext tools.
18775+ CATOBJEXT=.gmo
18776+ fi
18777+ ])
18778+
18779+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
18780+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
18781+ AC_DEFINE(ENABLE_NLS, 1,
18782+ [Define to 1 if translation of program messages to the user's native language
18783+ is requested.])
18784+ else
18785+ USE_NLS=no
18786+ fi
18787+ fi
18788+
18789+ AC_MSG_CHECKING([whether to use NLS])
18790+ AC_MSG_RESULT([$USE_NLS])
18791+ if test "$USE_NLS" = "yes"; then
18792+ AC_MSG_CHECKING([where the gettext function comes from])
18793+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
18794+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
18795+ gt_source="external libintl"
18796+ else
18797+ gt_source="libc"
18798+ fi
18799+ else
18800+ gt_source="included intl directory"
18801+ fi
18802+ AC_MSG_RESULT([$gt_source])
18803+ fi
18804+
18805+ if test "$USE_NLS" = "yes"; then
18806+
18807+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
18808+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
18809+ AC_MSG_CHECKING([how to link with libintl])
18810+ AC_MSG_RESULT([$LIBINTL])
18811+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
18812+ fi
18813+
18814+ dnl For backward compatibility. Some packages may be using this.
18815+ AC_DEFINE(HAVE_GETTEXT, 1,
18816+ [Define if the GNU gettext() function is already present or preinstalled.])
18817+ AC_DEFINE(HAVE_DCGETTEXT, 1,
18818+ [Define if the GNU dcgettext() function is already present or preinstalled.])
18819+ fi
18820+
18821+ dnl We need to process the po/ directory.
18822+ POSUB=po
18823+ fi
18824+
18825+ ifelse(gt_included_intl, yes, [
18826+ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
18827+ dnl to 'yes' because some of the testsuite requires it.
18828+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
18829+ BUILD_INCLUDED_LIBINTL=yes
18830+ fi
18831+
18832+ dnl Make all variables we use known to autoconf.
18833+ AC_SUBST(BUILD_INCLUDED_LIBINTL)
18834+ AC_SUBST(USE_INCLUDED_LIBINTL)
18835+ AC_SUBST(CATOBJEXT)
18836+
18837+ dnl For backward compatibility. Some configure.ins may be using this.
18838+ nls_cv_header_intl=
18839+ nls_cv_header_libgt=
18840+
18841+ dnl For backward compatibility. Some Makefiles may be using this.
18842+ DATADIRNAME=share
18843+ AC_SUBST(DATADIRNAME)
18844+
18845+ dnl For backward compatibility. Some Makefiles may be using this.
18846+ INSTOBJEXT=.mo
18847+ AC_SUBST(INSTOBJEXT)
18848+
18849+ dnl For backward compatibility. Some Makefiles may be using this.
18850+ GENCAT=gencat
18851+ AC_SUBST(GENCAT)
18852+
18853+ dnl For backward compatibility. Some Makefiles may be using this.
18854+ if test "$USE_INCLUDED_LIBINTL" = yes; then
18855+ INTLOBJS="\$(GETTOBJS)"
18856+ fi
18857+ AC_SUBST(INTLOBJS)
18858+
18859+ dnl Enable libtool support if the surrounding package wishes it.
18860+ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
18861+ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
18862+ ])
18863+
18864+ dnl For backward compatibility. Some Makefiles may be using this.
18865+ INTLLIBS="$LIBINTL"
18866+ AC_SUBST(INTLLIBS)
18867+
18868+ dnl Make all documented variables known to autoconf.
18869+ AC_SUBST(LIBINTL)
18870+ AC_SUBST(LTLIBINTL)
18871+ AC_SUBST(POSUB)
18872+])
18873+
18874+
18875+dnl Checks for all prerequisites of the intl subdirectory,
18876+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
18877+dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
18878+AC_DEFUN([AM_INTL_SUBDIR],
18879+[
18880+ AC_REQUIRE([AC_PROG_INSTALL])dnl
18881+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
18882+ AC_REQUIRE([AC_PROG_CC])dnl
18883+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
18884+ AC_REQUIRE([AC_PROG_RANLIB])dnl
18885+ AC_REQUIRE([AC_ISC_POSIX])dnl
18886+ AC_REQUIRE([AC_HEADER_STDC])dnl
18887+ AC_REQUIRE([AC_C_CONST])dnl
18888+ AC_REQUIRE([bh_C_SIGNED])dnl
18889+ AC_REQUIRE([AC_C_INLINE])dnl
18890+ AC_REQUIRE([AC_TYPE_OFF_T])dnl
18891+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
18892+ AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
18893+ AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
18894+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
18895+ AC_REQUIRE([gt_TYPE_WINT_T])dnl
18896+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
18897+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
18898+ AC_REQUIRE([gt_TYPE_INTMAX_T])
18899+ AC_REQUIRE([gt_PRINTF_POSIX])
18900+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
18901+ AC_REQUIRE([AC_FUNC_MMAP])dnl
18902+ AC_REQUIRE([jm_GLIBC21])dnl
18903+ AC_REQUIRE([gt_INTDIV0])dnl
18904+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
18905+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
18906+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
18907+ AC_REQUIRE([gl_XSIZE])dnl
18908+
18909+ AC_CHECK_TYPE([ptrdiff_t], ,
18910+ [AC_DEFINE([ptrdiff_t], [long],
18911+ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
18912+ ])
18913+ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
18914+stdlib.h string.h unistd.h sys/param.h])
18915+ AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
18916+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
18917+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
18918+__fsetlocking])
18919+
18920+ dnl Use the _snprintf function only if it is declared (because on NetBSD it
18921+ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
18922+ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
18923+ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
18924+
18925+ dnl Use the *_unlocked functions only if they are declared.
18926+ dnl (because some of them were defined without being declared in Solaris
18927+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
18928+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
18929+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
18930+ gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
18931+ gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
18932+ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
18933+
18934+ case $gt_cv_func_printf_posix in
18935+ *yes) HAVE_POSIX_PRINTF=1 ;;
18936+ *) HAVE_POSIX_PRINTF=0 ;;
18937+ esac
18938+ AC_SUBST([HAVE_POSIX_PRINTF])
18939+ if test "$ac_cv_func_asprintf" = yes; then
18940+ HAVE_ASPRINTF=1
18941+ else
18942+ HAVE_ASPRINTF=0
18943+ fi
18944+ AC_SUBST([HAVE_ASPRINTF])
18945+ if test "$ac_cv_func_snprintf" = yes; then
18946+ HAVE_SNPRINTF=1
18947+ else
18948+ HAVE_SNPRINTF=0
18949+ fi
18950+ AC_SUBST([HAVE_SNPRINTF])
18951+ if test "$ac_cv_func_wprintf" = yes; then
18952+ HAVE_WPRINTF=1
18953+ else
18954+ HAVE_WPRINTF=0
18955+ fi
18956+ AC_SUBST([HAVE_WPRINTF])
18957+
18958+ AM_ICONV
18959+ AM_LANGINFO_CODESET
18960+ if test $ac_cv_header_locale_h = yes; then
18961+ AM_LC_MESSAGES
18962+ fi
18963+
18964+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
18965+ dnl because plural.y uses bison specific features. It requires at least
18966+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
18967+ dnl compile.
18968+ dnl bison is only needed for the maintainer (who touches plural.y). But in
18969+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
18970+ dnl the rule in general Makefile. Now, some people carelessly touch the
18971+ dnl files or have a broken "make" program, hence the plural.c rule will
18972+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
18973+ dnl present or too old.
18974+ AC_CHECK_PROGS([INTLBISON], [bison])
18975+ if test -z "$INTLBISON"; then
18976+ ac_verc_fail=yes
18977+ else
18978+ dnl Found it, now check the version.
18979+ AC_MSG_CHECKING([version of bison])
18980+changequote(<<,>>)dnl
18981+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
18982+ case $ac_prog_version in
18983+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
18984+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
18985+changequote([,])dnl
18986+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
18987+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
18988+ esac
18989+ AC_MSG_RESULT([$ac_prog_version])
18990+ fi
18991+ if test $ac_verc_fail = yes; then
18992+ INTLBISON=:
18993+ fi
18994+])
18995+
18996+
18997+dnl gt_CHECK_DECL(FUNC, INCLUDES)
18998+dnl Check whether a function is declared.
18999+AC_DEFUN([gt_CHECK_DECL],
19000+[
19001+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
19002+ [AC_TRY_COMPILE([$2], [
19003+#ifndef $1
19004+ char *p = (char *) $1;
19005+#endif
19006+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
19007+ if test $ac_cv_have_decl_$1 = yes; then
19008+ gt_value=1
19009+ else
19010+ gt_value=0
19011+ fi
19012+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
19013+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
19014+])
19015+
19016+
19017+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
19018+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
19019--- lrzsz-0.12.20.safe/m4/glibc21.m4 1969-12-31 19:00:00.000000000 -0500
19020+++ lrzsz-0.12.20/m4/glibc21.m4 2004-09-12 14:40:34.833675432 -0400
19021@@ -0,0 +1,32 @@
19022+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
19023+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
19024+dnl This file is free software, distributed under the terms of the GNU
19025+dnl General Public License. As a special exception to the GNU General
19026+dnl Public License, this file may be distributed as part of a program
19027+dnl that contains a configuration script generated by Autoconf, under
19028+dnl the same distribution terms as the rest of that program.
19029+
19030+# Test for the GNU C Library, version 2.1 or newer.
19031+# From Bruno Haible.
19032+
19033+AC_DEFUN([jm_GLIBC21],
19034+ [
19035+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
19036+ ac_cv_gnu_library_2_1,
19037+ [AC_EGREP_CPP([Lucky GNU user],
19038+ [
19039+#include <features.h>
19040+#ifdef __GNU_LIBRARY__
19041+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
19042+ Lucky GNU user
19043+ #endif
19044+#endif
19045+ ],
19046+ ac_cv_gnu_library_2_1=yes,
19047+ ac_cv_gnu_library_2_1=no)
19048+ ]
19049+ )
19050+ AC_SUBST(GLIBC21)
19051+ GLIBC21="$ac_cv_gnu_library_2_1"
19052+ ]
19053+)
19054--- lrzsz-0.12.20.safe/m4/iconv.m4 1969-12-31 19:00:00.000000000 -0500
19055+++ lrzsz-0.12.20/m4/iconv.m4 2004-09-12 14:40:34.839674520 -0400
19056@@ -0,0 +1,103 @@
19057+# iconv.m4 serial AM4 (gettext-0.11.3)
19058+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
19059+dnl This file is free software, distributed under the terms of the GNU
19060+dnl General Public License. As a special exception to the GNU General
19061+dnl Public License, this file may be distributed as part of a program
19062+dnl that contains a configuration script generated by Autoconf, under
19063+dnl the same distribution terms as the rest of that program.
19064+
19065+dnl From Bruno Haible.
19066+
19067+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
19068+[
19069+ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
19070+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
19071+ AC_REQUIRE([AC_LIB_RPATH])
19072+
19073+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
19074+ dnl accordingly.
19075+ AC_LIB_LINKFLAGS_BODY([iconv])
19076+])
19077+
19078+AC_DEFUN([AM_ICONV_LINK],
19079+[
19080+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
19081+ dnl those with the standalone portable GNU libiconv installed).
19082+
19083+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
19084+ dnl accordingly.
19085+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
19086+
19087+ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
19088+ dnl because if the user has installed libiconv and not disabled its use
19089+ dnl via --without-libiconv-prefix, he wants to use it. The first
19090+ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
19091+ am_save_CPPFLAGS="$CPPFLAGS"
19092+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
19093+
19094+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
19095+ am_cv_func_iconv="no, consider installing GNU libiconv"
19096+ am_cv_lib_iconv=no
19097+ AC_TRY_LINK([#include <stdlib.h>
19098+#include <iconv.h>],
19099+ [iconv_t cd = iconv_open("","");
19100+ iconv(cd,NULL,NULL,NULL,NULL);
19101+ iconv_close(cd);],
19102+ am_cv_func_iconv=yes)
19103+ if test "$am_cv_func_iconv" != yes; then
19104+ am_save_LIBS="$LIBS"
19105+ LIBS="$LIBS $LIBICONV"
19106+ AC_TRY_LINK([#include <stdlib.h>
19107+#include <iconv.h>],
19108+ [iconv_t cd = iconv_open("","");
19109+ iconv(cd,NULL,NULL,NULL,NULL);
19110+ iconv_close(cd);],
19111+ am_cv_lib_iconv=yes
19112+ am_cv_func_iconv=yes)
19113+ LIBS="$am_save_LIBS"
19114+ fi
19115+ ])
19116+ if test "$am_cv_func_iconv" = yes; then
19117+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
19118+ fi
19119+ if test "$am_cv_lib_iconv" = yes; then
19120+ AC_MSG_CHECKING([how to link with libiconv])
19121+ AC_MSG_RESULT([$LIBICONV])
19122+ else
19123+ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
19124+ dnl either.
19125+ CPPFLAGS="$am_save_CPPFLAGS"
19126+ LIBICONV=
19127+ LTLIBICONV=
19128+ fi
19129+ AC_SUBST(LIBICONV)
19130+ AC_SUBST(LTLIBICONV)
19131+])
19132+
19133+AC_DEFUN([AM_ICONV],
19134+[
19135+ AM_ICONV_LINK
19136+ if test "$am_cv_func_iconv" = yes; then
19137+ AC_MSG_CHECKING([for iconv declaration])
19138+ AC_CACHE_VAL(am_cv_proto_iconv, [
19139+ AC_TRY_COMPILE([
19140+#include <stdlib.h>
19141+#include <iconv.h>
19142+extern
19143+#ifdef __cplusplus
19144+"C"
19145+#endif
19146+#if defined(__STDC__) || defined(__cplusplus)
19147+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
19148+#else
19149+size_t iconv();
19150+#endif
19151+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
19152+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
19153+ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
19154+ AC_MSG_RESULT([$]{ac_t:-
19155+ }[$]am_cv_proto_iconv)
19156+ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
19157+ [Define as const if the declaration of iconv() needs const.])
19158+ fi
19159+])
19160--- lrzsz-0.12.20.safe/m4/intdiv0.m4 1969-12-31 19:00:00.000000000 -0500
19161+++ lrzsz-0.12.20/m4/intdiv0.m4 2004-09-12 14:40:34.845673608 -0400
19162@@ -0,0 +1,72 @@
19163+# intdiv0.m4 serial 1 (gettext-0.11.3)
19164+dnl Copyright (C) 2002 Free Software Foundation, Inc.
19165+dnl This file is free software, distributed under the terms of the GNU
19166+dnl General Public License. As a special exception to the GNU General
19167+dnl Public License, this file may be distributed as part of a program
19168+dnl that contains a configuration script generated by Autoconf, under
19169+dnl the same distribution terms as the rest of that program.
19170+
19171+dnl From Bruno Haible.
19172+
19173+AC_DEFUN([gt_INTDIV0],
19174+[
19175+ AC_REQUIRE([AC_PROG_CC])dnl
19176+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
19177+
19178+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
19179+ gt_cv_int_divbyzero_sigfpe,
19180+ [
19181+ AC_TRY_RUN([
19182+#include <stdlib.h>
19183+#include <signal.h>
19184+
19185+static void
19186+#ifdef __cplusplus
19187+sigfpe_handler (int sig)
19188+#else
19189+sigfpe_handler (sig) int sig;
19190+#endif
19191+{
19192+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
19193+ exit (sig != SIGFPE);
19194+}
19195+
19196+int x = 1;
19197+int y = 0;
19198+int z;
19199+int nan;
19200+
19201+int main ()
19202+{
19203+ signal (SIGFPE, sigfpe_handler);
19204+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
19205+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
19206+ signal (SIGTRAP, sigfpe_handler);
19207+#endif
19208+/* Linux/SPARC yields signal SIGILL. */
19209+#if defined (__sparc__) && defined (__linux__)
19210+ signal (SIGILL, sigfpe_handler);
19211+#endif
19212+
19213+ z = x / y;
19214+ nan = y / y;
19215+ exit (1);
19216+}
19217+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
19218+ [
19219+ # Guess based on the CPU.
19220+ case "$host_cpu" in
19221+ alpha* | i[34567]86 | m68k | s390*)
19222+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
19223+ *)
19224+ gt_cv_int_divbyzero_sigfpe="guessing no";;
19225+ esac
19226+ ])
19227+ ])
19228+ case "$gt_cv_int_divbyzero_sigfpe" in
19229+ *yes) value=1;;
19230+ *) value=0;;
19231+ esac
19232+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
19233+ [Define if integer division by zero raises signal SIGFPE.])
19234+])
19235--- lrzsz-0.12.20.safe/m4/intmax.m4 1969-12-31 19:00:00.000000000 -0500
19236+++ lrzsz-0.12.20/m4/intmax.m4 2004-09-12 14:40:34.855672088 -0400
19237@@ -0,0 +1,32 @@
19238+# intmax.m4 serial 1 (gettext-0.12)
19239+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
19240+dnl This file is free software, distributed under the terms of the GNU
19241+dnl General Public License. As a special exception to the GNU General
19242+dnl Public License, this file may be distributed as part of a program
19243+dnl that contains a configuration script generated by Autoconf, under
19244+dnl the same distribution terms as the rest of that program.
19245+
19246+dnl From Bruno Haible.
19247+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
19248+dnl find a replacement if it is lacking.
19249+
19250+AC_DEFUN([gt_TYPE_INTMAX_T],
19251+[
19252+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
19253+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
19254+ AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
19255+ [AC_TRY_COMPILE([
19256+#include <stddef.h>
19257+#include <stdlib.h>
19258+#if HAVE_STDINT_H_WITH_UINTMAX
19259+#include <stdint.h>
19260+#endif
19261+#if HAVE_INTTYPES_H_WITH_UINTMAX
19262+#include <inttypes.h>
19263+#endif
19264+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
19265+ if test $gt_cv_c_intmax_t = yes; then
19266+ AC_DEFINE(HAVE_INTMAX_T, 1,
19267+ [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
19268+ fi
19269+])
19270--- lrzsz-0.12.20.safe/m4/inttypes_h.m4 1969-12-31 19:00:00.000000000 -0500
19271+++ lrzsz-0.12.20/m4/inttypes_h.m4 2004-09-12 14:40:34.868670112 -0400
19272@@ -0,0 +1,28 @@
19273+# inttypes_h.m4 serial 5 (gettext-0.12)
19274+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
19275+dnl This file is free software, distributed under the terms of the GNU
19276+dnl General Public License. As a special exception to the GNU General
19277+dnl Public License, this file may be distributed as part of a program
19278+dnl that contains a configuration script generated by Autoconf, under
19279+dnl the same distribution terms as the rest of that program.
19280+
19281+dnl From Paul Eggert.
19282+
19283+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
19284+# doesn't clash with <sys/types.h>, and declares uintmax_t.
19285+
19286+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
19287+[
19288+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
19289+ [AC_TRY_COMPILE(
19290+ [#include <sys/types.h>
19291+#include <inttypes.h>],
19292+ [uintmax_t i = (uintmax_t) -1;],
19293+ jm_ac_cv_header_inttypes_h=yes,
19294+ jm_ac_cv_header_inttypes_h=no)])
19295+ if test $jm_ac_cv_header_inttypes_h = yes; then
19296+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
19297+ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
19298+ and declares uintmax_t. ])
19299+ fi
19300+])
19301--- lrzsz-0.12.20.safe/m4/inttypes.m4 1969-12-31 19:00:00.000000000 -0500
19302+++ lrzsz-0.12.20/m4/inttypes.m4 2004-09-12 14:40:34.861671176 -0400
19303@@ -0,0 +1,27 @@
19304+# inttypes.m4 serial 1 (gettext-0.11.4)
19305+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
19306+dnl This file is free software, distributed under the terms of the GNU
19307+dnl General Public License. As a special exception to the GNU General
19308+dnl Public License, this file may be distributed as part of a program
19309+dnl that contains a configuration script generated by Autoconf, under
19310+dnl the same distribution terms as the rest of that program.
19311+
19312+dnl From Paul Eggert.
19313+
19314+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
19315+# <sys/types.h>.
19316+
19317+AC_DEFUN([gt_HEADER_INTTYPES_H],
19318+[
19319+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
19320+ [
19321+ AC_TRY_COMPILE(
19322+ [#include <sys/types.h>
19323+#include <inttypes.h>],
19324+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
19325+ ])
19326+ if test $gt_cv_header_inttypes_h = yes; then
19327+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
19328+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
19329+ fi
19330+])
19331--- lrzsz-0.12.20.safe/m4/inttypes-pri.m4 1969-12-31 19:00:00.000000000 -0500
19332+++ lrzsz-0.12.20/m4/inttypes-pri.m4 2004-09-12 14:40:34.874669200 -0400
19333@@ -0,0 +1,32 @@
19334+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
19335+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
19336+dnl This file is free software, distributed under the terms of the GNU
19337+dnl General Public License. As a special exception to the GNU General
19338+dnl Public License, this file may be distributed as part of a program
19339+dnl that contains a configuration script generated by Autoconf, under
19340+dnl the same distribution terms as the rest of that program.
19341+
19342+dnl From Bruno Haible.
19343+
19344+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
19345+# macros to non-string values. This is the case on AIX 4.3.3.
19346+
19347+AC_DEFUN([gt_INTTYPES_PRI],
19348+[
19349+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
19350+ if test $gt_cv_header_inttypes_h = yes; then
19351+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
19352+ gt_cv_inttypes_pri_broken,
19353+ [
19354+ AC_TRY_COMPILE([#include <inttypes.h>
19355+#ifdef PRId32
19356+char *p = PRId32;
19357+#endif
19358+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
19359+ ])
19360+ fi
19361+ if test "$gt_cv_inttypes_pri_broken" = yes; then
19362+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
19363+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
19364+ fi
19365+])
19366--- lrzsz-0.12.20.safe/m4/isc-posix.m4 1969-12-31 19:00:00.000000000 -0500
19367+++ lrzsz-0.12.20/m4/isc-posix.m4 2004-09-12 14:40:34.885667528 -0400
19368@@ -0,0 +1,26 @@
19369+# isc-posix.m4 serial 2 (gettext-0.11.2)
19370+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
19371+dnl This file is free software, distributed under the terms of the GNU
19372+dnl General Public License. As a special exception to the GNU General
19373+dnl Public License, this file may be distributed as part of a program
19374+dnl that contains a configuration script generated by Autoconf, under
19375+dnl the same distribution terms as the rest of that program.
19376+
19377+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
19378+
19379+# This test replaces the one in autoconf.
19380+# Currently this macro should have the same name as the autoconf macro
19381+# because gettext's gettext.m4 (distributed in the automake package)
19382+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
19383+# give these diagnostics:
19384+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
19385+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
19386+
19387+undefine([AC_ISC_POSIX])
19388+
19389+AC_DEFUN([AC_ISC_POSIX],
19390+ [
19391+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
19392+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
19393+ ]
19394+)
19395--- lrzsz-0.12.20.safe/m4/lcmessage.m4 1969-12-31 19:00:00.000000000 -0500
19396+++ lrzsz-0.12.20/m4/lcmessage.m4 2004-09-12 14:40:34.902664944 -0400
19397@@ -0,0 +1,32 @@
19398+# lcmessage.m4 serial 3 (gettext-0.11.3)
19399+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
19400+dnl This file is free software, distributed under the terms of the GNU
19401+dnl General Public License. As a special exception to the GNU General
19402+dnl Public License, this file may be distributed as part of a program
19403+dnl that contains a configuration script generated by Autoconf, under
19404+dnl the same distribution terms as the rest of that program.
19405+dnl
19406+dnl This file can can be used in projects which are not available under
19407+dnl the GNU General Public License or the GNU Library General Public
19408+dnl License but which still want to provide support for the GNU gettext
19409+dnl functionality.
19410+dnl Please note that the actual code of the GNU gettext library is covered
19411+dnl by the GNU Library General Public License, and the rest of the GNU
19412+dnl gettext package package is covered by the GNU General Public License.
19413+dnl They are *not* in the public domain.
19414+
19415+dnl Authors:
19416+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
19417+
19418+# Check whether LC_MESSAGES is available in <locale.h>.
19419+
19420+AC_DEFUN([AM_LC_MESSAGES],
19421+[
19422+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
19423+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
19424+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
19425+ if test $am_cv_val_LC_MESSAGES = yes; then
19426+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
19427+ [Define if your <locale.h> file defines LC_MESSAGES.])
19428+ fi
19429+])
19430--- lrzsz-0.12.20.safe/m4/lib-ld.m4 1969-12-31 19:00:00.000000000 -0500
19431+++ lrzsz-0.12.20/m4/lib-ld.m4 2004-09-12 14:40:34.908664032 -0400
19432@@ -0,0 +1,112 @@
19433+# lib-ld.m4 serial 3 (gettext-0.13)
19434+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
19435+dnl This file is free software, distributed under the terms of the GNU
19436+dnl General Public License. As a special exception to the GNU General
19437+dnl Public License, this file may be distributed as part of a program
19438+dnl that contains a configuration script generated by Autoconf, under
19439+dnl the same distribution terms as the rest of that program.
19440+
19441+dnl Subroutines of libtool.m4,
19442+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
19443+dnl with libtool.m4.
19444+
19445+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
19446+AC_DEFUN([AC_LIB_PROG_LD_GNU],
19447+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
19448+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
19449+case `$LD -v 2>&1 </dev/null` in
19450+*GNU* | *'with BFD'*)
19451+ acl_cv_prog_gnu_ld=yes ;;
19452+*)
19453+ acl_cv_prog_gnu_ld=no ;;
19454+esac])
19455+with_gnu_ld=$acl_cv_prog_gnu_ld
19456+])
19457+
19458+dnl From libtool-1.4. Sets the variable LD.
19459+AC_DEFUN([AC_LIB_PROG_LD],
19460+[AC_ARG_WITH(gnu-ld,
19461+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
19462+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
19463+AC_REQUIRE([AC_PROG_CC])dnl
19464+AC_REQUIRE([AC_CANONICAL_HOST])dnl
19465+# Prepare PATH_SEPARATOR.
19466+# The user is always right.
19467+if test "${PATH_SEPARATOR+set}" != set; then
19468+ echo "#! /bin/sh" >conf$$.sh
19469+ echo "exit 0" >>conf$$.sh
19470+ chmod +x conf$$.sh
19471+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
19472+ PATH_SEPARATOR=';'
19473+ else
19474+ PATH_SEPARATOR=:
19475+ fi
19476+ rm -f conf$$.sh
19477+fi
19478+ac_prog=ld
19479+if test "$GCC" = yes; then
19480+ # Check if gcc -print-prog-name=ld gives a path.
19481+ AC_MSG_CHECKING([for ld used by GCC])
19482+ case $host in
19483+ *-*-mingw*)
19484+ # gcc leaves a trailing carriage return which upsets mingw
19485+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
19486+ *)
19487+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
19488+ esac
19489+ case $ac_prog in
19490+ # Accept absolute paths.
19491+ [[\\/]* | [A-Za-z]:[\\/]*)]
19492+ [re_direlt='/[^/][^/]*/\.\./']
19493+ # Canonicalize the path of ld
19494+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
19495+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
19496+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
19497+ done
19498+ test -z "$LD" && LD="$ac_prog"
19499+ ;;
19500+ "")
19501+ # If it fails, then pretend we aren't using GCC.
19502+ ac_prog=ld
19503+ ;;
19504+ *)
19505+ # If it is relative, then search for the first ld in PATH.
19506+ with_gnu_ld=unknown
19507+ ;;
19508+ esac
19509+elif test "$with_gnu_ld" = yes; then
19510+ AC_MSG_CHECKING([for GNU ld])
19511+else
19512+ AC_MSG_CHECKING([for non-GNU ld])
19513+fi
19514+AC_CACHE_VAL(acl_cv_path_LD,
19515+[if test -z "$LD"; then
19516+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
19517+ for ac_dir in $PATH; do
19518+ test -z "$ac_dir" && ac_dir=.
19519+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
19520+ acl_cv_path_LD="$ac_dir/$ac_prog"
19521+ # Check to see if the program is GNU ld. I'd rather use --version,
19522+ # but apparently some GNU ld's only accept -v.
19523+ # Break only if it was the GNU/non-GNU ld that we prefer.
19524+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
19525+ *GNU* | *'with BFD'*)
19526+ test "$with_gnu_ld" != no && break ;;
19527+ *)
19528+ test "$with_gnu_ld" != yes && break ;;
19529+ esac
19530+ fi
19531+ done
19532+ IFS="$ac_save_ifs"
19533+else
19534+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
19535+fi])
19536+LD="$acl_cv_path_LD"
19537+if test -n "$LD"; then
19538+ AC_MSG_RESULT($LD)
19539+else
19540+ AC_MSG_RESULT(no)
19541+fi
19542+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
19543+AC_LIB_PROG_LD_GNU
19544+])
19545--- lrzsz-0.12.20.safe/m4/lib-link.m4 1969-12-31 19:00:00.000000000 -0500
19546+++ lrzsz-0.12.20/m4/lib-link.m4 2004-09-12 14:40:34.914663120 -0400
19547@@ -0,0 +1,551 @@
19548+# lib-link.m4 serial 4 (gettext-0.12)
19549+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
19550+dnl This file is free software, distributed under the terms of the GNU
19551+dnl General Public License. As a special exception to the GNU General
19552+dnl Public License, this file may be distributed as part of a program
19553+dnl that contains a configuration script generated by Autoconf, under
19554+dnl the same distribution terms as the rest of that program.
19555+
19556+dnl From Bruno Haible.
19557+
19558+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
19559+dnl the libraries corresponding to explicit and implicit dependencies.
19560+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
19561+dnl augments the CPPFLAGS variable.
19562+AC_DEFUN([AC_LIB_LINKFLAGS],
19563+[
19564+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
19565+ AC_REQUIRE([AC_LIB_RPATH])
19566+ define([Name],[translit([$1],[./-], [___])])
19567+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
19568+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
19569+ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
19570+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
19571+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
19572+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
19573+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
19574+ ])
19575+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
19576+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
19577+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
19578+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
19579+ AC_SUBST([LIB]NAME)
19580+ AC_SUBST([LTLIB]NAME)
19581+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
19582+ dnl results of this search when this library appears as a dependency.
19583+ HAVE_LIB[]NAME=yes
19584+ undefine([Name])
19585+ undefine([NAME])
19586+])
19587+
19588+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
19589+dnl searches for libname and the libraries corresponding to explicit and
19590+dnl implicit dependencies, together with the specified include files and
19591+dnl the ability to compile and link the specified testcode. If found, it
19592+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
19593+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
19594+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
19595+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
19596+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
19597+[
19598+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
19599+ AC_REQUIRE([AC_LIB_RPATH])
19600+ define([Name],[translit([$1],[./-], [___])])
19601+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
19602+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
19603+
19604+ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
19605+ dnl accordingly.
19606+ AC_LIB_LINKFLAGS_BODY([$1], [$2])
19607+
19608+ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
19609+ dnl because if the user has installed lib[]Name and not disabled its use
19610+ dnl via --without-lib[]Name-prefix, he wants to use it.
19611+ ac_save_CPPFLAGS="$CPPFLAGS"
19612+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
19613+
19614+ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
19615+ ac_save_LIBS="$LIBS"
19616+ LIBS="$LIBS $LIB[]NAME"
19617+ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
19618+ LIBS="$ac_save_LIBS"
19619+ ])
19620+ if test "$ac_cv_lib[]Name" = yes; then
19621+ HAVE_LIB[]NAME=yes
19622+ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
19623+ AC_MSG_CHECKING([how to link with lib[]$1])
19624+ AC_MSG_RESULT([$LIB[]NAME])
19625+ else
19626+ HAVE_LIB[]NAME=no
19627+ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
19628+ dnl $INC[]NAME either.
19629+ CPPFLAGS="$ac_save_CPPFLAGS"
19630+ LIB[]NAME=
19631+ LTLIB[]NAME=
19632+ fi
19633+ AC_SUBST([HAVE_LIB]NAME)
19634+ AC_SUBST([LIB]NAME)
19635+ AC_SUBST([LTLIB]NAME)
19636+ undefine([Name])
19637+ undefine([NAME])
19638+])
19639+
19640+dnl Determine the platform dependent parameters needed to use rpath:
19641+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
19642+dnl hardcode_direct, hardcode_minus_L.
19643+AC_DEFUN([AC_LIB_RPATH],
19644+[
19645+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
19646+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
19647+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
19648+ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
19649+ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
19650+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
19651+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
19652+ . ./conftest.sh
19653+ rm -f ./conftest.sh
19654+ acl_cv_rpath=done
19655+ ])
19656+ wl="$acl_cv_wl"
19657+ libext="$acl_cv_libext"
19658+ shlibext="$acl_cv_shlibext"
19659+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
19660+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
19661+ hardcode_direct="$acl_cv_hardcode_direct"
19662+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
19663+ dnl Determine whether the user wants rpath handling at all.
19664+ AC_ARG_ENABLE(rpath,
19665+ [ --disable-rpath do not hardcode runtime library paths],
19666+ :, enable_rpath=yes)
19667+])
19668+
19669+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
19670+dnl the libraries corresponding to explicit and implicit dependencies.
19671+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
19672+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
19673+[
19674+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
19675+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
19676+ dnl By default, look in $includedir and $libdir.
19677+ use_additional=yes
19678+ AC_LIB_WITH_FINAL_PREFIX([
19679+ eval additional_includedir=\"$includedir\"
19680+ eval additional_libdir=\"$libdir\"
19681+ ])
19682+ AC_LIB_ARG_WITH([lib$1-prefix],
19683+[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
19684+ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
19685+[
19686+ if test "X$withval" = "Xno"; then
19687+ use_additional=no
19688+ else
19689+ if test "X$withval" = "X"; then
19690+ AC_LIB_WITH_FINAL_PREFIX([
19691+ eval additional_includedir=\"$includedir\"
19692+ eval additional_libdir=\"$libdir\"
19693+ ])
19694+ else
19695+ additional_includedir="$withval/include"
19696+ additional_libdir="$withval/lib"
19697+ fi
19698+ fi
19699+])
19700+ dnl Search the library and its dependencies in $additional_libdir and
19701+ dnl $LDFLAGS. Using breadth-first-seach.
19702+ LIB[]NAME=
19703+ LTLIB[]NAME=
19704+ INC[]NAME=
19705+ rpathdirs=
19706+ ltrpathdirs=
19707+ names_already_handled=
19708+ names_next_round='$1 $2'
19709+ while test -n "$names_next_round"; do
19710+ names_this_round="$names_next_round"
19711+ names_next_round=
19712+ for name in $names_this_round; do
19713+ already_handled=
19714+ for n in $names_already_handled; do
19715+ if test "$n" = "$name"; then
19716+ already_handled=yes
19717+ break
19718+ fi
19719+ done
19720+ if test -z "$already_handled"; then
19721+ names_already_handled="$names_already_handled $name"
19722+ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
19723+ dnl or AC_LIB_HAVE_LINKFLAGS call.
19724+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
19725+ eval value=\"\$HAVE_LIB$uppername\"
19726+ if test -n "$value"; then
19727+ if test "$value" = yes; then
19728+ eval value=\"\$LIB$uppername\"
19729+ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
19730+ eval value=\"\$LTLIB$uppername\"
19731+ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
19732+ else
19733+ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
19734+ dnl that this library doesn't exist. So just drop it.
19735+ :
19736+ fi
19737+ else
19738+ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
19739+ dnl and the already constructed $LIBNAME/$LTLIBNAME.
19740+ found_dir=
19741+ found_la=
19742+ found_so=
19743+ found_a=
19744+ if test $use_additional = yes; then
19745+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
19746+ found_dir="$additional_libdir"
19747+ found_so="$additional_libdir/lib$name.$shlibext"
19748+ if test -f "$additional_libdir/lib$name.la"; then
19749+ found_la="$additional_libdir/lib$name.la"
19750+ fi
19751+ else
19752+ if test -f "$additional_libdir/lib$name.$libext"; then
19753+ found_dir="$additional_libdir"
19754+ found_a="$additional_libdir/lib$name.$libext"
19755+ if test -f "$additional_libdir/lib$name.la"; then
19756+ found_la="$additional_libdir/lib$name.la"
19757+ fi
19758+ fi
19759+ fi
19760+ fi
19761+ if test "X$found_dir" = "X"; then
19762+ for x in $LDFLAGS $LTLIB[]NAME; do
19763+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
19764+ case "$x" in
19765+ -L*)
19766+ dir=`echo "X$x" | sed -e 's/^X-L//'`
19767+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
19768+ found_dir="$dir"
19769+ found_so="$dir/lib$name.$shlibext"
19770+ if test -f "$dir/lib$name.la"; then
19771+ found_la="$dir/lib$name.la"
19772+ fi
19773+ else
19774+ if test -f "$dir/lib$name.$libext"; then
19775+ found_dir="$dir"
19776+ found_a="$dir/lib$name.$libext"
19777+ if test -f "$dir/lib$name.la"; then
19778+ found_la="$dir/lib$name.la"
19779+ fi
19780+ fi
19781+ fi
19782+ ;;
19783+ esac
19784+ if test "X$found_dir" != "X"; then
19785+ break
19786+ fi
19787+ done
19788+ fi
19789+ if test "X$found_dir" != "X"; then
19790+ dnl Found the library.
19791+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
19792+ if test "X$found_so" != "X"; then
19793+ dnl Linking with a shared library. We attempt to hardcode its
19794+ dnl directory into the executable's runpath, unless it's the
19795+ dnl standard /usr/lib.
19796+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
19797+ dnl No hardcoding is needed.
19798+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
19799+ else
19800+ dnl Use an explicit option to hardcode DIR into the resulting
19801+ dnl binary.
19802+ dnl Potentially add DIR to ltrpathdirs.
19803+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
19804+ haveit=
19805+ for x in $ltrpathdirs; do
19806+ if test "X$x" = "X$found_dir"; then
19807+ haveit=yes
19808+ break
19809+ fi
19810+ done
19811+ if test -z "$haveit"; then
19812+ ltrpathdirs="$ltrpathdirs $found_dir"
19813+ fi
19814+ dnl The hardcoding into $LIBNAME is system dependent.
19815+ if test "$hardcode_direct" = yes; then
19816+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
19817+ dnl resulting binary.
19818+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
19819+ else
19820+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
19821+ dnl Use an explicit option to hardcode DIR into the resulting
19822+ dnl binary.
19823+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
19824+ dnl Potentially add DIR to rpathdirs.
19825+ dnl The rpathdirs will be appended to $LIBNAME at the end.
19826+ haveit=
19827+ for x in $rpathdirs; do
19828+ if test "X$x" = "X$found_dir"; then
19829+ haveit=yes
19830+ break
19831+ fi
19832+ done
19833+ if test -z "$haveit"; then
19834+ rpathdirs="$rpathdirs $found_dir"
19835+ fi
19836+ else
19837+ dnl Rely on "-L$found_dir".
19838+ dnl But don't add it if it's already contained in the LDFLAGS
19839+ dnl or the already constructed $LIBNAME
19840+ haveit=
19841+ for x in $LDFLAGS $LIB[]NAME; do
19842+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
19843+ if test "X$x" = "X-L$found_dir"; then
19844+ haveit=yes
19845+ break
19846+ fi
19847+ done
19848+ if test -z "$haveit"; then
19849+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
19850+ fi
19851+ if test "$hardcode_minus_L" != no; then
19852+ dnl FIXME: Not sure whether we should use
19853+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
19854+ dnl here.
19855+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
19856+ else
19857+ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
19858+ dnl here, because this doesn't fit in flags passed to the
19859+ dnl compiler. So give up. No hardcoding. This affects only
19860+ dnl very old systems.
19861+ dnl FIXME: Not sure whether we should use
19862+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
19863+ dnl here.
19864+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
19865+ fi
19866+ fi
19867+ fi
19868+ fi
19869+ else
19870+ if test "X$found_a" != "X"; then
19871+ dnl Linking with a static library.
19872+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
19873+ else
19874+ dnl We shouldn't come here, but anyway it's good to have a
19875+ dnl fallback.
19876+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
19877+ fi
19878+ fi
19879+ dnl Assume the include files are nearby.
19880+ additional_includedir=
19881+ case "$found_dir" in
19882+ */lib | */lib/)
19883+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
19884+ additional_includedir="$basedir/include"
19885+ ;;
19886+ esac
19887+ if test "X$additional_includedir" != "X"; then
19888+ dnl Potentially add $additional_includedir to $INCNAME.
19889+ dnl But don't add it
19890+ dnl 1. if it's the standard /usr/include,
19891+ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
19892+ dnl 3. if it's already present in $CPPFLAGS or the already
19893+ dnl constructed $INCNAME,
19894+ dnl 4. if it doesn't exist as a directory.
19895+ if test "X$additional_includedir" != "X/usr/include"; then
19896+ haveit=
19897+ if test "X$additional_includedir" = "X/usr/local/include"; then
19898+ if test -n "$GCC"; then
19899+ case $host_os in
19900+ linux*) haveit=yes;;
19901+ esac
19902+ fi
19903+ fi
19904+ if test -z "$haveit"; then
19905+ for x in $CPPFLAGS $INC[]NAME; do
19906+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
19907+ if test "X$x" = "X-I$additional_includedir"; then
19908+ haveit=yes
19909+ break
19910+ fi
19911+ done
19912+ if test -z "$haveit"; then
19913+ if test -d "$additional_includedir"; then
19914+ dnl Really add $additional_includedir to $INCNAME.
19915+ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
19916+ fi
19917+ fi
19918+ fi
19919+ fi
19920+ fi
19921+ dnl Look for dependencies.
19922+ if test -n "$found_la"; then
19923+ dnl Read the .la file. It defines the variables
19924+ dnl dlname, library_names, old_library, dependency_libs, current,
19925+ dnl age, revision, installed, dlopen, dlpreopen, libdir.
19926+ save_libdir="$libdir"
19927+ case "$found_la" in
19928+ */* | *\\*) . "$found_la" ;;
19929+ *) . "./$found_la" ;;
19930+ esac
19931+ libdir="$save_libdir"
19932+ dnl We use only dependency_libs.
19933+ for dep in $dependency_libs; do
19934+ case "$dep" in
19935+ -L*)
19936+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
19937+ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
19938+ dnl But don't add it
19939+ dnl 1. if it's the standard /usr/lib,
19940+ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
19941+ dnl 3. if it's already present in $LDFLAGS or the already
19942+ dnl constructed $LIBNAME,
19943+ dnl 4. if it doesn't exist as a directory.
19944+ if test "X$additional_libdir" != "X/usr/lib"; then
19945+ haveit=
19946+ if test "X$additional_libdir" = "X/usr/local/lib"; then
19947+ if test -n "$GCC"; then
19948+ case $host_os in
19949+ linux*) haveit=yes;;
19950+ esac
19951+ fi
19952+ fi
19953+ if test -z "$haveit"; then
19954+ haveit=
19955+ for x in $LDFLAGS $LIB[]NAME; do
19956+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
19957+ if test "X$x" = "X-L$additional_libdir"; then
19958+ haveit=yes
19959+ break
19960+ fi
19961+ done
19962+ if test -z "$haveit"; then
19963+ if test -d "$additional_libdir"; then
19964+ dnl Really add $additional_libdir to $LIBNAME.
19965+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
19966+ fi
19967+ fi
19968+ haveit=
19969+ for x in $LDFLAGS $LTLIB[]NAME; do
19970+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
19971+ if test "X$x" = "X-L$additional_libdir"; then
19972+ haveit=yes
19973+ break
19974+ fi
19975+ done
19976+ if test -z "$haveit"; then
19977+ if test -d "$additional_libdir"; then
19978+ dnl Really add $additional_libdir to $LTLIBNAME.
19979+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
19980+ fi
19981+ fi
19982+ fi
19983+ fi
19984+ ;;
19985+ -R*)
19986+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
19987+ if test "$enable_rpath" != no; then
19988+ dnl Potentially add DIR to rpathdirs.
19989+ dnl The rpathdirs will be appended to $LIBNAME at the end.
19990+ haveit=
19991+ for x in $rpathdirs; do
19992+ if test "X$x" = "X$dir"; then
19993+ haveit=yes
19994+ break
19995+ fi
19996+ done
19997+ if test -z "$haveit"; then
19998+ rpathdirs="$rpathdirs $dir"
19999+ fi
20000+ dnl Potentially add DIR to ltrpathdirs.
20001+ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
20002+ haveit=
20003+ for x in $ltrpathdirs; do
20004+ if test "X$x" = "X$dir"; then
20005+ haveit=yes
20006+ break
20007+ fi
20008+ done
20009+ if test -z "$haveit"; then
20010+ ltrpathdirs="$ltrpathdirs $dir"
20011+ fi
20012+ fi
20013+ ;;
20014+ -l*)
20015+ dnl Handle this in the next round.
20016+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
20017+ ;;
20018+ *.la)
20019+ dnl Handle this in the next round. Throw away the .la's
20020+ dnl directory; it is already contained in a preceding -L
20021+ dnl option.
20022+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
20023+ ;;
20024+ *)
20025+ dnl Most likely an immediate library name.
20026+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
20027+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
20028+ ;;
20029+ esac
20030+ done
20031+ fi
20032+ else
20033+ dnl Didn't find the library; assume it is in the system directories
20034+ dnl known to the linker and runtime loader. (All the system
20035+ dnl directories known to the linker should also be known to the
20036+ dnl runtime loader, otherwise the system is severely misconfigured.)
20037+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
20038+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
20039+ fi
20040+ fi
20041+ fi
20042+ done
20043+ done
20044+ if test "X$rpathdirs" != "X"; then
20045+ if test -n "$hardcode_libdir_separator"; then
20046+ dnl Weird platform: only the last -rpath option counts, the user must
20047+ dnl pass all path elements in one option. We can arrange that for a
20048+ dnl single library, but not when more than one $LIBNAMEs are used.
20049+ alldirs=
20050+ for found_dir in $rpathdirs; do
20051+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
20052+ done
20053+ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
20054+ acl_save_libdir="$libdir"
20055+ libdir="$alldirs"
20056+ eval flag=\"$hardcode_libdir_flag_spec\"
20057+ libdir="$acl_save_libdir"
20058+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
20059+ else
20060+ dnl The -rpath options are cumulative.
20061+ for found_dir in $rpathdirs; do
20062+ acl_save_libdir="$libdir"
20063+ libdir="$found_dir"
20064+ eval flag=\"$hardcode_libdir_flag_spec\"
20065+ libdir="$acl_save_libdir"
20066+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
20067+ done
20068+ fi
20069+ fi
20070+ if test "X$ltrpathdirs" != "X"; then
20071+ dnl When using libtool, the option that works for both libraries and
20072+ dnl executables is -R. The -R options are cumulative.
20073+ for found_dir in $ltrpathdirs; do
20074+ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
20075+ done
20076+ fi
20077+])
20078+
20079+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
20080+dnl unless already present in VAR.
20081+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
20082+dnl contains two or three consecutive elements that belong together.
20083+AC_DEFUN([AC_LIB_APPENDTOVAR],
20084+[
20085+ for element in [$2]; do
20086+ haveit=
20087+ for x in $[$1]; do
20088+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
20089+ if test "X$x" = "X$element"; then
20090+ haveit=yes
20091+ break
20092+ fi
20093+ done
20094+ if test -z "$haveit"; then
20095+ [$1]="${[$1]}${[$1]:+ }$element"
20096+ fi
20097+ done
20098+])
20099--- lrzsz-0.12.20.safe/m4/lib-prefix.m4 1969-12-31 19:00:00.000000000 -0500
20100+++ lrzsz-0.12.20/m4/lib-prefix.m4 2004-09-12 14:40:34.921662056 -0400
20101@@ -0,0 +1,155 @@
20102+# lib-prefix.m4 serial 3 (gettext-0.13)
20103+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
20104+dnl This file is free software, distributed under the terms of the GNU
20105+dnl General Public License. As a special exception to the GNU General
20106+dnl Public License, this file may be distributed as part of a program
20107+dnl that contains a configuration script generated by Autoconf, under
20108+dnl the same distribution terms as the rest of that program.
20109+
20110+dnl From Bruno Haible.
20111+
20112+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
20113+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
20114+dnl require excessive bracketing.
20115+ifdef([AC_HELP_STRING],
20116+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
20117+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
20118+
20119+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
20120+dnl to access previously installed libraries. The basic assumption is that
20121+dnl a user will want packages to use other packages he previously installed
20122+dnl with the same --prefix option.
20123+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
20124+dnl libraries, but is otherwise very convenient.
20125+AC_DEFUN([AC_LIB_PREFIX],
20126+[
20127+ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
20128+ AC_REQUIRE([AC_PROG_CC])
20129+ AC_REQUIRE([AC_CANONICAL_HOST])
20130+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20131+ dnl By default, look in $includedir and $libdir.
20132+ use_additional=yes
20133+ AC_LIB_WITH_FINAL_PREFIX([
20134+ eval additional_includedir=\"$includedir\"
20135+ eval additional_libdir=\"$libdir\"
20136+ ])
20137+ AC_LIB_ARG_WITH([lib-prefix],
20138+[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
20139+ --without-lib-prefix don't search for libraries in includedir and libdir],
20140+[
20141+ if test "X$withval" = "Xno"; then
20142+ use_additional=no
20143+ else
20144+ if test "X$withval" = "X"; then
20145+ AC_LIB_WITH_FINAL_PREFIX([
20146+ eval additional_includedir=\"$includedir\"
20147+ eval additional_libdir=\"$libdir\"
20148+ ])
20149+ else
20150+ additional_includedir="$withval/include"
20151+ additional_libdir="$withval/lib"
20152+ fi
20153+ fi
20154+])
20155+ if test $use_additional = yes; then
20156+ dnl Potentially add $additional_includedir to $CPPFLAGS.
20157+ dnl But don't add it
20158+ dnl 1. if it's the standard /usr/include,
20159+ dnl 2. if it's already present in $CPPFLAGS,
20160+ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
20161+ dnl 4. if it doesn't exist as a directory.
20162+ if test "X$additional_includedir" != "X/usr/include"; then
20163+ haveit=
20164+ for x in $CPPFLAGS; do
20165+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
20166+ if test "X$x" = "X-I$additional_includedir"; then
20167+ haveit=yes
20168+ break
20169+ fi
20170+ done
20171+ if test -z "$haveit"; then
20172+ if test "X$additional_includedir" = "X/usr/local/include"; then
20173+ if test -n "$GCC"; then
20174+ case $host_os in
20175+ linux*) haveit=yes;;
20176+ esac
20177+ fi
20178+ fi
20179+ if test -z "$haveit"; then
20180+ if test -d "$additional_includedir"; then
20181+ dnl Really add $additional_includedir to $CPPFLAGS.
20182+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
20183+ fi
20184+ fi
20185+ fi
20186+ fi
20187+ dnl Potentially add $additional_libdir to $LDFLAGS.
20188+ dnl But don't add it
20189+ dnl 1. if it's the standard /usr/lib,
20190+ dnl 2. if it's already present in $LDFLAGS,
20191+ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
20192+ dnl 4. if it doesn't exist as a directory.
20193+ if test "X$additional_libdir" != "X/usr/lib"; then
20194+ haveit=
20195+ for x in $LDFLAGS; do
20196+ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
20197+ if test "X$x" = "X-L$additional_libdir"; then
20198+ haveit=yes
20199+ break
20200+ fi
20201+ done
20202+ if test -z "$haveit"; then
20203+ if test "X$additional_libdir" = "X/usr/local/lib"; then
20204+ if test -n "$GCC"; then
20205+ case $host_os in
20206+ linux*) haveit=yes;;
20207+ esac
20208+ fi
20209+ fi
20210+ if test -z "$haveit"; then
20211+ if test -d "$additional_libdir"; then
20212+ dnl Really add $additional_libdir to $LDFLAGS.
20213+ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
20214+ fi
20215+ fi
20216+ fi
20217+ fi
20218+ fi
20219+])
20220+
20221+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
20222+dnl acl_final_exec_prefix, containing the values to which $prefix and
20223+dnl $exec_prefix will expand at the end of the configure script.
20224+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
20225+[
20226+ dnl Unfortunately, prefix and exec_prefix get only finally determined
20227+ dnl at the end of configure.
20228+ if test "X$prefix" = "XNONE"; then
20229+ acl_final_prefix="$ac_default_prefix"
20230+ else
20231+ acl_final_prefix="$prefix"
20232+ fi
20233+ if test "X$exec_prefix" = "XNONE"; then
20234+ acl_final_exec_prefix='${prefix}'
20235+ else
20236+ acl_final_exec_prefix="$exec_prefix"
20237+ fi
20238+ acl_save_prefix="$prefix"
20239+ prefix="$acl_final_prefix"
20240+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
20241+ prefix="$acl_save_prefix"
20242+])
20243+
20244+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
20245+dnl variables prefix and exec_prefix bound to the values they will have
20246+dnl at the end of the configure script.
20247+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
20248+[
20249+ acl_save_prefix="$prefix"
20250+ prefix="$acl_final_prefix"
20251+ acl_save_exec_prefix="$exec_prefix"
20252+ exec_prefix="$acl_final_exec_prefix"
20253+ $1
20254+ exec_prefix="$acl_save_exec_prefix"
20255+ prefix="$acl_save_prefix"
20256+])
20257--- lrzsz-0.12.20.safe/m4/longdouble.m4 1969-12-31 19:00:00.000000000 -0500
20258+++ lrzsz-0.12.20/m4/longdouble.m4 2004-09-12 14:40:34.942658864 -0400
20259@@ -0,0 +1,30 @@
20260+# longdouble.m4 serial 1 (gettext-0.12)
20261+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
20262+dnl This file is free software, distributed under the terms of the GNU
20263+dnl General Public License. As a special exception to the GNU General
20264+dnl Public License, this file may be distributed as part of a program
20265+dnl that contains a configuration script generated by Autoconf, under
20266+dnl the same distribution terms as the rest of that program.
20267+
20268+dnl From Bruno Haible.
20269+dnl Test whether the compiler supports the 'long double' type.
20270+dnl Prerequisite: AC_PROG_CC
20271+
20272+AC_DEFUN([gt_TYPE_LONGDOUBLE],
20273+[
20274+ AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
20275+ [if test "$GCC" = yes; then
20276+ gt_cv_c_long_double=yes
20277+ else
20278+ AC_TRY_COMPILE([
20279+ /* The Stardent Vistra knows sizeof(long double), but does not support it. */
20280+ long double foo = 0.0;
20281+ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
20282+ int array [2*(sizeof(long double) >= sizeof(double)) - 1];
20283+ ], ,
20284+ gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
20285+ fi])
20286+ if test $gt_cv_c_long_double = yes; then
20287+ AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
20288+ fi
20289+])
20290--- lrzsz-0.12.20.safe/m4/longlong.m4 1969-12-31 19:00:00.000000000 -0500
20291+++ lrzsz-0.12.20/m4/longlong.m4 2004-09-12 14:40:34.949657800 -0400
20292@@ -0,0 +1,25 @@
20293+# longlong.m4 serial 4
20294+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
20295+dnl This file is free software, distributed under the terms of the GNU
20296+dnl General Public License. As a special exception to the GNU General
20297+dnl Public License, this file may be distributed as part of a program
20298+dnl that contains a configuration script generated by Autoconf, under
20299+dnl the same distribution terms as the rest of that program.
20300+
20301+dnl From Paul Eggert.
20302+
20303+# Define HAVE_LONG_LONG if 'long long' works.
20304+
20305+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
20306+[
20307+ AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
20308+ [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
20309+ [long long llmax = (long long) -1;
20310+ return ll << i | ll >> i | llmax / ll | llmax % ll;],
20311+ ac_cv_type_long_long=yes,
20312+ ac_cv_type_long_long=no)])
20313+ if test $ac_cv_type_long_long = yes; then
20314+ AC_DEFINE(HAVE_LONG_LONG, 1,
20315+ [Define if you have the 'long long' type.])
20316+ fi
20317+])
20318--- lrzsz-0.12.20.safe/m4/Makefile.am 1969-12-31 19:00:00.000000000 -0500
20319+++ lrzsz-0.12.20/m4/Makefile.am 2004-09-12 14:40:35.048642752 -0400
20320@@ -0,0 +1 @@
20321+EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
20322--- lrzsz-0.12.20.safe/m4/nls.m4 1969-12-31 19:00:00.000000000 -0500
20323+++ lrzsz-0.12.20/m4/nls.m4 2004-09-12 14:40:34.955656888 -0400
20324@@ -0,0 +1,49 @@
20325+# nls.m4 serial 1 (gettext-0.12)
20326+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
20327+dnl This file is free software, distributed under the terms of the GNU
20328+dnl General Public License. As a special exception to the GNU General
20329+dnl Public License, this file may be distributed as part of a program
20330+dnl that contains a configuration script generated by Autoconf, under
20331+dnl the same distribution terms as the rest of that program.
20332+dnl
20333+dnl This file can can be used in projects which are not available under
20334+dnl the GNU General Public License or the GNU Library General Public
20335+dnl License but which still want to provide support for the GNU gettext
20336+dnl functionality.
20337+dnl Please note that the actual code of the GNU gettext library is covered
20338+dnl by the GNU Library General Public License, and the rest of the GNU
20339+dnl gettext package package is covered by the GNU General Public License.
20340+dnl They are *not* in the public domain.
20341+
20342+dnl Authors:
20343+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20344+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
20345+
20346+AC_DEFUN([AM_NLS],
20347+[
20348+ AC_MSG_CHECKING([whether NLS is requested])
20349+ dnl Default is enabled NLS
20350+ AC_ARG_ENABLE(nls,
20351+ [ --disable-nls do not use Native Language Support],
20352+ USE_NLS=$enableval, USE_NLS=yes)
20353+ AC_MSG_RESULT($USE_NLS)
20354+ AC_SUBST(USE_NLS)
20355+])
20356+
20357+AC_DEFUN([AM_MKINSTALLDIRS],
20358+[
20359+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
20360+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
20361+ dnl Try to locate it.
20362+ MKINSTALLDIRS=
20363+ if test -n "$ac_aux_dir"; then
20364+ case "$ac_aux_dir" in
20365+ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
20366+ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
20367+ esac
20368+ fi
20369+ if test -z "$MKINSTALLDIRS"; then
20370+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
20371+ fi
20372+ AC_SUBST(MKINSTALLDIRS)
20373+])
20374--- lrzsz-0.12.20.safe/m4/po.m4 1969-12-31 19:00:00.000000000 -0500
20375+++ lrzsz-0.12.20/m4/po.m4 2004-09-12 14:40:34.961655976 -0400
20376@@ -0,0 +1,426 @@
20377+# po.m4 serial 3 (gettext-0.14)
20378+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
20379+dnl This file is free software, distributed under the terms of the GNU
20380+dnl General Public License. As a special exception to the GNU General
20381+dnl Public License, this file may be distributed as part of a program
20382+dnl that contains a configuration script generated by Autoconf, under
20383+dnl the same distribution terms as the rest of that program.
20384+dnl
20385+dnl This file can can be used in projects which are not available under
20386+dnl the GNU General Public License or the GNU Library General Public
20387+dnl License but which still want to provide support for the GNU gettext
20388+dnl functionality.
20389+dnl Please note that the actual code of the GNU gettext library is covered
20390+dnl by the GNU Library General Public License, and the rest of the GNU
20391+dnl gettext package package is covered by the GNU General Public License.
20392+dnl They are *not* in the public domain.
20393+
20394+dnl Authors:
20395+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
20396+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
20397+
20398+dnl Checks for all prerequisites of the po subdirectory.
20399+AC_DEFUN([AM_PO_SUBDIRS],
20400+[
20401+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
20402+ AC_REQUIRE([AC_PROG_INSTALL])dnl
20403+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
20404+ AC_REQUIRE([AM_NLS])dnl
20405+
20406+ dnl Perform the following tests also if --disable-nls has been given,
20407+ dnl because they are needed for "make dist" to work.
20408+
20409+ dnl Search for GNU msgfmt in the PATH.
20410+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
20411+ dnl The second test excludes FreeBSD msgfmt.
20412+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
20413+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
20414+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
20415+ :)
20416+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
20417+
20418+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
20419+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
20420+ dnl The second test excludes FreeBSD xgettext.
20421+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
20422+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
20423+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
20424+ :)
20425+ dnl Remove leftover from FreeBSD xgettext call.
20426+ rm -f messages.po
20427+
20428+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
20429+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
20430+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
20431+
20432+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
20433+ dnl Test whether we really found GNU msgfmt.
20434+ if test "$GMSGFMT" != ":"; then
20435+ dnl If it is no GNU msgfmt we define it as : so that the
20436+ dnl Makefiles still can work.
20437+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
20438+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
20439+ : ;
20440+ else
20441+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
20442+ AC_MSG_RESULT(
20443+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
20444+ GMSGFMT=":"
20445+ fi
20446+ fi
20447+
20448+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
20449+ dnl Test whether we really found GNU xgettext.
20450+ if test "$XGETTEXT" != ":"; then
20451+ dnl If it is no GNU xgettext we define it as : so that the
20452+ dnl Makefiles still can work.
20453+ if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
20454+ (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
20455+ : ;
20456+ else
20457+ AC_MSG_RESULT(
20458+ [found xgettext program is not GNU xgettext; ignore it])
20459+ XGETTEXT=":"
20460+ fi
20461+ dnl Remove leftover from FreeBSD xgettext call.
20462+ rm -f messages.po
20463+ fi
20464+
20465+ AC_OUTPUT_COMMANDS([
20466+ for ac_file in $CONFIG_FILES; do
20467+ # Support "outfile[:infile[:infile...]]"
20468+ case "$ac_file" in
20469+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
20470+ esac
20471+ # PO directories have a Makefile.in generated from Makefile.in.in.
20472+ case "$ac_file" in */Makefile.in)
20473+ # Adjust a relative srcdir.
20474+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
20475+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
20476+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
20477+ # In autoconf-2.13 it is called $ac_given_srcdir.
20478+ # In autoconf-2.50 it is called $srcdir.
20479+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
20480+ case "$ac_given_srcdir" in
20481+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
20482+ /*) top_srcdir="$ac_given_srcdir" ;;
20483+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
20484+ esac
20485+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
20486+ rm -f "$ac_dir/POTFILES"
20487+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
20488+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
20489+ POMAKEFILEDEPS="POTFILES.in"
20490+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
20491+ # on $ac_dir but don't depend on user-specified configuration
20492+ # parameters.
20493+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
20494+ # The LINGUAS file contains the set of available languages.
20495+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
20496+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
20497+ fi
20498+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
20499+ # Hide the ALL_LINGUAS assigment from automake.
20500+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
20501+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
20502+ else
20503+ # The set of available languages was given in configure.in.
20504+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
20505+ fi
20506+ # Compute POFILES
20507+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
20508+ # Compute UPDATEPOFILES
20509+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
20510+ # Compute DUMMYPOFILES
20511+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
20512+ # Compute GMOFILES
20513+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
20514+ case "$ac_given_srcdir" in
20515+ .) srcdirpre= ;;
20516+ *) srcdirpre='$(srcdir)/' ;;
20517+ esac
20518+ POFILES=
20519+ UPDATEPOFILES=
20520+ DUMMYPOFILES=
20521+ GMOFILES=
20522+ for lang in $ALL_LINGUAS; do
20523+ POFILES="$POFILES $srcdirpre$lang.po"
20524+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
20525+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
20526+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
20527+ done
20528+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
20529+ # environment variable.
20530+ INST_LINGUAS=
20531+ if test -n "$ALL_LINGUAS"; then
20532+ for presentlang in $ALL_LINGUAS; do
20533+ useit=no
20534+ if test "%UNSET%" != "$LINGUAS"; then
20535+ desiredlanguages="$LINGUAS"
20536+ else
20537+ desiredlanguages="$ALL_LINGUAS"
20538+ fi
20539+ for desiredlang in $desiredlanguages; do
20540+ # Use the presentlang catalog if desiredlang is
20541+ # a. equal to presentlang, or
20542+ # b. a variant of presentlang (because in this case,
20543+ # presentlang can be used as a fallback for messages
20544+ # which are not translated in the desiredlang catalog).
20545+ case "$desiredlang" in
20546+ "$presentlang"*) useit=yes;;
20547+ esac
20548+ done
20549+ if test $useit = yes; then
20550+ INST_LINGUAS="$INST_LINGUAS $presentlang"
20551+ fi
20552+ done
20553+ fi
20554+ CATALOGS=
20555+ if test -n "$INST_LINGUAS"; then
20556+ for lang in $INST_LINGUAS; do
20557+ CATALOGS="$CATALOGS $lang.gmo"
20558+ done
20559+ fi
20560+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
20561+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
20562+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
20563+ if test -f "$f"; then
20564+ case "$f" in
20565+ *.orig | *.bak | *~) ;;
20566+ *) cat "$f" >> "$ac_dir/Makefile" ;;
20567+ esac
20568+ fi
20569+ done
20570+ fi
20571+ ;;
20572+ esac
20573+ done],
20574+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
20575+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
20576+ # from automake.
20577+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
20578+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
20579+ LINGUAS="${LINGUAS-%UNSET%}"
20580+ ])
20581+])
20582+
20583+dnl Postprocesses a Makefile in a directory containing PO files.
20584+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
20585+[
20586+ # When this code is run, in config.status, two variables have already been
20587+ # set:
20588+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
20589+ # - LINGUAS is the value of the environment variable LINGUAS at configure
20590+ # time.
20591+
20592+changequote(,)dnl
20593+ # Adjust a relative srcdir.
20594+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
20595+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
20596+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
20597+ # In autoconf-2.13 it is called $ac_given_srcdir.
20598+ # In autoconf-2.50 it is called $srcdir.
20599+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
20600+ case "$ac_given_srcdir" in
20601+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
20602+ /*) top_srcdir="$ac_given_srcdir" ;;
20603+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
20604+ esac
20605+
20606+ # Find a way to echo strings without interpreting backslash.
20607+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
20608+ gt_echo='echo'
20609+ else
20610+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
20611+ gt_echo='printf %s\n'
20612+ else
20613+ echo_func () {
20614+ cat <<EOT
20615+$*
20616+EOT
20617+ }
20618+ gt_echo='echo_func'
20619+ fi
20620+ fi
20621+
20622+ # A sed script that extracts the value of VARIABLE from a Makefile.
20623+ sed_x_variable='
20624+# Test if the hold space is empty.
20625+x
20626+s/P/P/
20627+x
20628+ta
20629+# Yes it was empty. Look if we have the expected variable definition.
20630+/^[ ]*VARIABLE[ ]*=/{
20631+ # Seen the first line of the variable definition.
20632+ s/^[ ]*VARIABLE[ ]*=//
20633+ ba
20634+}
20635+bd
20636+:a
20637+# Here we are processing a line from the variable definition.
20638+# Remove comment, more precisely replace it with a space.
20639+s/#.*$/ /
20640+# See if the line ends in a backslash.
20641+tb
20642+:b
20643+s/\\$//
20644+# Print the line, without the trailing backslash.
20645+p
20646+tc
20647+# There was no trailing backslash. The end of the variable definition is
20648+# reached. Clear the hold space.
20649+s/^.*$//
20650+x
20651+bd
20652+:c
20653+# A trailing backslash means that the variable definition continues in the
20654+# next line. Put a nonempty string into the hold space to indicate this.
20655+s/^.*$/P/
20656+x
20657+:d
20658+'
20659+changequote([,])dnl
20660+
20661+ # Set POTFILES to the value of the Makefile variable POTFILES.
20662+ sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
20663+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
20664+ # Compute POTFILES_DEPS as
20665+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
20666+ POTFILES_DEPS=
20667+ for file in $POTFILES; do
20668+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
20669+ done
20670+ POMAKEFILEDEPS=""
20671+
20672+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
20673+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
20674+ fi
20675+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
20676+ # The LINGUAS file contains the set of available languages.
20677+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
20678+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
20679+ else
20680+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
20681+ sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
20682+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
20683+ fi
20684+ # Hide the ALL_LINGUAS assigment from automake.
20685+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
20686+ # Compute POFILES
20687+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
20688+ # Compute UPDATEPOFILES
20689+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
20690+ # Compute DUMMYPOFILES
20691+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
20692+ # Compute GMOFILES
20693+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
20694+ # Compute PROPERTIESFILES
20695+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
20696+ # Compute CLASSFILES
20697+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
20698+ # Compute QMFILES
20699+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
20700+ # Compute MSGFILES
20701+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
20702+ # Compute RESOURCESDLLFILES
20703+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
20704+ case "$ac_given_srcdir" in
20705+ .) srcdirpre= ;;
20706+ *) srcdirpre='$(srcdir)/' ;;
20707+ esac
20708+ POFILES=
20709+ UPDATEPOFILES=
20710+ DUMMYPOFILES=
20711+ GMOFILES=
20712+ PROPERTIESFILES=
20713+ CLASSFILES=
20714+ QMFILES=
20715+ MSGFILES=
20716+ RESOURCESDLLFILES=
20717+ for lang in $ALL_LINGUAS; do
20718+ POFILES="$POFILES $srcdirpre$lang.po"
20719+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
20720+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
20721+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
20722+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
20723+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
20724+ QMFILES="$QMFILES $srcdirpre$lang.qm"
20725+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
20726+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
20727+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
20728+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
20729+ done
20730+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
20731+ # environment variable.
20732+ INST_LINGUAS=
20733+ if test -n "$ALL_LINGUAS"; then
20734+ for presentlang in $ALL_LINGUAS; do
20735+ useit=no
20736+ if test "%UNSET%" != "$LINGUAS"; then
20737+ desiredlanguages="$LINGUAS"
20738+ else
20739+ desiredlanguages="$ALL_LINGUAS"
20740+ fi
20741+ for desiredlang in $desiredlanguages; do
20742+ # Use the presentlang catalog if desiredlang is
20743+ # a. equal to presentlang, or
20744+ # b. a variant of presentlang (because in this case,
20745+ # presentlang can be used as a fallback for messages
20746+ # which are not translated in the desiredlang catalog).
20747+ case "$desiredlang" in
20748+ "$presentlang"*) useit=yes;;
20749+ esac
20750+ done
20751+ if test $useit = yes; then
20752+ INST_LINGUAS="$INST_LINGUAS $presentlang"
20753+ fi
20754+ done
20755+ fi
20756+ CATALOGS=
20757+ JAVACATALOGS=
20758+ QTCATALOGS=
20759+ TCLCATALOGS=
20760+ CSHARPCATALOGS=
20761+ if test -n "$INST_LINGUAS"; then
20762+ for lang in $INST_LINGUAS; do
20763+ CATALOGS="$CATALOGS $lang.gmo"
20764+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
20765+ QTCATALOGS="$QTCATALOGS $lang.qm"
20766+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
20767+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
20768+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
20769+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
20770+ done
20771+ fi
20772+
20773+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
20774+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
20775+ # Add dependencies that cannot be formulated as a simple suffix rule.
20776+ for lang in $ALL_LINGUAS; do
20777+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
20778+ cat >> "$ac_file.tmp" <<EOF
20779+$frobbedlang.msg: $lang.po
20780+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
20781+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
20782+EOF
20783+ done
20784+ fi
20785+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
20786+ # Add dependencies that cannot be formulated as a simple suffix rule.
20787+ for lang in $ALL_LINGUAS; do
20788+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
20789+ cat >> "$ac_file.tmp" <<EOF
20790+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
20791+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
20792+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
20793+EOF
20794+ done
20795+ fi
20796+ if test -n "$POMAKEFILEDEPS"; then
20797+ cat >> "$ac_file.tmp" <<EOF
20798+Makefile: $POMAKEFILEDEPS
20799+EOF
20800+ fi
20801+ mv "$ac_file.tmp" "$ac_file"
20802+])
20803--- lrzsz-0.12.20.safe/m4/printf-posix.m4 1969-12-31 19:00:00.000000000 -0500
20804+++ lrzsz-0.12.20/m4/printf-posix.m4 2004-09-12 14:40:34.974654000 -0400
20805@@ -0,0 +1,46 @@
20806+# printf-posix.m4 serial 2 (gettext-0.13.1)
20807+dnl Copyright (C) 2003 Free Software Foundation, Inc.
20808+dnl This file is free software, distributed under the terms of the GNU
20809+dnl General Public License. As a special exception to the GNU General
20810+dnl Public License, this file may be distributed as part of a program
20811+dnl that contains a configuration script generated by Autoconf, under
20812+dnl the same distribution terms as the rest of that program.
20813+
20814+dnl From Bruno Haible.
20815+dnl Test whether the printf() function supports POSIX/XSI format strings with
20816+dnl positions.
20817+
20818+AC_DEFUN([gt_PRINTF_POSIX],
20819+[
20820+ AC_REQUIRE([AC_PROG_CC])
20821+ AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
20822+ gt_cv_func_printf_posix,
20823+ [
20824+ AC_TRY_RUN([
20825+#include <stdio.h>
20826+#include <string.h>
20827+/* The string "%2$d %1$d", with dollar characters protected from the shell's
20828+ dollar expansion (possibly an autoconf bug). */
20829+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
20830+static char buf[100];
20831+int main ()
20832+{
20833+ sprintf (buf, format, 33, 55);
20834+ return (strcmp (buf, "55 33") != 0);
20835+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
20836+ [
20837+ AC_EGREP_CPP(notposix, [
20838+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
20839+ notposix
20840+#endif
20841+ ], gt_cv_func_printf_posix="guessing no",
20842+ gt_cv_func_printf_posix="guessing yes")
20843+ ])
20844+ ])
20845+ case $gt_cv_func_printf_posix in
20846+ *yes)
20847+ AC_DEFINE(HAVE_POSIX_PRINTF, 1,
20848+ [Define if your printf() function supports format strings with positions.])
20849+ ;;
20850+ esac
20851+])
20852--- lrzsz-0.12.20.safe/m4/progtest.m4 1969-12-31 19:00:00.000000000 -0500
20853+++ lrzsz-0.12.20/m4/progtest.m4 2004-09-12 14:40:34.990651568 -0400
20854@@ -0,0 +1,91 @@
20855+# progtest.m4 serial 3 (gettext-0.12)
20856+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
20857+dnl This file is free software, distributed under the terms of the GNU
20858+dnl General Public License. As a special exception to the GNU General
20859+dnl Public License, this file may be distributed as part of a program
20860+dnl that contains a configuration script generated by Autoconf, under
20861+dnl the same distribution terms as the rest of that program.
20862+dnl
20863+dnl This file can can be used in projects which are not available under
20864+dnl the GNU General Public License or the GNU Library General Public
20865+dnl License but which still want to provide support for the GNU gettext
20866+dnl functionality.
20867+dnl Please note that the actual code of the GNU gettext library is covered
20868+dnl by the GNU Library General Public License, and the rest of the GNU
20869+dnl gettext package package is covered by the GNU General Public License.
20870+dnl They are *not* in the public domain.
20871+
20872+dnl Authors:
20873+dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
20874+
20875+# Search path for a program which passes the given test.
20876+
20877+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
20878+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
20879+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
20880+[
20881+# Prepare PATH_SEPARATOR.
20882+# The user is always right.
20883+if test "${PATH_SEPARATOR+set}" != set; then
20884+ echo "#! /bin/sh" >conf$$.sh
20885+ echo "exit 0" >>conf$$.sh
20886+ chmod +x conf$$.sh
20887+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
20888+ PATH_SEPARATOR=';'
20889+ else
20890+ PATH_SEPARATOR=:
20891+ fi
20892+ rm -f conf$$.sh
20893+fi
20894+
20895+# Find out how to test for executable files. Don't use a zero-byte file,
20896+# as systems may use methods other than mode bits to determine executability.
20897+cat >conf$$.file <<_ASEOF
20898+#! /bin/sh
20899+exit 0
20900+_ASEOF
20901+chmod +x conf$$.file
20902+if test -x conf$$.file >/dev/null 2>&1; then
20903+ ac_executable_p="test -x"
20904+else
20905+ ac_executable_p="test -f"
20906+fi
20907+rm -f conf$$.file
20908+
20909+# Extract the first word of "$2", so it can be a program name with args.
20910+set dummy $2; ac_word=[$]2
20911+AC_MSG_CHECKING([for $ac_word])
20912+AC_CACHE_VAL(ac_cv_path_$1,
20913+[case "[$]$1" in
20914+ [[\\/]]* | ?:[[\\/]]*)
20915+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
20916+ ;;
20917+ *)
20918+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
20919+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
20920+ IFS="$ac_save_IFS"
20921+ test -z "$ac_dir" && ac_dir=.
20922+ for ac_exec_ext in '' $ac_executable_extensions; do
20923+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
20924+ if [$3]; then
20925+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
20926+ break 2
20927+ fi
20928+ fi
20929+ done
20930+ done
20931+ IFS="$ac_save_IFS"
20932+dnl If no 4th arg is given, leave the cache variable unset,
20933+dnl so AC_PATH_PROGS will keep looking.
20934+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
20935+])dnl
20936+ ;;
20937+esac])dnl
20938+$1="$ac_cv_path_$1"
20939+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
20940+ AC_MSG_RESULT([$]$1)
20941+else
20942+ AC_MSG_RESULT(no)
20943+fi
20944+AC_SUBST($1)dnl
20945+])
20946--- lrzsz-0.12.20.safe/m4/signed.m4 1969-12-31 19:00:00.000000000 -0500
20947+++ lrzsz-0.12.20/m4/signed.m4 2004-09-12 14:40:34.996650656 -0400
20948@@ -0,0 +1,19 @@
20949+# signed.m4 serial 1 (gettext-0.10.40)
20950+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
20951+dnl This file is free software, distributed under the terms of the GNU
20952+dnl General Public License. As a special exception to the GNU General
20953+dnl Public License, this file may be distributed as part of a program
20954+dnl that contains a configuration script generated by Autoconf, under
20955+dnl the same distribution terms as the rest of that program.
20956+
20957+dnl From Bruno Haible.
20958+
20959+AC_DEFUN([bh_C_SIGNED],
20960+[
20961+ AC_CACHE_CHECK([for signed], bh_cv_c_signed,
20962+ [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
20963+ if test $bh_cv_c_signed = no; then
20964+ AC_DEFINE(signed, ,
20965+ [Define to empty if the C compiler doesn't support this keyword.])
20966+ fi
20967+])
20968--- lrzsz-0.12.20.safe/m4/size_max.m4 1969-12-31 19:00:00.000000000 -0500
20969+++ lrzsz-0.12.20/m4/size_max.m4 2004-09-12 14:40:35.003649592 -0400
20970@@ -0,0 +1,61 @@
20971+# size_max.m4 serial 2
20972+dnl Copyright (C) 2003 Free Software Foundation, Inc.
20973+dnl This file is free software, distributed under the terms of the GNU
20974+dnl General Public License. As a special exception to the GNU General
20975+dnl Public License, this file may be distributed as part of a program
20976+dnl that contains a configuration script generated by Autoconf, under
20977+dnl the same distribution terms as the rest of that program.
20978+
20979+dnl From Bruno Haible.
20980+
20981+AC_DEFUN([gl_SIZE_MAX],
20982+[
20983+ AC_CHECK_HEADERS(stdint.h)
20984+ dnl First test whether the system already has SIZE_MAX.
20985+ AC_MSG_CHECKING([for SIZE_MAX])
20986+ result=
20987+ AC_EGREP_CPP([Found it], [
20988+#include <limits.h>
20989+#if HAVE_STDINT_H
20990+#include <stdint.h>
20991+#endif
20992+#ifdef SIZE_MAX
20993+Found it
20994+#endif
20995+], result=yes)
20996+ if test -z "$result"; then
20997+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
20998+ dnl than the type 'unsigned long'.
20999+ dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
21000+ dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
21001+ _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
21002+ [#include <stddef.h>], result=?)
21003+ _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
21004+ [#include <stddef.h>], result=?)
21005+ _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
21006+ [#include <stddef.h>], result=?)
21007+ if test "$fits_in_uint" = 1; then
21008+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
21009+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
21010+ AC_TRY_COMPILE([#include <stddef.h>
21011+ extern size_t foo;
21012+ extern unsigned long foo;
21013+ ], [], fits_in_uint=0)
21014+ fi
21015+ if test -z "$result"; then
21016+ if test "$fits_in_uint" = 1; then
21017+ result="$res_hi$res_lo"U
21018+ else
21019+ result="$res_hi$res_lo"UL
21020+ fi
21021+ else
21022+ dnl Shouldn't happen, but who knows...
21023+ result='~(size_t)0'
21024+ fi
21025+ fi
21026+ AC_MSG_RESULT([$result])
21027+ if test "$result" != yes; then
21028+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
21029+ [Define as the maximum value of type 'size_t', if the system doesn't define it.])
21030+ fi
21031+])
21032--- lrzsz-0.12.20.safe/m4/stdint_h.m4 1969-12-31 19:00:00.000000000 -0500
21033+++ lrzsz-0.12.20/m4/stdint_h.m4 2004-09-12 14:40:35.009648680 -0400
21034@@ -0,0 +1,28 @@
21035+# stdint_h.m4 serial 3 (gettext-0.12)
21036+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
21037+dnl This file is free software, distributed under the terms of the GNU
21038+dnl General Public License. As a special exception to the GNU General
21039+dnl Public License, this file may be distributed as part of a program
21040+dnl that contains a configuration script generated by Autoconf, under
21041+dnl the same distribution terms as the rest of that program.
21042+
21043+dnl From Paul Eggert.
21044+
21045+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
21046+# doesn't clash with <sys/types.h>, and declares uintmax_t.
21047+
21048+AC_DEFUN([jm_AC_HEADER_STDINT_H],
21049+[
21050+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
21051+ [AC_TRY_COMPILE(
21052+ [#include <sys/types.h>
21053+#include <stdint.h>],
21054+ [uintmax_t i = (uintmax_t) -1;],
21055+ jm_ac_cv_header_stdint_h=yes,
21056+ jm_ac_cv_header_stdint_h=no)])
21057+ if test $jm_ac_cv_header_stdint_h = yes; then
21058+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
21059+ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
21060+ and declares uintmax_t. ])
21061+ fi
21062+])
21063--- lrzsz-0.12.20.safe/m4/uintmax_t.m4 1969-12-31 19:00:00.000000000 -0500
21064+++ lrzsz-0.12.20/m4/uintmax_t.m4 2004-09-12 14:40:35.021646856 -0400
21065@@ -0,0 +1,32 @@
21066+# uintmax_t.m4 serial 7 (gettext-0.12)
21067+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
21068+dnl This file is free software, distributed under the terms of the GNU
21069+dnl General Public License. As a special exception to the GNU General
21070+dnl Public License, this file may be distributed as part of a program
21071+dnl that contains a configuration script generated by Autoconf, under
21072+dnl the same distribution terms as the rest of that program.
21073+
21074+dnl From Paul Eggert.
21075+
21076+AC_PREREQ(2.13)
21077+
21078+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
21079+# if it is not already defined in <stdint.h> or <inttypes.h>.
21080+
21081+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
21082+[
21083+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
21084+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
21085+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
21086+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
21087+ test $ac_cv_type_unsigned_long_long = yes \
21088+ && ac_type='unsigned long long' \
21089+ || ac_type='unsigned long'
21090+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
21091+ [Define to unsigned long or unsigned long long
21092+ if <stdint.h> and <inttypes.h> don't define.])
21093+ else
21094+ AC_DEFINE(HAVE_UINTMAX_T, 1,
21095+ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
21096+ fi
21097+])
21098--- lrzsz-0.12.20.safe/m4/ulonglong.m4 1969-12-31 19:00:00.000000000 -0500
21099+++ lrzsz-0.12.20/m4/ulonglong.m4 2004-09-12 14:40:35.028645792 -0400
21100@@ -0,0 +1,25 @@
21101+# ulonglong.m4 serial 3
21102+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
21103+dnl This file is free software, distributed under the terms of the GNU
21104+dnl General Public License. As a special exception to the GNU General
21105+dnl Public License, this file may be distributed as part of a program
21106+dnl that contains a configuration script generated by Autoconf, under
21107+dnl the same distribution terms as the rest of that program.
21108+
21109+dnl From Paul Eggert.
21110+
21111+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
21112+
21113+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
21114+[
21115+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
21116+ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
21117+ [unsigned long long ullmax = (unsigned long long) -1;
21118+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
21119+ ac_cv_type_unsigned_long_long=yes,
21120+ ac_cv_type_unsigned_long_long=no)])
21121+ if test $ac_cv_type_unsigned_long_long = yes; then
21122+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
21123+ [Define if you have the 'unsigned long long' type.])
21124+ fi
21125+])
21126--- lrzsz-0.12.20.safe/m4/wchar_t.m4 1969-12-31 19:00:00.000000000 -0500
21127+++ lrzsz-0.12.20/m4/wchar_t.m4 2004-09-12 14:40:35.034644880 -0400
21128@@ -0,0 +1,22 @@
21129+# wchar_t.m4 serial 1 (gettext-0.12)
21130+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
21131+dnl This file is free software, distributed under the terms of the GNU
21132+dnl General Public License. As a special exception to the GNU General
21133+dnl Public License, this file may be distributed as part of a program
21134+dnl that contains a configuration script generated by Autoconf, under
21135+dnl the same distribution terms as the rest of that program.
21136+
21137+dnl From Bruno Haible.
21138+dnl Test whether <stddef.h> has the 'wchar_t' type.
21139+dnl Prerequisite: AC_PROG_CC
21140+
21141+AC_DEFUN([gt_TYPE_WCHAR_T],
21142+[
21143+ AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
21144+ [AC_TRY_COMPILE([#include <stddef.h>
21145+ wchar_t foo = (wchar_t)'\0';], ,
21146+ gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
21147+ if test $gt_cv_c_wchar_t = yes; then
21148+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
21149+ fi
21150+])
21151--- lrzsz-0.12.20.safe/m4/wint_t.m4 1969-12-31 19:00:00.000000000 -0500
21152+++ lrzsz-0.12.20/m4/wint_t.m4 2004-09-12 14:40:35.040643968 -0400
21153@@ -0,0 +1,22 @@
21154+# wint_t.m4 serial 1 (gettext-0.12)
21155+dnl Copyright (C) 2003 Free Software Foundation, Inc.
21156+dnl This file is free software, distributed under the terms of the GNU
21157+dnl General Public License. As a special exception to the GNU General
21158+dnl Public License, this file may be distributed as part of a program
21159+dnl that contains a configuration script generated by Autoconf, under
21160+dnl the same distribution terms as the rest of that program.
21161+
21162+dnl From Bruno Haible.
21163+dnl Test whether <wchar.h> has the 'wint_t' type.
21164+dnl Prerequisite: AC_PROG_CC
21165+
21166+AC_DEFUN([gt_TYPE_WINT_T],
21167+[
21168+ AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
21169+ [AC_TRY_COMPILE([#include <wchar.h>
21170+ wint_t foo = (wchar_t)'\0';], ,
21171+ gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
21172+ if test $gt_cv_c_wint_t = yes; then
21173+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
21174+ fi
21175+])
21176--- lrzsz-0.12.20.safe/m4/xsize.m4 1969-12-31 19:00:00.000000000 -0500
21177+++ lrzsz-0.12.20/m4/xsize.m4 2004-09-12 14:40:35.047642904 -0400
21178@@ -0,0 +1,14 @@
21179+# xsize.m4 serial 2
21180+dnl Copyright (C) 2003 Free Software Foundation, Inc.
21181+dnl This file is free software, distributed under the terms of the GNU
21182+dnl General Public License. As a special exception to the GNU General
21183+dnl Public License, this file may be distributed as part of a program
21184+dnl that contains a configuration script generated by Autoconf, under
21185+dnl the same distribution terms as the rest of that program.
21186+
21187+AC_DEFUN([gl_XSIZE],
21188+[
21189+ dnl Prerequisites of lib/xsize.h.
21190+ AC_REQUIRE([gl_SIZE_MAX])
21191+ AC_CHECK_HEADERS(stdint.h)
21192+])
21193--- lrzsz-0.12.20.safe/Makefile.am 1998-12-30 06:19:40.000000000 -0500
21194+++ lrzsz-0.12.20/Makefile.am 2004-09-12 14:40:35.121631656 -0400
21195@@ -1,5 +1,5 @@
21196 SUBDIRS = lib intl src po man testsuite
21197-EXTRA_DIST = check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
21198+EXTRA_DIST = config.rpath check.lrzsz COMPATABILITY README.cvs README.isdn4linux \
21199 README.gettext rpmrc buildrpm systype.in fastcheck.sh README.tests \
21200 beos-runpiped.c fastcheck.beos
21201 noinst_SCRIPTS=systype
21202@@ -83,3 +83,5 @@
21203 rpm: $(PR).tar.gz Specfile
21204 $(srcdir)/buildrpm $(srcdir)
21205
21206+
21207+ACLOCAL_AMFLAGS = -I m4
21208--- lrzsz-0.12.20.safe/Makefile.in 1998-12-30 11:31:40.000000000 -0500
21209+++ lrzsz-0.12.20/Makefile.in 2004-09-12 14:40:35.109633480 -0400
21210@@ -125,7 +125,7 @@
21211 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
21212
21213 $(ACLOCAL_M4): configure.in acinclude.m4
21214- cd $(srcdir) && $(ACLOCAL)
21215+ cd $(srcdir) && $(ACLOCAL) -I m4
21216
21217 config.status: $(srcdir)/configure
21218 $(SHELL) ./config.status --recheck
21219--- lrzsz-0.12.20.safe/mkinstalldirs 1998-04-26 09:20:52.000000000 -0400
21220+++ lrzsz-0.12.20/mkinstalldirs 2004-09-12 14:40:34.337750824 -0400
21221@@ -1,34 +1,150 @@
21222 #! /bin/sh
21223 # mkinstalldirs --- make directory hierarchy
21224-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
21225+
21226+scriptversion=2004-02-15.20
21227+
21228+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
21229 # Created: 1993-05-16
21230-# Last modified: 1995-03-05
21231-# Public domain
21232+# Public domain.
21233+#
21234+# This file is maintained in Automake, please report
21235+# bugs to <bug-automake@gnu.org> or send patches to
21236+# <automake-patches@gnu.org>.
21237
21238 errstatus=0
21239+dirmode=""
21240
21241-for file in ${1+"$@"} ; do
21242- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
21243- shift
21244+usage="\
21245+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
21246
21247- pathcomp=
21248- for d in ${1+"$@"} ; do
21249- pathcomp="$pathcomp$d"
21250- case "$pathcomp" in
21251- -* ) pathcomp=./$pathcomp ;;
21252- esac
21253+Create each directory DIR (with mode MODE, if specified), including all
21254+leading file name components.
21255
21256- if test ! -d "$pathcomp"; then
21257- echo "mkdir $pathcomp" 1>&2
21258- mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
21259- fi
21260+Report bugs to <bug-automake@gnu.org>."
21261
21262- if test ! -d "$pathcomp"; then
21263+# process command line arguments
21264+while test $# -gt 0 ; do
21265+ case $1 in
21266+ -h | --help | --h*) # -h for help
21267+ echo "$usage"
21268+ exit 0
21269+ ;;
21270+ -m) # -m PERM arg
21271+ shift
21272+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
21273+ dirmode=$1
21274+ shift
21275+ ;;
21276+ --version)
21277+ echo "$0 $scriptversion"
21278+ exit 0
21279+ ;;
21280+ --) # stop option processing
21281+ shift
21282+ break
21283+ ;;
21284+ -*) # unknown option
21285+ echo "$usage" 1>&2
21286+ exit 1
21287+ ;;
21288+ *) # first non-opt arg
21289+ break
21290+ ;;
21291+ esac
21292+done
21293+
21294+for file
21295+do
21296+ if test -d "$file"; then
21297+ shift
21298+ else
21299+ break
21300+ fi
21301+done
21302+
21303+case $# in
21304+ 0) exit 0 ;;
21305+esac
21306+
21307+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
21308+# mkdir -p a/c at the same time, both will detect that a is missing,
21309+# one will create a, then the other will try to create a and die with
21310+# a "File exists" error. This is a problem when calling mkinstalldirs
21311+# from a parallel make. We use --version in the probe to restrict
21312+# ourselves to GNU mkdir, which is thread-safe.
21313+case $dirmode in
21314+ '')
21315+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
21316+ echo "mkdir -p -- $*"
21317+ exec mkdir -p -- "$@"
21318+ else
21319+ # On NextStep and OpenStep, the `mkdir' command does not
21320+ # recognize any option. It will interpret all options as
21321+ # directories to create, and then abort because `.' already
21322+ # exists.
21323+ test -d ./-p && rmdir ./-p
21324+ test -d ./--version && rmdir ./--version
21325+ fi
21326+ ;;
21327+ *)
21328+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
21329+ test ! -d ./--version; then
21330+ echo "mkdir -m $dirmode -p -- $*"
21331+ exec mkdir -m "$dirmode" -p -- "$@"
21332+ else
21333+ # Clean up after NextStep and OpenStep mkdir.
21334+ for d in ./-m ./-p ./--version "./$dirmode";
21335+ do
21336+ test -d $d && rmdir $d
21337+ done
21338+ fi
21339+ ;;
21340+esac
21341+
21342+for file
21343+do
21344+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
21345+ shift
21346+
21347+ pathcomp=
21348+ for d
21349+ do
21350+ pathcomp="$pathcomp$d"
21351+ case $pathcomp in
21352+ -*) pathcomp=./$pathcomp ;;
21353+ esac
21354+
21355+ if test ! -d "$pathcomp"; then
21356+ echo "mkdir $pathcomp"
21357+
21358+ mkdir "$pathcomp" || lasterr=$?
21359+
21360+ if test ! -d "$pathcomp"; then
21361 errstatus=$lasterr
21362- fi
21363+ else
21364+ if test ! -z "$dirmode"; then
21365+ echo "chmod $dirmode $pathcomp"
21366+ lasterr=""
21367+ chmod "$dirmode" "$pathcomp" || lasterr=$?
21368
21369- pathcomp="$pathcomp/"
21370- done
21371+ if test ! -z "$lasterr"; then
21372+ errstatus=$lasterr
21373+ fi
21374+ fi
21375+ fi
21376+ fi
21377+
21378+ pathcomp="$pathcomp/"
21379+ done
21380 done
21381
21382 exit $errstatus
21383+
21384+# Local Variables:
21385+# mode: shell-script
21386+# sh-indentation: 2
21387+# eval: (add-hook 'write-file-hooks 'time-stamp)
21388+# time-stamp-start: "scriptversion="
21389+# time-stamp-format: "%:y-%02m-%02d.%02H"
21390+# time-stamp-end: "$"
21391+# End:
21392--- lrzsz-0.12.20.safe/po/boldquot.sed 1969-12-31 19:00:00.000000000 -0500
21393+++ lrzsz-0.12.20/po/boldquot.sed 2004-09-12 14:40:34.723692152 -0400
21394@@ -0,0 +1,10 @@
21395+s/"\([^"]*\)"/“\1”/g
21396+s/`\([^`']*\)'/‘\1’/g
21397+s/ '\([^`']*\)' / ‘\1’ /g
21398+s/ '\([^`']*\)'$/ ‘\1’/g
21399+s/^'\([^`']*\)' /‘\1’ /g
21400+s/“”/""/g
21401+s/“/“/g
21402+s/”/”/g
21403+s/‘/‘/g
21404+s/’/’/g
21405--- lrzsz-0.12.20.safe/po/cat-id-tbl.c 1998-12-29 04:24:24.000000000 -0500
21406+++ lrzsz-0.12.20/po/cat-id-tbl.c 1969-12-31 19:00:00.000000000 -0500
21407@@ -1,234 +0,0 @@
21408-/* Automatically generated by po2tbl.sed from lrzsz.pot. */
21409-
21410-#if HAVE_CONFIG_H
21411-# include <config.h>
21412-#endif
21413-
21414-#include "libgettext.h"
21415-
21416-const struct _msg_ent _msg_tbl[] = {
21417- {"", 1},
21418- {"io_mode(,2) in rbsb.c not implemented\n", 2},
21419- {"caught signal %d; exiting", 3},
21420- {"command tries", 4},
21421- {"packetlength", 5},
21422- {"packetlength out of range 24..%ld", 6},
21423- {"framelength", 7},
21424- {"framelength out of range 32..%ld", 8},
21425- {"min_bps", 9},
21426- {"min_bps must be >= 0", 10},
21427- {"min_bps_time", 11},
21428- {"min_bps_time must be > 1", 12},
21429- {"hour to large (0..23)", 13},
21430- {"unparsable stop time\n", 14},
21431- {"minute to large (0..59)", 15},
21432- {"stop time to small", 16},
21433- {"stop-at", 17},
21434- {"timeout", 18},
21435- {"timeout out of range 10..1000", 19},
21436- {"security violation: can't do that under restricted shell\n", 20},
21437- {"window size", 21},
21438- {"cannot turnoff syslog", 22},
21439- {"startup delay", 23},
21440- {"out of memory", 24},
21441- {"this program was never intended to be used setuid\n", 25},
21442- {"need at least one file to send", 26},
21443- {"Can't send command in restricted mode\n", 27},
21444- {"hostname too long\n", 28},
21445- {"illegal server address\n", 29},
21446- {"can read only one file from stdin", 30},
21447- {"Transfer incomplete\n", 31},
21448- {"Transfer complete\n", 32},
21449- {"send_pseudo %s: cannot open tmpfile %s: %s", 33},
21450- {"send_pseudo %s: cannot lstat tmpfile %s: %s", 34},
21451- {"send_pseudo %s: avoiding symlink trap", 35},
21452- {"send_pseudo %s: cannot write to tmpfile %s: %s", 36},
21453- {"send_pseudo %s: failed", 37},
21454- {"send_pseudo %s: ok", 38},
21455- {"tcp protocol init failed\n", 39},
21456- {"Answering TIMESYNC at %s", 40},
21457- {"timezone", 41},
21458- {"timezone unknown", 42},
21459- {"Can't open any requested files.", 43},
21460- {"security violation: not allowed to upload from %s", 44},
21461- {"cannot open %s", 45},
21462- {"is not a file: %s", 46},
21463- {"%s/%s: error occured", 47},
21464- {"skipped: %s", 48},
21465- {"%s/%s: skipped", 49},
21466- {"Bytes Sent:%7ld BPS:%-8ld \n", 50},
21467- {"Sending %s, %ld blocks: ", 51},
21468- {"Give your local XMODEM receive command now.", 52},
21469- {"Sending: %s\n", 53},
21470- {"Timeout on pathname", 54},
21471- {"Receiver Cancelled", 55},
21472- {"No ACK on EOT", 56},
21473- {"Xmodem sectors/kbytes sent: %3d/%2dk", 57},
21474- {"Ymodem sectors/kbytes sent: %3d/%2dk", 58},
21475- {"Cancelled", 59},
21476- {"Timeout on sector ACK", 60},
21477- {"NAK on sector", 61},
21478- {"Got burst for sector ACK", 62},
21479- {"Got %02x for sector ACK", 63},
21480- {"Retry Count Exceeded", 64},
21481- {"Try `%s --help' for more information.\n", 65},
21482- {"%s version %s\n", 66},
21483- {"Usage: %s [options] file ...\n", 67},
21484- {" or: %s [options] -{c|i} COMMAND\n", 68},
21485- {"Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n", 69},
21486- {"\
21487- (X) = option applies to XMODEM only\n\
21488- (Y) = option applies to YMODEM only\n\
21489- (Z) = option applies to ZMODEM only\n", 70},
21490- {"\
21491- -+, --append append to existing destination file (Z)\n\
21492- -2, --twostop use 2 stop bits\n\
21493- -4, --try-4k go up to 4K blocksize\n\
21494- --start-4k start with 4K blocksize (doesn't try 8)\n\
21495- -8, --try-8k go up to 8K blocksize\n\
21496- --start-8k start with 8K blocksize\n\
21497- -a, --ascii ASCII transfer (change CR/LF to LF)\n\
21498- -b, --binary binary transfer\n\
21499- -B, --bufsize N buffer N bytes (N==auto: buffer whole file)\n\
21500- -c, --command COMMAND execute remote command COMMAND (Z)\n\
21501- -C, --command-tries N try N times to execute a command (Z)\n\
21502- -d, --dot-to-slash change '.' to '/' in pathnames (Y/Z)\n\
21503- --delay-startup N sleep N seconds before doing anything\n\
21504- -e, --escape escape all control characters (Z)\n\
21505- -E, --rename force receiver to rename files it already has\n\
21506- -f, --full-path send full pathname (Y/Z)\n\
21507- -i, --immediate-command CMD send remote CMD, return immediately (Z)\n\
21508- -h, --help print this usage message\n\
21509- -k, --1k send 1024 byte packets (X)\n\
21510- -L, --packetlen N limit subpacket length to N bytes (Z)\n\
21511- -l, --framelen N limit frame length to N bytes (l>=L) (Z)\n\
21512- -m, --min-bps N stop transmission if BPS below N\n\
21513- -M, --min-bps-time N for at least N seconds (default: 120)\n", 71},
21514- {"\
21515- -n, --newer send file if source newer (Z)\n\
21516- -N, --newer-or-longer send file if source newer or longer (Z)\n\
21517- -o, --16-bit-crc use 16 bit CRC instead of 32 bit CRC (Z)\n\
21518- -O, --disable-timeouts disable timeout code, wait forever\n\
21519- -p, --protect protect existing destination file (Z)\n\
21520- -r, --resume resume interrupted file transfer (Z)\n\
21521- -R, --restricted restricted, more secure mode\n\
21522- -q, --quiet quiet (no progress reports)\n\
21523- -s, --stop-at {HH:MM|+N} stop transmission at HH:MM or in N seconds\n\
21524- --tcp build a TCP connection to transmit files\n\
21525- --tcp-server open socket, wait for connection\n\
21526- -u, --unlink unlink file after transmission\n\
21527- -U, --unrestrict turn off restricted mode (if allowed to)\n\
21528- -v, --verbose be verbose, provide debugging information\n\
21529- -w, --windowsize N Window is N bytes (Z)\n\
21530- -X, --xmodem use XMODEM protocol\n\
21531- -y, --overwrite overwrite existing files\n\
21532- -Y, --overwrite-or-skip overwrite existing files, else skip\n\
21533- --ymodem use YMODEM protocol\n\
21534- -Z, --zmodem use ZMODEM protocol\n\
21535-\n\
21536-short options use the same arguments as the long ones\n", 72},
21537- {"got ZRQINIT", 73},
21538- {"got ZCAN", 74},
21539- {"blklen now %d\n", 75},
21540- {"zsendfdata: bps rate %ld below min %ld", 76},
21541- {"zsendfdata: reached stop time", 77},
21542- {"Bytes Sent:%7ld/%7ld BPS:%-8ld ETA %02d:%02d ", 78},
21543- {"calc_blklen: reduced to %d due to error\n", 79},
21544- {"calc_blklen: returned old value %d due to low bpe diff\n", 80},
21545- {"calc_blklen: old %ld, new %ld, d %ld\n", 81},
21546- {"calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n", 82},
21547- {"calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n", 83},
21548- {"calc_blklen: returned %d as best\n", 84},
21549- {"\
21550-\n\
21551-countem: Total %d %ld\n", 85},
21552- {"Bad escape sequence %x", 86},
21553- {"Sender Canceled", 87},
21554- {"TIMEOUT", 88},
21555- {"Bad data subpacket", 89},
21556- {"Data subpacket too long", 90},
21557- {"Garbage count exceeded", 91},
21558- {"Got %s", 92},
21559- {"Retry %d: ", 93},
21560- {"don't have settimeofday, will not set time\n", 94},
21561- {"not running as root (this is good!), can not set time\n", 95},
21562- {"bytes_per_error", 96},
21563- {"bytes-per-error should be >100", 97},
21564- {"O_SYNC not supported by the kernel", 98},
21565- {"garbage on commandline", 99},
21566- {"Usage: %s [options] [filename.if.xmodem]\n", 100},
21567- {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101},
21568- {"\
21569- -+, --append append to existing files\n\
21570- -a, --ascii ASCII transfer (change CR/LF to LF)\n\
21571- -b, --binary binary transfer\n\
21572- -B, --bufsize N buffer N bytes (N==auto: buffer whole file)\n\
21573- -c, --with-crc Use 16 bit CRC (X)\n\
21574- -C, --allow-remote-commands allow execution of remote commands (Z)\n\
21575- -D, --null write all received data to /dev/null\n\
21576- --delay-startup N sleep N seconds before doing anything\n\
21577- -e, --escape Escape control characters (Z)\n\
21578- -E, --rename rename any files already existing\n\
21579- --errors N generate CRC error every N bytes (debugging)\n\
21580- -h, --help Help, print this usage message\n\
21581- -m, --min-bps N stop transmission if BPS below N\n\
21582- -M, --min-bps-time N for at least N seconds (default: 120)\n\
21583- -O, --disable-timeouts disable timeout code, wait forever for data\n\
21584- --o-sync open output file(s) in synchronous write mode\n\
21585- -p, --protect protect existing files\n\
21586- -q, --quiet quiet, no progress reports\n\
21587- -r, --resume try to resume interrupted file transfer (Z)\n\
21588- -R, --restricted restricted, more secure mode\n\
21589- -s, --stop-at {HH:MM|+N} stop transmission at HH:MM or in N seconds\n\
21590- -S, --timesync request remote time (twice: set local time)\n\
21591- --syslog[=off] turn syslog on or off, if possible\n\
21592- -t, --timeout N set timeout to N tenths of a second\n\
21593- -u, --keep-uppercase keep upper case filenames\n\
21594- -U, --unrestrict disable restricted mode (if allowed to)\n\
21595- -v, --verbose be verbose, provide debugging information\n\
21596- -w, --windowsize N Window is N bytes (Z)\n\
21597- -X --xmodem use XMODEM protocol\n\
21598- -y, --overwrite Yes, clobber existing file if any\n\
21599- --ymodem use YMODEM protocol\n\
21600- -Z, --zmodem use ZMODEM protocol\n\
21601-\n\
21602-short options use the same arguments as the long ones\n", 102},
21603- {"%s waiting to receive.", 103},
21604- {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 104},
21605- {"%s: ready to receive %s", 105},
21606- {"\rBytes received: %7ld BPS:%-6ld \r\n", 106},
21607- {"\
21608-\r\n\
21609-%s: %s removed.\r\n", 107},
21610- {"Pathname fetch returned EOT", 108},
21611- {"Received dup Sector", 109},
21612- {"Sync Error", 110},
21613- {"CRC", 111},
21614- {"Checksum", 112},
21615- {"Sector number garbled", 113},
21616- {"Sender Cancelled", 114},
21617- {"Got 0%o sector header", 115},
21618- {"file name ends with a /, skipped: %s\n", 116},
21619- {"zmanag=%d, Lzmanag=%d\n", 117},
21620- {"zconv=%d\n", 118},
21621- {"file exists, skipped: %s\n", 119},
21622- {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120},
21623- {"TIMESYNC: cannot set time: %s\n", 121},
21624- {"cannot tmpfile() for tcp protocol synchronization", 122},
21625- {"Topipe", 123},
21626- {"Receiving: %s\n", 124},
21627- {"Blocks received: %d", 125},
21628- {"%s: %s exists\n", 126},
21629- {"%s:\tSecurity Violation", 127},
21630- {"remote command execution requested", 128},
21631- {"not executed", 129},
21632- {"got ZRINIT", 130},
21633- {"Skipped", 131},
21634- {"rzfile: bps rate %ld below min %ld", 132},
21635- {"rzfile: reached stop time", 133},
21636- {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 134},
21637- {"fgets for tcp protocol synchronization failed: ", 135},
21638- {"file close error", 136},
21639-};
21640-
21641-int _msg_tbl_length = 136;
21642--- lrzsz-0.12.20.safe/po/ChangeLog 1998-04-26 09:20:52.000000000 -0400
21643+++ lrzsz-0.12.20/po/ChangeLog 2004-09-12 14:40:34.793681512 -0400
21644@@ -1,3 +1,15 @@
21645+2004-09-12 gettextize <bug-gnu-gettext@gnu.org>
21646+
21647+ * boldquot.sed: New file, from gettext-0.14.1.
21648+ * en@boldquot.header: New file, from gettext-0.14.1.
21649+ * en@quot.header: New file, from gettext-0.14.1.
21650+ * insert-header.sin: New file, from gettext-0.14.1.
21651+ * quot.sed: New file, from gettext-0.14.1.
21652+ * remove-potcdate.sin: New file, from gettext-0.14.1.
21653+ * Rules-quot: New file, from gettext-0.14.1.
21654+ * cat-id-tbl.c: Remove file.
21655+ * stamp-cat-id: Remove file.
21656+
21657 /* Automatically generated by po2tbl.sed from lrzsz.pot. */
21658
21659 #if HAVE_CONFIG_H
21660--- lrzsz-0.12.20.safe/po/en@boldquot.header 1969-12-31 19:00:00.000000000 -0500
21661+++ lrzsz-0.12.20/po/en@boldquot.header 2004-09-12 14:40:34.731690936 -0400
21662@@ -0,0 +1,25 @@
21663+# All this catalog "translates" are quotation characters.
21664+# The msgids must be ASCII and therefore cannot contain real quotation
21665+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
21666+# and double quote (0x22). These substitutes look strange; see
21667+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
21668+#
21669+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
21670+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
21671+# It also translates pairs of apostrophe (0x27) to
21672+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
21673+# and pairs of quotation mark (0x22) to
21674+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
21675+#
21676+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
21677+# When output to an ISO-8859-1 terminal, the single quotation marks are
21678+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
21679+# grave/acute accent (by libiconv), and the double quotation marks are
21680+# transliterated to 0x22.
21681+# When output to an ASCII terminal, the single quotation marks are
21682+# transliterated to apostrophes, and the double quotation marks are
21683+# transliterated to 0x22.
21684+#
21685+# This catalog furthermore displays the text between the quotation marks in
21686+# bold face, assuming the VT100/XTerm escape sequences.
21687+#
21688--- lrzsz-0.12.20.safe/po/en@quot.header 1969-12-31 19:00:00.000000000 -0500
21689+++ lrzsz-0.12.20/po/en@quot.header 2004-09-12 14:40:34.737690024 -0400
21690@@ -0,0 +1,22 @@
21691+# All this catalog "translates" are quotation characters.
21692+# The msgids must be ASCII and therefore cannot contain real quotation
21693+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
21694+# and double quote (0x22). These substitutes look strange; see
21695+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
21696+#
21697+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
21698+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
21699+# It also translates pairs of apostrophe (0x27) to
21700+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
21701+# and pairs of quotation mark (0x22) to
21702+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
21703+#
21704+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
21705+# When output to an ISO-8859-1 terminal, the single quotation marks are
21706+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
21707+# grave/acute accent (by libiconv), and the double quotation marks are
21708+# transliterated to 0x22.
21709+# When output to an ASCII terminal, the single quotation marks are
21710+# transliterated to apostrophes, and the double quotation marks are
21711+# transliterated to 0x22.
21712+#
21713--- lrzsz-0.12.20.safe/po/insert-header.sin 1969-12-31 19:00:00.000000000 -0500
21714+++ lrzsz-0.12.20/po/insert-header.sin 2004-09-12 14:40:34.743689112 -0400
21715@@ -0,0 +1,23 @@
21716+# Sed script that inserts the file called HEADER before the header entry.
21717+#
21718+# At each occurrence of a line starting with "msgid ", we execute the following
21719+# commands. At the first occurrence, insert the file. At the following
21720+# occurrences, do nothing. The distinction between the first and the following
21721+# occurrences is achieved by looking at the hold space.
21722+/^msgid /{
21723+x
21724+# Test if the hold space is empty.
21725+s/m/m/
21726+ta
21727+# Yes it was empty. First occurrence. Read the file.
21728+r HEADER
21729+# Output the file's contents by reading the next line. But don't lose the
21730+# current line while doing this.
21731+g
21732+N
21733+bb
21734+:a
21735+# The hold space was nonempty. Following occurrences. Do nothing.
21736+x
21737+:b
21738+}
21739--- lrzsz-0.12.20.safe/po/Makevars 1969-12-31 19:00:00.000000000 -0500
21740+++ lrzsz-0.12.20/po/Makevars 2004-09-12 14:40:34.748688352 -0400
21741@@ -0,0 +1,41 @@
21742+# Makefile variables for PO directory in any package using GNU gettext.
21743+
21744+# Usually the message domain is the same as the package name.
21745+DOMAIN = $(PACKAGE)
21746+
21747+# These two variables depend on the location of this directory.
21748+subdir = po
21749+top_builddir = ..
21750+
21751+# These options get passed to xgettext.
21752+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
21753+
21754+# This is the copyright holder that gets inserted into the header of the
21755+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
21756+# package. (Note that the msgstr strings, extracted from the package's
21757+# sources, belong to the copyright holder of the package.) Translators are
21758+# expected to transfer the copyright for their translations to this person
21759+# or entity, or to disclaim their copyright. The empty string stands for
21760+# the public domain; in this case the translators are expected to disclaim
21761+# their copyright.
21762+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
21763+
21764+# This is the email address or URL to which the translators shall report
21765+# bugs in the untranslated strings:
21766+# - Strings which are not entire sentences, see the maintainer guidelines
21767+# in the GNU gettext documentation, section 'Preparing Strings'.
21768+# - Strings which use unclear terms or require additional context to be
21769+# understood.
21770+# - Strings which make invalid assumptions about notation of date, time or
21771+# money.
21772+# - Pluralisation problems.
21773+# - Incorrect English spelling.
21774+# - Incorrect formatting.
21775+# It can be your email address, or a mailing list address where translators
21776+# can write to without being subscribed, or the URL of a web page through
21777+# which the translators can contact you.
21778+MSGID_BUGS_ADDRESS =
21779+
21780+# This is the list of locale categories, beyond LC_MESSAGES, for which the
21781+# message catalogs shall be used. It is usually empty.
21782+EXTRA_LOCALE_CATEGORIES =
21783--- lrzsz-0.12.20.safe/po/quot.sed 1969-12-31 19:00:00.000000000 -0500
21784+++ lrzsz-0.12.20/po/quot.sed 2004-09-12 14:40:34.754687440 -0400
21785@@ -0,0 +1,6 @@
21786+s/"\([^"]*\)"/“\1”/g
21787+s/`\([^`']*\)'/‘\1’/g
21788+s/ '\([^`']*\)' / ‘\1’ /g
21789+s/ '\([^`']*\)'$/ ‘\1’/g
21790+s/^'\([^`']*\)' /‘\1’ /g
21791+s/“”/""/g
21792--- lrzsz-0.12.20.safe/po/remove-potcdate.sin 1969-12-31 19:00:00.000000000 -0500
21793+++ lrzsz-0.12.20/po/remove-potcdate.sin 2004-09-12 14:40:34.762686224 -0400
21794@@ -0,0 +1,19 @@
21795+# Sed script that remove the POT-Creation-Date line in the header entry
21796+# from a POT file.
21797+#
21798+# The distinction between the first and the following occurrences of the
21799+# pattern is achieved by looking at the hold space.
21800+/^"POT-Creation-Date: .*"$/{
21801+x
21802+# Test if the hold space is empty.
21803+s/P/P/
21804+ta
21805+# Yes it was empty. First occurrence. Remove the line.
21806+g
21807+d
21808+bb
21809+:a
21810+# The hold space was nonempty. Following occurrences. Do nothing.
21811+x
21812+:b
21813+}
21814--- lrzsz-0.12.20.safe/po/Rules-quot 1969-12-31 19:00:00.000000000 -0500
21815+++ lrzsz-0.12.20/po/Rules-quot 2004-09-12 14:40:34.778683792 -0400
21816@@ -0,0 +1,47 @@
21817+# Special Makefile rules for English message catalogs with quotation marks.
21818+
21819+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
21820+
21821+.SUFFIXES: .insert-header .po-update-en
21822+
21823+en@quot.po-create:
21824+ $(MAKE) en@quot.po-update
21825+en@boldquot.po-create:
21826+ $(MAKE) en@boldquot.po-update
21827+
21828+en@quot.po-update: en@quot.po-update-en
21829+en@boldquot.po-update: en@boldquot.po-update-en
21830+
21831+.insert-header.po-update-en:
21832+ @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
21833+ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
21834+ tmpdir=`pwd`; \
21835+ echo "$$lang:"; \
21836+ ll=`echo $$lang | sed -e 's/@.*//'`; \
21837+ LC_ALL=C; export LC_ALL; \
21838+ cd $(srcdir); \
21839+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
21840+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
21841+ rm -f $$tmpdir/$$lang.new.po; \
21842+ else \
21843+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
21844+ :; \
21845+ else \
21846+ echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
21847+ exit 1; \
21848+ fi; \
21849+ fi; \
21850+ else \
21851+ echo "creation of $$lang.po failed!" 1>&2; \
21852+ rm -f $$tmpdir/$$lang.new.po; \
21853+ fi
21854+
21855+en@quot.insert-header: insert-header.sin
21856+ sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
21857+
21858+en@boldquot.insert-header: insert-header.sin
21859+ sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
21860+
21861+mostlyclean: mostlyclean-quot
21862+mostlyclean-quot:
21863+ rm -f *.insert-header
21864--- lrzsz-0.12.20.safe/po/stamp-cat-id 1998-12-30 02:50:01.000000000 -0500
21865+++ lrzsz-0.12.20/po/stamp-cat-id 1969-12-31 19:00:00.000000000 -0500
21866@@ -1 +0,0 @@
21867-timestamp
21868--- lrzsz-0.12.20.safe/src/Makefile.am 1998-12-28 03:38:47.000000000 -0500
21869+++ lrzsz-0.12.20/src/Makefile.am 2004-09-12 14:40:53.665812512 -0400
21870@@ -2,12 +2,12 @@
21871 lrz_SOURCES=lrz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
21872 lsz_SOURCES=lsz.c timing.c zperr.c zreadline.c crctab.c rbsb.c zm.c protname.c tcp.c lsyslog.c canit.c
21873 noinst_HEADERS = timing.h zglobal.h zmodem.h
21874-datadir = $(prefix)/@DATADIRNAME@
21875+datadir = $(prefix)/share
21876 localedir = $(datadir)/locale
21877 CFLAGS=@CFLAGS@
21878 DISTCLEAN_FILES=lrzszbug
21879
21880-LDADD = ../lib/libzmodem.a @INTLLIBS@
21881+LDADD = ../lib/libzmodem.a @LIBINTL@
21882 AUTOMAKE_OPTIONS=ansi2knr
21883 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
21884 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
deleted file mode 100644
index 682f1c9c8d..0000000000
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Upstream-Status: Pending
2
3This patch fixes following issue with automake 1.12
4
5| configure.in:95: error: automatic de-ANSI-fication support has been removed
6...
7| lib/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
8| lib/Makefile.am: installing './depcomp'
9| src/Makefile.am:11: error: automatic de-ANSI-fication support has been removed
10
11
12Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
132012/05/03
14
15Index: lrzsz-0.12.20/configure.in
16===================================================================
17--- lrzsz-0.12.20.orig/configure.in
18+++ lrzsz-0.12.20/configure.in
19@@ -92,7 +92,6 @@ AC_PROG_RANLIB
20 AC_ISC_POSIX
21 AC_AIX
22 AC_MINIX
23-AM_C_PROTOTYPES
24 AC_C_CONST
25 AC_C_INLINE
26
27Index: lrzsz-0.12.20/lib/Makefile.am
28===================================================================
29--- lrzsz-0.12.20.orig/lib/Makefile.am
30+++ lrzsz-0.12.20/lib/Makefile.am
31@@ -1,6 +1,5 @@
32 noinst_LIBRARIES=libzmodem.a
33 CFLAGS=@CFLAGS@
34-AUTOMAKE_OPTIONS=ansi2knr
35
36 EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
37 getopt.c getopt1.c mkdir.c mktime.c \
38Index: lrzsz-0.12.20/src/Makefile.am
39===================================================================
40--- lrzsz-0.12.20.orig/src/Makefile.am
41+++ lrzsz-0.12.20/src/Makefile.am
42@@ -8,7 +8,6 @@ CFLAGS=@CFLAGS@
43 DISTCLEAN_FILES=lrzszbug
44
45 LDADD = ../lib/libzmodem.a @LIBINTL@
46-AUTOMAKE_OPTIONS=ansi2knr
47 EXTRA_DIST = ansi2knr.1 ansi2knr.c lrzszbug.in
48 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl -I$(top_srcdir)/lib
49 #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 34556b2c29..4129237c59 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -13,11 +13,9 @@ DEPENDS = ""
13PR = "r6" 13PR = "r6"
14 14
15SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \ 15SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
16 file://autotools-update.patch \
16 file://autotools.patch \ 17 file://autotools.patch \
17 file://makefile.patch \ 18 file://makefile.patch \
18 file://gettext.patch \
19 file://acdefine.patch \
20 file://lrzsz_fix_for_automake-1.12.patch \
21 file://lrzsz-check-locale.h.patch \ 19 file://lrzsz-check-locale.h.patch \
22 file://cve-2018-10195.patch \ 20 file://cve-2018-10195.patch \
23 file://include.patch \ 21 file://include.patch \