Skip to content

R
riscv-gcc-1
Commit f8b2ac1e by Jeff Law
Options

Merge in texinfo-3.11. 

From-SVN: r18767
parent 8491377b
Showing with 4021 additions and 517 deletions
texinfo/ChangeLog
Tue Mar 17 10:33:28 1998 Manfred Hollstein <manfred@s-direktnet.de> Mon Feb 2 17:17:17 1998 Jason Molenda (crash@bugshack.cygnus.com)
* Makefile.in (clean, distclean): Add 'info' explicitly. * info/termdep.h (TIOCGETC): Don't define if we have termios.h.
From Robert Lipe.
Tue Mar 3 10:05:46 1998 Jeffrey A Law (law@cygnus.com) Tue Oct 7 11:14:04 1997 Michael Meissner <meissner@cygnus.com>
* makeinfo/makeinfo.c (CommandTable): Fix braces in initializer. * info/tilde.c (alloca): Don't redefine alloca as __builtin_alloca
if alloca was already defined.
Tue Jan 13 21:34:23 1998 H.J. Lu (hjl@gnu.org) Mon Oct 6 12:46:27 1997 Ian Lance Taylor <ian@cygnus.com>
* libtxi/Makefile.in (AR_FLAGS): Defined as "rc". * util/Makefile.am (bin_PROGRAMS): Remove install-info.
(noinst_PROGRAMS, install_inf_SOURCES): Define.
(install-exec-local): New target.
* util/Makefile.in: Rebuild.
* info/Makefile.in: Rebuild with current automake.
Tue Dec 2 20:24:40 1997 Bruno Haible <haible@ilog.fr> Wed Sep 3 12:44:18 1997 Ian Lance Taylor <ian@cygnus.com>
* makeinfo/makeinfo.c (find_and_load, convert_from_stream): * po/Makefile.in.in: More --enable-maintainer-mode changes.
Zero-terminate the file contents.
Fri Oct 31 09:39:31 1997 Jeffrey A Law (law@cygnus.com) Thu Aug 28 23:52:29 1997 Ian Lance Taylor <ian@cygnus.com>
* Makefile.in (install targets): Add a dummy target for sunos make. * po/Makefile.in.in: Make automatic dependencies only run programs
(SUBDIR): Remove 'info'. It's unneeded. if --enable-maintainer-mode.
Wed Oct 29 22:56:46 1997 Robert Lipe (robertl@dgii.com) Mon Aug 25 16:50:32 1997 Ian Lance Taylor <ian@cygnus.com>
* info/termdep.h: If POSIX, #undef TIOCGETC for benefit of systems * configure.in: Add AM_MAINTAINER_MODE and AM_EXEEXT.
that provide TIOCETC but not struct tchars. * Makefile.in, */Makefile.in: Rebuild with automake --cygnus.
* configure: Rebuild with current autoconf.
Wed Oct 15 09:49:57 1997 Richard Henderson <rth@cygnus.com> Wed Feb 12 11:15:16 1997 Michael Meissner <meissner@cygnus.com>
* util/texindex.c (main): Make main an int function, not void.
Sat Jun 29 18:56:07 1996 Geoffrey Noer <noer@cygnus.com>
* configure.in: if ac_cv_c_cross is yes, don't run the
AC_FUNC_SETVBUF_REVERSED call since it tries to do a run
test. This allows texinfo to build for cygwin32 Canadian
crosses/natives
* configure: regenerate
Thu Jul 31 11:57:46 1997 Karl Berry <karl@cs.umb.edu>
* Version 3.11.
* info/man.c (reap_children): Declare status as int, not unsigned,
since that's what POSIX says the arg to wait should be.
* makeinfo/makeinfo.c (cm_uref, cm_email): Rewrite to do macro
expansion in the arguments.
* makeinfo/makeinfo.c (main): setlocale LC_MESSAGES and LC_TIME,
instead of LC_ALL.
From: Akim Demaille <demaille@inf.enst.fr>.
* makeinfo/makeinfo.c (cm_today): Let the %d %s %d be translated,
so other languages can change the order of day/month/year.
From: Akim Demaille <demaille@inf.enst.fr>.
* info/infomap.c: Doc fix.
* lib/system.h [!O_RDONLY]: Prefer <fcntl.h> to <sys/fcntl.h>.
* configure.in (AC_CHECK_HEADERS): Check for fcntl.h.
* doc/Makefile.am (install-data-local): Suggest tex/generic/dvips
for epsf.tex.
From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
* configure.in (TEXMF): Move check to block with other program
checks.
Wed Jul 30 11:20:37 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (defun_internal): Allow extra text after
most @def... commands, for tzname[2] in libc.texinfo.
* info/info.c: Include indices.h.
* configure.in (AC_CHECK_HEADERS): Test for sys/wait.h, info/man.c
uses it.
From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
Tue Jul 29 15:55:19 1997 Karl Berry <karl@cs.umb.edu>
* configure.in: Version 3.9j.
* info/terminal.c (output_character_function): Return int (the
arg), not void.
* info/infomap.c: Don't define term_kP as 'v', since that's undefined.
From: Tom Hageman <tom@basil.icce.rug.nl>.
* makeinfo/makeinfo.c: Parameterize some messages to avoid
duplicate translations.
* info/terminal.c: Only try to declare ospeed, PC, tputs, etc. if
we don't have <ncurses.h/termcap.h> or <termcap.h>.
* makeinfo/makeinfo.c (cm_email): New function, like cm_uref.
Sun Jul 27 17:09:20 1997 Karl Berry <karl@cs.umb.edu>
* configure.in: Only check for <ncurses/termcap.h> if we're using
-lncurses.
From: Bo Johansson <bo.johansson@mbox2.swipnet.se>.
* info/dir.c (new_dir_file_p): Avoid automatic struct
initialization, SunOS 4 etc. cc can't handle it.
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
Sat Jul 26 15:08:13 1997 Karl Berry <karl@cs.umb.edu>
* Version 3.9i.
* configure.in: Check for termcap.h and ncurses/termcap.h.
From: bo.johansson@mbox2.swipnet.se.
Fri Jul 25 14:09:05 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Document new second optional arg to email.
* info/infodoc.c: Document CTRL-x 0 as the way to get out of help.
* info/dir.c (maybe_build_dir_node): Really check for the same dir
file twice, not just by name.
(new_dir_file_p): New function.
* util/install-info.c: Tell them about --help in doc strings.
Thu Jul 24 14:25:44 1997 Karl Berry <karl@cs.umb.edu>
* util/texindex.c (memory_error): Move to avoid incorrect implicit
decl.
* makeinfo/makeinfo.c,
* makeinfo/multi.c,
* util/install-info.c,
* util/texindex.c,
* info/tilde.c,
* info/man.c,
* info/gc.c,
* info/session.c (info_replace_key_to_typeahead): Remove unused
function,
* info/nodemenu.c,
* info/man.c,
* info/m-x.c,
* info/footnotes.c
* info/info.c
* info/indices.c,
* info/filesys.c: Parenthesize to avoid -Wall warnings
remove unused variables,
make return types explicit,
printf type corrections.
* lib/system.h: <ctype.h>: Include this.
* util/texindex.c,
* makeinfo/makeinfo.c,
* info/echo-area.c,
* info/display.c: ctype.h: Included in system.h now.
* info/echo-area.c: Parenthesize to avoid -Wall warnings.
(ctype.h): #include for isprint.
(echo_area_stack_depth): Remove unused function.
* info/display.c: Parenthesize to avoid -Wall warnings.
(ctype.h): #include for isprint.
* info/dir.c: Parenthesize to avoid -Wall warnings.
(build_dir_node_internal): Remove declaration of nonexistent function.
From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
* configure.in (TEXMF): Call texconfig to discover the default value,
for the sake of the warning in doc/Makefile.
From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
* doc/Makefile.am (TEXMF): New variable.
(install-data-local): Use it in warning.
From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
* info/session.c (initialize_info_session): Only call
terminal_prep_terminal if clear_screen is true. Otherwise, failed
--index-searches prep the terminal but do not unprep it.
From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
* info/nodemenu.c: Doc fix.
Mon Jul 21 17:11:09 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Comment out @smallbook and @set smallbook so
people at other sites can print it the way they want.
From: Thomas Walter <walter@pctc.chemie.uni-erlangen.de>
Sun Jul 20 07:52:25 1997 Karl Berry <karl@cs.umb.edu>
* configure.in: 3.9h.
* doc/Makefile.am (install-info-am, distclean-aminfo): New targets
to avoid assuming info files are in srcdir.
* lib/system.h (xstrdup): Returns char *, not void *.
* doc/Makefile.am (.texi.info),
* doc/Makefile.am (texinfo): Don't run in $(srcdir).
* util/install-info.c (main): Remove unnecessary decl of strrchr.
* info/tilde.c: Include info.h (for config.h) before alloca stuff.
* makeinfo/makeinfo.c (validate_file): Rename `valid' to `valid_p'
to avoid conflict with SunOS 4 header files.
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
* info/session.c (initialize_info_session): Call
terminal_prep_terminal here (before calling terminal_clear_screen).
(info_session): Instead of here.
From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
* Makefile.am (EXTRA_DIST): Add README-alpha.
Sat Jul 19 13:50:27 1997 Karl Berry <karl@cs.umb.edu>
* info/terminal.c: Use `keypad transmit' sequence if it's defined:
(term_keypad_on, term_keypad_off): New statics.
(terminal_begin_using_terminal): If term_keypad_on, send it.
(terminal_end_using_terminal): If term_keypad_off, send it.
(terminal_initialize_terminal): Look up ks and ke termcap strings.
From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
* info/infomap.c (initialize_info_keymaps): Initialize hardwired
cases for arrow keys a la readline. Found by John Eaton,
jwe@bevo.che.wisc.edu.
* makeinfo/makeinfo.c (output_pending_notes): Remove footnote
macro expansion code I #if 0'd out some time ago. And doc fixes.
* Applied this patch:
Sat Jul 19 16:29:01 1997 Karl Eichwalder <ke@suse.de>
* info/info.c (main): setlocale, bindtextdomain, and textdomain.
Fri Jul 18 10:02:18 1997 Karl Berry <karl@cs.umb.edu>
* doc/Makefile.am (install-data-local),
* emacs/Makefile.am (install-data-local): Give subdir in warning.
* configure.in: Version 3.9f.
* doc/texinfo.texi: Correct \^ to @^.
From Andreas S.
* Merged these changes:
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* info/display.c (display_cursor_at_point): Flush ouput.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* info/session.c (remember_window_and_node): Don't crash when the
current window has no current node.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* util/texindex.c (usage): Translate the doc strings.
* makeinfo/makeinfo.c (cm_today): Translate the month names.
* info/variables.c (describe_variable): Translate the doc strings.
* info/nodes.h: Don't translate the strings defining the info format.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* makeinfo/makeinfo.c (get_item_function): Remove superfluous call
to canon_white after get_rest_of_line.
(cm_end): Likewise.
(handle_variable): Likewise.
(cm_item): Likewise.
(cm_unmacro): Likewise.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* info/nodemenu.c (list_visited_nodes): Don't clear the internal
flag, this and other functions depend on it. Don't insist on
displaying the menu below the current window.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* makeinfo/makeinfo.c (cm_uref): Fix memory leaks.
(cm_inforef): Likewise. Handle empty cross reference name.
1997-07-17 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* info/echo-area.c (ea_possible_completions): Check that the
current window can actually be split.
Thu Jul 17 17:19:34 1997 Karl Berry <karl@cs.umb.edu>
* emacs/Makefile.am (*clean-lisp): Define, as Automake didn't.
From: Kenneth Stailey <kstailey@disclosure.com>.
* doc/Makefile.am: Do not distribute info.1.
* makeinfo/macros: Do not distribute this directory, it's merged
into the main documentation.
* doc/makeinfo.texi: Don't distribute this either, it's in the
main manual.
* util/install-info.c: Use \n\ for multiline string constant.
From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
Wed Jul 16 15:29:50 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: @set must be after @setfilename, I guess.
Noted by Erick Branderhorst.
* Applied this change:
Tue Nov 12 22:20:22 1996 John Eaton <jwe@bevo.che.wisc.edu>
* makeinfo.c (INDEX_ALIST): Use two indices, read_index and
write_index, instead of just one.
(find_index_offset): If a match is found, return index to the
current INDEX_ALIST struct, not the index pointing to the list of
index entries.
(translate_index): Return read_index from the matching
INDEX_ALIST.
(undefindex): Delete the list of index elements pointed to by
read_index from the INDEX_ALIST that matches name.
(defindex): Initialize read_index and write_index.
(index_add_arg): Add entries to the list pointed to by write_index
from the INDEX_ALIST matching name.
(index_append): Delete unused function.
(cm_synindex): Don't merge indcies, just make the write_index for
redirectee the same as the write_index for redirector.
Tue Jul 15 09:32:04 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Bump edition number for 2.24.
* util/Makefile.am (localedir): Define.
* info/window.h: Rename __window__ to window_struct.
* info/window.h,
* info/variables.h,
* info/search.h,
* info/man.h,
* info/info-utils.h,
* info/gc.h,
* info/footnotes.h,
* info/filesys.h,
* info/echo-area.h,
* info/display.h: Avoid leading _ in #define for #include protection.
* makeinfo/makeinfo.c: Version 1.68.
* info/info.c: Version 2.17.
* Most all files: Untabify.
* doc/Makefile.am (texinfo): Add explicit target.
* emacs/Makefile.am (noinst_LISP): Remove the obsolete
detexinfo.el (makeinfo --no-headers is better) and
texnfo-tex.el (now handled by TeX modes in general).
Mon Jul 14 15:21:03 1997 Karl Berry <karl@cs.umb.edu>
* util/texi2dvi: Update RCS file from 3.9 distribution.
* util/Makefile.am (EXTRA_DIST): Add update-info, from
rhawes@dmapub.dma.org
Sun Jul 13 17:05:03 1997 Karl Berry <karl@cs.umb.edu>
* info/signals.c: Use RETSIGTYPE instead of hardwiring void.
From: "Jeffery L. JT Vogt" <lfm@atw.earthreach.com>.
* info/session.c (info_history_node): Rewrite as
info_kill_node (current_node).
(kill_node, read_nodename_to_kill): New functions from info_kill_node.
(info_kill_node): Now this just calls them.
Fri Jul 11 11:56:58 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Fix `Conditionals' xref.
Thu Jul 10 17:58:12 1997 Karl Berry <karl@cs.umb.edu>
* doc/info.texi: Don't say SPC clears ? screen.
Sun Jul 6 16:26:41 1997 Karl Berry <karl@cs.umb.edu>
* doc/info-stnd.texi: Document --index-search.
* info/tilde.c,
* info/session.c: Remove redundant getenv decl.
* Installed following change:
Tue Nov 12 14:44:00 1996 John W. Eaton <jwe@bevo.che.wisc.edu>
* info/info.c (main): Handle new option, --index-search STRING.
(index_search_p, index_search_string): New static variables, used
to handle --index-search option.
* info/session.c (initialize_info_session): New arg,
clear_screen. Change all callers.
* info/indices.h (do_info_index_search, index_intry_exists):
Provide declarations here.
* info/indices.c (do_info_index_search): New function, extracted
from info_index_search.
(info_index_search): Simply call do_info_index_search() with
search_string set to NULL.
(index_entry_exists): New function.
Sat Jul 5 17:17:14 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Document @kbdinputstyle.
* makeinfo/makeinfo.c (kbdinputstyle): New command.
(cm_no_op_line_arg): New function.
* info/termdep.h (HAVE_TERMIOS_H) [NeXT]: #undef.
From: Gregor Hoffleit <flight@mathi.uni-heidelberg.de> et al.
Fri Jul 4 14:18:08 1997 Karl Berry <karl@cs.umb.edu>
* info/Makefile.am (EXTRA_DIST),
* util/Makefile.am (EXTRA_DIST),
* makeinfo/Makefile.am (EXTRA_DIST),
* lib/Makefile.am (EXTRA_DIST): Include README.
* doc/texinfo.texi (makeinfo options): Document --paragraph-indent
values more completely.
* makeinfo/makeinfo.c (set_paragraph_indent): Allow translated
asis or none, improve doc.
From ke.
* info/man.c (find_man_formatter): Don't cast getenv(), but provide * doc/Makefile.am (dist-info): New empty target so that we do not
a minimal declaration at top level. distribute info files.
From Erick Branderhorst.
* makeinfo/makeinfo.c: Don't redefine alloca if it is already defined. * doc/texinfo.texi (Invoking install-info): Document that the dir
file is created now if need be.
* Makefile.am (EXTRA_DIST): No longer need dir.
* util/install-info.c (ensure_dirfile_exists): New routine.
(main): Call it before trying to open dirfile for reading.
Tue Oct 7 16:27:34 1997 Manfred Hollstein <manfred@s-direktnet.de> * doc/texinfo.texi: Document install-info --delete a little better.
* util/install-info.c: Set something_deleted when we delete a
normal line.
Bug from: Denis Kosygin <dkosygin@math.Princeton.EDU>.
* aclocal.m4: Substitute INSTALL. * util/install-info.c: If no info dir entry, give warning and exit 0.
* configure: Re-built.
Tue Oct 7 10:25:22 1997 Manfred Hollstein (manfred@lts.sel.alcatel.de) Wed Jul 2 06:35:17 1997 Karl Berry <karl@cs.umb.edu>
* info/man.c (SIGCHLD): Define to SIGCLD if <sys/signal.h> * configure.in (ALL_LINGUAS): Add fr.
fails to provide it.
Wed Sep 17 23:56:11 1997 Jeffrey A Law (law@cygnus.com) * makeinfo/makeinfo.h (insertion_type, insertion_type_names): Add
ifnot... entries. Alphabetize.
* util/install-info.c: Only provide an external decl for strrchr Tue Jul 1 17:21:54 1997 Karl Berry <karl@cs.umb.edu>
if HAVE_STRCHR is not defined.
Mon Sep 15 22:53:01 1997 Jeffrey A Law (law@cygnus.com) * makeinfo/makeinfo.c (sort_index): Set defining_line and
input_filename so errors in index entries are reported at
the correct location. From rms.
* aclocal.m4: Add replacement for AC_PROG_INSTALL. * makeinfo/makeinfo.c (cm_ifnothtml, etc.): Routines for new
* configure.in: Use EGCS_PROG_INSTALL. commands.
Tue Sep 9 23:16:35 1997 H.J. Lu (hjl@gnu.ai.mit.edu) Sun Jun 29 09:44:01 1997 Karl Berry <karl@cs.umb.edu>
* Makefile (all): Remove sub-all. * doc/texinfo.texi: Document new @ifnot... commands, etc.
(stmp-sub-all): New target. Renamed from sub-all. * doc/texinfo.texi: Document @image, etc.
(info, texinfo): Also depend on stmp-sub-all.
(clean): Also remove stmp*.
(maintainer-clean): New target. Same as realclean.
Fri Sep 5 09:07:33 1997 Jeffrey A Law (law@cygnus.com) Thu Jun 26 17:57:37 1997 Karl Berry <karl@cs.umb.edu>
* install-sh: Delete duplicate install script. * makeinfo/makeinfo.c (cm_image): New routine for new command @image.
(cm_end): Move to better place, doesn't need its own page.
Doc fixes.
Tue Sep 2 22:25:34 1997 Jeffrey A Law (law@cygnus.com) Mon Jun 23 16:54:03 1997 Karl Berry <karl@cs.umb.edu>
* Makefile.in (install, install-info, installdirs, uninstall): Make * Makefile.am (SUBDIRS): Do intl first.
these phony targets.
Tue Sep 2 10:19:48 1997 Richard Henderson <rth@cygnus.com> * doc/Makefile.am (EXTRA_DIST): Include epsf.tex.
(install-data-local): Suggest possible installation directory.
* epsf.tex: New file.
* makeinfo/makeinfo.c: Maybe include <stdlib.h> for malloc et al. Wed Jun 18 17:51:52 1997 Karl Berry <karl@cs.umb.edu>
* util/install-info.c: Include <string*.h>.
(my_strerror): Use strerror if available.
Tue Aug 26 11:18:52 1997 Jeffrey A Law (law@cygnus.com) * doc/texinfo.texi: Document texinfo.cnf.
* libtxi/Makefile.in: Add dependencies for memcpy, memmove and strdup. Sun Jun 15 14:37:58 1997 Karl Berry <karl@cs.umb.edu>
Mon Jul 28 17:26:48 1997 Rob Savoye <rob@chinadoll.cygnus.com> * doc/texinfo.texi (Command List): Various commands missing or
erroneous.
From: Karl_Heinz_Marbaise@p69.ks.fido.de.
* aclocal.m4: Add CYGWIN and EXEEXT autoconf macros. * makeinfo/makeinfo.c: Oops, failed to break out of loop.
* configure.in: Use CYGWIN and EXEEXT autoconf macro to look for
win32 dependencies.
* configure: Regenerated with autoconf 2.12.
* Makefile.in: Add $(EXEEXT) to all executables.
* makeinfo/Makefile.in: Add $(EXEEXT) to all executables.
* util/Makefile.in: Add $(EXEEXT) to all executables.
Mon May 26 12:44:43 1997 Ian Lance Taylor <ian@cygnus.com> * util/texindex.c: Use <getopt.h> not "getopt.h".
* texinfo.tex: Update to newest FSF version (2.201). * All source files: Merge gettext changes from Karl E.;
his ChangeLog entries below.
Sat Jun 14 17:04:28 1997 Karl Berry <karl@cs.umb.edu>
* Makefile.am,
* makeinfo/Makefile.am: Doc fix.
* util/Makefile.am (EXTRA_DIST): Add texi2dvi. From Karl E.
Fri Jun 13 17:39:34 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c [WIN32]: Handle read bogosity and c:\
absolute paths.
From: Eric Hanchrow <erich@MICROSOFT.com>.
* configure.in (AC_CHECK_HEADERS): Check for pwd.h.
* info/tilde.c (pwd.h): Move #include to system.h.
* makeinfo/makeinfo.c (main): New option -P to prepend to search path.
From: Kenneth Stailey <kstailey@cvs.openbsd.org>.
* doc/texinfo.texi (Invoking makeinfo),
* doc/makeinfo.texi: Mention -P.
Thu Jun 12 16:25:40 1997 Karl Berry <karl@cs.umb.edu>
* info/signals.h (SIGCHLD): #define as SIGCLD if undefined, for sysV68.
From: "Philippe De Muyter" <phdm%labauto1@ulb.ac.be>.
* util/install-info.c (O_RDONLY): Remove this stuff, it's in system.h.
(main): Handle existing entry in dir file having .info extension.
From: "Bradley C. Kuszmaul" <bradley@GRANITE.SYSTEMSX.CS.YALE.EDU>.
* makeinfo/makeinfo.c (get_char_len): Don't count 8-bit characters
as two chars in the output.
From: Sung-Hyun Nam <namsh@amuna.rms.lgic.co.kr>.
Wed Jun 11 16:36:51 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi (Other Info Directories): Document new trailing
: in INFOPATH feature.
* info/info.c (main): Have trailing : in INFOPATH expand to the
default path.
Fri Jun 6 13:22:02 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi (uref): New node for new command.
Thu Jun 5 18:13:48 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (cm_uref): New function to accept optional
second argument. Call it in command table.
Sat Jun 14 10:54:16 1997 Karl Eichwalder <ke@suse.de>
* mkinstalldirs: Update from automake-1.1p.
* configure.in: Touch po/ChangeLog (gettext needs it).
Thu Jun 12 08:37:52 1997 Karl Eichwalder <ke@ke.Central.DE>
* util/texindex.c: Include system.h, remove config.h.
* po/POTFILES.in: Fill it.
* makeinfo/multi.c: Include system.h.
* info/Makefile.am:
* makeinfo/Makefile.am:
* util/Makefile.am:
(localedir): Set.
(INCLUDES): Add intl/ and LOCALEDIR.
(LDADD): Add @INTLLIBS@.
* makeinfo/makeinfo.c (main):
* util/texindex.c (main):
* util/install-info.c (main):
setlocale, bindtextdomain, and textdomain.
* lib/system.h: Include locale.h and libintl.h.
* acconfig.h: Include libintl.h.
(_, N_): Define.
Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES,
HAVE_STPCPY for libintl.
Add @TOP@ and @BOTTOM@.
* configure.in (AM_GNU_GETTEXT): Add.
(AC_OUTPUT): Process Makefiles in intl/ and po/.
(ALL_LINGUAS): Available languages.
* Makefile.am (AUTOMAKE_OPTIONS): Now use 1.1p.
Wed Jun 11 17:05:37 1997 Karl Eichwalder <ke@ke.Central.DE>
* Makefile.am (SUBDIRS): Add intl/ and po/ for NLS.
* run `gettextize -c' to get the i18n skeleton.
Wed Jun 4 17:51:08 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (uref): New command, another alias for @code
for now.
Wed Jun 4 02:02:33 1997 Miles Bader <miles@gnu.ai.mit.edu>
* doc/texinfo.texi (email): { and } need @ escapes.
Sun Jun 1 16:34:12 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi (itemx): @itemx should always follow @item.
* makeinfo/makeinfo.c (cm_item): Insert blank line if two
consecutive @item's.
From: Karl Eichwalder <ke@ke.central.de>.
Also various doc fixes.
Tue May 27 17:20:44 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi (various): Document @deftypemethod.
(email): @ should have been @@ in the example.
From: Mate Wierdl <mw@wierdlmpc.msci.memphis.edu>
Mon May 26 16:56:26 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/multi.c (setup_multitable_parameters): Avoid use of %n
for sake of m68k-hp-bsd.
From: Derek L Davies <ddavies@world.std.com>.
* info/terminal.c (terminal_begin_using_terminal,
terminal_end_using_terminal): Call fflush and sleep to handle
cmdtool/shelltool with scrollbars. Also ignore
SIGWINCH so we do not prematurely exit. Move call.
(terminal_prep_terminal): Disable LNEXT (CTRL-V).
From: strube@physik3.gwdg.de (Hans Werner Strube).
* configure.in (AC_TYPE_SIGNAL): Check this.
Sun May 25 16:49:58 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (discard_insertions): Take arg saying
whether ifinfo/ifset/etc. are ok.
(convert_from_loaded_file): At `finished', call discard_insertions.
(handle_variable_internal): Complain if we reach eof before the
@end for a false condition.
From: HERBERT@boevm4.vnet.ibm.com.
* info/Makefile.am (ginfo_SOURCES): Add doc.h.
* lib/Makefile.am (libtxi_a_SOURCES): Add system.h.
Sat May 24 18:08:27 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c: Check that we have macro_expansion_filename
before using strcmp.
Thu May 22 17:59:46 1997 Karl Berry <karl@cs.umb.edu>
* doc/makeinfo.texi: Minimally document --force.
* makeinfo/makeinfo.c (--force): New option.
(-E): Allow stdout via `-'.
(convert_from_loaded_file): Unlink output files if errors and !force.
Tue May 20 17:48:42 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c: Change all strdup calls to xstrdup.
(xmalloc, xrealloc, memory_error): Remove these functions, they're
in lib.
(set_paragraph_indent, cm_paragraph_indent): Move to misc page.
(cm_footnote): Expand macros in the arg for the macro expansion output.
Fri May 16 17:26:59 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (cm_macro): Allocate an empty body if the
macro was empty.
(cm_unmacro): Allocate one more byte for the null.
From: Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>.
Sun May 11 17:51:21 1997 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* makeinfo/makeinfo.c (cm_printindex): Fix calculation of the
length of an index line.
Sun May 11 14:47:42 1997 Tom Tromey <tromey@cygnus.com>
* makeinfo/makeinfo.c (main): Don't unconditionally run usage when
-e specified.
Sun May 11 17:47:42 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (init_indices): Free the source for an @synindex.
(undefindex): Do not go further if the target was already freed.
(free_index): Do not free the node names, as init_tags already did.
(cm_synindex, index_add_arg): Improve error message.
(program_index, function_index, etc.): Remove these unused #defines.
Tue May 6 17:53:37 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (init_internals): Do not free current_node,
it already is, at least when multiple input files are specified.
From: Karl Eichwalder <ke@ke.central.de>.
Mon May 5 16:14:39 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Mention both alignment and non-alignment of
continuation description lines in menus (Arnold).
Sun Apr 27 16:12:44 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (apply): Handle body being `\string'.
Also, avoid dereferencing a null pointer when a macro has no named
parameters.
From: Eli Zaretskii <eliz@is.elta.co.il>.
* makeinfo/makeinfo.c: Wording changes/fixes in warnings.
* info/session.c (info_get_input_char): Do not mix stdio with raw I/O.
From: Egil Kvaleberg <egilk@sn.no>.
From Tom Hageman <tom@basil.icce.rug.nl>. These changes make
arrow keys work:
* info/infomap.c: Add arrow key bindings.
(keymap_bind_keyseq): New support function.
(initialize_info_keymaps): Use it.
(term_ku,term_kd,term_kl,term_kr): Remove explicit declarations;
use #include "terminal.h" instead.
* info/session.c (initialize_info_session): Unbuffer stdin.
(info_get_another_input_char): Fix bug in `ready' logic.
* info/terminal.h,
* info/terminal.c (term_kP, term_kN): New variables to hold
PageUp, PageDown key sequences.
(terminal_initialize_terminal): Set them.
* util/texindex.c (main),
* util/install-info.c (main),
* makeinfo/makeinfo.c (print_version_info),
* info/info.c (main): Use PACKAGE and VERSION from Automake for
printing version number.
Sat Apr 26 19:19:46 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (get_until_in_line): Do not expand if
executing_string.
Also, free temporary strings.
Also, untabify entire file.
* doc/texinfo.texi: Many corrections from Arnold.
Thu Apr 24 16:31:09 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/multi.c (draw_horizontal_separator): Account for indent
here also. From Ulrich.
Wed Apr 23 15:15:34 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (cm_today): Use time_t instead of long;
everyone else does.
(LOCALTIME_CAST): Remove kludge, we'll always use time_t now.
* info/Makefile.am (ginfo_SOURCES): Remove general.h, that got
merged into system.h.
Mon Apr 21 17:13:25 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/multi.c (output_multitable_row): Account for
column_indent, both the global one and for each column.
(setup_multitable_parameters): Account for column_indent in the table
width in the columnfrac case, but don't bother with the template
case for now.
Sun Apr 20 16:32:00 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (output_stream): Remove redundant
definition; it's in makeinfo.h,
and a vaxstation-ultrix4.3 fails to link because of the two defns.
From: Anders Olofsson <anders@kid025.ericsson.se>.
* makeinfo/makeinfo.c (expansion): Inhibit appending to the macro
expansion stream.
(get_until_in_line): Possibly expand the text.
Change caller in get_node_token to do the expansion,
all other calls to remain the same.
* makeinfo/makeinfo.c (cm_node): No need to call strlen to check
for the empty string.
* doc/texinfo.texi: Restore missing @c for initial comment.
Fri Apr 18 17:41:36 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Mention that .info is unnecessary in the info
file name argument of an xref.
* doc/texinfo.texi: Mention texi2dvi -t instead of embedding
@smallbook or @afourpaper in the document source.
Sun Apr 13 15:19:08 1997 Karl Berry <karl@cs.umb.edu>
* lib/system.h (_GNU_SOURCE): #define.
Mon Apr 7 16:30:11 1997 Karl Berry <karl@cs.umb.edu>
* doc/info.texi,
* doc/info-stnd.texi,
* doc/texinfo.texi: Do not make (dir) the previous ptr from the top node,
and tell people not to do that in the manual.
From: rmedina@kanojo.ivic.ve (Rodrigo Medina),
confirmed by rms.
Fri Apr 4 16:30:33 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c: Move error page to top to avoid
prototypes, and do add prototypes for add_word_args and execute_string,
so we can use <stdarg.h>.
* info/makedoc.c,
* info/nodemenu.c: Use %ld instead of %d for file offsets.
* makeinfo/makeinfo.c (delete_macro): Decrement macro_list_len.
(get_macro_args): Decrement line number if see \n.
* utils/texindex.c (indexify): Use fputs instead of fprintf
for constant string.
From: Eli Zaretskii <eliz@is.elta.co.il>.
Thu Apr 3 17:40:52 1997 Karl Berry <karl@cs.umb.edu>
* configure.in (AC_CHECK_HEADERS): No need to check for vararg.h
here, AC_FUNC_VPRINTF does it.
(AC_CHECK_FUNCS): Likewise for vsprintf and vfprintf.
* makeinfo/makeinfo.c (add_word_args, execute_string): Rewrite
like the error functions.
Wed Apr 2 17:46:28 1997 Karl Berry <karl@cs.umb.edu>
* configure.in: Add AC_FUNC_VPRINTF.
* makeinfo/makeinfo.c (error, line_error, warning): Rewrite a la
error.c from the *utils to use <stdarg.h> if available.
Tue Apr 1 11:48:40 1997 Karl Berry <karl@cs.umb.edu>
* doc/texinfo.texi: Tabs are a bad idea.
* doc/userdoc.texi,
* doc/info.texi: Untabify.
Sun Mar 30 17:36:47 1997 Karl Berry <karl@cs.umb.edu>
* makeinfo/makeinfo.c (end_of_sentence_p): New function.
(add_char): Call it, instead of simply sentence_ender.
(post_sentence): New macro.
Also, remove some #include's now in system.h.
* lib/system.h [VMS]: #include <perror.h>, from makeinfo.
Thu Mar 27 17:41:03 1997 Karl Berry <karl@cs.umb.edu>
* info/search.c (skip_node_characters): Do not arbitrarily
strip trailing period from end of node name; this is valid.
Mon Mar 24 16:44:42 1997 Karl Berry <karl@cs.umb.edu>
* configure.in (AC_OUTPUT): Don't need to create stamp-h here,
tromey says AM_CONFIG_HEADER will do it.
* info/Makefile.am, util/Makefile.am, makeinfo/Makefile.am (INCLUDES):
Don't need -I.. (for config.h) or -I$(srcdir), says tromey.
Automake includes those already.
Fri Mar 14 15:05:17 1997 Karl Berry <karl@cs.umb.edu> Fri Mar 14 15:05:17 1997 Karl Berry <karl@cs.umb.edu>
* info/Makefile.am: Build as ginfo, install as info,
to avoid conflict with the standard info target.
* lib/system.h: New file.
* makeinfo/makeinfo.c (strerror): Remove declaration,
include system.h, remove other redundant #if stuff.
* info/general.h: Include system.h instead of doing common stuff.
* util/install-info.c (my_strerror): Remove this, use strerror,
include system.h.
* info/terminal.c (terminal_prep_terminal): Only use OCRNL and * info/terminal.c (terminal_prep_terminal): Only use OCRNL and
ONLCR if they are defined. Reported by many people. ONLCR if they are defined. Reported by many people.
Wed Feb 12 11:15:16 1997 Michael Meissner <meissner@cygnus.com> * Installed:
* util/texindex.c (main): Make main an int function, not void. Sun Dec 1 19:23:54 1996 Karl Eichwalder <ke@ke.Central.DE>
Sat Jun 29 18:56:07 1996 Geoffrey Noer <noer@cygnus.com> * configure.in (TERMLIBS): Add ncurses.
* configure.in: if ac_cv_c_cross is yes, don't run the Thu Mar 13 13:59:45 1997 Karl Berry <karl@cs.umb.edu>
AC_FUNC_SETVBUF_REVERSED call since it tries to do a run
test. This allows texinfo to build for cygwin32 Canadian * lib/Makefile.am (libtxi_a_SOURCES): Add xstrdup.c.
crosses/natives * info/*.c: Use xstrdup instead of strdup everywhere.
* configure: regenerate
* info/tilde.c: Do not include clib.h, move stdlib.h include to
* info/general.h: here.
* configure.in (AC_CONFIG_HEADER): Use this,
to avoid hugely long compile line with all the -D's.
* info/general.h: Include <config.h>.
* emacs/Makefile.am (install, install-data): Do @echo
to tell the user to compile/install the elisp manually.
* configure.in (AC_REPLACE_FUNCS): Move strerror check to here.
(AC_CHECK_FUNCS): From here.
* lib/strerror.c: New file, from enscript (et al.) distribution.
Tue Mar 11 16:36:25 1997 Karl Berry <karl@cs.umb.edu>
* info/Makefile.am (info_SOURCES): Add doc.c, dribble.c, infodoc.c.
(LDADD): Add @TERMLIBS@.
* info/info.h: HANDLE_MAN_PAGES, NAMED_FUNCTIONS: Define these.
* info/filesys.h: Spurious ! when DEFAULT_INFOPATH is not defined.
* configure.in (AC_OUTPUT): Do lib first and doc last.
* info/echo-area.c,
* info/echo-area.h,
* info/info.h: Rename echo_area to echo-area.
Mon Mar 10 17:59:05 1997 Karl Berry <karl@cs.umb.edu>
Wed Jun 26 12:48:10 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) * */Makefile.am: Write Makefile.am files for Automake.
* doc: New subdirectory, move all manuals and texinfo.tex there.
* Makefile.in (bindir, libdir, mandir, infodir): Use autoconf-set * AUTHORS, THANKS, config.guess, config.sub, mkinstalldirs: New files,
values. required by Automake.
* configure.in (AC_PREREQ): autoconf 2.5 or higher. * lib/xmalloc.c: Move from info/.
* configure: Rebuilt.
* emacs/Makefile.in (bindir, libdir, mandir, infodir): Use
autoconf-set values.
* info/Makefile.in (bindir, libdir, mandir, infodir): Use
autoconf-set values.
* libtxi/Makefile.in (bindir, libdir, mandir, infodir): Use
autoconf-set values.
* makeinfo/Makefile.in (bindir, libdir, mandir, infodir):
Use autoconf-set values.
* util/Makefile.in (bindir, libdir, mandir, infodir): Use
autoconf-set values.
Fri Oct 4 07:49:49 1996 Karl Berry <karl@cs.umb.edu> Fri Oct 4 07:49:49 1996 Karl Berry <karl@cs.umb.edu>
......
texinfo/aclocal.m4
dnl aclocal.m4 generated automatically by aclocal 1.2 dnl aclocal.m4 generated automatically by aclocal 1.2
# Check to see if we're running under Cygwin32, without using # Macro to add for using GNU gettext.
# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes". # Ulrich Drepper <drepper@cygnus.com>, 1995.
# Otherwise set it to "no".
dnl AM_CYGWIN32() # serial 2
AC_DEFUN(AM_CYGWIN32,
[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, AC_DEFUN(AM_WITH_NLS,
[AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }], [AC_MSG_CHECKING([whether NLS is requested])
am_cv_cygwin32=yes, am_cv_cygwin32=no) dnl Default is enabled NLS
rm -f conftest*]) AC_ARG_ENABLE(nls,
CYGWIN32= [ --disable-nls do not use Native Language Support],
test "$am_cv_cygwin32" = yes && CYGWIN32=yes]) USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS)
USE_INCLUDED_LIBINTL=no
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
AC_DEFINE(ENABLE_NLS)
AC_MSG_CHECKING([whether included gettext is requested])
AC_ARG_WITH(included-gettext,
[ --with-included-gettext use the GNU gettext library included here],
nls_cv_force_use_gnu_gettext=$withval,
nls_cv_force_use_gnu_gettext=no)
AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
dnl User does not insist on using GNU NLS library. Figure out what
dnl to use. If gettext or catgets are available (in this order) we
dnl use this. Else we have to fall back to GNU NLS library.
dnl catgets is only used if permitted by option --with-catgets.
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE
AC_CHECK_HEADER(libintl.h,
[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
[AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
[AC_CACHE_CHECK([for gettext in libintl],
gt_cv_func_gettext_libintl,
[AC_TRY_LINK([], [return (int) gettext ("")],
gt_cv_func_gettext_libintl=yes,
gt_cv_func_gettext_libintl=no)])])
fi
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
AC_DEFINE(HAVE_GETTEXT)
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
if test "$MSGFMT" != "no"; then
AC_CHECK_FUNCS(dcgettext)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr],
[CATOBJEXT=.gmo
DATADIRNAME=share],
[CATOBJEXT=.mo
DATADIRNAME=lib])
INSTOBJEXT=.mo
fi
fi
])
if test "$CATOBJEXT" = "NONE"; then
AC_MSG_CHECKING([whether catgets can be used])
AC_ARG_WITH(catgets,
[ --with-catgets use catgets functions if available],
nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
AC_MSG_RESULT($nls_cv_use_catgets)
if test "$nls_cv_use_catgets" = "yes"; then
dnl No gettext in C library. Try catgets next.
AC_CHECK_LIB(i, main)
AC_CHECK_FUNC(catgets,
[AC_DEFINE(HAVE_CATGETS)
INTLOBJS="\$(CATOBJS)"
AC_PATH_PROG(GENCAT, gencat, no)dnl
if test "$GENCAT" != "no"; then
AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
if test "$GMSGFMT" = "no"; then
AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
fi
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
DATADIRNAME=lib
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi])
fi
fi
if test "$CATOBJEXT" = "NONE"; then
dnl Neither gettext nor catgets in included in the C library.
dnl Fall back on GNU gettext library.
nls_cv_use_gnu_gettext=yes
fi
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions used to generate GNU NLS library.
INTLOBJS="\$(GETTOBJS)"
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
AC_SUBST(MSGFMT)
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INSTOBJEXT=.mo
DATADIRNAME=share
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
dnl Test whether we really found GNU xgettext.
if test "$XGETTEXT" != ":"; then
dnl If it is no GNU xgettext we define it as : so that the
dnl Makefiles still can work.
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
AC_MSG_RESULT(
[found xgettext programs is not GNU xgettext; ignore it])
XGETTEXT=":"
fi
fi
# We need to process the po/ directory.
POSUB=po
else
DATADIRNAME=share
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
# If this is used in GNU gettext we have to set USE_NLS to `yes'
# because some of the sources are only built for this goal.
if test "$PACKAGE" = gettext; then
USE_NLS=yes
USE_INCLUDED_LIBINTL=yes
fi
dnl These rules are solely for the distribution goal. While doing this
dnl we only have to keep exactly one list of the available catalogs
dnl in configure.in.
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
done
dnl Make all variables we use known to autoconf.
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT)
AC_SUBST(DATADIRNAME)
AC_SUBST(GMOFILES)
AC_SUBST(INSTOBJEXT)
AC_SUBST(INTLDEPS)
AC_SUBST(INTLLIBS)
AC_SUBST(INTLOBJS)
AC_SUBST(POFILES)
AC_SUBST(POSUB)
])
AC_DEFUN(AM_GNU_GETTEXT,
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_C_INLINE])dnl
AC_REQUIRE([AC_TYPE_OFF_T])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h values.h])
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
__argz_count __argz_stringify __argz_next])
if test "${ac_cv_func_stpcpy+set}" != "set"; then
AC_CHECK_FUNCS(stpcpy)
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
AC_DEFINE(HAVE_STPCPY)
fi
AM_LC_MESSAGES
AM_WITH_NLS
if test "x$CATOBJEXT" != "x"; then
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
AC_MSG_CHECKING(for catalogs to be installed)
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
esac
done
LINGUAS=$NEW_LINGUAS
AC_MSG_RESULT($LINGUAS)
fi
dnl Construct list of names of catalog files to be constructed.
if test -n "$LINGUAS"; then
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
fi
fi
dnl Determine which catalog format we have (if any is needed)
dnl For now we know about two different formats:
dnl Linux libc-5 and the normal X/Open format
test -d intl || mkdir intl
if test "$CATOBJEXT" = ".cat"; then
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
dnl Transform the SED scripts while copying because some dumb SEDs
dnl cannot handle comments.
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
fi
dnl po2tbl.sed is always needed.
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
dnl In the intl/Makefile.in we have a special dependency which makes
dnl only sense for gettext. We comment this out for non-gettext
dnl packages.
if test "$PACKAGE" = "gettext"; then
GT_NO="#NO#"
GT_YES=
else
GT_NO=
GT_YES="#YES#"
fi
AC_SUBST(GT_NO)
AC_SUBST(GT_YES)
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
dnl Try to locate is.
MKINSTALLDIRS=
if test $ac_aux_dir; then
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
if test -z $MKINSTALLDIRS; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
AC_SUBST(MKINSTALLDIRS)
dnl *** For now the libtool support in intl/Makefile is not for real.
l=
AC_SUBST(l)
dnl Generate list of files to be processed by xgettext which will
dnl be included in po/Makefile.
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
else
posrcprefix="../"
fi
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
])
# Search path for a program which passes the given test.
# Ulrich Drepper <drepper@cygnus.com>, 1996.
# serial 1
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN(AM_PATH_PROG_WITH_TEST,
[# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
AC_CACHE_VAL(ac_cv_path_$1,
[case "[$]$1" in
/*)
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in ifelse([$5], , $PATH, [$5]); do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if [$3]; then
ac_cv_path_$1="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
dnl If no 4th arg is given, leave the cache variable unset,
dnl so AC_PATH_PROGS will keep looking.
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
])dnl
;;
esac])dnl
$1="$ac_cv_path_$1"
if test -n "[$]$1"; then
AC_MSG_RESULT([$]$1)
else
AC_MSG_RESULT(no)
fi
AC_SUBST($1)dnl
])
# Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <drepper@cygnus.com>, 1995.
# serial 1
AC_DEFUN(AM_LC_MESSAGES,
[if test $ac_cv_header_locale_h = yes; then
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
if test $am_cv_val_LC_MESSAGES = yes; then
AC_DEFINE(HAVE_LC_MESSAGES)
fi
fi])
# Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN(AM_CONFIG_HEADER,
[AC_PREREQ([2.12])
AC_CONFIG_HEADER([$1])
dnl When config.status generates a header, we must update the stamp-h file.
dnl This file resides in the same directory as the config header
dnl that is generated. We must strip everything past the first ":",
dnl and everything past the last "/".
AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
<<am_indx=1
for am_file in <<$1>>; do
case " <<$>>CONFIG_HEADERS " in
*" <<$>>am_file "*<<)>>
echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
;;
esac
am_indx=`expr "<<$>>am_indx" + 1`
done<<>>dnl>>)
changequote([,]))])
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
# serial 1
dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN(AM_INIT_AUTOMAKE,
[AC_REQUIRE([AM_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
AC_SUBST(VERSION)
dnl test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
ifelse([$3],,
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
AM_SANITY_CHECK
AC_ARG_PROGRAM
dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_PROG_MAKE_SET])
# serial 1
AC_DEFUN(AM_PROG_INSTALL,
[AC_REQUIRE([AC_PROG_INSTALL])
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
AC_SUBST(INSTALL_SCRIPT)dnl
])
#
# Check to make sure that the build environment is sane.
#
AC_DEFUN(AM_SANITY_CHECK,
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
if test "$@" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
test "[$]2" = conftestfile
)
then
# Ok.
:
else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
rm -f conftest*
AC_MSG_RESULT(yes)])
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
dnl The program must properly implement --version.
AC_DEFUN(AM_MISSING_PROG,
[AC_MSG_CHECKING(for working $2)
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if ($2 --version) < /dev/null > /dev/null 2>&1; then
$1=$2
AC_MSG_RESULT(found)
else
$1="$3/missing $2"
AC_MSG_RESULT(missing)
fi
AC_SUBST($1)])
# Add --enable-maintainer-mode option to configure.
# From Jim Meyering
# serial 1
AC_DEFUN(AM_MAINTAINER_MODE,
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
dnl maintainer-mode is disabled by default
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
USE_MAINTAINER_MODE=$enableval,
USE_MAINTAINER_MODE=no)
AC_MSG_RESULT($USE_MAINTAINER_MODE)
if test $USE_MAINTAINER_MODE = yes; then
MAINT=
else
MAINT='#M#'
fi
AC_SUBST(MAINT)dnl
]
)
# Check to see if we're running under Win32, without using # Check to see if we're running under Win32, without using
# AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe". # AC_CANONICAL_*. If so, set output variable EXEEXT to ".exe".
...@@ -22,9 +495,9 @@ dnl This knows we add .exe if we're building in the Cygwin32 ...@@ -22,9 +495,9 @@ dnl This knows we add .exe if we're building in the Cygwin32
dnl environment. But if we're not, then it compiles a test program dnl environment. But if we're not, then it compiles a test program
dnl to see if there is a suffix for executables. dnl to see if there is a suffix for executables.
AC_DEFUN(AM_EXEEXT, AC_DEFUN(AM_EXEEXT,
dnl AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AM_CYGWIN32]) [AC_REQUIRE([AM_CYGWIN32])
AC_MSG_CHECKING([for executable suffix]) AC_MSG_CHECKING([for executable suffix])
[AC_CACHE_VAL(am_cv_exeext, AC_CACHE_VAL(am_cv_exeext,
[if test "$CYGWIN32" = yes; then [if test "$CYGWIN32" = yes; then
am_cv_exeext=.exe am_cv_exeext=.exe
else else
...@@ -34,7 +507,7 @@ int main() { ...@@ -34,7 +507,7 @@ int main() {
} }
EOF EOF
${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 ${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
rm -f am_c_test*]) rm -f am_c_test*])
test x"${am_cv_exeext}" = x && am_cv_exeext=no test x"${am_cv_exeext}" = x && am_cv_exeext=no
fi fi
...@@ -106,3 +579,17 @@ AC_SUBST(INSTALL_PROGRAM)dnl ...@@ -106,3 +579,17 @@ AC_SUBST(INSTALL_PROGRAM)dnl
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
AC_SUBST(INSTALL_DATA)dnl AC_SUBST(INSTALL_DATA)dnl
]) ])
# Check to see if we're running under Cygwin32, without using
# AC_CANONICAL_*. If so, set output variable CYGWIN32 to "yes".
# Otherwise set it to "no".
dnl AM_CYGWIN32()
AC_DEFUN(AM_CYGWIN32,
[AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32,
[AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }],
am_cv_cygwin32=yes, am_cv_cygwin32=no)
rm -f conftest*])
CYGWIN32=
test "$am_cv_cygwin32" = yes && CYGWIN32=yes])
texinfo/configure
...@@ -11,6 +11,15 @@ ...@@ -11,6 +11,15 @@
ac_help= ac_help=
ac_default_prefix=/usr/local ac_default_prefix=/usr/local
# Any additions from configure.in: # Any additions from configure.in:
ac_help="$ac_help
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer"
ac_help="$ac_help
--disable-nls do not use Native Language Support"
ac_help="$ac_help
--with-included-gettext use the GNU gettext library included here"
ac_help="$ac_help
--with-catgets use catgets functions if available"
# Initialize some variables set by options. # Initialize some variables set by options.
# The variables have the same names as the options, with # The variables have the same names as the options, with
...@@ -451,7 +460,7 @@ echo > confdefs.h ...@@ -451,7 +460,7 @@ echo > confdefs.h
# A filename unique to this package, relative to the directory that # A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct. # configure is in, which we can look for to find out if srcdir is correct.
ac_unique_file=texinfo.texi ac_unique_file=makeinfo/makeinfo.c
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
if test -z "$srcdir"; then if test -z "$srcdir"; then
...@@ -520,6 +529,9 @@ fi ...@@ -520,6 +529,9 @@ fi
ac_aux_dir= ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then if test -f $ac_dir/install-sh; then
...@@ -550,7 +562,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. ...@@ -550,7 +562,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:554: checking for a BSD compatible install" >&5 echo "configure:566: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -562,7 +574,7 @@ else ...@@ -562,7 +574,7 @@ else
/|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*) *)
# OSF1 and SCO ODT 3.0 have their own names for install. # OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall scoinst install; do for ac_prog in ginstall installbsd scoinst install; do
if test -f $ac_dir/$ac_prog; then if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install && if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
...@@ -599,40 +611,169 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ...@@ -599,40 +611,169 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:606: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then PACKAGE=texinfo
VERSION=3.11
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
fi
cat >> confdefs.h <<EOF
#define PACKAGE "$PACKAGE"
EOF
cat >> confdefs.h <<EOF
#define VERSION "$VERSION"
EOF
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:635: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
if test "" = "X"; then
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
test "$2" = conftestfile
)
then
# Ok.
:
else
{ echo "configure: error: newly created file is older than distributed files!
Check your system clock" 1>&2; exit 1; }
fi
rm -f conftest*
echo "$ac_t""yes" 1>&6
if test "$program_transform_name" = s,x,x,; then
program_transform_name=
else
# Double any \ or $. echo might interpret backslashes.
cat <<\EOF_SED > conftestsed
s,\\,\\\\,g; s,\$,$$,g
EOF_SED
program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
rm -f conftestsed
fi
test "$program_prefix" != NONE &&
program_transform_name="s,^,${program_prefix},; $program_transform_name"
# Use a double $ so make ignores it.
test "$program_suffix" != NONE &&
program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
# sed with no file args requires a program.
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:682: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (aclocal --version) < /dev/null > /dev/null 2>&1; then
ACLOCAL=aclocal
echo "$ac_t""found" 1>&6
else
ACLOCAL="$missing_dir/missing aclocal"
echo "$ac_t""missing" 1>&6
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:695: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoconf --version) < /dev/null > /dev/null 2>&1; then
AUTOCONF=autoconf
echo "$ac_t""found" 1>&6
else
AUTOCONF="$missing_dir/missing autoconf"
echo "$ac_t""missing" 1>&6
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:708: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (automake --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake
echo "$ac_t""found" 1>&6
else
AUTOMAKE="$missing_dir/missing automake"
echo "$ac_t""missing" 1>&6
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:721: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (autoheader --version) < /dev/null > /dev/null 2>&1; then
AUTOHEADER=autoheader
echo "$ac_t""found" 1>&6
else
AUTOHEADER="$missing_dir/missing autoheader"
echo "$ac_t""missing" 1>&6
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:734: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
MAKEINFO=makeinfo
echo "$ac_t""found" 1>&6
else
MAKEINFO="$missing_dir/missing makeinfo"
echo "$ac_t""missing" 1>&6
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:747: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
if test -n "$RANLIB"; then cat > conftestmake <<\EOF
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. all:
@echo 'ac_maketemp="${MAKE}"'
EOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" eval ac_cv_prog_make_${ac_make}_set=no
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_RANLIB="ranlib"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
fi fi
rm -f conftestmake
fi fi
RANLIB="$ac_cv_prog_RANLIB" if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
if test -n "$RANLIB"; then echo "$ac_t""yes" 1>&6
echo "$ac_t""$RANLIB" 1>&6 SET_MAKE=
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
SET_MAKE="MAKE=${MAKE-make}"
fi fi
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:636: checking for $ac_word" >&5 echo "configure:777: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -661,7 +802,7 @@ if test -z "$CC"; then ...@@ -661,7 +802,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args. # Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2 set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:665: checking for $ac_word" >&5 echo "configure:806: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -709,7 +850,7 @@ fi ...@@ -709,7 +850,7 @@ fi
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 echo "configure:854: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
...@@ -719,11 +860,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS ...@@ -719,11 +860,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 723 "configure" #line 864 "configure"
#include "confdefs.h" #include "confdefs.h"
main(){return(0);} main(){return(0);}
EOF EOF
if { (eval echo configure:727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler. # If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then if (./conftest; exit) 2>/dev/null; then
...@@ -743,12 +884,12 @@ if test $ac_cv_prog_cc_works = no; then ...@@ -743,12 +884,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "configure:888: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:752: checking whether we are using GNU C" >&5 echo "configure:893: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -757,7 +898,7 @@ else ...@@ -757,7 +898,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes ac_cv_prog_gcc=yes
else else
ac_cv_prog_gcc=no ac_cv_prog_gcc=no
...@@ -772,7 +913,7 @@ if test $ac_cv_prog_gcc = yes; then ...@@ -772,7 +913,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS= CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:776: checking whether ${CC-cc} accepts -g" >&5 echo "configure:917: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -799,29 +940,8 @@ else ...@@ -799,29 +940,8 @@ else
test "${CFLAGS+set}" = set || CFLAGS="-g" test "${CFLAGS+set}" = set || CFLAGS="-g"
fi fi
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
echo "configure:804: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
echo "$ac_t""yes" 1>&6
ISC=yes # If later tests want to check for ISC.
cat >> confdefs.h <<\EOF
#define _POSIX_SOURCE 1
EOF
if test "$GCC" = yes; then
CC="$CC -posix"
else
CC="$CC -Xp"
fi
else
echo "$ac_t""no" 1>&6
ISC=
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:825: checking how to run the C preprocessor" >&5 echo "configure:945: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
...@@ -836,13 +956,13 @@ else ...@@ -836,13 +956,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 840 "configure" #line 960 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -853,13 +973,13 @@ else ...@@ -853,13 +973,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 857 "configure" #line 977 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -881,19 +1001,211 @@ else ...@@ -881,19 +1001,211 @@ else
fi fi
echo "$ac_t""$CPP" 1>&6 echo "$ac_t""$CPP" 1>&6
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
echo "configure:1007: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
#line 1013 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "$ac_pattern" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_prog_gcc_traditional=yes
else
rm -rf conftest*
ac_cv_prog_gcc_traditional=no
fi
rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 1031 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "$ac_pattern" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_prog_gcc_traditional=yes
fi
rm -f conftest*
fi
fi
echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
if test $ac_cv_prog_gcc_traditional = yes; then
CC="$CC -traditional"
fi
fi
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1063: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
/|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall scoinst install; do
if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
# OSF/1 installbsd also uses dspmsg, but is usable.
:
else
ac_cv_path_install="$ac_dir/$ac_prog -c"
break 2
fi
fi
done
;;
esac
done
IFS="$ac_save_IFS"
fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL="$ac_cv_path_install"
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
INSTALL="$ac_install_sh"
fi
fi
echo "$ac_t""$INSTALL" 1>&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1115: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_RANLIB="ranlib"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
fi
fi
RANLIB="$ac_cv_prog_RANLIB"
if test -n "$RANLIB"; then
echo "$ac_t""$RANLIB" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# We do this for the sake of a more helpful warning in doc/Makefile.
TEXMF='$(datadir)/texmf'
# Extract the first word of "texconfig", so it can be a program name with args.
set dummy texconfig; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1147: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TEXCONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$TEXCONFIG"; then
ac_cv_prog_TEXCONFIG="$TEXCONFIG" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_TEXCONFIG="true"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_prog_TEXCONFIG" && ac_cv_prog_TEXCONFIG="false"
fi
fi
TEXCONFIG="$ac_cv_prog_TEXCONFIG"
if test -n "$TEXCONFIG"; then
echo "$ac_t""$TEXCONFIG" 1>&6
else
echo "$ac_t""no" 1>&6
fi
$TEXCONFIG && eval `texconfig confall | grep '^TEXMF='`
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
echo "configure:1177: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
echo "$ac_t""yes" 1>&6
ISC=yes # If later tests want to check for ISC.
cat >> confdefs.h <<\EOF
#define _POSIX_SOURCE 1
EOF
if test "$GCC" = yes; then
CC="$CC -posix"
else
CC="$CC -Xp"
fi
else
echo "$ac_t""no" 1>&6
ISC=
fi
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
echo "configure:887: checking for minix/config.h" >&5 echo "configure:1199: checking for minix/config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 892 "configure" #line 1204 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <minix/config.h> #include <minix/config.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -931,20 +1243,38 @@ EOF ...@@ -931,20 +1243,38 @@ EOF
fi fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:1248: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
USE_MAINTAINER_MODE=$enableval
else
USE_MAINTAINER_MODE=no
fi
echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
if test $USE_MAINTAINER_MODE = yes; then
MAINT=
else
MAINT='#M#'
fi
echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
echo "configure:936: checking for Cygwin32 environment" >&5 echo "configure:1266: checking for Cygwin32 environment" >&5
if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 941 "configure" #line 1271 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
int main () { return __CYGWIN32__; } int main () { return __CYGWIN32__; }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
am_cv_cygwin32=yes am_cv_cygwin32=yes
else else
...@@ -960,8 +1290,9 @@ fi ...@@ -960,8 +1290,9 @@ fi
echo "$ac_t""$am_cv_cygwin32" 1>&6 echo "$ac_t""$am_cv_cygwin32" 1>&6
CYGWIN32= CYGWIN32=
test "$am_cv_cygwin32" = yes && CYGWIN32=yes test "$am_cv_cygwin32" = yes && CYGWIN32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
echo "configure:965: checking for executable suffix" >&5 echo "configure:1296: checking for executable suffix" >&5
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -974,7 +1305,7 @@ int main() { ...@@ -974,7 +1305,7 @@ int main() {
} }
EOF EOF
${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 ${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
rm -f am_c_test* rm -f am_c_test*
fi fi
...@@ -987,7 +1318,7 @@ echo "$ac_t""${am_cv_exeext}" 1>&6 ...@@ -987,7 +1318,7 @@ echo "$ac_t""${am_cv_exeext}" 1>&6
# Needed on sysV68 for sigblock, sigsetmask. # Needed on sysV68 for sigblock, sigsetmask.
echo $ac_n "checking for sigblock in -lbsd""... $ac_c" 1>&6 echo $ac_n "checking for sigblock in -lbsd""... $ac_c" 1>&6
echo "configure:991: checking for sigblock in -lbsd" >&5 echo "configure:1322: checking for sigblock in -lbsd" >&5
ac_lib_var=`echo bsd'_'sigblock | sed 'y%./+-%__p_%'` ac_lib_var=`echo bsd'_'sigblock | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -995,7 +1326,7 @@ else ...@@ -995,7 +1326,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS" LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 999 "configure" #line 1330 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1006,7 +1337,7 @@ int main() { ...@@ -1006,7 +1337,7 @@ int main() {
sigblock() sigblock()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1034,10 +1365,12 @@ else ...@@ -1034,10 +1365,12 @@ else
fi fi
# Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
# rather ncurses. So we check for it.
TERMLIBS= TERMLIBS=
for termlib in curses ncurses termcap terminfo termlib ; do for termlib in ncurses curses termcap terminfo termlib ; do
echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
echo "configure:1041: checking for tputs in -l${termlib}" >&5 echo "configure:1374: checking for tputs in -l${termlib}" >&5
ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1045,7 +1378,7 @@ else ...@@ -1045,7 +1378,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-l${termlib} $LIBS" LIBS="-l${termlib} $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1049 "configure" #line 1382 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -1056,7 +1389,7 @@ int main() { ...@@ -1056,7 +1389,7 @@ int main() {
tputs() tputs()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -1080,12 +1413,12 @@ done ...@@ -1080,12 +1413,12 @@ done
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:1084: checking for ANSI C header files" >&5 echo "configure:1417: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1089 "configure" #line 1422 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -1093,7 +1426,7 @@ else ...@@ -1093,7 +1426,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -1110,7 +1443,7 @@ rm -f conftest* ...@@ -1110,7 +1443,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1114 "configure" #line 1447 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -1128,7 +1461,7 @@ fi ...@@ -1128,7 +1461,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1132 "configure" #line 1465 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -1149,7 +1482,7 @@ if test "$cross_compiling" = yes; then ...@@ -1149,7 +1482,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1153 "configure" #line 1486 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -1160,7 +1493,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -1160,7 +1493,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -1183,22 +1516,23 @@ EOF ...@@ -1183,22 +1516,23 @@ EOF
fi fi
for ac_hdr in unistd.h termios.h termio.h strings.h string.h varargs.h \ for ac_hdr in fcntl.h pwd.h string.h strings.h termcap.h termio.h \
sys/time.h sys/fcntl.h sys/ttold.h sys/ptem.h sys/file.h termios.h unistd.h \
sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1192: checking for $ac_hdr" >&5 echo "configure:1526: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1197 "configure" #line 1531 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -1225,24 +1559,60 @@ fi ...@@ -1225,24 +1559,60 @@ fi
done done
echo $ac_n "checking for off_t""... $ac_c" 1>&6 if test "x$termlib" = xncurses; then
echo "configure:1230: checking for off_t" >&5 ac_safe=`echo "ncurses/termcap.h" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "checking for ncurses/termcap.h""... $ac_c" 1>&6
echo "configure:1566: checking for ncurses/termcap.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1235 "configure" #line 1571 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <ncurses/termcap.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then { (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
rm -rf conftest* ac_err=`grep -v '^ *+' conftest.out`
ac_cv_type_off_t=yes if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
:
else
echo "$ac_t""no" 1>&6
fi
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
echo "configure:1600: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1605 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_off_t=yes
else else
rm -rf conftest* rm -rf conftest*
ac_cv_type_off_t=no ac_cv_type_off_t=no
...@@ -1258,13 +1628,54 @@ EOF ...@@ -1258,13 +1628,54 @@ EOF
fi fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:1633: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1638 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
#ifdef signal
#undef signal
#endif
#ifdef __cplusplus
extern "C" void (*signal (int, void (*)(int)))(int);
#else
void (*signal ()) ();
#endif
int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:1655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_type_signal=int
fi
rm -f conftest*
fi
echo "$ac_t""$ac_cv_type_signal" 1>&6
cat >> confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
EOF
echo $ac_n "checking for working const""... $ac_c" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1263: checking for working const" >&5 echo "configure:1674: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1268 "configure" #line 1679 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
...@@ -1313,7 +1724,7 @@ ccp = (char const *const *) p; ...@@ -1313,7 +1724,7 @@ ccp = (char const *const *) p;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_const=yes ac_cv_c_const=yes
else else
...@@ -1334,12 +1745,12 @@ EOF ...@@ -1334,12 +1745,12 @@ EOF
fi fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
echo "configure:1338: checking whether struct tm is in sys/time.h or time.h" >&5 echo "configure:1749: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1343 "configure" #line 1754 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <time.h> #include <time.h>
...@@ -1347,7 +1758,7 @@ int main() { ...@@ -1347,7 +1758,7 @@ int main() {
struct tm *tp; tp->tm_sec; struct tm *tp; tp->tm_sec;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_struct_tm=time.h ac_cv_struct_tm=time.h
else else
...@@ -1371,19 +1782,19 @@ fi ...@@ -1371,19 +1782,19 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless! # for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
echo "configure:1375: checking for working alloca.h" >&5 echo "configure:1786: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1380 "configure" #line 1791 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <alloca.h> #include <alloca.h>
int main() { int main() {
char *p = alloca(2 * sizeof(int)); char *p = alloca(2 * sizeof(int));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_alloca_h=yes ac_cv_header_alloca_h=yes
else else
...@@ -1404,12 +1815,12 @@ EOF ...@@ -1404,12 +1815,12 @@ EOF
fi fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6 echo $ac_n "checking for alloca""... $ac_c" 1>&6
echo "configure:1408: checking for alloca" >&5 echo "configure:1819: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1413 "configure" #line 1824 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef __GNUC__ #ifdef __GNUC__
...@@ -1432,7 +1843,7 @@ int main() { ...@@ -1432,7 +1843,7 @@ int main() {
char *p = (char *) alloca(1); char *p = (char *) alloca(1);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
ac_cv_func_alloca_works=yes ac_cv_func_alloca_works=yes
else else
...@@ -1464,12 +1875,12 @@ EOF ...@@ -1464,12 +1875,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
echo "configure:1468: checking whether alloca needs Cray hooks" >&5 echo "configure:1879: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1473 "configure" #line 1884 "configure"
#include "confdefs.h" #include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2) #if defined(CRAY) && ! defined(CRAY2)
webecray webecray
...@@ -1494,12 +1905,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 ...@@ -1494,12 +1905,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1498: checking for $ac_func" >&5 echo "configure:1909: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1503 "configure" #line 1914 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1522,7 +1933,7 @@ $ac_func(); ...@@ -1522,7 +1933,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1549,7 +1960,7 @@ done ...@@ -1549,7 +1960,7 @@ done
fi fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
echo "configure:1553: checking stack direction for C alloca" >&5 echo "configure:1964: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1557,7 +1968,7 @@ else ...@@ -1557,7 +1968,7 @@ else
ac_cv_c_stack_direction=0 ac_cv_c_stack_direction=0
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1561 "configure" #line 1972 "configure"
#include "confdefs.h" #include "confdefs.h"
find_stack_direction () find_stack_direction ()
{ {
...@@ -1576,7 +1987,7 @@ main () ...@@ -1576,7 +1987,7 @@ main ()
exit (find_stack_direction() < 0); exit (find_stack_direction() < 0);
} }
EOF EOF
if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_stack_direction=1 ac_cv_c_stack_direction=1
else else
...@@ -1597,9 +2008,114 @@ EOF ...@@ -1597,9 +2008,114 @@ EOF
fi fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
echo "configure:2013: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2018 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char vprintf();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_vprintf) || defined (__stub___vprintf)
choke me
#else
vprintf();
#endif
; return 0; }
EOF
if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_vprintf=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_VPRINTF 1
EOF
else
echo "$ac_t""no" 1>&6
fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
echo "configure:2065: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2070 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char _doprnt();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub__doprnt) || defined (__stub____doprnt)
choke me
#else
_doprnt();
#endif
; return 0; }
EOF
if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func__doprnt=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_DOPRNT 1
EOF
else
echo "$ac_t""no" 1>&6
fi
fi
if test "$ac_cv_c_cross" = no; then if test "$ac_cv_c_cross" = no; then
echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
echo "configure:1603: checking whether setvbuf arguments are reversed" >&5 echo "configure:2119: checking whether setvbuf arguments are reversed" >&5
if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1607,7 +2123,7 @@ else ...@@ -1607,7 +2123,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1611 "configure" #line 2127 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */ /* If setvbuf has the reversed format, exit 0. */
...@@ -1621,7 +2137,7 @@ main () { ...@@ -1621,7 +2137,7 @@ main () {
exit(0); /* Non-reversed systems segv here. */ exit(0); /* Non-reversed systems segv here. */
} }
EOF EOF
if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_setvbuf_reversed=yes ac_cv_func_setvbuf_reversed=yes
else else
...@@ -1646,15 +2162,15 @@ fi ...@@ -1646,15 +2162,15 @@ fi
fi fi
for ac_func in setvbuf getcwd memset bzero strchr strcasecmp \ for ac_func in setvbuf getcwd memset bzero strchr strcasecmp \
vfprintf vsprintf strerror sigprocmask sigsetmask sigprocmask sigsetmask
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1653: checking for $ac_func" >&5 echo "configure:2169: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1658 "configure" #line 2174 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1677,7 +2193,7 @@ $ac_func(); ...@@ -1677,7 +2193,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1701,15 +2217,15 @@ else ...@@ -1701,15 +2217,15 @@ else
fi fi
done done
for ac_func in memcpy memmove strdup for ac_func in memcpy memmove strdup strerror
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:1708: checking for $ac_func" >&5 echo "configure:2224: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1713 "configure" #line 2229 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -1732,7 +2248,7 @@ $ac_func(); ...@@ -1732,7 +2248,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -1759,109 +2275,1515 @@ done ...@@ -1759,109 +2275,1515 @@ done
trap '' 1 2 15 ALL_LINGUAS="de fr"
cat > confcache <<\EOF echo $ac_n "checking for inline""... $ac_c" 1>&6
# This file is a shell script that caches the results of configure echo "configure:2281: checking for inline" >&5
# tests run on this system so they can be shared between configure if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
# scripts and configure runs. It is not useful on other systems. echo $ac_n "(cached) $ac_c" 1>&6
# If it contains results you don't want to keep, you may remove or edit it. else
# ac_cv_c_inline=no
# By default, configure uses ./config.cache as the cache file, for ac_kw in inline __inline__ __inline; do
# creating it if it does not exist already. You can give configure cat > conftest.$ac_ext <<EOF
# the --cache-file=FILE option to use a different cache file; that is #line 2288 "configure"
# what configure does when it calls configure scripts in #include "confdefs.h"
# subdirectories, so they share the cache.
# Giving --cache-file=/dev/null disables caching, for debugging configure. int main() {
# config.status only pays attention to the cache file if you give it the } $ac_kw foo() {
# --recheck option to rerun configure. ; return 0; }
#
EOF EOF
# The following way of writing the cache mishandles newlines in values, if { (eval echo configure:2295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# but we know of no workaround that is simple, portable, and efficient. rm -rf conftest*
# So, don't put newlines in cache variables' values. ac_cv_c_inline=$ac_kw; break
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
case `(ac_space=' '; set) 2>&1` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
sed -n \
-e "s/'/'\\\\''/g" \
-e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
;;
esac >> confcache
if cmp -s $cache_file confcache; then
:
else else
if test -w $cache_file; then echo "configure: failed program was:" >&5
echo "updating cache $cache_file" cat conftest.$ac_ext >&5
cat confcache > $cache_file
else
echo "not updating unwritable cache $cache_file"
fi
fi fi
rm -f confcache rm -f conftest*
done
trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# Any assignment to VPATH causes Sun make to only execute
# the first set of double-colon rules, so remove it if not needed.
# If there is a colon in the path, we need to keep it.
if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi fi
trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 echo "$ac_t""$ac_cv_c_inline" 1>&6
case "$ac_cv_c_inline" in
# Transform confdefs.h into DEFS. inline | yes) ;;
# Protect against shell expansion while executing Makefile rules. no) cat >> confdefs.h <<\EOF
# Protect against Makefile macro expansion. #define inline
cat > conftest.defs <<\EOF EOF
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g ;;
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g *) cat >> confdefs.h <<EOF
s%\[%\\&%g #define inline $ac_cv_c_inline
s%\]%\\&%g
s%\$%$$%g
EOF EOF
DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` ;;
rm -f conftest.defs esac
echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:2321: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2326 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_size_t=yes
else
rm -rf conftest*
ac_cv_type_size_t=no
fi
rm -f conftest*
# Without the "./", some shells look in PATH for config.status. fi
: ${CONFIG_STATUS=./config.status} echo "$ac_t""$ac_cv_type_size_t" 1>&6
if test $ac_cv_type_size_t = no; then
cat >> confdefs.h <<\EOF
#define size_t unsigned
EOF
echo creating $CONFIG_STATUS fi
rm -f $CONFIG_STATUS
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
# Run this file to recreate the current configuration.
# This directory was configured as follows,
# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
#
# $0 $ac_configure_args
#
# Compiler output produced by configure, useful for debugging
# configure, is in ./config.log if it exists.
ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" for ac_hdr in unistd.h
for ac_option
do do
case "\$ac_option" in ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" echo "configure:2357: checking for $ac_hdr" >&5
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo $ac_n "(cached) $ac_c" 1>&6
echo "$CONFIG_STATUS generated by autoconf version 2.12.1" else
cat > conftest.$ac_ext <<EOF
#line 2362 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2396: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2401 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
$ac_func();
#endif
; return 0; }
EOF
if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:2449: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
#line 2457 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
Here is a matrix of mmap possibilities:
mmap private not fixed
mmap private fixed at somewhere currently unmapped
mmap private fixed at somewhere already mapped
mmap shared not fixed
mmap shared fixed at somewhere currently unmapped
mmap shared fixed at somewhere already mapped
For private mappings, we should verify that changes cannot be read()
back from the file, nor mmap's back from the file at a different
address. (There have been systems where private was not correctly
implemented like the infamous i386 svr4.0, and systems where the
VM page cache was not coherent with the filesystem buffer cache
like early versions of FreeBSD and possibly contemporary NetBSD.)
For shared mappings, we should conversely verify that changes get
propogated back to all the places they're supposed to be.
Grep wants private fixed already mapped.
The main things grep needs to know about mmap are:
* does it exist and is it safe to write into the mmap'd area
* how to use it (BSD variants) */
#include <sys/types.h>
#include <fcntl.h>
#include <sys/mman.h>
/* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
/* Assume that all systems that can run configure have sys/param.h. */
# ifndef HAVE_SYS_PARAM_H
# define HAVE_SYS_PARAM_H 1
# endif
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
# else /* no EXEC_PAGESIZE */
# ifdef NBPG
# define getpagesize() NBPG * CLSIZE
# ifndef CLSIZE
# define CLSIZE 1
# endif /* no CLSIZE */
# else /* no NBPG */
# ifdef NBPC
# define getpagesize() NBPC
# else /* no NBPC */
# ifdef PAGESIZE
# define getpagesize() PAGESIZE
# endif /* PAGESIZE */
# endif /* no NBPC */
# endif /* no NBPG */
# endif /* no EXEC_PAGESIZE */
# else /* no HAVE_SYS_PARAM_H */
# define getpagesize() 8192 /* punt totally */
# endif /* no HAVE_SYS_PARAM_H */
# endif /* no _SC_PAGESIZE */
#endif /* no HAVE_GETPAGESIZE */
#ifdef __cplusplus
extern "C" { void *malloc(unsigned); }
#else
char *malloc();
#endif
int
main()
{
char *data, *data2, *data3;
int i, pagesize;
int fd;
pagesize = getpagesize();
/*
* First, make a file with some known garbage in it.
*/
data = malloc(pagesize);
if (!data)
exit(1);
for (i = 0; i < pagesize; ++i)
*(data + i) = rand();
umask(0);
fd = creat("conftestmmap", 0600);
if (fd < 0)
exit(1);
if (write(fd, data, pagesize) != pagesize)
exit(1);
close(fd);
/*
* Next, try to mmap the file at a fixed address which
* already has something else allocated at it. If we can,
* also make sure that we see the same garbage.
*/
fd = open("conftestmmap", O_RDWR);
if (fd < 0)
exit(1);
data2 = malloc(2 * pagesize);
if (!data2)
exit(1);
data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FIXED, fd, 0L))
exit(1);
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
exit(1);
/*
* Finally, make sure that changes to the mapped area
* do not percolate back to the file as seen by read().
* (This is a bug on some variants of i386 svr4.0.)
*/
for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1;
data3 = malloc(pagesize);
if (!data3)
exit(1);
if (read(fd, data3, pagesize) != pagesize)
exit(1);
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data3 + i))
exit(1);
close(fd);
unlink("conftestmmap");
exit(0);
}
EOF
if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_func_mmap_fixed_mapped=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
ac_cv_func_mmap_fixed_mapped=no
fi
rm -fr conftest*
fi
fi
echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
if test $ac_cv_func_mmap_fixed_mapped = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_MMAP 1
EOF
fi
for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h values.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2625: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2630 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
__argz_count __argz_stringify __argz_next
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2665: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2670 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
$ac_func();
#endif
; return 0; }
EOF
if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
if test "${ac_cv_func_stpcpy+set}" != "set"; then
for ac_func in stpcpy
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2722: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2727 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
$ac_func();
#endif
; return 0; }
EOF
if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
fi
if test "${ac_cv_func_stpcpy}" = "yes"; then
cat >> confdefs.h <<\EOF
#define HAVE_STPCPY 1
EOF
fi
if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
echo "configure:2784: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2789 "configure"
#include "confdefs.h"
#include <locale.h>
int main() {
return LC_MESSAGES
; return 0; }
EOF
if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
am_cv_val_LC_MESSAGES=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
am_cv_val_LC_MESSAGES=no
fi
rm -f conftest*
fi
echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
if test $am_cv_val_LC_MESSAGES = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_LC_MESSAGES 1
EOF
fi
fi
echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
echo "configure:2817: checking whether NLS is requested" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
USE_NLS=$enableval
else
USE_NLS=yes
fi
echo "$ac_t""$USE_NLS" 1>&6
USE_INCLUDED_LIBINTL=no
if test "$USE_NLS" = "yes"; then
cat >> confdefs.h <<\EOF
#define ENABLE_NLS 1
EOF
echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
echo "configure:2837: checking whether included gettext is requested" >&5
# Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then
withval="$with_included_gettext"
nls_cv_force_use_gnu_gettext=$withval
else
nls_cv_force_use_gnu_gettext=no
fi
echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
nls_cv_header_intl=
nls_cv_header_libgt=
CATOBJEXT=NONE
ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
echo "configure:2856: checking for libintl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2861 "configure"
#include "confdefs.h"
#include <libintl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
echo "configure:2883: checking for gettext in libc" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2888 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
return (int) gettext ("")
; return 0; }
EOF
if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
gt_cv_func_gettext_libc=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
gt_cv_func_gettext_libc=no
fi
rm -f conftest*
fi
echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
if test "$gt_cv_func_gettext_libc" != "yes"; then
echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
echo "configure:2911: checking for bindtextdomain in -lintl" >&5
ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2919 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char bindtextdomain();
int main() {
bindtextdomain()
; return 0; }
EOF
if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
echo "configure:2946: checking for gettext in libintl" >&5
if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2951 "configure"
#include "confdefs.h"
int main() {
return (int) gettext ("")
; return 0; }
EOF
if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
gt_cv_func_gettext_libintl=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
gt_cv_func_gettext_libintl=no
fi
rm -f conftest*
fi
echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
else
echo "$ac_t""no" 1>&6
fi
fi
if test "$gt_cv_func_gettext_libc" = "yes" \
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
cat >> confdefs.h <<\EOF
#define HAVE_GETTEXT 1
EOF
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2986: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MSGFMT" in
/*)
ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
ac_cv_path_MSGFMT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
;;
esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
echo "$ac_t""$MSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test "$MSGFMT" != "no"; then
for ac_func in dcgettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3020: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3025 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
$ac_func();
#endif
; return 0; }
EOF
if { (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
echo "$ac_t""no" 1>&6
fi
done
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3075: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$GMSGFMT" in
/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT="$ac_cv_path_GMSGFMT"
if test -n "$GMSGFMT"; then
echo "$ac_t""$GMSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3110: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$XGETTEXT" in
/*)
ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
;;
esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
echo "$ac_t""$XGETTEXT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
cat > conftest.$ac_ext <<EOF
#line 3142 "configure"
#include "confdefs.h"
int main() {
extern int _nl_msg_cat_cntr;
return _nl_msg_cat_cntr
; return 0; }
EOF
if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
CATOBJEXT=.gmo
DATADIRNAME=share
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
DATADIRNAME=lib
fi
rm -f conftest*
INSTOBJEXT=.mo
fi
fi
else
echo "$ac_t""no" 1>&6
fi
if test "$CATOBJEXT" = "NONE"; then
echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
echo "configure:3173: checking whether catgets can be used" >&5
# Check whether --with-catgets or --without-catgets was given.
if test "${with_catgets+set}" = set; then
withval="$with_catgets"
nls_cv_use_catgets=$withval
else
nls_cv_use_catgets=no
fi
echo "$ac_t""$nls_cv_use_catgets" 1>&6
if test "$nls_cv_use_catgets" = "yes"; then
echo $ac_n "checking for main in -li""... $ac_c" 1>&6
echo "configure:3186: checking for main in -li" >&5
ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-li $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3194 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
LIBS="-li $LIBS"
else
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking for catgets""... $ac_c" 1>&6
echo "configure:3229: checking for catgets" >&5
if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3234 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char catgets(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char catgets();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_catgets) || defined (__stub___catgets)
choke me
#else
catgets();
#endif
; return 0; }
EOF
if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_catgets=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_catgets=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_CATGETS 1
EOF
INTLOBJS="\$(CATOBJS)"
# Extract the first word of "gencat", so it can be a program name with args.
set dummy gencat; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3279: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$GENCAT" in
/*)
ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_GENCAT="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
;;
esac
fi
GENCAT="$ac_cv_path_GENCAT"
if test -n "$GENCAT"; then
echo "$ac_t""$GENCAT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test "$GENCAT" != "no"; then
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3314: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$GMSGFMT" in
/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
;;
esac
fi
GMSGFMT="$ac_cv_path_GMSGFMT"
if test -n "$GMSGFMT"; then
echo "$ac_t""$GMSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test "$GMSGFMT" = "no"; then
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3350: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$GMSGFMT" in
/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
;;
esac
fi
GMSGFMT="$ac_cv_path_GMSGFMT"
if test -n "$GMSGFMT"; then
echo "$ac_t""$GMSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3385: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$XGETTEXT" in
/*)
ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
;;
esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
echo "$ac_t""$XGETTEXT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.cat
INSTOBJEXT=.cat
DATADIRNAME=lib
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
else
echo "$ac_t""no" 1>&6
fi
fi
fi
if test "$CATOBJEXT" = "NONE"; then
nls_cv_use_gnu_gettext=yes
fi
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
INTLOBJS="\$(GETTOBJS)"
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3443: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$MSGFMT" in
/*)
ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
ac_cv_path_MSGFMT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
;;
esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
echo "$ac_t""$MSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3477: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$GMSGFMT" in
/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
;;
?:/*)
ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT="$ac_cv_path_GMSGFMT"
if test -n "$GMSGFMT"; then
echo "$ac_t""$GMSGFMT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:3512: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
case "$XGETTEXT" in
/*)
ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
break
fi
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
;;
esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
echo "$ac_t""$XGETTEXT" 1>&6
else
echo "$ac_t""no" 1>&6
fi
USE_INCLUDED_LIBINTL=yes
CATOBJEXT=.gmo
INSTOBJEXT=.mo
DATADIRNAME=share
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
if test "$XGETTEXT" != ":"; then
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
XGETTEXT=":"
fi
fi
# We need to process the po/ directory.
POSUB=po
else
DATADIRNAME=share
nls_cv_header_intl=intl/libintl.h
nls_cv_header_libgt=intl/libgettext.h
fi
# If this is used in GNU gettext we have to set USE_NLS to `yes'
# because some of the sources are only built for this goal.
if test "$PACKAGE" = gettext; then
USE_NLS=yes
USE_INCLUDED_LIBINTL=yes
fi
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES $lang.po"
done
if test "x$CATOBJEXT" != "x"; then
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
echo "configure:3602: checking for catalogs to be installed" >&5
NEW_LINGUAS=
for lang in ${LINGUAS=$ALL_LINGUAS}; do
case "$ALL_LINGUAS" in
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
esac
done
LINGUAS=$NEW_LINGUAS
echo "$ac_t""$LINGUAS" 1>&6
fi
if test -n "$LINGUAS"; then
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
fi
fi
test -d intl || mkdir intl
if test "$CATOBJEXT" = ".cat"; then
ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
echo "configure:3622: checking for linux/version.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3627 "configure"
#include "confdefs.h"
#include <linux/version.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
msgformat=linux
else
echo "$ac_t""no" 1>&6
msgformat=xopen
fi
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
fi
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
if test "$PACKAGE" = "gettext"; then
GT_NO="#NO#"
GT_YES=
else
GT_NO=
GT_YES="#YES#"
fi
MKINSTALLDIRS=
if test $ac_aux_dir; then
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
if test -z $MKINSTALLDIRS; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
l=
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
posrcprefix="$srcdir/"
else
posrcprefix="../$srcdir/"
fi
else
posrcprefix="../"
fi
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
< $srcdir/po/POTFILES.in > po/POTFILES
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
# scripts and configure runs. It is not useful on other systems.
# If it contains results you don't want to keep, you may remove or edit it.
#
# By default, configure uses ./config.cache as the cache file,
# creating it if it does not exist already. You can give configure
# the --cache-file=FILE option to use a different cache file; that is
# what configure does when it calls configure scripts in
# subdirectories, so they share the cache.
# Giving --cache-file=/dev/null disables caching, for debugging configure.
# config.status only pays attention to the cache file if you give it the
# --recheck option to rerun configure.
#
EOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
# So, don't put newlines in cache variables' values.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
case `(ac_space=' '; set) 2>&1 | grep ac_space` in
*ac_space=\ *)
# `set' does not quote correctly, so add quotes (double-quote substitution
# turns \\\\ into \\, and sed turns \\ into \).
sed -n \
-e "s/'/'\\\\''/g" \
-e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
;;
esac >> confcache
if cmp -s $cache_file confcache; then
:
else
if test -w $cache_file; then
echo "updating cache $cache_file"
cat confcache > $cache_file
else
echo "not updating unwritable cache $cache_file"
fi
fi
rm -f confcache
trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# Any assignment to VPATH causes Sun make to only execute
# the first set of double-colon rules, so remove it if not needed.
# If there is a colon in the path, we need to keep it.
if test "x$srcdir" = x.; then
ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
fi
trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
DEFS=-DHAVE_CONFIG_H
# Without the "./", some shells look in PATH for config.status.
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
rm -f $CONFIG_STATUS
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
# Run this file to recreate the current configuration.
# This directory was configured as follows,
# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
#
# $0 $ac_configure_args
#
# Compiler output produced by configure, useful for debugging
# configure, is in ./config.log if it exists.
ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
for ac_option
do
case "\$ac_option" in
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
exit 0 ;; exit 0 ;;
-help | --help | --hel | --he | --h) -help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;; echo "\$ac_cs_usage"; exit 0 ;;
...@@ -1870,8 +3792,18 @@ do ...@@ -1870,8 +3792,18 @@ do
done done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "Makefile \
doc/Makefile \
emacs/Makefile \
info/Makefile \
intl/Makefile \
lib/Makefile \
makeinfo/Makefile \
po/Makefile.in \
util/Makefile \
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
...@@ -1902,16 +3834,48 @@ s%@includedir@%$includedir%g ...@@ -1902,16 +3834,48 @@ s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g s%@infodir@%$infodir%g
s%@mandir@%$mandir%g s%@mandir@%$mandir%g
s%@INSTALL@%$INSTALL%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@RANLIB@%$RANLIB%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@PACKAGE@%$PACKAGE%g
s%@VERSION@%$VERSION%g
s%@ACLOCAL@%$ACLOCAL%g
s%@AUTOCONF@%$AUTOCONF%g
s%@AUTOMAKE@%$AUTOMAKE%g
s%@AUTOHEADER@%$AUTOHEADER%g
s%@MAKEINFO@%$MAKEINFO%g
s%@SET_MAKE@%$SET_MAKE%g
s%@CC@%$CC%g s%@CC@%$CC%g
s%@CPP@%$CPP%g s%@CPP@%$CPP%g
s%@INSTALL@%$INSTALL%g
s%@RANLIB@%$RANLIB%g
s%@TEXCONFIG@%$TEXCONFIG%g
s%@TEXMF@%$TEXMF%g
s%@MAINT@%$MAINT%g
s%@EXEEXT@%$EXEEXT%g s%@EXEEXT@%$EXEEXT%g
s%@TERMLIBS@%$TERMLIBS%g s%@TERMLIBS@%$TERMLIBS%g
s%@ALLOCA@%$ALLOCA%g s%@ALLOCA@%$ALLOCA%g
s%@LIBOBJS@%$LIBOBJS%g s%@LIBOBJS@%$LIBOBJS%g
s%@USE_NLS@%$USE_NLS%g
s%@MSGFMT@%$MSGFMT%g
s%@GMSGFMT@%$GMSGFMT%g
s%@XGETTEXT@%$XGETTEXT%g
s%@GENCAT@%$GENCAT%g
s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
s%@CATALOGS@%$CATALOGS%g
s%@CATOBJEXT@%$CATOBJEXT%g
s%@DATADIRNAME@%$DATADIRNAME%g
s%@GMOFILES@%$GMOFILES%g
s%@INSTOBJEXT@%$INSTOBJEXT%g
s%@INTLDEPS@%$INTLDEPS%g
s%@INTLLIBS@%$INTLLIBS%g
s%@INTLOBJS@%$INTLOBJS%g
s%@POFILES@%$POFILES%g
s%@POSUB@%$POSUB%g
s%@GT_NO@%$GT_NO%g
s%@GT_YES@%$GT_YES%g
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
s%@l@%$l%g
CEOF CEOF
EOF EOF
...@@ -1953,7 +3917,16 @@ EOF ...@@ -1953,7 +3917,16 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile"} CONFIG_FILES=\${CONFIG_FILES-"Makefile \
doc/Makefile \
emacs/Makefile \
info/Makefile \
intl/Makefile \
lib/Makefile \
makeinfo/Makefile \
po/Makefile.in \
util/Makefile \
"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
...@@ -1988,6 +3961,10 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then ...@@ -1988,6 +3961,10 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
top_srcdir="$ac_dots$ac_given_srcdir" ;; top_srcdir="$ac_dots$ac_given_srcdir" ;;
esac esac
case "$ac_given_INSTALL" in
[/$]*) INSTALL="$ac_given_INSTALL" ;;
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
echo creating "$ac_file" echo creating "$ac_file"
rm -f "$ac_file" rm -f "$ac_file"
...@@ -2003,16 +3980,171 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then ...@@ -2003,16 +3980,171 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
s%@configure_input@%$configure_input%g s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g s%@srcdir@%$srcdir%g
s%@top_srcdir@%$top_srcdir%g s%@top_srcdir@%$top_srcdir%g
s%@INSTALL@%$INSTALL%g
" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
fi; done fi; done
rm -f conftest.s* rm -f conftest.s*
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
ac_dC='\3'
ac_dD='%g'
# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='\([ ]\)%\1#\2define\3'
ac_uC=' '
ac_uD='\4%g'
# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_eB='$%\1#\2define\3'
ac_eC=' '
ac_eD='%g'
if test "${CONFIG_HEADERS+set}" != set; then
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_HEADERS="config.h"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi
for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
*:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
echo creating $ac_file
rm -f conftest.frag conftest.in conftest.out
ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
cat $ac_file_inputs > conftest.in
EOF
# Transform confdefs.h into a sed script conftest.vals that substitutes
# the proper values into config.h.in to produce config.h. And first:
# Protect against being on the right side of a sed subst in config.status.
# Protect against being in an unquoted here document in config.status.
rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
sed -n -f conftest.hdr confdefs.h > conftest.vals
rm -f conftest.hdr
# This sed command replaces #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >> conftest.vals <<\EOF
s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
EOF
# Break up conftest.vals because some shells have a limit on
# the size of here documents, and old seds have small limits too.
rm -f conftest.tail
while :
do
ac_lines=`grep -c . conftest.vals`
# grep -c gives empty output for an empty file on some AIX systems.
if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
# Write a limited-size here document to conftest.frag.
echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
echo 'CEOF
sed -f conftest.frag conftest.in > conftest.out
rm -f conftest.in
mv conftest.out conftest.in
' >> $CONFIG_STATUS
sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
rm -f conftest.vals
mv conftest.tail conftest.vals
done
rm -f conftest.vals
cat >> $CONFIG_STATUS <<\EOF
rm -f conftest.frag conftest.h
echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
cat conftest.in >> conftest.h
rm -f conftest.in
if cmp -s $ac_file conftest.h 2>/dev/null; then
echo "$ac_file is unchanged"
rm -f conftest.h
else
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
# The file is in a subdirectory.
test ! -d "$ac_dir" && mkdir "$ac_dir"
fi
rm -f $ac_file
mv conftest.h $ac_file
fi
fi; done
EOF
cat >> $CONFIG_STATUS <<EOF
ac_sources="$nls_cv_header_libgt"
ac_dests="$nls_cv_header_intl"
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
srcdir=$ac_given_srcdir
while test -n "$ac_sources"; do
set $ac_dests; ac_dest=$1; shift; ac_dests=$*
set $ac_sources; ac_source=$1; shift; ac_sources=$*
echo "linking $srcdir/$ac_source to $ac_dest"
if test ! -r $srcdir/$ac_source; then
{ echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
fi
rm -f $ac_dest
# Make relative symlinks.
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
# The dest file is in a subdirectory.
test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
# A "../" for each directory in $ac_dest_dir_suffix.
ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
else
ac_dest_dir_suffix= ac_dots=
fi
case "$srcdir" in
[/$]*) ac_rel_source="$srcdir/$ac_source" ;;
*) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
esac
# Make a symlink if possible; otherwise try a hard link.
if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
ln $srcdir/$ac_source $ac_dest; then :
else
{ echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
fi
done
EOF
cat >> $CONFIG_STATUS <<EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile
exit 0 exit 0
EOF EOF
chmod +x $CONFIG_STATUS chmod +x $CONFIG_STATUS
......
texinfo/configure.in
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Id: configure.in,v 1.2 1997/09/16 05:01:43 law Exp $ dnl $Id: configure.in,v 1.5 1998/03/24 18:05:13 law Exp $
AC_PREREQ(2.5) dnl
AC_INIT(texinfo.texi) AC_INIT(makeinfo/makeinfo.c)
AC_PREREQ(2.12)dnl Minimum Autoconf version required.
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([texinfo], [3.11])
dnl Checks for programs. dnl Checks for programs.
dnl AC_PROG_GCC_TRADITIONAL AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
EGCS_PROG_INSTALL EGCS_PROG_INSTALL
AC_PROG_RANLIB AC_PROG_RANLIB
# We do this for the sake of a more helpful warning in doc/Makefile.
TEXMF='$(datadir)/texmf'
AC_CHECK_PROG(TEXCONFIG, texconfig, true, false)
$TEXCONFIG && eval `texconfig confall | grep '^TEXMF='`
AC_SUBST(TEXMF)
AC_ISC_POSIX AC_ISC_POSIX
AC_MINIX AC_MINIX
AM_CYGWIN32 dnl CYGNUS LOCAL: Add AM_MAINTAINER_MODE and AM_EXEEXT
AM_MAINTAINER_MODE
AM_EXEEXT AM_EXEEXT
dnl Checks for libraries. dnl Checks for libraries.
# Needed on sysV68 for sigblock, sigsetmask. # Needed on sysV68 for sigblock, sigsetmask.
AC_CHECK_LIB(bsd, sigblock) AC_CHECK_LIB(bsd, sigblock)
# Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
# rather ncurses. So we check for it.
TERMLIBS= TERMLIBS=
for termlib in curses ncurses termcap terminfo termlib ; do for termlib in ncurses curses termcap terminfo termlib ; do
AC_CHECK_LIB(${termlib}, tputs, AC_CHECK_LIB(${termlib}, tputs,
[TERMLIBS="${TERMLIBS} -l${termlib}"; break]) [TERMLIBS="${TERMLIBS} -l${termlib}"; break])
done done
...@@ -27,22 +41,45 @@ AC_SUBST(TERMLIBS) ...@@ -27,22 +41,45 @@ AC_SUBST(TERMLIBS)
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h termios.h termio.h strings.h string.h varargs.h \ AC_CHECK_HEADERS(fcntl.h pwd.h string.h strings.h termcap.h termio.h \
sys/time.h sys/fcntl.h sys/ttold.h sys/ptem.h sys/file.h) termios.h unistd.h \
sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h)
dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
if test "x$termlib" = xncurses; then
AC_CHECK_HEADER(ncurses/termcap.h)
fi
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_OFF_T AC_TYPE_OFF_T
AC_TYPE_SIGNAL
AC_C_CONST AC_C_CONST
AC_STRUCT_TM AC_STRUCT_TM
dnl Checks for library functions. dnl Checks for library functions.
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_FUNC_VPRINTF
if test "$ac_cv_c_cross" = no; then if test "$ac_cv_c_cross" = no; then
AC_FUNC_SETVBUF_REVERSED AC_FUNC_SETVBUF_REVERSED
fi fi
AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \ AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \
vfprintf vsprintf strerror sigprocmask sigsetmask) sigprocmask sigsetmask)
dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added. dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
AC_REPLACE_FUNCS(memcpy memmove strdup) AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
dnl Set of available languages and i18n macros.
ALL_LINGUAS="de fr"
AM_GNU_GETTEXT
AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
AC_OUTPUT(Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile) AC_OUTPUT([Makefile \
doc/Makefile \
emacs/Makefile \
info/Makefile \
intl/Makefile \
lib/Makefile \
makeinfo/Makefile \
po/Makefile.in \
util/Makefile \
],
[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile])
texinfo/info/man.c
/* man.c: How to read and format man files. */ /* man.c: How to read and format man files.
$Id: man.c,v 1.4 1998/03/22 21:47:54 law Exp $
/* This file is part of GNU Info, a program for reading online documentation Copyright (C) 1995, 97 Free Software Foundation, Inc.
stored in Info format.
Copyright (C) 1995 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -23,7 +21,6 @@ ...@@ -23,7 +21,6 @@
#include "info.h" #include "info.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/file.h>
#include "signals.h" #include "signals.h"
#if defined (HAVE_SYS_TIME_H) #if defined (HAVE_SYS_TIME_H)
#include <sys/time.h> #include <sys/time.h>
...@@ -31,8 +28,8 @@ ...@@ -31,8 +28,8 @@
#if defined (HAVE_SYS_WAIT_H) #if defined (HAVE_SYS_WAIT_H)
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#include "tilde.h"
#include "tilde.h"
#include "man.h" #include "man.h"
#if !defined (SIGCHLD) && defined (SIGCLD) #if !defined (SIGCHLD) && defined (SIGCLD)
...@@ -116,12 +113,9 @@ get_manpage_node (file_buffer, pagename) ...@@ -116,12 +113,9 @@ get_manpage_node (file_buffer, pagename)
FILE_BUFFER * FILE_BUFFER *
create_manpage_file_buffer () create_manpage_file_buffer ()
{ {
FILE_BUFFER *file_buffer; FILE_BUFFER *file_buffer = make_file_buffer ();
struct stat *finfo; file_buffer->filename = xstrdup (MANPAGE_FILE_BUFFER_NAME);
file_buffer->fullpath = xstrdup (MANPAGE_FILE_BUFFER_NAME);
file_buffer = make_file_buffer ();
file_buffer->filename = strdup (MANPAGE_FILE_BUFFER_NAME);
file_buffer->fullpath = strdup (MANPAGE_FILE_BUFFER_NAME);
file_buffer->finfo.st_size = 0; file_buffer->finfo.st_size = 0;
file_buffer->filesize = 0; file_buffer->filesize = 0;
file_buffer->contents = (char *)NULL; file_buffer->contents = (char *)NULL;
...@@ -143,9 +137,8 @@ executable_file_in_path (filename, path) ...@@ -143,9 +137,8 @@ executable_file_in_path (filename, path)
dirname_index = 0; dirname_index = 0;
while (temp_dirname = extract_colon_unit (path, &dirname_index)) while ((temp_dirname = extract_colon_unit (path, &dirname_index)))
{ {
register int i;
char *temp; char *temp;
/* Expand a leading tilde if one is present. */ /* Expand a leading tilde if one is present. */
...@@ -227,7 +220,7 @@ static void ...@@ -227,7 +220,7 @@ static void
reap_children (sig) reap_children (sig)
int sig; int sig;
{ {
unsigned int status; int status;
wait (&status); wait (&status);
} }
...@@ -239,7 +232,6 @@ get_manpage_contents (pagename) ...@@ -239,7 +232,6 @@ get_manpage_contents (pagename)
int pipes[2]; int pipes[2];
pid_t child; pid_t child;
char *formatted_page = (char *)NULL; char *formatted_page = (char *)NULL;
char *section = (char *)NULL;
int arg_index = 1; int arg_index = 1;
if (formatter_args[0] == (char *)NULL) if (formatter_args[0] == (char *)NULL)
...@@ -310,7 +302,7 @@ clean_manpage (manpage) ...@@ -310,7 +302,7 @@ clean_manpage (manpage)
newpage = (char *)xmalloc (1 + strlen (manpage)); newpage = (char *)xmalloc (1 + strlen (manpage));
for (i = 0, j = 0; newpage[j] = manpage[i]; i++, j++) for (i = 0, j = 0; (newpage[j] = manpage[i]); i++, j++)
{ {
if (manpage[i] == '\n') if (manpage[i] == '\n')
newline_count++; newline_count++;
...@@ -345,7 +337,7 @@ manpage_node_of_file_buffer (file_buffer, pagename) ...@@ -345,7 +337,7 @@ manpage_node_of_file_buffer (file_buffer, pagename)
{ {
register int i; register int i;
for (i = 0; tag = file_buffer->tags[i]; i++) for (i = 0; (tag = file_buffer->tags[i]); i++)
{ {
if (strcasecmp (pagename, tag->nodename) == 0) if (strcasecmp (pagename, tag->nodename) == 0)
break; break;
...@@ -543,8 +535,8 @@ xrefs_of_manpage (node) ...@@ -543,8 +535,8 @@ xrefs_of_manpage (node)
entry->label = (char *)xmalloc (1 + len); entry->label = (char *)xmalloc (1 + len);
strncpy (entry->label, (reference_section->buffer) + start, len); strncpy (entry->label, (reference_section->buffer) + start, len);
entry->label[len] = '\0'; entry->label[len] = '\0';
entry->filename = strdup (node->filename); entry->filename = xstrdup (node->filename);
entry->nodename = strdup (entry->label); entry->nodename = xstrdup (entry->label);
entry->start = start; entry->start = start;
entry->end = end; entry->end = end;
...@@ -564,7 +556,6 @@ locate_manpage_xref (node, start, dir) ...@@ -564,7 +556,6 @@ locate_manpage_xref (node, start, dir)
long start; long start;
int dir; int dir;
{ {
register int i, count;
REFERENCE **refs; REFERENCE **refs;
long position = -1; long position = -1;
...@@ -580,7 +571,7 @@ locate_manpage_xref (node, start, dir) ...@@ -580,7 +571,7 @@ locate_manpage_xref (node, start, dir)
if (dir > 0) if (dir > 0)
{ {
for (i = 0; entry = refs[i]; i++) for (i = 0; (entry = refs[i]); i++)
if (entry->start > start) if (entry->start > start)
{ {
position = entry->start; position = entry->start;
...@@ -628,7 +619,7 @@ manpage_xrefs_in_binding (node, binding) ...@@ -628,7 +619,7 @@ manpage_xrefs_in_binding (node, binding)
start = binding->start + (binding->buffer - node->contents); start = binding->start + (binding->buffer - node->contents);
end = binding->end + (binding->buffer - node->contents); end = binding->end + (binding->buffer - node->contents);
for (i = 0; entry = all_refs[i]; i++) for (i = 0; (entry = all_refs[i]); i++)
{ {
if ((entry->start > start) && (entry->end < end)) if ((entry->start > start) && (entry->end < end))
{ {
......
texinfo/info/termdep.h
/* termdep.h -- System things that terminal.c depends on. /* termdep.h -- System things that terminal.c depends on.
$Id: termdep.h,v 1.2 1997/10/30 05:55:14 law Exp $ $Id: termdep.h,v 1.4 1998/03/24 18:06:50 law Exp $
This file is part of GNU Info, a program for reading online documentation This file is part of GNU Info, a program for reading online documentation
stored in Info format. stored in Info format.
Copyright (C) 1993, 96 Free Software Foundation, Inc. Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -22,32 +22,20 @@ ...@@ -22,32 +22,20 @@
Written by Brian Fox (bfox@ai.mit.edu). */ Written by Brian Fox (bfox@ai.mit.edu). */
#if !defined (_TERMDEP_H_) #ifndef INFO_TERMDEP_H
# define _TERMDEP_H_ #define INFO_TERMDEP_H
#if defined (HAVE_SYS_FCNTL_H) /* NeXT supplies <termios.h> but it is broken. Probably Autoconf should
# include <sys/fcntl.h> have a separate test, but anyway ... */
#else #ifdef NeXT
# include <fcntl.h> #undef HAVE_TERMIOS_H
#endif /* !HAVE_SYS_FCNTL_H */
#if defined (HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif /* HAVE_SYS_FILE_H */
#if defined (HAVE_STRINGS_H)
# include <strings.h>
#else
# if defined (HAVE_STRING_H)
# include <string.h>
# endif
#endif #endif
#if defined (HAVE_TERMIOS_H) #ifdef HAVE_TERMIOS_H
# include <termios.h> # include <termios.h>
/* /*
* POSIX does not mandate that we have these and it may, in fact, be only POSIX does not mandate that we have these and it may, in fact, be only
* partially implemented partially implemented.
*/ */
# undef TIOCGETC # undef TIOCGETC
#else #else
...@@ -67,15 +55,8 @@ ...@@ -67,15 +55,8 @@
# endif /* !HAVE_TERMIO_H */ # endif /* !HAVE_TERMIO_H */
#endif /* !HAVE_TERMIOS_H */ #endif /* !HAVE_TERMIOS_H */
#if defined (HAVE_SYS_TTOLD_H) #ifdef HAVE_SYS_TTOLD_H
# include <sys/ttold.h> # include <sys/ttold.h>
#endif /* HAVE_SYS_TTOLD_H */ #endif /* HAVE_SYS_TTOLD_H */
#if !defined (HAVE_STRCHR) #endif /* not INFO_TERMDEP_H */
# undef strchr
# undef strrchr
# define strchr index
# define strrchr rindex
#endif /* !HAVE_STRCHR */
#endif /* _TERMDEP_H_ */
texinfo/info/terminal.c
/* terminal.c -- How to handle the physical terminal for Info. */ /* terminal.c -- How to handle the physical terminal for Info.
$Id: terminal.c,v 1.4 1998/03/24 18:06:53 law Exp $
/* This file is part of GNU Info, a program for reading online documentation Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97 Free Software
stored in Info format. Foundation, Inc.
This file has appeared in prior works by the Free Software Foundation;
thus it carries copyright dates from 1988 through 1993.
Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -24,19 +20,33 @@ ...@@ -24,19 +20,33 @@
Written by Brian Fox (bfox@ai.mit.edu). */ Written by Brian Fox (bfox@ai.mit.edu). */
#include <stdio.h> #include "info.h"
#include <sys/types.h>
#include "terminal.h" #include "terminal.h"
#include "termdep.h" #include "termdep.h"
extern void *xmalloc (), *xrealloc (); #include <sys/types.h>
#include <signal.h>
/* The Unix termcap interface code. */ /* The Unix termcap interface code. */
#ifdef HAVE_NCURSES_TERMCAP_H
#include <ncurses/termcap.h>
#else
#ifdef HAVE_TERMCAP_H
#include <termcap.h>
#else
/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
Unfortunately, PC is a global variable used by the termcap library. */
#undef PC
/* Termcap requires these variables, whether we access them or not. */
char *BC, *UP;
char PC; /* Pad character */
short ospeed; /* Terminal output baud rate */
extern int tgetnum (), tgetflag (), tgetent (); extern int tgetnum (), tgetflag (), tgetent ();
extern char *tgetstr (), *tgoto (); extern char *tgetstr (), *tgoto ();
extern char *getenv ();
extern void tputs (); extern void tputs ();
#endif /* not HAVE_TERMCAP_H */
#endif /* not HAVE_NCURSES_TERMCAP_H */
/* Function "hooks". If you make one of these point to a function, that /* Function "hooks". If you make one of these point to a function, that
function is called when appropriate instead of its namesake. Your function is called when appropriate instead of its namesake. Your
...@@ -65,15 +75,6 @@ VFunction *terminal_scroll_terminal_hook = (VFunction *)NULL; ...@@ -65,15 +75,6 @@ VFunction *terminal_scroll_terminal_hook = (VFunction *)NULL;
/* */ /* */
/* **************************************************************** */ /* **************************************************************** */
/* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC.
Unfortunately, PC is a global variable used by the termcap library. */
#undef PC
/* TERMCAP requires these variables, whether we access them or not. */
char PC;
char *BC, *UP;
short ospeed;
/* A buffer which holds onto the current terminal description, and a pointer /* A buffer which holds onto the current terminal description, and a pointer
used to float within it. */ used to float within it. */
static char *term_buffer = (char *)NULL; static char *term_buffer = (char *)NULL;
...@@ -84,6 +85,8 @@ static char *term_goto, *term_clreol, *term_cr, *term_clrpag; ...@@ -84,6 +85,8 @@ static char *term_goto, *term_clreol, *term_cr, *term_clrpag;
static char *term_begin_use, *term_end_use; static char *term_begin_use, *term_end_use;
static char *term_AL, *term_DL, *term_al, *term_dl; static char *term_AL, *term_DL, *term_al, *term_dl;
static char *term_keypad_on, *term_keypad_off;
/* How to go up a line. */ /* How to go up a line. */
static char *term_up; static char *term_up;
...@@ -108,11 +111,15 @@ static char *term_invbeg; ...@@ -108,11 +111,15 @@ static char *term_invbeg;
/* The string to turn off inverse mode, if this term has one. */ /* The string to turn off inverse mode, if this term has one. */
static char *term_invend; static char *term_invend;
static void /* Although I can't find any documentation that says this is supposed to
return its argument, all the code I've looked at (termutils, less)
does so, so fine. */
static int
output_character_function (c) output_character_function (c)
int c; int c;
{ {
putc (c, stdout); putc (c, stdout);
return c;
} }
/* Macro to send STRING to the terminal. */ /* Macro to send STRING to the terminal. */
...@@ -126,15 +133,43 @@ output_character_function (c) ...@@ -126,15 +133,43 @@ output_character_function (c)
static void static void
terminal_begin_using_terminal () terminal_begin_using_terminal ()
{ {
RETSIGTYPE (*sigsave) ();
if (term_keypad_on)
send_to_terminal (term_keypad_on);
if (!term_begin_use || !*term_begin_use)
return;
sigsave = signal (SIGWINCH, SIG_IGN);
send_to_terminal (term_begin_use); send_to_terminal (term_begin_use);
/* Without this fflush and sleep, running info in a shelltool or
cmdtool (TERM=sun-cmd) with scrollbars loses -- the scrollbars are
not restored properly.
From: strube@physik3.gwdg.de (Hans Werner Strube). */
fflush (stdout);
sleep (1);
signal (SIGWINCH, sigsave);
} }
/* Tell the terminal that we will not be doing any more cursor addressable /* Tell the terminal that we will not be doing any more cursor
motion. */ addressable motion. */
static void static void
terminal_end_using_terminal () terminal_end_using_terminal ()
{ {
RETSIGTYPE (*sigsave) ();
if (term_keypad_off)
send_to_terminal (term_keypad_off);
if (!term_end_use || !*term_end_use)
return;
sigsave = signal (SIGWINCH, SIG_IGN);
send_to_terminal (term_end_use); send_to_terminal (term_end_use);
fflush (stdout);
sleep (1);
signal (SIGWINCH, sigsave);
} }
/* **************************************************************** */ /* **************************************************************** */
...@@ -169,6 +204,8 @@ char *term_ku = (char *)NULL; ...@@ -169,6 +204,8 @@ char *term_ku = (char *)NULL;
char *term_kd = (char *)NULL; char *term_kd = (char *)NULL;
char *term_kr = (char *)NULL; char *term_kr = (char *)NULL;
char *term_kl = (char *)NULL; char *term_kl = (char *)NULL;
char *term_kP = (char *)NULL; /* page-up */
char *term_kN = (char *)NULL; /* page-down */
/* Move the cursor to the terminal location of X and Y. */ /* Move the cursor to the terminal location of X and Y. */
void void
...@@ -457,12 +494,12 @@ terminal_get_screen_size () ...@@ -457,12 +494,12 @@ terminal_get_screen_size ()
} }
} }
/* Initialize the terminal which is known as TERMINAL_NAME. If this terminal /* Initialize the terminal which is known as TERMINAL_NAME. If this
doesn't have cursor addressability, TERMINAL_IS_DUMB_P becomes non-zero. terminal doesn't have cursor addressability, `terminal_is_dumb_p'
The variables SCREENHEIGHT and SCREENWIDTH are set to the dimensions that becomes nonzero. The variables SCREENHEIGHT and SCREENWIDTH are set
this terminal actually has. The variable TERMINAL_HAS_META_P becomes non- to the dimensions that this terminal actually has. The variable
zero if this terminal supports a Meta key. Finally, the terminal screen is TERMINAL_HAS_META_P becomes nonzero if this terminal supports a Meta
cleared. */ key. Finally, the terminal screen is cleared. */
void void
terminal_initialize_terminal (terminal_name) terminal_initialize_terminal (terminal_name)
char *terminal_name; char *terminal_name;
...@@ -500,6 +537,7 @@ terminal_initialize_terminal (terminal_name) ...@@ -500,6 +537,7 @@ terminal_initialize_terminal (terminal_name)
term_cr = "\r"; term_cr = "\r";
term_up = term_dn = audible_bell = visible_bell = (char *)NULL; term_up = term_dn = audible_bell = visible_bell = (char *)NULL;
term_ku = term_kd = term_kl = term_kr = (char *)NULL; term_ku = term_kd = term_kl = term_kr = (char *)NULL;
term_kP = term_kN = (char *)NULL;
return; return;
} }
...@@ -553,6 +591,9 @@ terminal_initialize_terminal (terminal_name) ...@@ -553,6 +591,9 @@ terminal_initialize_terminal (terminal_name)
term_begin_use = tgetstr ("ti", &buffer); term_begin_use = tgetstr ("ti", &buffer);
term_end_use = tgetstr ("te", &buffer); term_end_use = tgetstr ("te", &buffer);
term_keypad_on = tgetstr ("ks", &buffer);
term_keypad_off = tgetstr ("ke", &buffer);
/* Check to see if this terminal has a meta key. */ /* Check to see if this terminal has a meta key. */
terminal_has_meta_p = (tgetflag ("km") || tgetflag ("MT")); terminal_has_meta_p = (tgetflag ("km") || tgetflag ("MT"));
if (terminal_has_meta_p) if (terminal_has_meta_p)
...@@ -572,11 +613,12 @@ terminal_initialize_terminal (terminal_name) ...@@ -572,11 +613,12 @@ terminal_initialize_terminal (terminal_name)
term_kr = tgetstr ("kr", &buffer); term_kr = tgetstr ("kr", &buffer);
term_kl = tgetstr ("kl", &buffer); term_kl = tgetstr ("kl", &buffer);
term_kP = tgetstr ("kP", &buffer);
term_kN = tgetstr ("kN", &buffer);
/* If this terminal is not cursor addressable, then it is really dumb. */ /* If this terminal is not cursor addressable, then it is really dumb. */
if (!term_goto) if (!term_goto)
terminal_is_dumb_p = 1; terminal_is_dumb_p = 1;
terminal_begin_using_terminal ();
} }
/* **************************************************************** */ /* **************************************************************** */
...@@ -623,6 +665,8 @@ terminal_prep_terminal () ...@@ -623,6 +665,8 @@ terminal_prep_terminal ()
return; return;
} }
terminal_begin_using_terminal ();
tty = fileno (stdin); tty = fileno (stdin);
#if defined (HAVE_TERMIOS_H) #if defined (HAVE_TERMIOS_H)
...@@ -655,7 +699,12 @@ terminal_prep_terminal () ...@@ -655,7 +699,12 @@ terminal_prep_terminal ()
if (ttybuff.c_cc[VQUIT] == '\177') if (ttybuff.c_cc[VQUIT] == '\177')
ttybuff.c_cc[VQUIT] = -1; ttybuff.c_cc[VQUIT] = -1;
#endif
#ifdef VLNEXT
if (ttybuff.c_cc[VLNEXT] == '\026')
ttybuff.c_cc[VLNEXT] = -1;
#endif /* VLNEXT */
#endif /* TERMIOS or TERMIO */
#if defined (HAVE_TERMIOS_H) #if defined (HAVE_TERMIOS_H)
tcsetattr (tty, TCSANOW, &ttybuff); tcsetattr (tty, TCSANOW, &ttybuff);
......
texinfo/makeinfo/makeinfo.c
This source diff could not be displayed because it is too large. You can view the blob instead.
texinfo/util/install-info.c
/* install-info -- create Info directory entry(ies) for an Info file. /* install-info -- create Info directory entry(ies) for an Info file.
Copyright (C) 1996 Free Software Foundation, Inc. $Id: install-info.c,v 1.5 1998/03/24 18:08:44 law Exp $
$Id: install-info.c,v 1.3 1997/09/18 05:54:18 law Exp $ Copyright (C) 1996, 97 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/
#define INSTALL_INFO_VERSION_STRING "GNU install-info (Texinfo 3.9) 1.2" #include "system.h"
#include <stdio.h>
#include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <sys/types.h>
#if defined (HAVE_STRING_H)
#include <string.h>
#else
#include <strings.h>
#endif /* !HAVE_STRING_H */
#if !defined (HAVE_STRCHR)
char *strrchr ();
#endif /* !HAVE_STRCHR */
/* Get O_RDONLY. */
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#else
#include <fcntl.h>
#endif /* !HAVE_SYS_FCNTL_H */
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
/* Name this program was invoked with. */ /* Name this program was invoked with. */
char *progname; char *progname;
char *readfile (); char *readfile ();
struct line_data *findlines (); struct line_data *findlines ();
char *my_strerror ();
void fatal (); void fatal ();
void insert_entry_here (); void insert_entry_here ();
int compare_section_names (); int compare_section_names ();
...@@ -59,9 +33,8 @@ struct spec_entry; ...@@ -59,9 +33,8 @@ struct spec_entry;
/* Data structures. */ /* Data structures. */
/* Record info about a single line from a file
as read into core. */
/* Record info about a single line from a file as read into core. */
struct line_data struct line_data
{ {
/* The start of the line. */ /* The start of the line. */
...@@ -78,9 +51,9 @@ struct line_data ...@@ -78,9 +51,9 @@ struct line_data
int delete; int delete;
}; };
/* This is used for a list of the specified menu section names /* This is used for a list of the specified menu section names
in which entries should be added. */ in which entries should be added. */
struct spec_section struct spec_section
{ {
struct spec_section *next; struct spec_section *next;
...@@ -90,16 +63,16 @@ struct spec_section ...@@ -90,16 +63,16 @@ struct spec_section
int missing; int missing;
}; };
/* This is used for a list of the entries specified to be added. */
/* This is used for a list of the entries specified to be added. */
struct spec_entry struct spec_entry
{ {
struct spec_entry *next; struct spec_entry *next;
char *text; char *text;
}; };
/* This is used for a list of nodes found by parsing the dir file. */
/* This is used for a list of nodes found by parsing the dir file. */
struct node struct node
{ {
struct node *next; struct node *next;
...@@ -120,9 +93,9 @@ struct node ...@@ -120,9 +93,9 @@ struct node
struct menu_section *last_section; struct menu_section *last_section;
}; };
/* This is used for a list of sections found in a node's menu. /* This is used for a list of sections found in a node's menu.
Each struct node has such a list in the sections field. */ Each struct node has such a list in the sections field. */
struct menu_section struct menu_section
{ {
struct menu_section *next; struct menu_section *next;
...@@ -136,7 +109,6 @@ struct menu_section ...@@ -136,7 +109,6 @@ struct menu_section
/* Memory allocation and string operations. */ /* Memory allocation and string operations. */
/* Like malloc but get fatal error if memory is exhausted. */ /* Like malloc but get fatal error if memory is exhausted. */
void * void *
xmalloc (size) xmalloc (size)
unsigned int size; unsigned int size;
...@@ -144,12 +116,11 @@ xmalloc (size) ...@@ -144,12 +116,11 @@ xmalloc (size)
extern void *malloc (); extern void *malloc ();
void *result = malloc (size); void *result = malloc (size);
if (result == NULL) if (result == NULL)
fatal ("virtual memory exhausted", 0); fatal (_("virtual memory exhausted"), 0);
return result; return result;
} }
/* Like malloc but get fatal error if memory is exhausted. */ /* Like realloc but get fatal error if memory is exhausted. */
void * void *
xrealloc (obj, size) xrealloc (obj, size)
void *obj; void *obj;
...@@ -158,12 +129,12 @@ xrealloc (obj, size) ...@@ -158,12 +129,12 @@ xrealloc (obj, size)
extern void *realloc (); extern void *realloc ();
void *result = realloc (obj, size); void *result = realloc (obj, size);
if (result == NULL) if (result == NULL)
fatal ("virtual memory exhausted", 0); fatal (_("virtual memory exhausted"), 0);
return result; return result;
} }
/* Return a newly-allocated string whose contents concatenate those of s1, s2, s3. */ /* Return a newly-allocated string
whose contents concatenate those of S1, S2, S3. */
char * char *
concat (s1, s2, s3) concat (s1, s2, s3)
char *s1, *s2, *s3; char *s1, *s2, *s3;
...@@ -197,7 +168,7 @@ copy_string (string, size) ...@@ -197,7 +168,7 @@ copy_string (string, size)
/* Error message functions. */ /* Error message functions. */
/* Print error message. `s1' is printf control string, `s2' is arg for it. */ /* Print error message. S1 is printf control string, S2 and S3 args for it. */
/* VARARGS1 */ /* VARARGS1 */
void void
...@@ -206,7 +177,7 @@ error (s1, s2, s3) ...@@ -206,7 +177,7 @@ error (s1, s2, s3)
{ {
fprintf (stderr, "%s: ", progname); fprintf (stderr, "%s: ", progname);
fprintf (stderr, s1, s2, s3); fprintf (stderr, s1, s2, s3);
fprintf (stderr, "\n"); putc ('\n', stderr);
} }
/* VARARGS1 */ /* VARARGS1 */
...@@ -214,9 +185,9 @@ void ...@@ -214,9 +185,9 @@ void
warning (s1, s2, s3) warning (s1, s2, s3)
char *s1, *s2, *s3; char *s1, *s2, *s3;
{ {
fprintf (stderr, "%s: Warning: ", progname); fprintf (stderr, _("%s: warning: "), progname);
fprintf (stderr, s1, s2, s3); fprintf (stderr, s1, s2, s3);
fprintf (stderr, "\n"); putc ('\n', stderr);
} }
/* Print error message and exit. */ /* Print error message and exit. */
...@@ -235,7 +206,7 @@ void ...@@ -235,7 +206,7 @@ void
pfatal_with_name (name) pfatal_with_name (name)
char *name; char *name;
{ {
char *s = concat ("", my_strerror (errno), " for %s"); char *s = concat ("", strerror (errno), _(" for %s"));
fatal (s, name); fatal (s, name);
} }
...@@ -304,7 +275,7 @@ extract_menu_file_name (item_text) ...@@ -304,7 +275,7 @@ extract_menu_file_name (item_text)
void void
suggest_asking_for_help () suggest_asking_for_help ()
{ {
fprintf (stderr, "\tTry `%s --help' for a complete list of options.\n", fprintf (stderr, _("\tTry `%s --help' for a complete list of options.\n"),
progname); progname);
exit (1); exit (1);
} }
...@@ -312,7 +283,7 @@ suggest_asking_for_help () ...@@ -312,7 +283,7 @@ suggest_asking_for_help ()
void void
print_help () print_help ()
{ {
printf ("%s [OPTION]... [INFO-FILE [DIR-FILE]]\n\ printf (_("%s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
Install INFO-FILE in the Info directory file DIR-FILE.\n\ Install INFO-FILE in the Info directory file DIR-FILE.\n\
\n\ \n\
Options:\n\ Options:\n\
...@@ -342,27 +313,54 @@ Options:\n\ ...@@ -342,27 +313,54 @@ Options:\n\
--version Display version information and exit.\n\ --version Display version information and exit.\n\
\n\ \n\
Email bug reports to bug-texinfo@prep.ai.mit.edu.\n\ Email bug reports to bug-texinfo@prep.ai.mit.edu.\n\
", progname); "), progname);
} }
/* Convert an errno value into a string describing the error. /* If DIRFILE does not exist, create a minimal one (or abort). If it
We define this function here rather than using strerror already exists, do nothing. */
because not all systems have strerror. */ void
ensure_dirfile_exists (dirfile)
char * char *dirfile;
my_strerror (errnum)
int errnum;
{ {
#ifdef HAVE_STRERROR int desc = open (dirfile, O_RDONLY);
return strerror(errnum); if (desc < 0 && errno == ENOENT)
#else {
extern char *sys_errlist[]; FILE *f;
extern int sys_nerr; char *readerr = strerror (errno);
close (desc);
if (errnum >= 0 && errnum < sys_nerr) f = fopen (dirfile, "w");
return sys_errlist[errnum]; if (f)
return (char *) "Unknown error"; {
#endif fputs (_("This is the file .../info/dir, which contains the\n\
topmost node of the Info hierarchy, called (dir)Top.\n\
The first time you invoke Info you start off looking at this node.\n\
\n\
File: dir Node: Top This is the top of the INFO tree\n\
\n\
This (the Directory node) gives a menu of major topics.\n\
Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
\"h\" gives a primer for first-timers,\n\
\"mEmacs<Return>\" visits the Emacs manual, etc.\n\
\n\
In Emacs, you can click mouse button 2 on a menu item or cross reference\n\
to select it.\n\
\n\
* Menu:\n\
"), f);
if (fclose (f) < 0)
pfatal_with_name (dirfile);
}
else
{
/* Didn't exist, but couldn't open for writing. */
fprintf (stderr,
_("%s: could not read (%s) and could not create (%s)\n"),
dirfile, readerr, strerror (errno));
exit (1);
}
}
else
close (desc); /* It already existed, so fine. */
} }
/* This table defines all the long-named options, says whether they /* This table defines all the long-named options, says whether they
...@@ -384,6 +382,7 @@ struct option longopts[] = ...@@ -384,6 +382,7 @@ struct option longopts[] =
{ 0 } { 0 }
}; };
int
main (argc, argv) main (argc, argv)
int argc; int argc;
char **argv; char **argv;
...@@ -425,6 +424,15 @@ main (argc, argv) ...@@ -425,6 +424,15 @@ main (argc, argv)
progname = argv[0]; progname = argv[0];
#ifdef HAVE_SETLOCALE
/* Set locale via LC_ALL. */
setlocale (LC_ALL, "");
#endif
/* Set the text message domain. */
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
while (1) while (1)
{ {
int opt = getopt_long (argc, argv, "i:d:e:s:hHr", longopts, 0); int opt = getopt_long (argc, argv, "i:d:e:s:hHr", longopts, 0);
...@@ -445,7 +453,7 @@ main (argc, argv) ...@@ -445,7 +453,7 @@ main (argc, argv)
case 'd': case 'd':
if (dirfile) if (dirfile)
{ {
fprintf (stderr, "%s: Specify the Info directory only once.\n", fprintf (stderr, _("%s: Specify the Info directory only once.\n"),
progname); progname);
suggest_asking_for_help (); suggest_asking_for_help ();
} }
...@@ -455,7 +463,7 @@ main (argc, argv) ...@@ -455,7 +463,7 @@ main (argc, argv)
case 'D': case 'D':
if (dirfile) if (dirfile)
{ {
fprintf (stderr, "%s: Specify the Info directory only once.\n", fprintf (stderr, _("%s: Specify the Info directory only once.\n"),
progname); progname);
suggest_asking_for_help (); suggest_asking_for_help ();
} }
...@@ -483,7 +491,7 @@ main (argc, argv) ...@@ -483,7 +491,7 @@ main (argc, argv)
case 'i': case 'i':
if (infile) if (infile)
{ {
fprintf (stderr, "%s: Specify the Info file only once.\n", fprintf (stderr, _("%s: Specify the Info file only once.\n"),
progname); progname);
suggest_asking_for_help (); suggest_asking_for_help ();
} }
...@@ -510,11 +518,11 @@ main (argc, argv) ...@@ -510,11 +518,11 @@ main (argc, argv)
break; break;
case 'V': case 'V':
puts (INSTALL_INFO_VERSION_STRING); printf (_("install-info (GNU %s) %s\n"), PACKAGE, VERSION);
puts ("Copyright (C) 1996 Free Software Foundation, Inc.\n\ puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
There is NO warranty. You may redistribute this software\n\ There is NO warranty. You may redistribute this software\n\
under the terms of the GNU General Public License.\n\ under the terms of the GNU General Public License.\n\
For more information about these matters, see the files named COPYING."); For more information about these matters, see the files named COPYING."));
exit (0); exit (0);
default: default:
...@@ -530,13 +538,13 @@ For more information about these matters, see the files named COPYING."); ...@@ -530,13 +538,13 @@ For more information about these matters, see the files named COPYING.");
else if (dirfile == 0) else if (dirfile == 0)
dirfile = argv[optind]; dirfile = argv[optind];
else else
error ("excess command line argument `%s'", argv[optind]); error (_("excess command line argument `%s'"), argv[optind]);
} }
if (!infile) if (!infile)
fatal ("No input file specified"); fatal (_("No input file specified; try --help for more information."));
if (!dirfile) if (!dirfile)
fatal ("No dir file specified"); fatal (_("No dir file specified; try --help for more information."));
/* Read the Info file and parse it into lines. */ /* Read the Info file and parse it into lines. */
...@@ -588,7 +596,7 @@ For more information about these matters, see the files named COPYING."); ...@@ -588,7 +596,7 @@ For more information about these matters, see the files named COPYING.");
&& sizeof ("START-INFO-DIR-ENTRY") - 1 == input_lines[i].size) && sizeof ("START-INFO-DIR-ENTRY") - 1 == input_lines[i].size)
{ {
if (start_of_this_entry != 0) if (start_of_this_entry != 0)
fatal ("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"); fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"));
start_of_this_entry = input_lines[i + 1].start; start_of_this_entry = input_lines[i + 1].start;
} }
if (!strncmp ("END-INFO-DIR-ENTRY", input_lines[i].start, if (!strncmp ("END-INFO-DIR-ENTRY", input_lines[i].start,
...@@ -607,18 +615,26 @@ For more information about these matters, see the files named COPYING."); ...@@ -607,18 +615,26 @@ For more information about these matters, see the files named COPYING.");
start_of_this_entry = 0; start_of_this_entry = 0;
} }
else else
fatal ("END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"); fatal (_("END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"));
} }
} }
if (start_of_this_entry != 0) if (start_of_this_entry != 0)
fatal ("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"); fatal (_("START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"));
} }
if (!delete_flag) if (!delete_flag)
if (entries_to_add == 0) if (entries_to_add == 0)
fatal ("no info dir entry in `%s'", infile); { /* No need to abort here, the original info file may not have
the requisite Texinfo commands. This is not something an
installer should have to correct (it's a problem for the
maintainer), and there's no need to cause subsequent parts of
`make install' to fail. */
warning (_("no info dir entry in `%s'"), infile);
exit (0);
}
/* Now read in the Info dir file. */ /* Now read in the Info dir file. */
ensure_dirfile_exists (dirfile);
dir_data = readfile (dirfile, &dir_size); dir_data = readfile (dirfile, &dir_size);
dir_lines = findlines (dir_data, dir_size, &dir_nlines); dir_lines = findlines (dir_data, dir_size, &dir_nlines);
...@@ -747,8 +763,12 @@ For more information about these matters, see the files named COPYING."); ...@@ -747,8 +763,12 @@ For more information about these matters, see the files named COPYING.");
if ((dir_lines[i].size if ((dir_lines[i].size
> (p - dir_lines[i].start + infilelen_sans_info)) > (p - dir_lines[i].start + infilelen_sans_info))
&& !strncmp (p, infile_sans_info, infilelen_sans_info) && !strncmp (p, infile_sans_info, infilelen_sans_info)
&& p[infilelen_sans_info] == ')') && (p[infilelen_sans_info] == ')'
|| !strncmp (p + infilelen_sans_info, ".info)", 6)))
{
dir_lines[i].delete = 1; dir_lines[i].delete = 1;
something_deleted = 1;
}
} }
} }
/* Treat lines that start with whitespace /* Treat lines that start with whitespace
...@@ -820,7 +840,7 @@ For more information about these matters, see the files named COPYING."); ...@@ -820,7 +840,7 @@ For more information about these matters, see the files named COPYING.");
dir_lines[i].start, dir_lines[i].start,
dir_lines[i].size) dir_lines[i].size)
&& !dir_lines[i].delete) && !dir_lines[i].delete)
fatal ("menu item `%s' already exists, for file `%s'", fatal (_("menu item `%s' already exists, for file `%s'"),
extract_menu_item_name (entry->text), extract_menu_item_name (entry->text),
extract_menu_file_name (dir_lines[i].start)); extract_menu_file_name (dir_lines[i].start));
if (dir_lines[i].start[0] == '*' if (dir_lines[i].start[0] == '*'
...@@ -843,7 +863,7 @@ For more information about these matters, see the files named COPYING."); ...@@ -843,7 +863,7 @@ For more information about these matters, see the files named COPYING.");
} }
if (delete_flag && !something_deleted && !quiet_flag) if (delete_flag && !something_deleted && !quiet_flag)
warning ("no entries found for `%s'; nothing deleted", infile); warning (_("no entries found for `%s'; nothing deleted"), infile);
/* Output the old dir file, interpolating the new sections /* Output the old dir file, interpolating the new sections
and/or new entries where appropriate. */ and/or new entries where appropriate. */
...@@ -941,7 +961,6 @@ readfile (filename, sizep) ...@@ -941,7 +961,6 @@ readfile (filename, sizep)
int nread = 0; int nread = 0;
int desc = open (filename, O_RDONLY); int desc = open (filename, O_RDONLY);
if (desc < 0) if (desc < 0)
pfatal_with_name (filename); pfatal_with_name (filename);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment