[Pkg-wmaker-commits] [wmbiff] 11/77: automatically generate wmbiffrc.5 based on the results of configure, so that the configure-time chosen defaults are accurately shown
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 03:01:04 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 3e8a4a9dae3698272abfdbe85e4c439e09c68326
Author: bluehal <bluehal>
Date: Mon Apr 8 09:35:19 2002 +0000
automatically generate wmbiffrc.5 based on the results of configure, so that the configure-time chosen defaults are accurately shown
---
configure.in | 17 +++++++---
wmbiff/{wmbiffrc.5 => wmbiffrc.5.in} | 62 +++++++++++++++++++++---------------
2 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/configure.in b/configure.in
index de92dda..67bd136 100644
--- a/configure.in
+++ b/configure.in
@@ -32,15 +32,22 @@ 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
+GNUTLS_MAN_STATUS="This copy of WMBiff was not compiled with GNUTLS."
if test "$gnutls" == "ok"; then
AM_PATH_LIBGNUTLS(0.3.3, [LIBS="$LIBS $LIBGNUTLS_LIBS"
- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"])
+ CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+ GNUTLS_MAN_STATUS="This copy of WMBiff was compiled with GNUTLS." ])
AC_CHECK_HEADERS(gnutls.h)
fi
+GCRYPT_MAN_STATUS="This copy of WMBiff was not compiled with gcrypt."
AM_PATH_LIBGCRYPT(1.1.5, [LIBS="$LIBS $LIBGCRYPT_LIBS"
- CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"])
+ CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS"
+ GCRYPT_MAN_STATUS="This copy of WMBiff was compiled with gcrypt."])
AC_CHECK_HEADERS(gcrypt.h)
+AC_SUBST(GNUTLS_MAN_STATUS)
+AC_SUBST(GCRYPT_MAN_STATUS)
+
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.
@@ -58,9 +65,9 @@ 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_PROGS(DEFAULT_ASKPASS, ssh-askpass x11-ssh-askpass ssh-askpass-gnome, /usr/bin/ssh-askpass)
AC_PATH_PROG(CVS2CL, cvs2cl)
-AC_DEFINE_UNQUOTED(DEFAULT_ASKPASS, "$ASKPASS")
+AC_DEFINE_UNQUOTED(DEFAULT_ASKPASS, "$DEFAULT_ASKPASS")
dnl Skin files; note - this is duplicated in wmbiff/Makefile.am
dnl haven't thought of a way around it.
@@ -76,4 +83,4 @@ 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)
+AC_OUTPUT(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5)
diff --git a/wmbiff/wmbiffrc.5 b/wmbiff/wmbiffrc.5.in
similarity index 76%
rename from wmbiff/wmbiffrc.5
rename to wmbiff/wmbiffrc.5.in
index d34995c..9e433ba 100644
--- a/wmbiff/wmbiffrc.5
+++ b/wmbiff/wmbiffrc.5.in
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5,v 1.11 2002/04/05 19:42:20 bluehal Exp $
+.\" $Id: wmbiffrc.5.in,v 1.1 2002/04/08 09:35:19 bluehal Exp $
.\"
.\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2002 by
.\" Jordi Mallach <jordi at debian.org>
@@ -25,19 +25,20 @@ Comment must be preceeded by pound signs (#).
The supported configuration options are:
-.TP 4
+.TP 3
\fBinterval\fP
Global interval between mailbox checking. Value is the number of seconds, 5
is the default.
-.TP 4
+.TP
\fBaskpass\fP
Program run to ask for IMAP passwords, if left empty in the configuration file.
-The default is /usr/bin/ssh-askpass. Can be specified on a per-mailbox basis.
-.TP 4
+The default is @DEFAULT_ASKPASS at . Can be specified on a per-mailbox basis.
+.TP
\fBskinfile\fP
-XPM pixmap file to load for the background. If not a full path, wmbiff will
-search /usr/share/wmbiff, /usr/local/share/wmbiff, and the current directory
-for the pixmap file.
+XPM pixmap file to load for the background. If not a full
+path, wmbiff will search @SKINDIR@, /usr/share/wmbiff,
+/usr/local/share/wmbiff, and the current directory for the
+pixmap file.
.TP
\fBlabel.n\fP
Specifies the displayed label for a mailbox. It can be up to five characters
@@ -61,18 +62,16 @@ mbox:/path/to/mail/debian-devel
.RE
.TP
.I maildir
-\fBMaildir mailboxes are now supported!\fP
-This works just like \fImbox\fP above. After the prefix, you need to put
-the path to the maildir wmbiff will read.
+This works just like \fImbox\fP above.
.RS
maildir:/path/to/mail/bugtraq/
.RE
.TP
.I pop3
-Using this type, wmbiff will fetch mail from a pop3 server, using the
+Using this type, WMBiff will check for mail on a pop3 server using the
specified username, password, host and an optional port number (defaulting
-to 110). If your password contained special character, eg. '@' or ':',
-use another path format. See Authentication below for a description of
+to 110). If your password contains a special character, eg. '@' or ':',
+use the second path format. See Authentication below for a description of
the auth field.
.RS
pop3:user:passwd at server[:port] [auth]
@@ -82,29 +81,41 @@ pop3:user passwd server[ port] [auth]
.RE
.TP
.I imap
-These are IMAP4 boxes. As with pop3, wmbiff will read a imap4 mbox using
-the given values and will display info about the remote mail. This type
-accepts user, password, host and optional path to mailbox and port number.
-See Authentication below for a description of the auth field.
+These are IMAP4 boxes. As with pop3, WMBiff will report the
+status of an IMAP4 mbox using the given values. This type
+accepts user, optional password, host and optional path to
+mailbox and port number. See Authentication below for a
+description of the auth field. The password may be left
+empty: see askpass above for information on password
+prompting.
.RS
imap:user:passwd at server[/mailbox][:port] [auth]
.RE
.RS
+imap:user:@server[/mailbox][:port] [auth]
+.RE
+.RS
imap:user passwd server[/mailbox][ port] [auth]
.RE
.TP
.I imaps
-These are IMAP4 boxes wrapped in a TLS (SSL) connection, only available if
-wmbiff was compiled with TLS support. Parameters are the same as those for
-ordinary IMAP4 boxes. Port defaults to 993. If 143 is specified,
-wmbiff will attempt to connect unencrypted but negotiate TLS using
-IMAP's STARTTLS command. TLS support uses gnutls, which is under development
-and may be insecure. TLS support is only for encryption: since certificates
-are not yet checked, it is vulnerable to man-in-the-middle attack.
+These are IMAP4 boxes wrapped in a TLS (SSL)
+connection. @GNUTLS_MAN_STATUS@ Parameters are the same as
+those for ordinary IMAP4 boxes. Port defaults to 993. If
+143 is specified, WMBiff will attempt to connect unencrypted
+but negotiate TLS using IMAP's STARTTLS command. TLS
+support uses GNUTLS, which is under development and may be
+insecure. TLS support is only for encryption: since
+certificates are not yet checked, it is vulnerable to
+man-in-the-middle attack. Like IMAP, WMBiff will prompt
+the user if the password is left blank.
.RS
imaps:user:passwd at server[/mailbox][:port] [auth]
.RE
.RS
+imaps:user:@server[/mailbox][:port] [auth]
+.RE
+.RS
imaps:user passwd server[/mailbox][ port] [auth]
.RE
.TP
@@ -166,6 +177,7 @@ connection per server, per-mailbox debugging may not
Authentication methods include "cram-md5", "apop" (for
Pop3), and "plaintext". "cram-md5" and "apop" are only
available when wmbiff is compiled with libgcrypt.
+ at GCRYPT_MAN_STATUS@
Authentication methods are tried in the following order:
cram-md5, apop, plaintext.
--
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