[Pkg-wmaker-commits] [wmbiff] 08/77: use automake / autoconf; after checkout run ./FromCVS.sh
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to tag wmbiff_0_4_0
in repository wmbiff.
commit d1f9e7b45f9a9f55ff369b54b5b42352c9c2c173
Author: bluehal <bluehal>
Date: Sun Apr 7 05:08:23 2002 +0000
use automake / autoconf; after checkout run ./FromCVS.sh
---
COPYING | 340 +++++++++++++++++++++++++++++++++++++++++++++++++
ChangeLog | 48 +++++++
FromCVS.sh | 9 ++
INSTALL | 182 ++++++++++++++++++++++++++
Makefile.am | 34 +++++
NEWS | 13 +-
TODO | 3 +-
autoconf/acconfig.h | 3 +
autoconf/install-sh | 251 ++++++++++++++++++++++++++++++++++++
autoconf/missing | 190 +++++++++++++++++++++++++++
autoconf/mkinstalldirs | 40 ++++++
configure.in | 75 +++++++++++
maint/changelog-header | 12 ++
wmbiff/Client.h | 7 +-
wmbiff/Imap4Client.c | 13 +-
wmbiff/LicqClient.c | 5 +-
wmbiff/Makefile | 136 --------------------
wmbiff/Makefile.am | 35 +++++
wmbiff/Pop3Client.c | 13 +-
wmbiff/charutil.h | 10 +-
wmbiff/maildirClient.c | 12 +-
wmbiff/mboxClient.c | 5 +-
wmbiff/tlsComm.c | 15 ++-
wmbiff/wmbiff.c | 19 +--
wmgeneral/Makefile.am | 4 +
wmgeneral/wmgeneral.c | 9 ++
26 files changed, 1305 insertions(+), 178 deletions(-)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/ChangeLog b/ChangeLog
index e25c174..c1cc017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+
+CVS Changelog. Don't bother editing this file, because it will get overwritten
+by maint/prerelease.sh .
+
+The latest changelog entry is in a different format, because it's inserted by
+CVS on commit.
+
+ $Log: ChangeLog,v $
+ Revision 1.23 2002/04/07 05:08:23 bluehal
+ use automake / autoconf; after checkout run ./FromCVS.sh
+
+
+
+2002-04-05 Friday 19:44 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/wmbiff-master-contrast.xpm: a first cut higher-contrast
+ skin
+
+2002-04-05 Friday 19:43 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: Makefile, sample.wmbiffrc, test-make.sh, wmbiff.c:
+ askpass - invoke ssh-askpass to fill in passwords for IMAP servers;
+ skin - dynamically load an .xpm background
+
+2002-04-05 Friday 19:42 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/wmbiffrc.5: documentation of askpass and skin
+
+2002-04-05 Friday 19:08 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/tlsComm.c: explicit handling of timeouts
+
+2002-04-05 Friday 19:02 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/passwordMgr.c: askpass having a space in it is an INFO,
+ not an ERR.
+
+2002-04-04 Thursday 08:51 UTC -- Neil Spring <nspring at cs.washington.edu>
+
+ * wmbiff/: Client.h, Imap4Client.c, Makefile, Pop3Client.c,
+ passwordMgr.c, passwordMgr.h, sample.wmbiffrc, test-make.sh:
+ interactive password prompting support for imap - leave password in
+ the : format blank to use
+
+2002-03-26 Tuesday 16:30 UTC -- Jordi Mallach <jordi at sindominio.net>
+
+ * ChangeLog, NEWS, wmbiff/Makefile: Released WMBiff 0.3.8.
+
2002-03-18 Monday 21:13 UTC -- Neil Spring <nspring at cs.washington.edu>
* TODO: add failure handling in expect
diff --git a/FromCVS.sh b/FromCVS.sh
new file mode 100755
index 0000000..2c9ca46
--- /dev/null
+++ b/FromCVS.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# runs all the things necessary to rebuild files from CVS.
+autoheader -l autoconf && \
+ aclocal && \
+ automake && \
+ autoconf && \
+ ./configure && \
+ make
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..b42a17a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,182 @@
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+ The file `configure.in' is used to create `configure' by a program
+called `autoconf'. You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. You can give `configure'
+initial values for variables by setting them in the environment. Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+ CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+ env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory. After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on. Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+ CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+ If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+ Use and save the results of the tests in FILE instead of
+ `./config.cache'. Set FILE to `/dev/null' to disable caching, for
+ debugging `configure'.
+
+`--help'
+ Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--version'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..ca119a8
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,34 @@
+SUBDIRS = wmgeneral wmbiff
+EXTRA_DIST = autoconf README.licq TODO
+
+AUTOHEADER = @AUTOHEADER@ -l autoconf
+
+# make maintainer-clean is all about returning to CVS.
+# aclocal.m4 is generated by aclocal
+# config.h.in is generated by autoheader
+# stamp-h.in appears somewhere
+# Makefile.in and configure are obviously generated.
+MAINTAINERCLEANFILES = aclocal.m4 config.h.in stamp-h.in \
+ Makefile.in configure
+maintainer-clean-local:
+ rm -f *~
+
+# conf.libgnutlstest seems to outstay its welcome.
+# I don't know why the -stamp s linger.
+DISTCLEANFILES = conf.libgnutlstest build-stamp install-stamp
+
+dist-hook-local: ChangeLog
+
+# manually increment version in configure.in, which should be enough.
+ChangeLog: stamp-h Makefile configure.in
+ @if test -e maint/changelog-header && test "x$(CVS2CL)" != "x"; then \
+ cat maint/changelog-header > $@; \
+ echo >> $@; \
+ echo "running $(CVS2CL)..."; \
+ $(CVS2CL) --stdout --utc --day-of-week | sed -f maint/changelog.sed >> $@; \
+ else \
+ echo "Unable to build ChangeLog for distribution"; \
+ exit 1; \
+ fi
+
+
diff --git a/NEWS b/NEWS
index bc2ba56..d5c4b7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
Release Notes
~~~~~~~~~~~~~
+Release 0.4.0 - unreleased
+
+ * Can leave IMAP password empty in .wmbiffrc: ssh-askpass
+ will be used to prompt the user. See sample.wmbiffrc
+ and wmbiffrc(5).
+ * A different background pixmap can be specified in .wmbiffrc.
+ This has the effect of "skins." See wmbiffrc(5).
+ * Migrated to automake / autoconf to detect defaults for
+ ssh-askpass and prepare for future changes.
+ * [unfinished] Permissions on .wmbiffrc are checked to protect
+ security.
Release 0.3.8 - Tue, 26 Mar 2002 17:17:07 +0100
@@ -279,4 +290,4 @@ Release 0.1 - Wed, 17 Nov 1999 00:00:00 +0000
* Initial release by Gennady Belyakov <gb at ccat.elect.ru>.
-$Id: NEWS,v 1.16 2002/03/26 16:30:32 jordi Exp $
+$Id: NEWS,v 1.17 2002/04/07 05:08:23 bluehal Exp $
diff --git a/TODO b/TODO
index db54c8d..472f788 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
- Store and verify server certificates.
-- Prompt for passwords (in progress)
- Add a FAQ (sighup, app size, deleted messages)
- Make the shell method support old messages too
- Add more shell "recipes" besides gicu.
@@ -12,4 +11,4 @@
and a bad response (a003 NO STATUS). As soon as
one of them is received, we're done.
-$Id: TODO,v 1.4 2002/03/18 21:13:55 bluehal Exp $
+$Id: TODO,v 1.5 2002/04/07 05:08:23 bluehal Exp $
diff --git a/autoconf/acconfig.h b/autoconf/acconfig.h
new file mode 100644
index 0000000..6a95a71
--- /dev/null
+++ b/autoconf/acconfig.h
@@ -0,0 +1,3 @@
+#undef DEFAULT_SKIN_PATH
+#undef DEFAULT_ASKPASS
+#undef VERSION
diff --git a/autoconf/install-sh b/autoconf/install-sh
new file mode 100755
index 0000000..e9de238
--- /dev/null
+++ b/autoconf/install-sh
@@ -0,0 +1,251 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission. M.I.T. makes no representations about the
+# suitability of this software for any purpose. It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+ case $1 in
+ -c) instcmd="$cpprog"
+ shift
+ continue;;
+
+ -d) dir_arg=true
+ shift
+ continue;;
+
+ -m) chmodcmd="$chmodprog $2"
+ shift
+ shift
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
+
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd="$stripprog"
+ shift
+ continue;;
+
+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ shift
+ continue;;
+
+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ shift
+ continue;;
+
+ *) if [ x"$src" = x ]
+ then
+ src=$1
+ else
+ # this colon is to work around a 386BSD /bin/sh bug
+ :
+ dst=$1
+ fi
+ shift
+ continue;;
+ esac
+done
+
+if [ x"$src" = x ]
+then
+ echo "install: no input file specified"
+ exit 1
+else
+ true
+fi
+
+if [ x"$dir_arg" != x ]; then
+ dst=$src
+ src=""
+
+ if [ -d $dst ]; then
+ instcmd=:
+ chmodcmd=""
+ else
+ instcmd=mkdir
+ fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+
+ if [ -f $src -o -d $src ]
+ then
+ true
+ else
+ echo "install: $src does not exist"
+ exit 1
+ fi
+
+ if [ x"$dst" = x ]
+ then
+ echo "install: no destination specified"
+ exit 1
+ else
+ true
+ fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+ if [ -d $dst ]
+ then
+ dst="$dst"/`basename $src`
+ else
+ true
+ fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+# this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+ pathcomp="${pathcomp}${1}"
+ shift
+
+ if [ ! -d "${pathcomp}" ] ;
+ then
+ $mkdirprog "${pathcomp}"
+ else
+ true
+ fi
+
+ pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+ $doit $instcmd $dst &&
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+ if [ x"$transformarg" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ dstfile=`basename $dst $transformbasename |
+ sed $transformarg`$transformbasename
+ fi
+
+# don't allow the sed command to completely eliminate the filename
+
+ if [ x"$dstfile" = x ]
+ then
+ dstfile=`basename $dst`
+ else
+ true
+ fi
+
+# Make a temp file name in the proper directory.
+
+ dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+ $doit $instcmd $src $dsttmp &&
+
+ trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing. If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+ $doit $rmcmd -f $dstdir/$dstfile &&
+ $doit $mvcmd $dsttmp $dstdir/$dstfile
+
+fi &&
+
+
+exit 0
diff --git a/autoconf/missing b/autoconf/missing
new file mode 100755
index 0000000..7789652
--- /dev/null
+++ b/autoconf/missing
@@ -0,0 +1,190 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Franc,ois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+case "$1" in
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing - GNU libit 0.0"
+ ;;
+
+ -*)
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+ ;;
+
+ aclocal)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`acinclude.m4' or \`configure.in'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`configure.in'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`acconfig.h' or \`configure.in'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case "$f" in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ bison|yacc)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f y.tab.h ]; then
+ echo >y.tab.h
+ fi
+ if [ ! -f y.tab.c ]; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex|flex)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f lex.yy.c ]; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ makeinfo)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ fi
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequirements for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/autoconf/mkinstalldirs b/autoconf/mkinstalldirs
new file mode 100755
index 0000000..1a6732a
--- /dev/null
+++ b/autoconf/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.1 2002/04/07 05:08:23 bluehal Exp $
+
+errstatus=0
+
+for file
+do
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case "$pathcomp" in
+ -* ) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/configure.in b/configure.in
new file mode 100644
index 0000000..f78156e
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,75 @@
+dnl Autoconf is here to detect:
+dnl gnutls, libgcrypt
+dnl gnu regex (-lgnuregex / DEXT_GNU_REGEX_LIB)
+dnl default ssh-askpass
+dnl and the basics X11, Xext, Xpm
+dnl and configure:
+dnl installation prefix
+dnl version
+
+AC_INIT(configure.in)
+AC_CONFIG_AUX_DIR(autoconf)
+AM_INIT_AUTOMAKE(wmbiff, 0.4.0pre2)
+dnl AUTOHEADER="$AUTOHEADER -l \\\\\\\$\(srcdir)/autoconf"
+AM_CONFIG_HEADER(config.h)
+AC_SUBST(VERSION)
+
+AC_PROG_INSTALL
+AC_PROG_CC
+AC_PROG_RANLIB
+
+if test -n "$GCC"; then
+ CFLAGS="$CFLAGS -D_GNU_SOURCE -W -Wall -Wshadow -Wpointer-arith -Wwrite-strings"
+ AC_MSG_RESULT(adding -Wall and friends to CFLAGS.)
+fi
+
+dnl Pre-gnutls.
+AC_CHECK_LIB(z, gzopen) dnl GNUTLS seems to need libz; fail here if it's missing.
+AC_CHECK_LIB(gdbm, dbminit) dnl GNUTLS seems to need libgdbm; fail here if it's missing.
+
+dnl Parameter is minimum version
+dnl TODO: fix so that GCRYPT is tested only if GNUTLS fails; the dependence
+dnl between them makes this turn redundant
+
+AM_PATH_LIBGNUTLS(0.3.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"])
+AM_PATH_LIBGCRYPT(1.1.5, [LIBS="$LIBS $LIBGCRYPT_LIBS"
+ CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"])
+AC_CHECK_HEADERS(gnutls.h gcrypt.h)
+
+dnl regex stuff.
+AC_CHECK_HEADERS(regex.h gnuregex.h) dnl linux has regex.h, BSD gnuregex
+AC_CHECK_LIB(gnuregex, re_search) dnl BSD.
+
+dnl X11 stuff.
+AC_PATH_XTRA
+LIBS="$X_LIBS $LIBS"
+dnl want to get the -I flags so that later tests for include files work.
+dnl the preprocessor is used for check_headers, which doesn't use cflags.
+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+AC_CHECK_LIB(X11, XrmParseCommand)
+AC_CHECK_LIB(Xext, XextAddDisplay)
+AC_CHECK_LIB(Xpm, XpmCreateImageFromXpmImage)
+
+AC_CHECK_HEADERS(X11/xpm.h, , AC_CHECK_HEADERS(xpm.h, , AC_MSG_ERROR([xpm.h is needed])))
+
+dnl Password prompting stuff.
+AC_PATH_PROGS(ASKPASS, ssh-askpass x11-ssh-askpass ssh-askpass-gnome, /usr/bin/ssh-askpass)
+AC_PATH_PROG(CVS2CL, cvs2cl)
+AC_DEFINE_UNQUOTED(DEFAULT_ASKPASS, "$ASKPASS")
+
+dnl Skin files; note - this is duplicated in wmbiff/Makefile.am
+dnl haven't thought of a way around it.
+if test "x$prefix" != xNONE; then
+ SKINDIR="$prefix/share/wmbiff/skins"
+else
+ SKINDIR="$ac_default_prefix/share/wmbiff/skins"
+fi
+dnl where to install em
+AC_SUBST(SKINDIR)
+dnl where to find em
+AC_DEFINE_UNQUOTED(DEFAULT_SKIN_PATH,
+ "$SKINDIR:/usr/share/wmbiff/skins:/usr/local/share/wmbiff/skins:.")
+
+dnl We're done.
+AC_OUTPUT(Makefile wmbiff/Makefile wmgeneral/Makefile)
diff --git a/maint/changelog-header b/maint/changelog-header
new file mode 100644
index 0000000..3dba971
--- /dev/null
+++ b/maint/changelog-header
@@ -0,0 +1,12 @@
+
+CVS Changelog. Don't bother editing this file, because it will get overwritten
+by maint/prerelease.sh .
+
+The latest changelog entry is in a different format, because it's inserted by
+CVS on commit.
+
+ $Log: changelog-header,v $
+ Revision 1.1 2002/04/07 05:08:23 bluehal
+ use automake / autoconf; after checkout run ./FromCVS.sh
+
+
diff --git a/wmbiff/Client.h b/wmbiff/Client.h
index f7f002d..cc0aa7b 100644
--- a/wmbiff/Client.h
+++ b/wmbiff/Client.h
@@ -1,4 +1,4 @@
-/* $Id: Client.h,v 1.13 2002/04/04 08:51:50 bluehal Exp $ */
+/* $Id: Client.h,v 1.14 2002/04/07 05:08:23 bluehal Exp $ */
/* Author : Scott Holden ( scotth at thezone.net )
Modified : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -11,13 +11,16 @@
#ifndef CLIENT
#define CLIENT
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
#include <gcrypt.h>
#endif
diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index f6f42ec..41f6a96 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -7,8 +7,9 @@
* modified by Jay Francis (jtf at u880.org) to support
* CRAM-MD5 */
-/* get asprintf */
-#define _GNU_SOURCE
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "Client.h"
#include "charutil.h"
@@ -46,7 +47,7 @@ static struct fdmap_struct {
static void ask_user_for_password(Pop3 pc, int bFlushCache);
/* authentication callbacks */
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
static int authenticate_md5(Pop3 pc, struct connection_state *scs,
const char *capabilities);
#endif
@@ -62,7 +63,7 @@ static struct imap_authentication_method {
const char *capabilities);
} auth_methods[] = {
{
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
"cram-md5", authenticate_md5}, {
#endif
"plaintext", authenticate_plaintext}, {
@@ -302,7 +303,7 @@ int imap4Create(Pop3 pc, const char *const str)
/* IMAP4 format: imap:user:password at server/mailbox[:port] */
/* If 'str' line is badly formatted, wmbiff won't display the mailbox. */
if (strncmp("sslimap:", str, 8) == 0 || strncmp("imaps:", str, 6) == 0) {
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
static int haveBeenWarned;
PCU.dossl = 1;
if (!haveBeenWarned) {
@@ -413,7 +414,7 @@ static int authenticate_plaintext(Pop3 pc,
return (0);
}
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
static int authenticate_md5(Pop3 pc,
struct connection_state *scs,
const char *capabilities)
diff --git a/wmbiff/LicqClient.c b/wmbiff/LicqClient.c
index 6aa9c37..5d7df5f 100644
--- a/wmbiff/LicqClient.c
+++ b/wmbiff/LicqClient.c
@@ -1,4 +1,4 @@
-/* $Id: LicqClient.c,v 1.4 2002/03/01 08:41:29 bluehal Exp $ */
+/* $Id: LicqClient.c,v 1.5 2002/04/07 05:08:23 bluehal Exp $ */
/* Author : Yong-iL Joh ( tolkien at mizi.com )
Modified: Jorge Garc�a ( Jorge.Garcia at uv.es )
*
@@ -42,7 +42,8 @@ int licqCheckHistory(Pop3 pc)
" was changed,"
" TIME: old %lu, new %lu"
" SIZE: old %lu, new %lu\n",
- PCM.mtime, st.st_mtime, (unsigned long) PCM.size, st.st_size);
+ PCM.mtime, (unsigned long)st.st_mtime,
+ (unsigned long) PCM.size, (unsigned long)st.st_size);
ut.actime = st.st_atime;
ut.modtime = st.st_mtime;
F = pc->open(pc);
diff --git a/wmbiff/Makefile b/wmbiff/Makefile
deleted file mode 100644
index cba8fdd..0000000
--- a/wmbiff/Makefile
+++ /dev/null
@@ -1,136 +0,0 @@
-# Makefile for wmbiff
-#
-# $Id: Makefile,v 1.30 2002/04/05 19:43:54 bluehal Exp $
-
-# Disable gnutls crypto?
-#WITHOUT_CRYPTO= 1
-
-# Use external GNU regexp lib?
-#EXT_GNU_REGEX_LIB=1
-
-# Use debugging?
-#DEBUG= 1
-
-PREFIX?= /usr/local
-BINDIR?= $(PREFIX)/bin
-MANDIR?= $(PREFIX)/share/man
-XPMDIR?= $(PREFIX)/share/wmbiff
-
-CC?= gcc
-LIBDIR?= -L/usr/X11R6/lib
-LIBS= -lXpm -lXext -lX11
-CFLAGS?= -O2 -Wall -Wpointer-arith
-
-###########################################################
-# Nothing below here should need to be changed
-###########################################################
-
-WMBIFF_VERSION= "0.4.0pre1"
-EXTRAFLAGS= -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
-
-# Default linux owners
-INSTALL_USER= root
-INSTALL_GROUP= root
-
-# Debugging
-ifdef DEBUG
-CFLAGS= -g -Wall -Wpointer-arith -Wwrite-strings \
--W -Wtraditional -Wshadow -Wcast-qual
-#-pedantic -Wmissing-noreturn
-endif
-
-# FreeBSD overrides
-ifeq ($(OSTYPE),FreeBSD)
-INSTALL_GROUP= wheel
-EXT_GNU_REGEX_LIB=1
-CFLAGS+= -I/usr/X11R6/include/
-endif
-
-# External GNU RegExp lib... needed on FreeBSD
-ifdef EXT_GNU_REGEX_LIB
-LIBS+= -lgnuregex
-CFLAGS+= -DEXT_GNU_REGEX_LIB
-endif
-
-# Crypto support
-ifndef WITHOUT_CRYPTO
-EXTRAFLAGS+= -DWITH_TLS -DWITH_GCRYPT
-LIBS+= -lgnutls -lgcrypt
-endif
-
-INSTALL?= /usr/bin/install
-INSTALL_DIR?= $(INSTALL) -d -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 755
-INSTALL_PRG?= $(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 755 -s
-INSTALL_FILE?= $(INSTALL) -p -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 644
-
-# For malloc debug :
-#CFLAGS += -DUSE_DMALLOC
-#LIBS += -ldmalloc
-
-
-###########################################################
-# Real make stuff begins :
-###########################################################
-
-OBJS = wmbiff.o socket.o \
- Pop3Client.o LicqClient.o mboxClient.o \
- maildirClient.o Imap4Client.o tlsComm.o \
- ShellClient.o passwordMgr.o\
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
- ../wmgeneral/list.o \
- charutil.o
-
-all: wmbiff
-
-Imap4Client.o: Imap4Client.c Client.h Makefile
-Pop3Client.o: Pop3Client.c Client.h Makefile
-passwordMgr.o: passwordMgr.c passwordMgr.h Client.h Makefile
-wmbiff.o: wmbiff-master.xpm wmbiff.c Client.h
-
-.c.o:
- $(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
-
-wmbiff-master.xpm:
- ln -s wmbiff-master-led.xpm wmbiff-master.xpm
-
-wmbiff: $(OBJS)
- $(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff $^ $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i ; \
- done
- rm -f wmbiff *~ tags core wmbiff-master.xpm
-
-distclean: clean
-
-install: wmbiff
- $(INSTALL_DIR) $(BINDIR)
- $(INSTALL_DIR) $(MANDIR)/man1
- $(INSTALL_DIR) $(MANDIR)/man5
- $(INSTALL_PRG) wmbiff $(BINDIR)
- $(INSTALL_FILE) wmbiff.1 $(MANDIR)/man1
- $(INSTALL_FILE) wmbiffrc.5 $(MANDIR)/man5
- $(INSTALL_DIR) $(XPMDIR)
- $(INSTALL_FILE) wmbiff-master-led.xpm $(XPMDIR)
- $(INSTALL_FILE) wmbiff-master-contrast.xpm $(XPMDIR)
-
-# CODING STYLE AND INDENTATION [2001-Mar-12]:
-#
-# There have been some problems with coding style in the past. Many people
-# contributed to wmbiff (thank you!), and the code got really messy. To help
-# resolve this, I used GNU indent with what I believe to be the most
-# widely-accepted coding style options (K&R style) with 4-space TAB indents
-# (because some of the code is highly nested) to clean up the code. Not
-# everyone may be happy with this, but has been determined to be necessary for
-# consistency and legibility.
-#
-# In other words, make sure you run "make clean" and "make indent", and do not
-# change the options on the indent command, before you submit patches against
-# wmbiff. This will make everyone's life easier.
-#
-# -- Dwayne C. Litzenberger <dlitz at dlitz.net>
-indent:
- indent -npro -kr -i4 -ts4 *.[ch] || true
-
diff --git a/wmbiff/Makefile.am b/wmbiff/Makefile.am
new file mode 100644
index 0000000..51c2673
--- /dev/null
+++ b/wmbiff/Makefile.am
@@ -0,0 +1,35 @@
+bin_PROGRAMS = wmbiff
+wmbiff_SOURCES = wmbiff.c socket.c Pop3Client.c LicqClient.c mboxClient.c \
+ maildirClient.c Imap4Client.c tlsComm.c tlsComm.h ShellClient.c \
+ passwordMgr.c passwordMgr.h charutil.c charutil.h Client.h
+wmbiff_LDADD = -L../wmgeneral -lwmgeneral
+wmbiff_DEPENDENCIES = ../wmgeneral/libwmgeneral.a
+man_MANS = wmbiff.1 wmbiffrc.5
+skindir = $(datadir)/wmbiff/skins
+skin_DATA = wmbiff-master-led.xpm wmbiff-master-contrast.xpm
+
+EXTRA_DIST = $(man_MANS) sample.wmbiffrc
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# CODING STYLE AND INDENTATION [2001-Mar-12]:
+#
+# There have been some problems with coding style in the past. Many people
+# contributed to wmbiff (thank you!), and the code got really messy. To help
+# resolve this, I used GNU indent with what I believe to be the most
+# widely-accepted coding style options (K&R style) with 4-space TAB indents
+# (because some of the code is highly nested) to clean up the code. Not
+# everyone may be happy with this, but has been determined to be necessary for
+# consistency and legibility.
+#
+# In other words, make sure you run "make clean" and "make indent", and do not
+# change the options on the indent command, before you submit patches against
+# wmbiff. This will make everyone's life easier.
+#
+# -- Dwayne C. Litzenberger <dlitz at dlitz.net>
+indent:
+ indent -npro -kr -i4 -ts4 $(wmbiff_SOURCES) || true
+
+dist-hook-local: indent
+dist-clean-local:
+ test -L wmbiff-master.xpm && rm wmbiff-master.xpm
diff --git a/wmbiff/Pop3Client.c b/wmbiff/Pop3Client.c
index edab0dd..13ded49 100644
--- a/wmbiff/Pop3Client.c
+++ b/wmbiff/Pop3Client.c
@@ -1,4 +1,4 @@
-/* $Id: Pop3Client.c,v 1.10 2002/04/04 08:51:50 bluehal Exp $ */
+/* $Id: Pop3Client.c,v 1.11 2002/04/07 05:08:23 bluehal Exp $ */
/* Author : Scott Holden ( scotth at thezone.net )
Modified : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
@@ -10,6 +10,9 @@
* Last Updated : Tue Nov 13 13:45:23 PST 2001
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "Client.h"
#include "charutil.h"
@@ -21,7 +24,7 @@
#define PCU (pc->u).pop_imap
#define POP_DM(pc, lvl, args...) DM(pc, lvl, "pop3: " args)
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
static FILE *authenticate_md5(Pop3 pc, FILE * fp, char *unused);
static FILE *authenticate_apop(Pop3 pc, FILE * fp, char *apop_str);
#endif
@@ -34,7 +37,7 @@ static struct authentication_method {
FILE *(*auth_callback) (Pop3 pc, FILE * fp, char *apop_str);
} auth_methods[] = {
{
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
"cram-md5", authenticate_md5}, {
"apop", authenticate_apop}, {
#endif
@@ -209,7 +212,7 @@ int pop3Create(Pop3 pc, const char *str)
}
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
static FILE *authenticate_md5(Pop3 pc,
FILE * fp,
char *apop_str __attribute__ ((unused)))
@@ -299,7 +302,7 @@ static FILE *authenticate_apop(Pop3 pc, FILE * fp, char *apop_str)
return NULL;
}
}
-#endif /* WITH_GCRYPT */
+#endif /* HAVE_GCRYPT_H */
static FILE *authenticate_plaintext(Pop3 pc, FILE * fp, char *apop_str
__attribute__ ((unused)))
diff --git a/wmbiff/charutil.h b/wmbiff/charutil.h
index 6e5ac62..161ff87 100644
--- a/wmbiff/charutil.h
+++ b/wmbiff/charutil.h
@@ -1,4 +1,4 @@
-/* $Id: charutil.h,v 1.5 2002/02/02 18:04:19 jordi Exp $ */
+/* $Id: charutil.h,v 1.6 2002/04/07 05:08:23 bluehal Exp $ */
/* Author: Mark Hurley (debian4tux at telocity.com)
*
* Character / string manipulation utilities.
@@ -8,11 +8,17 @@
#ifndef CHARUTIL
#define CHARUTIL
-#ifdef EXT_GNU_REGEX_LIB
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_GNUREGEX_H
#include <gnuregex.h>
#else
+#ifdef HAVE_REGEX_H
#include <regex.h>
#endif
+#endif
int FullTrim(char *psValue);
diff --git a/wmbiff/maildirClient.c b/wmbiff/maildirClient.c
index 5b834f5..95ca0c0 100644
--- a/wmbiff/maildirClient.c
+++ b/wmbiff/maildirClient.c
@@ -1,11 +1,11 @@
-/* $Id: maildirClient.c,v 1.5 2002/03/05 05:02:44 dwonis Exp $ */
+/* $Id: maildirClient.c,v 1.6 2002/04/07 05:08:23 bluehal Exp $ */
/* Author : Yong-iL Joh ( tolkien at mizi.com )
Modified : Jorge Garc�a ( Jorge.Garcia at uv.es )
Modified : Dwayne C. Litzenberger ( dlitz at dlitz.net )
*
* Maildir checker.
*
- * Last Updated : $Date: 2002/03/05 05:02:44 $
+ * Last Updated : $Date: 2002/04/07 05:08:23 $
*
*/
@@ -83,10 +83,10 @@ int maildirCheckHistory(Pop3 pc)
" SIZE(new): old %lu, new %lu\n"
" TIME(cur): old %lu, new %lu"
" SIZE(cur): old %lu, new %lu\n",
- PCM.mtime_new, st_new.st_mtime,
- (unsigned long) PCM.size_new, st_new.st_size,
- PCM.mtime_cur, st_cur.st_mtime,
- (unsigned long) PCM.size_cur, st_cur.st_size);
+ PCM.mtime_new, (unsigned long)st_new.st_mtime,
+ (unsigned long) PCM.size_new, (unsigned long)st_new.st_size,
+ PCM.mtime_cur, (unsigned long)st_cur.st_mtime,
+ (unsigned long) PCM.size_cur, (unsigned long)st_cur.st_size);
count_new = count_msgs(path_new);
count_cur = count_msgs(path_cur);
diff --git a/wmbiff/mboxClient.c b/wmbiff/mboxClient.c
index 2fbee5a..a3eb13f 100644
--- a/wmbiff/mboxClient.c
+++ b/wmbiff/mboxClient.c
@@ -1,4 +1,4 @@
-/* $Id: mboxClient.c,v 1.6 2002/03/06 07:15:08 bluehal Exp $ */
+/* $Id: mboxClient.c,v 1.7 2002/04/07 05:08:23 bluehal Exp $ */
/* Author: Yong-iL Joh <tolkien at mizi.com>
Modified: Jorge Garc�a <Jorge.Garcia at uv.es>
Rob Funk <rfunk at funknet.net>
@@ -61,7 +61,8 @@ int mboxCheckHistory(Pop3 pc)
" was changed,"
" TIME: old %lu, new %lu"
" SIZE: old %lu, new %lu\n",
- PCM.mtime, st.st_mtime, (unsigned long) PCM.size, st.st_size);
+ PCM.mtime, (unsigned long)st.st_mtime,
+ (unsigned long) PCM.size, (unsigned long)st.st_size);
ut.actime = st.st_atime;
ut.modtime = st.st_mtime;
F = pc->open(pc);
diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index 600010a..fb6764c 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -6,6 +6,9 @@
Neil Spring (nspring at cs.washington.edu) */
/* TODO: handle "* BYE" internally? */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdarg.h>
#include <sys/time.h>
@@ -16,7 +19,7 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
#include <gnutls.h>
#endif
#ifdef USE_DMALLOC
@@ -42,7 +45,7 @@
struct connection_state {
int sd;
char *name;
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
GNUTLS_STATE state;
X509PKI_CLIENT_CREDENTIALS xcred;
#else
@@ -65,7 +68,7 @@ void tlscomm_close(struct connection_state *scs)
/* not ok to call this more than once */
if (scs->state) {
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
gnutls_bye(scs->state, GNUTLS_SHUT_RDWR);
gnutls_x509pki_free_sc(scs->xcred);
gnutls_deinit(scs->state);
@@ -155,7 +158,7 @@ int tlscomm_expect(struct connection_state *scs,
memset(buf, 0, buflen);
TDM(DEBUG_INFO, "%s: expecting: %s\n", scs->name, prefix);
while (wait_for_it(scs->sd, EXPECT_TIMEOUT)) {
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
if (scs->state) {
readbytes =
gnutls_read(scs->state, scs->unprocessed, BUF_SIZE);
@@ -232,7 +235,7 @@ void tlscomm_printf(struct connection_state *scs, const char *format, ...)
va_end(args);
if (scs->sd != -1) {
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
if (scs->state) {
int written = gnutls_write(scs->state, buf, bytes);
if (written < bytes) {
@@ -253,7 +256,7 @@ void tlscomm_printf(struct connection_state *scs, const char *format, ...)
}
/* most of this file only makes sense if using TLS. */
-#ifdef WITH_TLS
+#ifdef HAVE_GNUTLS_H
/* taken from the GNUTLS documentation, version 0.3.0 and
0.2.10; this may need to be updated from gnutls's cli.c
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index 3acdd52..2f25825 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,8 @@
-/* $Id: wmbiff.c,v 1.18 2002/04/05 19:43:54 bluehal Exp $ */
+/* $Id: wmbiff.c,v 1.19 2002/04/07 05:08:23 bluehal Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define USE_POLL
@@ -31,7 +35,7 @@
#include <dmalloc.h>
#endif
-#include "wmbiff-master.xpm"
+#include "wmbiff-master-led.xpm"
char wmbiff_mask_bits[64 * 64];
const int wmbiff_mask_width = 64;
const int wmbiff_mask_height = 64;
@@ -55,8 +59,7 @@ const char *skin_filename = "wmbiff-master-led.xpm";
/* this should eventually be derived at compile (or
configure) time to use PREFIX from the makefile, but I (blueHal)
prefer to wait for autoconf integration. */
-const char *skin_search_path =
- "/usr/share/wmbiff:/usr/local/share/wmbiff:.";
+const char *skin_search_path = DEFAULT_SKIN_PATH;
int ReadLine(FILE *, char *, char *, int *);
int Read_Config_File(char *, int *);
@@ -91,7 +94,7 @@ void init_biff(char *uconfig_file)
mbox[i].fetchcmd[0] = 0;
mbox[i].loopinterval = 0;
mbox[i].debug = debug_default;
- mbox[i].askpass = "/usr/bin/ssh-askpass";
+ mbox[i].askpass = DEFAULT_ASKPASS;
}
/* Some defaults, if config file is unavailable */
@@ -102,7 +105,7 @@ void init_biff(char *uconfig_file)
strcpy(mbox[0].path, "/var/mail/");
strcat(mbox[0].path, m);
}
-#ifdef WITH_GCRYPT
+#ifdef HAVE_GCRYPT_H
/* gcrypt is a little strange, in that it doesn't
* seem to initialize its memory pool by itself.
* I believe we *expect* "Warning: using insecure memory!"
@@ -762,7 +765,7 @@ void parse_cmd(int argc, char **argv, char *config_file)
void usage(void)
{
- printf("\nwmBiff v" WMBIFF_VERSION
+ printf("\nwmBiff v" VERSION
" - incoming mail checker\n"
"Gennady Belyakov and others (see the README file)\n"
"Please report bugs to wmbiff-devel at lists.sourceforge.net\n"
@@ -779,7 +782,7 @@ void usage(void)
void printversion(void)
{
- printf("wmbiff v%s\n", WMBIFF_VERSION);
+ printf("wmbiff v%s\n", VERSION);
}
/* vim:set ts=4: */
diff --git a/wmgeneral/Makefile.am b/wmgeneral/Makefile.am
new file mode 100644
index 0000000..78d10db
--- /dev/null
+++ b/wmgeneral/Makefile.am
@@ -0,0 +1,4 @@
+noinst_LIBRARIES = libwmgeneral.a
+libwmgeneral_a_SOURCES = list.c list.h misc.c misc.h wmgeneral.c wmgeneral.h
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index acda07e..6b2f893 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -38,6 +38,9 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -46,7 +49,13 @@
#include <stdarg.h>
#include <X11/Xlib.h>
+#ifdef HAVE_X11_XPM_H
#include <X11/xpm.h>
+#endif
+#ifdef HAVE_XPM_H
+#include <xpm.h>
+#endif
+#include <X11/Xutil.h> /* needed for Region on solaris? */
#include <X11/extensions/shape.h>
#include "wmgeneral.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git
More information about the Pkg-wmaker-commits
mailing list