--- wily-0.13.41.orig/Doc/pythonpaper.html
+++ wily-0.13.41/Doc/pythonpaper.html
@@ -87,10 +87,6 @@
Modern Aesthetics
-
-
The screen is divided into columns, which are divided into windows.
A window may represent a file, a directory, or the output from some
program. The screen, columns and windows each have a narrow horizontal
--- wily-0.13.41.orig/debian/README.Debian
+++ wily-0.13.41/debian/README.Debian
@@ -0,0 +1,14 @@
+User notes for Debian wily
+--------------------------
+
+To run the Wily tutorial, copy the file /usr/share/doc/wily/tute.tar.gz
+to your account, untar it ('tar zxvf tute.tar.gz' will do), and run the
+command 'wily tute/start'.
+
+When you want to start using guides, copy the file
+/usr/share/doc/wily/wily.tar.gz to your account and untar it.
+The directory wily will contain the html and macros guide directories.
+
+ -- Karl Sackett Tue, 26 Nov 1996 09:47:52 -0600
+ -- MJ Ray Thu, 17 Apr 2003 23:40:52 +0100
+
--- wily-0.13.41.orig/debian/changelog
+++ wily-0.13.41/debian/changelog
@@ -0,0 +1,214 @@
+wily (0.13.41-10) unstable; urgency=medium
+
+ * QA upload.
+ * debian/rules: Pass --mode argument to tar to ensure consistent
+ permissions regardless of umask.
+
+ -- Vagrant Cascadian Sat, 26 Dec 2020 12:47:45 -0800
+
+wily (0.13.41-9) unstable; urgency=medium
+
+ * QA upload.
+ * debian/rules: Pass options to tar to generate reproducible tarballs.
+ (Closes: #978044)
+ * Remove dead link to image in documentation.
+ * Patch tools/win/Makefile.in to pass additional include directory.
+ * debian/menu: Update to use the "Applications" section.
+ * debian/rules: Switch to "dh".
+ * Switch to debhelper compat 13.
+ * Use debian/wily.install and debian/wily.manpages instead of installing
+ manually from debian/rules.
+ * debian/rules: Generated tarballs from dh_installdocs override.
+ * debian/source/format: Set to "1.0".
+ * debian/control: Update Standards-Version to 4.5.1.
+ * debian/source/lintian-overrides: Override
+ configure-generated-file-in-source, removed in clean target.
+ * debian/control: Set Vcs headers.
+
+ -- Vagrant Cascadian Thu, 24 Dec 2020 20:52:49 -0800
+
+wily (0.13.41-8) unstable; urgency=medium
+
+ * QA upload.
+ * Set Rules-Requires-Root to "no".
+ * Drop calls to dh_test due to Rules-Requires-Root.
+ * Replace calls to dh_clean -k with dh_prep.
+ * Drop long obsolete debian/rules targets.
+ * Bump debhelper compat to level 8. No changes required.
+ * Add missing ${misc:Depends} dependency to wily.
+ * Remove tools/win/config.log during clean.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: (Closes: #882542)
+ + Pass a cross compiler to ./configure.
+ + Defer stripping to dh_strip. (Closes: #438263)
+
+ -- Niels Thykier Wed, 21 Aug 2019 10:11:18 +0000
+
+wily (0.13.41-7.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make the build reproducible. (Closes: #777360)
+
+ -- Chris Lamb Fri, 18 Aug 2017 09:08:17 -0700
+
+wily (0.13.41-7.2) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * debian/control
+ - (Build-Depends): update obsolete x-dev to x11proto-core-dev.
+ (important RC bug; Closes: #515460).
+
+ -- Jari Aalto Sat, 27 Mar 2010 10:36:45 +0200
+
+wily (0.13.41-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix bashism in debian/rules (Closes: #478638)
+ * Bump Standards-Version to 3.8.0.
+
+ -- Chris Lamb Sat, 07 Jun 2008 21:02:30 +0100
+
+wily (0.13.41-7) unstable; urgency=low
+
+ * Use \[12] instead of charset-specific half-symbol in man page
+ * Install to /usr not /usr/X11R6
+ * Update Standards-Version to 3.6.2.0
+ * Update to debhelper V5 mode
+ * Improve clean target of debian/rules
+ * Update Build-Depends after xlibs-dev removal (Closes: #347056)
+ * Update menu after Bill Allombert debian-devel-announce of 2005-06-15
+ * Fix win's configure test for ptmx (Closes: #319266, #318828)
+
+ -- MJ Ray (Debian) Sun, 15 Jan 2006 01:33:20 +0000
+
+wily (0.13.41-6) unstable; urgency=low
+
+ * Fix for gcc-3.4 compiles. Thanks to Andreas Jochens for his patch.
+ (Closes: #270071)
+
+ -- MJ Ray (Debian) Tue, 7 Sep 2004 00:25:12 +0100
+
+wily (0.13.41-5) unstable; urgency=low
+
+ * Stupid maintainer address consistency fix
+ * Fixed implicit declaration in libXg (Closes: #226649)
+
+ -- MJ Ray (Debian) Tue, 16 Mar 2004 11:32:21 +0000
+
+wily (0.13.41-4) unstable; urgency=low
+
+ * A 9libs release may be coming soon, so uploading known fixes.
+ * Freshened README.Debian (Closes: #181012)
+ * Corrected copyright file (Closes: #181014)
+ * Added known maintainers (Closes: #181015)
+ * Change of maintainer address.
+
+ -- MJ Ray (Debian) Tue, 08 Jul 2003 15:03:31 +0100
+
+wily (0.13.41-3) unstable; urgency=low
+
+ * Finishing adoption as maintainer (Closes: #87816)
+ * Adding win to the package. Omitted in error previously.
+
+ -- MJ Ray Tue, 13 Aug 2003 19:20:15 +0100
+
+wily (0.13.41-2) unstable; urgency=low
+
+ * Don't upload the original source code just to change maintainers, this way
+ madness lies...
+
+ -- Thom May Wed, 3 Apr 2002 22:38:49 +0100
+
+wily (0.13.41-1) unstable; urgency=low
+
+ * Changing maintainer as directed by Josip Rodin.
+
+ -- MJ Ray Sat, 9 Mar 2002 02:40:19 +0000
+
+wily (0.13.41-0.3) unstable; urgency=low
+
+ * Fixes to packaging to make it comply with current policy. (Closes:
+ #113496)
+
+ -- MJ Ray Wed, 20 Feb 2002 20:15:01 +0000
+
+wily (0.13.41-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Now installs Doc/perl.txt, Doc/FAQ.txt, Doc/changes.txt
+ (Closes: #40511)
+
+ -- William Ono Thu, 29 Jul 1999 17:35:57 -0700
+
+wily (0.13.41-0.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * New upstream version, from ftp.cs.york.ac.uk.
+ * Converted debian/rules to debhelper (and moved exe to X11R6/bin).
+ * Some changes to other debian/* files, mostly to control.
+ * Added the Artistic licence to copyright (it is in README).
+ * Added a menu entry.
+
+ -- Josip Rodin Tue, 15 Jun 1999 23:49:16 +0200
+
+wily (0.13.33-3) unstable; urgency=low
+
+ * Interim maintainer release
+ * Set maintainer field to debian-qa, i.e. orphaning it.
+ * Updated Standards-Version
+
+ -- Martin Schulze Sat, 24 Oct 1998 15:22:35 +0200
+
+wily (0.13.33-2) unstable; urgency=low
+
+ * Compilied against libc6 (non-maintainer)
+
+ -- Karl Sackett Mon, 3 Nov 1997 17:08:01 -0500
+
+wily (0.13.33-1) unstable; urgency=low
+
+ * Latest upstream release.
+
+ -- Karl Sackett Thu, 20 Mar 1997 10:06:44 -0600
+
+wily (0.13.23-2) unstable; urgency=low
+
+ * Added user notes in README.debian.
+ * Wily.ad: corrected path for p9font and p9fixed.
+ * repackaged wily macros and tutorial for ease of use.
+ * macros, html: corrected paths for rc and fonts.
+ * corrected html guide files problem which prevented rebuilding
+ source with dpkg-source -x.
+
+ -- Karl Sackett Tue, 26 Nov 1996 09:47:52 -0600
+
+wily (0.13.23-1) unstable; urgency=low
+
+ * New upstream release; many bug fixes.
+
+ -- Karl Sackett Thu, 21 Nov 1996 13:35:06 -0600
+
+wily (0.13.10-2) unstable; urgency=low
+
+ * debian/rules: package builds under binary-arch target (bug #4651).
+
+ -- Karl Sackett Mon, 30 Sep 1996 10:40:38 -0500
+
+wily (0.13.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * Converted to new packaging standards.
+ * Doc/Makefile: call 'sgml2latex -p' instead of 'sgml2ps'
+
+ -- Karl Sackett Thu, 19 Sep 1996 10:22:32 -0500
+
+0.12.11-1
+ * added Debian support files
+ * misc/Wily.ad: changed definitions for geometry, p9font, and p9fixed
+ * added html and macros guide files
+
+Local variables:
+mode: debian-changelog
+End:
--- wily-0.13.41.orig/debian/control
+++ wily-0.13.41/debian/control
@@ -0,0 +1,21 @@
+Source: wily
+Section: editors
+Priority: optional
+Maintainer: Debian QA Group
+Standards-Version: 4.5.1
+Build-Depends: libx11-dev, libxt-dev, x11proto-core-dev, debhelper-compat (= 13)
+Rules-Requires-Root: no
+Vcs-Git: https://git.dgit.debian.org/wily
+Vcs-Browser: https://browse.dgit.debian.org/wily.git
+
+Package: wily
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: 9fonts, rc
+Description: work-alike of the Acme programming environment for Plan 9
+ Wily's basic functions are to edit and search for text and to run
+ commands. It is intended to eventually be an integrated working
+ environment for all tasks involving text. It uses the mouse heavily.
+ .
+ It emphasises speed for experienced users, but is probably simple
+ to learn as it has very few concepts.
--- wily-0.13.41.orig/debian/copyright
+++ wily-0.13.41/debian/copyright
@@ -0,0 +1,32 @@
+This is the Debian prepackaged version of Wily.
+
+This package was put together originally by Karl Sackett ,
+from sources obtained from:
+ ftp://ftp.cs.su.oz.au/gary/wily.tgz
+ ftp://ftp.cs.su.oz.au/gary/wily/tools/shell/html.tgz
+ ftp://ftp.cs.su.oz.au/gary/wily/tools/shell/macros.tgz
+
+For more information see:
+ http://www.cs.su.oz.au/~gary/wily/
+ http://www.cs.yorku.ca/~oz/wily/
+
+The current maintainer is MJ Ray
+The previous maintainer was Karl Sackett
+
+Copyright:
+
+ * The author of this software is Gary Capell.
+ * Copyright (c) 1995, 1996 by Gary Capell.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY. IN PARTICULAR, THE AUTHOR DOES NOT MAKE ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+
+It can be distributed under the terms of the Artistic licence, full text
+of which can on Debian systems be found in /usr/share/common-licenses
+
--- wily-0.13.41.orig/debian/menu
+++ wily-0.13.41/debian/menu
@@ -0,0 +1,2 @@
+?package(wily):needs="X11" section="Applications/Editors" \
+ title="Wily" command="/usr/bin/wily"
--- wily-0.13.41.orig/debian/rules
+++ wily-0.13.41/debian/rules
@@ -0,0 +1,51 @@
+#!/usr/bin/make -f
+# Derived from dh_make example.
+
+-include /usr/share/dpkg/buildtools.mk
+export CC
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- --with-X
+ dh_auto_configure --builddirectory=tools/win -- --with-X --cache-file=../../config.cache
+
+override_dh_auto_build:
+ dh_auto_build
+ dh_auto_build --builddirectory=tools/win
+
+du_auto_clean:
+ dh_auto_clean
+ rm -f build-stamp install-stamp
+ [ ! -e Makefile ] || $(MAKE) nuke
+ cd tools/win && [ ! -e Makefile ] || $(MAKE) clean
+ rm -f ./Makefile libXg/Makefile libframe/Makefile \
+ libmsg/Makefile wily/Makefile tools/win/Makefile
+ rm -f config.h config.cache config.status
+ rm -f tools/win/config.cache
+ rm -f tools/win/config.status
+ rm -f tools/win/config.log
+
+override_dh_auto_install:
+ mkdir -p debian/wily/etc/X11/app-defaults/
+ install -m644 misc/Wily.ad \
+ debian/wily/etc/X11/app-defaults/Wily
+
+override_dh_installdocs:
+ dh_installdocs
+ cd Doc && GZIP="-9n" tar --sort=name \
+ --mtime="@${SOURCE_DATE_EPOCH}" \
+ --owner=0 --group=0 --numeric-owner \
+ --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+ --mode=a+rX,og-w \
+ -czhf ../debian/wily/usr/share/doc/wily/tute.tar.gz tute
+ cd misc && GZIP="-9n" tar --sort=name \
+ --mtime="@${SOURCE_DATE_EPOCH}" \
+ --owner=0 --group=0 --numeric-owner \
+ --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+ --mode=a+rX,og-w \
+ -czhf ../debian/wily/usr/share/doc/wily/wily.tar.gz wily
+
+override_dh_installchangelogs:
+ dh_installchangelogs Doc/changes.txt
--- wily-0.13.41.orig/debian/source/format
+++ wily-0.13.41/debian/source/format
@@ -0,0 +1 @@
+1.0
--- wily-0.13.41.orig/debian/source/lintian-overrides
+++ wily-0.13.41/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# These are removed in debian/rules clean target
+wily source: configure-generated-file-in-source tools/win/config*
--- wily-0.13.41.orig/debian/wily.1x
+++ wily-0.13.41/debian/wily.1x
@@ -0,0 +1,465 @@
+.TH WILY 1x
+.SH NAME
+wily, win, awd \- interactive text windows
+.SH SYNOPSIS
+.B wily
+[
+.B -f
+.I varfont
+]
+[
+.B -F
+.I fixfont
+]
+[
+.B -c
+.I ncol
+]
+.LP
+.B win
+[
+.I command
+]
+.LP
+.B awd
+[
+.I label
+]
+.SH NOTE
+This manual page is out of date. The original documentation is in
+/usr/share/doc/wily
+.SH DESCRIPTION
+.I Wily
+manages windows of text that may be edited interactively or by external programs.
+The interactive interface uses a different interface.
+.PP
+Any named
+.I files
+are read into
+.I wily
+windows before
+.I wily
+accepts input.
+Plain files display as text; directories display as columnated lists of the
+names of their components, as in
+.B "ls -p directory|mc
+except that the names of subdirectories have a slash appended.
+.PP
+The
+.B -f
+.RB ( -F )
+option sets the default variable-pitch (fixed-pitch)
+font; the default is
+.B /lib/font/bit/lucidasans/euro.8.font
+.RB ( \&.../lucm/unicode.9.font ).
+Tab intervals are set to the width of 4(8) numeral zeros in the variable-pitch font.
+.PP
+.SS Windows
+.I Wily
+windows are in two parts: a short
+.I tag
+above a multi-line
+.IR body .
+The body typically contains an image of a file, as in
+.IR sam (1),
+or the output of a
+program, as in an
+.IR 8\[12] (1)
+window.
+The tag contains a number of
+blank-separated words, followed by a vertical bar character, followed by anything.
+The first word is the name of the window, typically the name of the associated
+file or directory, and the other words are commands available in that window.
+Any text may be added after the bar; examples are strings to search for or
+commands to execute in that window.
+.PP
+If a window holds a directory, the name (first word of the tag) will end with
+a slash.
+.SS Scrolling
+Each window has a scroll bar to the left of the body.
+The scroll bar behaves much as in
+.IR sam (1)
+or
+.IR 8\[12] (1)
+except that scrolling occurs when the button is pressed, rather than released,
+and continues
+as long as the mouse button is held down in the scroll bar.
+For example, to scroll slowly through a file,
+hold button 3 down near the top of the scroll bar. Moving the mouse
+down the scroll bar speeds up the rate of scrolling.
+.SS Layout
+.I Wily
+windows are arranged in columns. By default, it creates two columns when starting;
+this can be overridden with the
+.B -c
+option.
+Placement is automatic but may be adjusted
+using the
+.I layout box
+in the upper left corner of each window and column.
+Pressing and holding any mouse button in the box drags
+the associated window or column.
+For windows, just
+clicking in the layout box grows the window in place: button 1
+grows it a little, button 2 grows it as much as it can, still leaving all other
+tags in that column visible, and button 3 takes over the column completely,
+temporarily hiding other windows in the column.
+(They will return
+.I en masse
+if any of them needs attention.)
+The layout box in a window is normally white; when it is black in the center,
+it records that the file is `dirty':
+.I Wily
+believes it is modified from its original
+contents.
+.PP
+Tags exist at the top of each column and across the whole display.
+.I Wily
+pre-loads them with useful commands.
+Also, the tag across the top maintains a list of executing long-running commands.
+.SS Typing
+The behavior of typed text is similar to that in
+.IR 8\[12] (1)
+except that the characters are delivered to the tag or body under the mouse; there is no
+`click to type'.
+The usual backspacing conventions apply.
+As in
+.IR sam (1)
+but not
+.IR 8\[12] ,
+the ESC key selects the text typed since the last mouse action,
+a feature particularly useful when executing commands.
+A side effect is that typing ESC with text already selected is identical
+to a
+.B Cut
+command
+.RI ( q.v. ).
+.PP
+All text, including the names of windows, may be edited uniformly.
+
+.SS "Directory context
+Each window's tag names a directory: explicitly if the window
+holds a directory; implicitly if it holds a regular file
+(e.g. the directory
+.B /adm
+if the window holds
+.BR /adm/users ).
+This directory provides a
+.I context
+for interpreting file names in that window.
+For example, the string
+.B users
+in a window labeled
+.B /adm/
+or
+.B /adm/keys
+will be interpreted as the file name
+.BR /adm/users .
+The directory is defined purely textually, so it can be a non-existent
+directory or a real directory associated with a non-existent file
+(e.g.
+.BR /adm/not-a-file ).
+File names beginning with a slash
+are assumed to be absolute file names.
+.SS Errors
+Windows whose names begin with
+.B -
+or
+.B +
+conventionally hold diagnostics and other data
+not directly associated with files.
+A window labeled
+.B +Errors
+receives all diagnostics produced by
+.I wily
+itself.
+Diagnostics from commands run by
+.I wily
+appear in a window named
+.IB directory /+Errors
+where
+.I directory
+is identified by the context of the command.
+These error windows are created when needed.
+.SS "Mouse button 1
+Mouse button 1 selects text just as in
+.IR sam (1)
+or
+.IR 8\[12] (1) ,
+including the usual double-clicking conventions.
+.SS "Mouse button 2
+By an
+action similar to selecting text with button 1,
+button 2 indicates text to execute as a command.
+If the indicated text has multiple white-space-separated words,
+the first is the command name and the second and subsequent
+are its arguments.
+If button 2 is `clicked'\(emindicates a null string\(em\c
+.I wily
+.I expands
+the indicated text to find a command to run:
+if the click is within button-1-selected text,
+.I wily
+takes that selection as the command;
+otherwise it takes the largest string of valid file name characters containing the click.
+Valid file name characters are alphanumerics and
+.B _
+.B .
+.B -
+.B +
+.BR / .
+This behavior is similar to double-clicking with button 1 but,
+because a null command is meaningless, only a single click is required.
+.PP
+Some commands, all by convention starting with a capital letter, are
+.I built-ins
+that are executed directly by
+.IR wily :
+.TP
+.B Cut
+Delete most recently selected text and place in snarf buffer.
+.TP
+.B Del
+Delete window. If window is dirty, saves a backup of the file.
+.TP
+.B Delcol
+Delete column and all its windows, after checking that windows are not dirty.
+.TP
+.B Quit
+Exit
+.I wily
+after checking that windows are not dirty.
+.TP
+.B Font
+With no arguments, change the font of the associated window or column from fixed-spaced to
+proportional-spaced or
+.I vice versa\f1.
+Given a font name argument, change the font of the window to the named font.
+Other existing windows are unaffected.
+.TP
+.B Get
+Load file into window, replacing previous contents (after checking for dirtiness as in
+.BR Del ).
+With no argument, use the existing file name of the window.
+Given an argument, use that file but do not change the window's file name.
+.TP
+.B Kill
+Send a
+.B kill
+note to
+.IR wily -initiated
+commands named as arguments.
+.TP
+.B Look
+Search in body for occurrence of literal text indicated by the argument or,
+if none is given, by the selected text in the body.
+.TP
+.B New
+Make new window. With arguments, load the named files into windows.
+.TP
+.B Newcol
+Make new column.
+.TP
+.B Paste
+Replace most recently selected text with contents of snarf buffer.
+.TP
+.B Put
+Write window to the named file.
+With no argument, write to the file named in the tag of the window.
+.TP
+.B Putall
+Write all dirty windows whose names indicate existing regular files.
+.TP
+.B Redo
+Complement of
+.BR Undo .
+.TP
+.B Send
+Append selected text or snarf buffer to end of body; used mainly with
+.IR win .
+.TP
+.B Snarf
+Place selected text in snarf buffer.
+.TP
+.B Sort
+Arrange the windows in the column from top to bottom in lexicographical
+order based on their names.
+.TP
+.B Split
+Create a copy of the window containing most recently selected text.
+.TP
+.B Undo
+Undo last textual change or set of changes.
+.PP
+A common place to store text for commands is in the tag; in fact
+.I wily
+maintains a set of commands appropriate to the state of the window
+to the left of the bar in the tag.
+.PP
+If the text indicated with button 2 is not a recognized built-in, it is executed as
+a shell command. For example, indicating
+.B date
+with button 2 runs
+.IR date (1).
+The standard
+and error outputs of commands are sent to the error window associated with
+the directory from which the command was run, which will be created if
+necessary.
+For example, in a window
+.B /adm/users
+executing
+.B pwd
+will produce the output
+.B /adm
+in a (possibly newly-created) window labeled
+.BR /adm/+Errors ;
+in a window containing
+.B /sys/src/cmd/sam/sam.c
+executing
+.B make
+will run
+.IR make (1)
+in
+.BR /sys/src/cmd/sam ,
+producing output in a window labeled
+.BR /sys/src/cmd/sam/+Errors .
+.SS "Mouse button 3
+Pointing at text with button 3 instructs
+.I wily
+to locate or acquire the file, string, etc. described by the indicated text and
+its context.
+This description follows the actions taken when
+button 3 is released after sweeping out some text.
+In the description,
+.I text
+refers to the text of the original sweep or, if it was null, the result of
+applying similar expansion rules that apply to button 2 actions.
+.PP
+If the text names an existing window,
+.I wily
+moves the mouse cursor to the selected text in the body of that window.
+If the text names an existing file with no associated window,
+.I wily
+loads the file into a new window and moves the mouse there.
+.PP
+If the text begins with a colon, it is taken to be an address, in
+the style of
+.IR sam (1),
+within the body of the window containing the text.
+The address is evaluated, the resulting text highlighted, and the mouse moved to it.
+Thus, in
+.IR wily ,
+one must type
+.B :/regexp
+or
+.B :127
+not just
+.B /regexp
+or
+.BR 127 .
+(There is an easier way to locate literal text; see below.)
+.PP
+If the text is a file name followed by a colon and an address,
+.I wily
+loads the file and evaluates the address. For example, clicking button 3 anywhere
+in the text
+.B file.c:27
+will open
+.BR file.c ,
+select line
+27, and put the mouse at the beginning of the line. The rules about Error
+files, directories, and so on all combine to make this an efficient way to
+investigate errors from compilers, etc.
+.PP
+If the text is not an address or file, it is taken to
+be literal text, which is then searched for in the body of the window
+in which button 3 was clicked. If a match is found, it is selected and the mouse is
+moved there. Thus, to search for occurrences of a word in a file,
+just click button 3 on the word. Because of the rule of using the
+selection as the button 3 action, subsequent clicks will find subsequent
+occurrences without moving the mouse.
+.PP
+In all these actions, the mouse motion is not done if the text is a null string
+within a non-null selected string in the tag, so that (for example) complex regular expressions
+may be selected and applied repeatedly to the
+body by just clicking button 3 over them.
+.SS "Chords of mouse buttons
+Several operations are bound to multiple-button actions.
+After selecting text, with button 1 still down, pressing button 2
+executes
+.B Cut
+and button 3 executes
+.BR Paste .
+After clicking one button, the other undoes
+the first; thus (while holding down button 1) 2 followed by 3 is a
+.B Snarf
+that leaves the file undirtied;
+3 followed by 2 is a no-op.
+These actions also apply to text selected by double-clicking because
+the double-click expansion is made when the second
+click starts, not when it ends.
+.PP
+Commands may be given extra arguments by a mouse chord with buttons 2 and 1.
+While holding down button 2 on text to be executed as a command, clicking button 1
+appends the text last pointed to by button 1 as a distinct final argument.
+For example, to search for literal
+.B text
+one may execute
+.B Look text
+with button 2 or instead point at
+.B text
+with button 1 in any window, release button 1,
+then execute
+.BR Look ,
+clicking button 1 while 2 is held down.
+.PP
+When an external command (e.g.
+.IR echo (1))
+is executed this way, the extra argument is passed as expected and an
+environment variable
+.B $wilyaddr
+is created that holds, in the form interpreted by button 3,
+the fully-qualified address of the extra argument.
+.SS "Support programs
+.I Win
+creates a new
+.I wily
+window and runs a
+.I command
+(default
+.BR $SHELL )
+in it, turning the window into something analogous to an
+.IR 8\[12] (1)
+window.
+Executing text in a
+.I win
+window with button
+2 is similar to using
+.BR Send .
+.PP
+.I Awd
+loads the tag line of its window with the directory in which it's running, suffixed
+.BI - label
+(default
+.BR rc );
+it is
+intended to be executed by a
+.B cd
+function for use in
+.I win
+windows. An example definition is
+.EX
+ fn cd { builtin cd $1 && awd $sysname }
+.EE
+.SH FILES
+.TF $home/.wilybak
+.TP
+.B $home/.wilybak
+default directory for backup files.
+.SH SEE ALSO
+.IR wily (4)
+.br
+Rob Pike,
+.I
+Acme: A User Interface for Programmers.
+.SH BUGS
--- wily-0.13.41.orig/debian/wily.install
+++ wily-0.13.41/debian/wily.install
@@ -0,0 +1,18 @@
+wily/wily /usr/bin
+tools/win/win /usr/bin
+tools/win/wgoto /usr/bin
+tools/win/wreplace /usr/bin
+
+misc/fixed.9.font /usr/share/fonts/X11/misc/
+misc/prop.9.font /usr/share/fonts/X11/misc/
+
+README /usr/share/doc/wily/
+misc/wily.xpm /usr/share/doc/wily/
+misc/wily2.xpm /usr/share/doc/wily/
+Doc/demo.utf /usr/share/doc/wily/
+
+Doc/perl.txt /usr/share/doc/wily/html
+Doc/FAQ.txt /usr/share/doc/wily/html
+Doc/changes.txt /usr/share/doc/wily/html
+Doc/*.html /usr/share/doc/wily/html
+Doc/*.gif /usr/share/doc/wily/html
--- wily-0.13.41.orig/debian/wily.manpages
+++ wily-0.13.41/debian/wily.manpages
@@ -0,0 +1,2 @@
+debian/wily.1x
+tools/win/w*.1
--- wily-0.13.41.orig/include/libg.h
+++ wily-0.13.41/include/libg.h
@@ -91,12 +91,12 @@
struct Subfont
{
- short minrow; /* first character row in font (for X subfonts) */
- short mincol; /* first character col in font (for X subfonts) */
- short minchar; /* first char code in subfont */
- short maxchar; /* last char code in subfont */
- short width; /* number of chars in row */
- short n; /* number of chars in font */
+ int minrow; /* first character row in font (for X subfonts) */
+ int mincol; /* first character col in font (for X subfonts) */
+ int minchar; /* first char code in subfont */
+ int maxchar; /* last char code in subfont */
+ int width; /* number of chars in row */
+ int n; /* number of chars in font */
unsigned char height; /* height of bitmap */
char ascent; /* top of bitmap to baseline */
Fontchar *info; /* n+1 character descriptors */
--- wily-0.13.41.orig/libXg/font.c
+++ wily-0.13.41/libXg/font.c
@@ -24,7 +24,7 @@
sf = csf->f;
c = rx-csf->min+sf->minchar;
c = ((c>>8)-sf->minrow)*sf->width+(c&0xff)-sf->mincol;
- if (c < 0)
+ if ((c < 0) || (c >= sf->n))
break;
/* ignore zero width characters */
if (sf->info[c].cwidth == 0 && sf->info[c].width == 0)
--- wily-0.13.41.orig/libXg/libgint.h
+++ wily-0.13.41/libXg/libgint.h
@@ -1,6 +1,7 @@
/* Copyright (c) 1992 AT&T - All rights reserved. */
/* internal libg implementation file - include after libg */
+#include "config.h"
/*
* include defs of standard library routines, if possible,
* and string routines
--- wily-0.13.41.orig/misc/wily/html/README
+++ wily-0.13.41/misc/wily/html/README
@@ -0,0 +1,34 @@
+Wily html tools:
+
+README this file
+guide guide file
+bin/ script directory, contains the following programs:
+
+ books removes un-needed tags from Netscape bookmark files
+ href generate an href
+ html h1 h2 h3 h4 h5 h6 title pre cite code em kbd samp strong var tt dfn
+ html1 bold italic underline
+ htmlsig add your signature to an html document
+ indent indent - by one tab
+ mdate metric date?
+ quote quote - for email
+ remote tell netscape to open a URL
+ sdate short-form date
+ skel create a skeletal html document (a good thing to start with)
+ ulhref create an unordered list, where each list item is an href
+ ullist create a simple unordered list
+ undent undent - by one tab
+ unquote unquote - for email
+
+All scripts assume rc is in /bin/rc, so they can run under acme on plan9
+unmodified (though I haven't tested it yet).
+
+This package should be installed under $home/wily/html
+and you should make sure $home/wily/html/bin is in your path
+To set things up, 'cd' to the bin directory and run 'make', which
+sets up a bunch of symbolic links to the html and html1 scripts,
+then just point wily at $home/wily/html/guide
+
+html, indent, remote, undent by Gary Capell, other scripts by Steve Kotsopoulos
+
+Comments to steve@border.com please
--- wily-0.13.41.orig/misc/wily/html/bin/Makefile
+++ wily-0.13.41/misc/wily/html/bin/Makefile
@@ -0,0 +1,18 @@
+SHELL=/bin/sh
+
+html = h1 h2 h3 h4 h5 h6 title pre cite code em kbd samp strong var tt dfn
+html1 = bold italic underline
+
+install:
+ - for file in $(html) ; do \
+ rm -f $$file ; \
+ ln -s html $$file ; \
+ done
+
+ - for file in $(html1) ; do \
+ rm -f $$file ; \
+ ln -s html1 $$file ; \
+ done
+
+clean:
+ rm -f $(html) $(html1)
--- wily-0.13.41.orig/misc/wily/html/bin/books
+++ wily-0.13.41/misc/wily/html/bin/books
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# books - remove netscape tags from netscape bookmark files
+# useful if you want to put them into private hotlists
+
+progname=`basename $0`
+
+usage() {
+ echo "Usage: $progname file.html" 1>&2
+ exit 1
+}
+
+if [ $# -lt 1 ]; then
+ # usage
+ exec books $HOME/.netscape/bookmarks.html
+fi
+
+for arg
+do
+ grep http $arg | sed \
+ -e 's/ .DT.//' \
+ -e 's/ ADD_DATE=...........//' \
+ -e 's/ LAST_VISIT=...........//' \
+ -e 's/ LAST_MODIFIED=...........//'
+done
--- wily-0.13.41.orig/misc/wily/html/bin/href
+++ wily-0.13.41/misc/wily/html/bin/href
@@ -0,0 +1,4 @@
+#!/usr/bin/rc
+# href - generate an href
+
+cat $* | awk '{printf "%s\n", $1, $1 }'
--- wily-0.13.41.orig/misc/wily/html/bin/html
+++ wily-0.13.41/misc/wily/html/bin/html
@@ -0,0 +1,6 @@
+#!/usr/bin/rc
+# html - generate the html tag that corresponds to argv[0]
+tag = `{basename $0}
+echo -n '<'^$tag^'>'
+cat $*
+echo -n ''^$tag^'>'
--- wily-0.13.41.orig/misc/wily/html/bin/html1
+++ wily-0.13.41/misc/wily/html/bin/html1
@@ -0,0 +1,9 @@
+#!/usr/bin/rc
+# html1 - generate the html tag that corresponds to argv[0][0] (a single char)
+#
+# bold= italic= underline=
+
+tag = `{basename $0| sed 's;\(.\)[^/]*$;\1;' }
+echo -n '<'^$tag^'>'
+cat $*
+echo -n ''^$tag^'>'
--- wily-0.13.41.orig/misc/wily/html/bin/htmlsig
+++ wily-0.13.41/misc/wily/html/bin/htmlsig
@@ -0,0 +1,24 @@
+#!/usr/bin/rc
+#
+# htmlsig - add your signature to an html document
+
+# customize the following to suit
+date=`{sdate}
+verbose='This page by
+Steve Kotsopoulos, steve@border.com
'
+#verbose=''
+
+cat <
+
+
+$verbose
+
+
+Last update: $date
+
+
+
+
+EOF
--- wily-0.13.41.orig/misc/wily/html/bin/indent
+++ wily-0.13.41/misc/wily/html/bin/indent
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# indent - by one tab
+sed 's/^/ /' $*
--- wily-0.13.41.orig/misc/wily/html/bin/mailto
+++ wily-0.13.41/misc/wily/html/bin/mailto
@@ -0,0 +1,4 @@
+#!/usr/bin/rc
+# mailto - generate a mailto link
+
+cat $* | awk '{printf "%s\n", $1, $1 }'
--- wily-0.13.41.orig/misc/wily/html/bin/mdate
+++ wily-0.13.41/misc/wily/html/bin/mdate
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# mdate - metric date
+/bin/date '+%y/%m/%e'
--- wily-0.13.41.orig/misc/wily/html/bin/quote
+++ wily-0.13.41/misc/wily/html/bin/quote
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# quote - for email
+sed 's/^/> /' $*
--- wily-0.13.41.orig/misc/wily/html/bin/remote
+++ wily-0.13.41/misc/wily/html/bin/remote
@@ -0,0 +1,5 @@
+#!/usr/bin/rc
+# remote - tell netscape to open a URL
+for(i) {
+ netscape -noraise -remote 'openURL('^$i^',new-window)'
+}
--- wily-0.13.41.orig/misc/wily/html/bin/sdate
+++ wily-0.13.41/misc/wily/html/bin/sdate
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# sdate - short-form date
+/bin/date '+%b %e, %Y'
--- wily-0.13.41.orig/misc/wily/html/bin/skel
+++ wily-0.13.41/misc/wily/html/bin/skel
@@ -0,0 +1,44 @@
+#!/usr/bin/rc
+#
+# skel - create a skeletal html document that lists a bunch of files in a
+# search for xxx to find the places where you'll want to edit
+
+cat <
+xxx auto-generated title
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+xxx auto-generated heading
+
+
+
+EOF
+
+ulhref $*
+
+htmlsig
+
+cat <
+
+EOF
--- wily-0.13.41.orig/misc/wily/html/bin/ulhref
+++ wily-0.13.41/misc/wily/html/bin/ulhref
@@ -0,0 +1,6 @@
+#!/usr/bin/rc
+# uhlhref - create an unordered list, where each list item is an href
+
+echo ''
+cat $* | awk '{printf " - %s\n", $1, $1 }'
+echo '
'
--- wily-0.13.41.orig/misc/wily/html/bin/ullist
+++ wily-0.13.41/misc/wily/html/bin/ullist
@@ -0,0 +1,6 @@
+#!/usr/bin/rc
+# uhlist - create a simple unordered list
+
+echo ''
+cat $* | awk '{printf " - %s\n", $1 }'
+echo '
'
--- wily-0.13.41.orig/misc/wily/html/bin/undent
+++ wily-0.13.41/misc/wily/html/bin/undent
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# undent - by one tab
+sed 's/^ //' $*
--- wily-0.13.41.orig/misc/wily/html/bin/unquote
+++ wily-0.13.41/misc/wily/html/bin/unquote
@@ -0,0 +1,3 @@
+#!/usr/bin/rc
+# unquote - for email
+sed 's/^> //' $*
--- wily-0.13.41.orig/misc/wily/html/guide
+++ wily-0.13.41/misc/wily/html/guide
@@ -0,0 +1,5 @@
+|title |h1 |h2 |h4 |h6 |pre |address Font
+|cite |code |em |kbd |samp |strong |var |tt
+|bold |italic |skel |ulhref |ullist |href |mailto
+spell remote
--- wily-0.13.41.orig/misc/wily/macros/Cut
+++ wily-0.13.41/misc/wily/macros/Cut
@@ -0,0 +1,4 @@
+To: steve
+Subject: fake sendmail input
+
+Hev's Duties
--- wily-0.13.41.orig/misc/wily/macros/README
+++ wily-0.13.41/misc/wily/macros/README
@@ -0,0 +1,37 @@
+Some Wily macros:
+
+README this file
+acme rc script - start up wily with some nice macros
+guide guide file
+h history program, by Gary
+magic magic-cat program
+utf sample UTF text
+wbiff wily biff
+wilytools wilytools for wily freaks, additions welcome
+
+The acme script sets some variables (SHELL, HISTORY, $mail),
+reads in your .rcrc file if you have one, defines some useful
+functions for code browsing (untarz, gre, def, uses),
+and then fires up wily with $home and $home/wily/macros/guide open.
+
+The guide file assumes you have the html tools in $home/html
+and has strings for common programming and editing tasks.
+
+The 3 different grep functions are listed by decreasing generality:
+- gre is likely to get many 'hits' in large source directories
+- sg is a general-purpose source grep
+- def searches for function definitions, assumed to start at column 1.
+- uses searches for variable/function calls, it depends on 'grep -w',
+ which is available from gnu-grep if your system doesn't support it.
+
+The second line of the guide file forms a primitive mail interface.
+Click B2 on 'frm' (the elm program) to list your messages,
+click B2 on $mail to view your mailbox,
+select some text that contains a valid 'To: ' header
+and then fire B2 on sendmail to quickly send some mail,
+or if you want to use the aliases in your .mailrc file
+you can use the ">mail -s 'subject' who" guide instead.
+
+I install these files in $home/wily/macros
+--
+Steve Kotsopoulos
--- wily-0.13.41.orig/misc/wily/macros/acme
+++ wily-0.13.41/misc/wily/macros/acme
@@ -0,0 +1,61 @@
+#!/usr/bin/rc
+# acme - start up wily with some nice defaults
+#
+# usage: wily -f p9font -F p9fixed -a 8
+#
+# addresses: file:10 (line 10) file:/wow/ file:#0 (start of file)
+# file:#20 (character 20) file:?wow? file:$ (end of file)
+
+cd $home
+h=`{pwd}
+macros=$h/wily/macros
+SHELL=/usr/bin/rc
+HISTORY=$h/wily/hist
+WILYTOOLS=$macros/wilytools
+WILYFIFO=/tmp/wilyfifo.acme-$USER
+WFILETAG='Del | Look . .. Anchor Snarf'
+WDIRTAG='Del Get | Look .. gre sg uses'
+WCOLTAG='Delcol New Cut Paste Snarf Anchor Split | Font remote '
+WMAINTAG='Indent rdist -v 9term sam en enr phone tel locate files glimpse wman :, :,. h '
+
+test -f $h/.rcrc && . $h/.rcrc
+path=($h/wily/html/bin $macros $path)
+m=/var/spool/mail/$USER
+M=$h/Mail/guide
+g=$h/wily/guide
+html=$h/wily/html/guide
+docs=/usr/doc
+work=$h/work/guide
+
+# export some functions
+fn tarlook { gunzip -c $* | tar tvf - }
+fn untarz { gunzip -c $* | tar xvf - }
+fn tardir { tar cvf $1.tar $1 && gzip -v $1.tar }
+fn gconfig { CC=shlicc CFLAGS='-g' ./configure '--prefix=/usr/local' }
+fn en { nenscript -G -fCourier7 $* }
+fn enr { nenscript -G -2r -fCourier5 $* }
+
+# gre - general-purpose grep
+# sg - source grep
+# def - find C/Alef definitions, from Gary (aka decl in Help paper)
+# uses - very crude, from Rob Pike's Help paper
+# wman - manpage browser, uses sed to cut the .1 suffix if it's there
+fn gre { grep -sn $1 * /dev/null }
+fn sg { grep -sn $1 *.[hcyl] *.java *.cat /dev/null }
+fn def { grep -sn '^'^$1 *.[lc] *.java *.cat /dev/null }
+fn uses { grep -sn -w $* *.[cly] *.java *.cat /dev/null }
+fn wman { man `{echo $*|sed 's/\..//'}|col -b|cat -s }
+fn wlint { lint $w }
+fn wspell { spell $w }
+
+# mh functions
+fn chfolder { folder +^$1 }
+fn sin { scan +inbox}
+fn sTodo { scan +Todo }
+fn sBugs { scan +Bugs }
+fn sBoS { scan +BoS }
+fn sBSD { scan +BSD }
+fn sFire { scan +Firewalls}
+fn wpack { echo y | packf }
+
+exec wily $* $macros/guide $h
--- wily-0.13.41.orig/misc/wily/macros/fonts
+++ wily-0.13.41/misc/wily/macros/fonts
@@ -0,0 +1,20 @@
+Font /usr/X11R6/lib/X11/fonts/Xg/lucm/euro.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/lucm/latin1.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/lucm/unicode.9.font
+Font /usr/X11R6/lib/X11/wily/fixed.9.font
+Font /usr/X11R6/lib/X11/wily/prop.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/matty/unicode.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/ascii.10.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/ascii.12.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/ascii.16.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/euro.8.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/euro.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/fangsong.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/hku.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/jis.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/latin1.8.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/latin1.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/song.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/unicode.8.font
+Font /usr/X11R6/lib/X11/fonts/Xg/pelm/unicode.9.font
+Font /usr/X11R6/lib/X11/fonts/Xg/smiley/0.font
--- wily-0.13.41.orig/misc/wily/macros/guide
+++ wily-0.13.41/misc/wily/macros/guide
@@ -0,0 +1,5 @@
+ $h $m $M $g $html $docs $work remote magic h
+ frm >sendmail >mail -s 'subject' wbiff |sort -nr
+ rm wc sam B |fmt |quote |indent |undent wspell
+ tarlook untarz gconfig mk make install clean tardir
+ gre sg uses def cvs diff lpr en lpq wman wlint win
--- wily-0.13.41.orig/misc/wily/macros/h
+++ wily-0.13.41/misc/wily/macros/h
@@ -0,0 +1,8 @@
+#!/usr/bin/rc
+
+switch ($#*) {
+case 0
+ tail $HISTORY
+case 1
+ grep $1 $HISTORY | tail
+}
--- wily-0.13.41.orig/misc/wily/macros/magic
+++ wily-0.13.41/misc/wily/macros/magic
@@ -0,0 +1,87 @@
+#!/usr/bin/sh
+#
+# magic-cat - this script tries to guess what kind of data a file contains,
+# and then runs a program that knows what to do with that data
+# It can be teamed with AFDP by 'afdpsend -c magic-cat file1 file2'
+# to send multimedia files to many systems at once. Upon receiving
+# the files each system will run magic-cat to display them locally.
+# Steve Kotsopoulos
+#
+# rcsid[] = "$Id: magic-cat,v 1.10 1995/10/24 16:37:25 steve Exp $";
+
+PATH=/local/bin:/usr/local/bin:/usr/ucb:/usr/bin:/bin:$PATH:$HOME/bin
+
+# start with some reasonable defaults
+TMP=/tmp/magic.$$
+MYMAGIC=$HOME/bin/etc.magic # for systems where /etc/magic is incomplete
+PROGfile="file -m $MYMAGIC"
+PROGfile="file"
+PROGimage="xli -delay 10 -geometry +200+200 -quiet"
+PROGps="ghostview -geometry -0-0"
+PROGmpeg="mpeg_play"
+PROGmovie="xanim"
+PROGsound=$PROGfile
+PROGrgb=$PROGfile
+PROGtext="head"
+
+case $# in
+ 0) echo 'Usage: magic-cat file ...'; exit ;;
+ 1) BACKGROUND=1 ;; # run file in background, if only 1 arg
+ *) BACKGROUND=0 ;; # run files in foreground, 1 at a time
+esac
+
+case `uname` in
+ NetBSD|"BSD/OS"|"BSD/386")
+ XPLAYGIZMO=false; export XPLAYGIZMO; PROGimage="xv";
+ PROGsound="showaudio audio/au" ;;
+ IRIX)
+ PROGsound="sfplay -p"; PROGrgb="ipaste" ;;
+ SunOS)
+ PROGsound="play" ;;
+ *)
+ PROGps=$PROGfile ;; # assume we don't have ghostview
+esac
+
+# if !$DISPLAY ; then # we aren't running under X Windows!?
+# PROGimage=$PROGfile
+# fi
+
+for ARG
+do
+ # default program to run, if we can't figure out what file contains
+ PROG=$PROGfile
+
+ $PROGfile $ARG > $TMP
+ if grep "SGI imagelib image" $TMP; then
+ PROG=$PROGrgb
+ elif egrep '(image|GIF|JPEG|jpeg|rasterfile|xpm|xbm)' $TMP ; then
+ PROG=$PROGimage
+ elif grep face $TMP ; then
+ PROG=xview # xv does not support face files
+ elif grep AIFF $TMP ; then
+ PROG=playaiff # only on SGI systems
+ elif egrep '(audio|sound)' $TMP ; then
+ PROG=$PROGsound
+ elif grep -i PostScript $TMP ; then
+ PROG=$PROGps
+ elif grep -i mpg $TMP ; then
+ PROG=$PROGmpeg
+ elif grep -i movie $TMP ; then
+ PROG=$PROGmovie
+ elif grep -i text $TMP; then
+ PROG=$PROGtext
+ elif grep "shell script" $TMP; then
+ PROG=$PROGtext
+ else
+ echo "$ARG: file type not supported:"
+ fi
+
+ if test "$BACKGROUND" = 1 ; then
+ $PROG $ARG & # run program in background, so we exit NOW
+ else
+ $PROG $ARG
+ fi
+done
+
+rm -f $TMP
+exit 0
--- wily-0.13.41.orig/misc/wily/macros/utf
+++ wily-0.13.41/misc/wily/macros/utf
@@ -0,0 +1,33 @@
+UTF encoding/font test
+======================
+
+Cat this file to test the unicode support. Your font should be
+set to something like pelm/unicode.8.font or pelm/unicode.9.font
+in whatever place you have installed the Xg unicode fonts, e.g.,
+font=~matty/lib/font/Xg/pelm/unicode.8.font.
+
+The Plan 9 window system is 8½ (8 1/2).
+
+Here are some chess pieces: ♔♕♖♗♘♙♚♛♜♝♞♟
+
+Now some accented characters: áàäéèëíìï (aei each with acute, grave, diaeresis)
+
+Some greek characters: τραπεζα
+
+Some mathematical symbols: ∀x: x ∈ Integers ⇒ x+1 ≮ x
+
+Demonstrate proportional fonts, toggle Font builtin:
+iiiiiii
+mmmmmmm
+
+☺ ☻ ☹ ★ ☆ ☉ ☌ ☎ ☏ ☐ ☑ ☒ ☜ ☞ ♀ ♁ ♂
+
+∙ Why use :-) when you can use ☺?
+∙ Gøëring, Garçon
+∙ Γαρη Ξαπελλ
+∙ ∀x ∃y : ½y ≧ x²
+∙ ♘♙♚♜♝♞♟♠♡♢♣♤♥♦♧♩♪♭♮♯
+∙ ЙКЛ МОП РСУФХЦЧШЩЪЫЬЭЯабвг
+∙ ひびぴふぶぷへべ ぺみむめもゃやゅゆょよるゎゐァイキ
+∙ ∴ Use Wily
+
--- wily-0.13.41.orig/misc/wily/macros/wbiff
+++ wily-0.13.41/misc/wily/macros/wbiff
@@ -0,0 +1,22 @@
+#!/usr/bin/rc
+# wbiff - wily/acme mailbox watcher, by steve@border.com
+# it includes the string $mail:line in all output, so you can B3 on it
+
+mail=/var/mail/$USER # Unix mailbox
+test -f /dev/sysstat && mail=/mail/box/$user/mbox # Plan 9 mailbox
+
+interval=30
+t1=/tmp/wbiff.1.$USER
+t2=/tmp/wbiff.2.$USER
+
+fn frm { egrep -n '^From |^Subject:' $1 | sed 's/^/wbiff $m:/' }
+
+frm $mail > $t1
+> $t1
+echo wbiff watching $mail on `{sdate}
+while() {
+ frm $mail > $t2
+ diff $t1 $t2 | egrep '>' | sed 's/> //'
+ mv $t2 $t1
+ sleep $interval
+}
--- wily-0.13.41.orig/misc/wily/macros/wilytools
+++ wily-0.13.41/misc/wily/macros/wilytools
@@ -0,0 +1,22 @@
+ftp.*.c$ sg accept( select( cvs diff
+p9/wily.*/$ gconfig gmake install
+src/wily.*/$ gconfig gmake install
+norman def make wman
+\.c$ sg uses def wman
+work*/$ cvs diff make
+proxy/$ SO_KEEP
+.h/$ $h $m $M $g $html rdist
+Mail/guide$ frm sin
+html/guide$ Indent remote
+macros/guide$ magic
+Makefile make install clean
+Errors$ Clear
+win$ uptime df who
+Mace/$ subject mace
+Mace.*/$ subject
+Mace/out deliver
+Mace reply wrm
+News followup
+tmp xv
+print/$ gv bpr
+/$ make install
--- wily-0.13.41.orig/tools/win/Makefile.in
+++ wily-0.13.41/tools/win/Makefile.in
@@ -12,9 +12,9 @@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
-CFLAGS = @CFLAGS@ -I.. -I$(srcdir)/../include -I$(srcdir)/../sam/include
+CFLAGS = @CFLAGS@ -I../.. -I$(srcdir)/../../include -I../../include
DEFS = @DEFS@
-LIBS = @LIBS@ ../libmsg/libmsg.a ../sam/libXg/libXg.a
+LIBS = @LIBS@ ../../libmsg/libmsg.a ../../libXg/libXg.a
LDFLAGS = @LDFLAGS@
RC = @RC@
--- wily-0.13.41.orig/tools/win/configure
+++ wily-0.13.41/tools/win/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.4
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.13
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -33,9 +33,25 @@
verbose=
x_includes=NONE
x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
# Initialize some other variables.
subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
ac_prev=
for ac_option
@@ -57,9 +73,14 @@
case "$ac_option" in
- -build | --build | --buil | --bui | --bu | --b)
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
@@ -69,6 +90,12 @@
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
cache_file="$ac_optarg" ;;
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
-disable-* | --disable-*)
ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
@@ -119,12 +146,29 @@
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
- --exec-prefix=PREFIX install architecture-dependent files in PREFIX
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix]
+ --bindir=DIR user executables in DIR [EPREFIX/bin]
+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data in DIR
+ [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data in DIR
+ [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
+ --libdir=DIR object code libraries in DIR [EPREFIX/lib]
+ --includedir=DIR C header files in DIR [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
+ --infodir=DIR info documentation in DIR [PREFIX/info]
+ --mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+ --program-transform-name=PROGRAM
+ run sed PROGRAM on installed program names
+EOF
+ cat << EOF
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
@@ -136,8 +180,10 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
---enable and --with options recognized:$ac_help
EOF
+ if test -n "$ac_help"; then
+ echo "--enable and --with options recognized:$ac_help"
+ fi
exit 0 ;;
-host | --host | --hos | --ho)
@@ -145,6 +191,44 @@
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir="$ac_optarg" ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir="$ac_optarg" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
@@ -157,6 +241,15 @@
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
no_recursion=yes ;;
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
+
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
@@ -197,6 +290,23 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
+
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
@@ -207,6 +317,13 @@
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
srcdir="$ac_optarg" ;;
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir="$ac_optarg" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
@@ -216,7 +333,7 @@
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.4"
+ echo "configure generated by autoconf version 2.13"
exit 0 ;;
-with-* | --with-*)
@@ -262,7 +379,7 @@
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
- *)
+ *)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
@@ -318,11 +435,14 @@
done
# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Only set these to C if already set. These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
@@ -382,9 +502,12 @@
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+ac_exeext=
+ac_objext=o
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -425,27 +548,30 @@
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# 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:557: 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}:"
+ IFS="${IFS= }"; ac_save_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 installbsd scoinst install; do
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ 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"
@@ -456,11 +582,18 @@
;;
esac
done
- IFS="$ac_save_ifs"
- # As a last resort, use the slow shell script.
- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
+ IFS="$ac_save_IFS"
+
fi
- INSTALL="$ac_cv_path_install"
+ 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
@@ -468,19 +601,23 @@
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:612: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC="gcc"
@@ -488,7 +625,6 @@
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
@@ -498,8 +634,141 @@
echo "$ac_t""no" 1>&6
fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:642: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_prog_rejected=no
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ if test -z "$CC"; then
+ case "`uname -s`" in
+ *win32* | *WIN32*)
+ # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:693: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_CC="cl"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ ;;
+ esac
+ fi
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 736 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+ ac_cv_prog_cc_cross=no
+ else
+ ac_cv_prog_cc_cross=yes
+ fi
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+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; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:772: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -508,51 +777,66 @@
yes;
#endif
EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
fi
fi
+
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
if test $ac_cv_prog_gcc = yes; then
GCC=yes
- if test "${CFLAGS+set}" != set; then
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+else
+ GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:800: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
- ac_cv_prog_gcc_g=yes
+ ac_cv_prog_cc_g=yes
else
- ac_cv_prog_gcc_g=no
+ ac_cv_prog_cc_g=no
fi
rm -f conftest*
fi
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
- if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
- else
- CFLAGS="-O"
- fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
fi
else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:832: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_c_const=no
fi
rm -f conftest*
-
fi
+
echo "$ac_t""$ac_cv_c_const" 1>&6
if test $ac_cv_c_const = no; then
cat >> confdefs.h <<\EOF
@@ -621,6 +907,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:911: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -628,9 +915,13 @@
/*)
ac_cv_path_RC="$RC" # Let the user override the test with a path.
;;
+ ?:/*)
+ ac_cv_path_RC="$RC" # Let the user override the test with a dos path.
+ ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_path_RC="$ac_dir/$ac_word"
@@ -652,35 +943,43 @@
done
-echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then
+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:948: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | 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="-lnsl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_lib_nsl=yes"
+ 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_nsl=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'nsl`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo nsl | tr '[a-z]' '[A-Z]'`
+ ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <&6
fi
-echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then
+echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:995: checking for connect in -lsocket" >&5
+ac_lib_var=`echo socket'_'connect | 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="-lsocket $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_lib_socket=yes"
+ 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_socket=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'socket`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo socket | tr '[a-z]' '[A-Z]'`
+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <&6
+echo "configure:1045: 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 <
/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
+/* 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() { return 0; }
-int t() {
+int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
@@ -760,19 +1069,21 @@
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 '[a-z]' '[A-Z]'`
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <&6
-if /bin/test -e /dev/ptmx ; then
+echo "configure:1098: checking for /dev/ptmx" >&5
+if test -e /dev/ptmx ; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_DEV_PTMX 1
@@ -793,6 +1105,7 @@
echo "$ac_t""no" 1>&6
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1109: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -807,37 +1120,62 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
CPP=/lib/cpp
fi
rm -f conftest*
fi
rm -f conftest*
+fi
+rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
CPP="$ac_cv_prog_CPP"
@@ -848,23 +1186,27 @@
for ac_hdr in sys/ptem.h
do
-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1192: 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
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' 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; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
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
@@ -872,7 +1214,7 @@
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 | tr '[a-z]./\055' '[A-Z]___'`
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <&1 |
- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
- >> confcache
+ case `(ac_space=' '; set | grep ac_space) 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
@@ -936,7 +1292,7 @@
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
@@ -971,7 +1327,7 @@
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.4"
+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -983,22 +1339,39 @@
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS < conftest.subs <<\CEOF
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
+s%@SHELL@%$SHELL%g
s%@CFLAGS@%$CFLAGS%g
s%@CPPFLAGS@%$CPPFLAGS%g
s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
s%@DEFS@%$DEFS%g
s%@LDFLAGS@%$LDFLAGS%g
s%@LIBS@%$LIBS%g
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@CC@%$CC%g
s%@RC@%$RC%g
@@ -1006,20 +1379,56 @@
CEOF
EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+ else
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+ fi
+ if test ! -s conftest.s$ac_file; then
+ ac_more_lines=false
+ rm -f conftest.s$ac_file
+ else
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f conftest.s$ac_file"
+ else
+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+ fi
+ ac_file=`expr $ac_file + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
+ fi
+done
+if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
+fi
+EOF
+
cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile]", defaulting infile="outfile.in".
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
- # Adjust relative srcdir, etc. for subdirectories.
+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -1047,6 +1456,7 @@
[/$]*) INSTALL="$ac_given_INSTALL" ;;
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
+
echo creating "$ac_file"
rm -f "$ac_file"
configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -1055,16 +1465,22 @@
# $configure_input" ;;
*) ac_comsub= ;;
esac
+
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
sed -e "$ac_comsub
s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
s%@top_srcdir@%$top_srcdir%g
s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
fi; done
-rm -f conftest.subs
+rm -f conftest.s*
+EOF
+cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF
exit 0
EOF
--- wily-0.13.41.orig/tools/win/configure.in
+++ wily-0.13.41/tools/win/configure.in
@@ -13,7 +13,7 @@
dnl Checks for pty stuff
AC_CHECK_FUNCS(_getpty)
AC_MSG_CHECKING(for /dev/ptmx)
-if /bin/test -e /dev/ptmx ; then
+if test -e /dev/ptmx ; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_DEV_PTMX)
else
--- wily-0.13.41.orig/tools/win/wgoto.c
+++ wily-0.13.41/tools/win/wgoto.c
@@ -18,7 +18,7 @@
#define STRINGIZE2(x) #x
#define STRINGIZE(x) STRINGIZE2(x)
#ifdef __GNUC__
- #define here " at " __FILE__ ":" STRINGIZE(__LINE__) " in " __FUNCTION__ "()"
+ #define here " at " __FILE__ ":" STRINGIZE(__LINE__) " in " STRINGIZE(__FUNCTION__) "()"
#else
#define here " at " __FILE__ ":" STRINGIZE(__LINE__)
#endif
--- wily-0.13.41.orig/tools/win/win.c
+++ wily-0.13.41/tools/win/win.c
@@ -65,7 +65,7 @@
#define stringize2(x) #x
#define stringize(x) stringize2(x)
#if defined(__GNUC__)
- #define here " at " __FILE__ ":" stringize(__LINE__) " in " __FUNCTION__ "()"
+ #define here " at " __FILE__ ":" stringize(__LINE__) " in " stringize(__FUNCTION__) "()"
#else
#define here " at " __FILE__ ":" stringize(__LINE__)
#endif
--- wily-0.13.41.orig/tools/win/wreplace.c
+++ wily-0.13.41/tools/win/wreplace.c
@@ -18,7 +18,7 @@
#define STRINGIZE2(x) #x
#define STRINGIZE(x) STRINGIZE2(x)
#ifdef __GNUC__
- #define here " at " __FILE__ ":" STRINGIZE(__LINE__) " in " __FUNCTION__ "()"
+ #define here " at " __FILE__ ":" STRINGIZE(__LINE__) " in " STRINGIZE(__FUNCTION__) "()"
#else
#define here " at " __FILE__ ":" STRINGIZE(__LINE__)
#endif