Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 4a703f82 4a703f8271a7b17104f728f0e0a421b2ff65a966 by Jeff Bailey
Options

2002-11-01 Jeff Bailey <jbailey@gnu.org> 

        * mh/Makefile.am: Use MHPROGRAMS and MHLIBRARIES instead of
        MH_PROGRAMS and MH_LIBRARIES so that automake doesn't complain.

        * mail.remote/Makefile.am: Use SMTPPROGRAMS instead of
        SMTP_PROGRAMS so that automake doesn't complain.

        * configure.ac: Adjust for above changes.

        * mh/Makefile.am: Use AM_YFLAGS instead of YFLAGS.

        * libmu_scm/Makefile.am: Use AM_CPPFLAGS instead of CPPFLAGS

        * autogen.sh: Redo using 'autoreconf'.  This is now the right
        tool to use for generating the build environment.

        * Makefile.am: Require version 1.7.1, add std-options to
        AUTOMAKE_OPTIONS

        * configure.in: Require version 2.54.  Update quoting.  Change
        AC_ARG_WITH and AC_ARG_ENABLE to use AC_HELP_STRING

        * m4/enable.m4: Change AC_ARG_ENABLE to use AC_HELP_STRING

        * lib/Makefile.am: Remove ansi2knr

        * lib/ansi2knr.c: Remove

        * lib/ansi2knr.1: Remove
1 parent 360e5ac6
Expand all
Inline Side-by-side
Showing 9 changed files with 132 additions and 115 deletions
2002-11-01 Sergey Poznyakoff
2002-11-01 Jeff Bailey <jbailey@gnu.org>
* m4/enable.m4: Fixed action-if-false.
* Makefile.am: Restored to pre-2002-10-29 state.
* configure.ac: Substitute MH_PROGRAMS, MH_LIBRARIES and
SMTP_PROGRAMS variables.
* mh/Makefile.am: Build the targets conditionally.
* mail.remote/Makefile.am: Likewise.
* mh/Makefile.am: Use MHPROGRAMS and MHLIBRARIES instead of
MH_PROGRAMS and MH_LIBRARIES so that automake doesn't complain.
* mail.remote/Makefile.am: Use SMTPPROGRAMS instead of
SMTP_PROGRAMS so that automake doesn't complain.
2002-10-30 Jeff Bailey <jbailey@gnu.org>
* configure.ac: Adjust for above changes.
* mh/Makefile.am: Use AM_YFLAGS instead of YFLAGS
* mh/Makefile.am: Use AM_YFLAGS instead of YFLAGS.
* libmu_scm/Makefile.am: Use AM_CPPFLAGS instead of CPPFLAGS
* autogen.sh: Redo using 'autoreconf'. This is now the right
tool to use for generating the build environment.
* Makefile.am: Require version 1.7.1, add std-options to
AUTOMAKE_OPTIONS
* configure.in: Require version 2.54. Update quoting. Change
AC_ARG_WITH and AC_ARG_ENABLE to use AC_HELP_STRING
* m4/enable.m4: Change AC_ARG_ENABLE to use AC_HELP_STRING
* lib/Makefile.am: Remove ansi2knr
* lib/ansi2knr.c: Remove
* lib/ansi2knr.1: Remove
2002-11-01 Sergey Poznyakoff
* m4/enable.m4: Fixed action-if-false.
* Makefile.am: Restored to pre-2002-10-29 state.
* configure.ac: Substitute MH_PROGRAMS, MH_LIBRARIES and
SMTP_PROGRAMS variables.
* mh/Makefile.am: Build the targets conditionally.
* mail.remote/Makefile.am: Likewise.
2002-10-29 Sergey Poznyakoff
Following the proposition of Olivier Bornet
......
......@@ -2,7 +2,7 @@
# Copyright (C) 2000,2001,2002 Free Software Foundation
# See file COPYING in the distribution root directory for copying conditions.
AUTOMAKE_OPTIONS = gnu 1.6 readme-alpha
AUTOMAKE_OPTIONS = gnu 1.7.1 readme-alpha std-options
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = include m4 lib testsuite mailbox examples doc \
......
......@@ -17,13 +17,13 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
AC_INIT([GNU Mailutils], [0.1.2], [bug-mailutils@gnu.org])
AC_INIT([GNU Mailutils],[0.1.2],[bug-mailutils@gnu.org])
AC_CONFIG_SRCDIR([mailbox/mailbox.c])
AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
AC_CONFIG_HEADERS([config.h])
AC_PREREQ(2.52)
AC_PREREQ(2.54)
dnl Check for programs
AC_PROG_CC
......@@ -42,32 +42,39 @@ MU_DEBUG_MODE
AUTHLIBS=../auth/libmuauth.la
dnl Check for arguments
AC_ARG_ENABLE(pam,
[ --disable-pam disable pam],
[case "${enableval}" in
AC_ARG_ENABLE([pam],
AC_HELP_STRING([--disable-pam],
[disable pam]),
[
case "${enableval}" in
yes) testpam=yes ;;
no) testpam=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-pam) ;;
esac],[testpam=yes])
*) AC_MSG_ERROR([bad value ${enableval} for --disable-pam]) ;;
esac],[testpam=yes])
AC_ARG_ENABLE(pthread,
[ --disable-pthread disable pthread],
[case "${enableval}" in
AC_ARG_ENABLE([pthread],
AC_HELP_STRING([--disable-pthread],
[disable pthread]),
[
case "${enableval}" in
yes) usepthread=yes ;;
no) usepthread=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-pthread) ;;
esac],[usepthread=yes])
esac],[usepthread=yes])
AC_ARG_WITH(readline,
[ --without-readline do not use readline],
[case "${withval}" in
AC_ARG_WITH([readline],
AC_HELP_STRING([--without-readline],
[do not use readline]),
[
case "${withval}" in
yes) usereadline=yes ;;
no) usereadline=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --without-readline) ;;
esac],[usereadline=yes])
esac],[usereadline=yes])
AC_ARG_WITH(gssapi,
[ --with-gssapi use GSSAPI authentication ],
AC_ARG_WITH([gssapi],
AC_HELP_STRING([--with-gssapi],
[use GSSAPI authentication]),
[WITH_GSSAPI=$withval],
[WITH_GSSAPI=no])
......@@ -85,32 +92,38 @@ if test "x$WITH_GSSAPI" != "xno"; then
fi
AC_SUBST(AUTHOBJS)
AC_ARG_WITH(guile,
[ --without-guile do not build guile interface],
[case "${withval}" in
AC_ARG_WITH([guile],
AC_HELP_STRING([--without-guile],
[do not build guile interface]),
[
case "${withval}" in
yes) useguile=yes ;;
no) useguile=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --without-guile) ;;
esac],[useguile=yes])
esac],[useguile=yes])
AC_SUBST(SITE_MAIL_RC)
AC_ARG_WITH(mail-rc,
[ --with-mail-rc=FILE use FILE instead of \$sysconfdir/mail.rc],
[case "${withval}" in
AC_ARG_WITH([mail-rc],
AC_HELP_STRING([--with-mail-rc=FILE],
[use FILE instead of $sysconfdir/mail.rc]),
[
case "${withval}" in
/*) SITE_MAIL_RC="${withval}";;
*) SITE_MAIL_RC="\$(sysconfdir)/${withval}";;
esac],
[SITE_MAIL_RC="\$(sysconfdir)/mail.rc"])
MU_CONF_MAILDIR=
AC_ARG_WITH(mail-spool,
[ --with-mail-spool=PATH use PATH instead of /var/spool/mail],
[case "$withval" in
AC_ARG_WITH([mail-spool],
AC_HELP_STRING([--with-mail-spool=PATH],
[use PATH instead of /var/spool/mail]),
[
case "$withval" in
/*/) MU_CONF_MAILDIR="\"${withval}\"";;
/*) MU_CONF_MAILDIR="\"${withval}/\"";;
*:*[[/=]]) MU_CONF_MAILDIR="\"${withval}\"";;
*) AC_MSG_ERROR(--with-mail-spool must be an absolute path or a valid URL);;
esac])
esac])
if test "x$MU_CONF_MAILDIR" != x; then
AC_DEFINE_UNQUOTED(MU_CONF_MAILDIR,$MU_CONF_MAILDIR,
......@@ -134,44 +147,53 @@ AH_BOTTOM([
#endif])
use_dbm=no
AC_ARG_WITH(gdbm,
[ --with-gdbm use GDBM],
[case "${withval}" in
AC_ARG_WITH([gdbm],
AC_HELP_STRING([--with-gdbm],
[use GDBM]),
[
case "${withval}" in
yes) use_dbm=GDBM ;;
no) use_dbm=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-gdbm) ;;
esac])
esac])
AC_ARG_WITH(db2,
[ --with-db2 use Berkeley DB],
[case "${withval}" in
AC_ARG_WITH([db2],
AC_HELP_STRING([--with-db2],
[use Berkeley DB]),
[
case "${withval}" in
yes) use_dbm=BDB2 ;;
no) use_dbm=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-db) ;;
esac])
esac])
AC_ARG_WITH(ndbm,
[ --with-ndbm use NDBM],
[case "${withval}" in
AC_ARG_WITH([ndbm],
AC_HELP_STRING([--with-ndbm],
[use NDBM]),
[
case "${withval}" in
yes) use_dbm=NDBM ;;
no) use_dbm=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-ndbm) ;;
esac])
esac])
AC_ARG_WITH(dbm,
[ --with-dbm use old DBM],
[case "${withval}" in
AC_ARG_WITH([dbm],
AC_HELP_STRING([--with-dbm],
[use old DBM]),
[
case "${withval}" in
yes) use_dbm=ODBM ;;
no) use_dbm=no ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-old-dbm) ;;
esac])
esac])
AC_MSG_CHECKING(for log facility)
log_facility="LOG_MAIL"
AC_ARG_WITH(log-facility,
[ --with-log-facility=facility enable logging to the given facility],
AC_TRY_COMPILE([#include <syslog.h>], int lf = $withval,
log_facility=$withval))
AC_ARG_WITH([log-facility],
AC_HELP_STRING([--with-log-facility=facility],
[enable logging to the given facility]),
[AC_TRY_COMPILE([#include <syslog.h>], int lf = $withval,
log_facility=$withval)])
AC_DEFINE_UNQUOTED(LOG_FACILITY, $log_facility,
[Default syslog facility to use])
AC_MSG_RESULT($log_facility)
......@@ -308,7 +330,10 @@ AC_CHECK_FUNCS(_obstack_begin,
dnl check if mysql support was added
AC_SUBST(BUILD_LIBMYSQL)
AC_SUBST(MYSQLLIBS)
AC_ARG_ENABLE(mysql, [ --enable-mysql enable mysql support (default no)], [use_mysql="yes"],,)
AC_ARG_ENABLE([mysql],
AC_HELP_STRING([--enable-mysql],
[enable mysql support (default no)]),
[use_mysql="yes"],,)
if test x"$use_mysql" = x"yes"; then
AC_CHECK_HEADER(mysql/mysql.h,
[AUTHLIBS="$AUTHLIBS -lmysqlclient -lm -L/usr/lib/mysql -L/usr/local/lib/mysql"
......@@ -316,27 +341,32 @@ if test x"$use_mysql" = x"yes"; then
fi
dnl Virtual domain support, at least for pop3d
AC_ARG_ENABLE(virtual-domains, [ --enable-virtual-domains enable virtual domain support (default no)], [use_virtual_domains="yes"],,)
AC_ARG_ENABLE([virtual-domains],
AC_HELP_STRING([--enable-virtual-domains],
[enable virtual domain support (default no)]),
[use_virtual_domains="yes"],,)
if test x"$use_virtual_domains" = x"yes"; then
AC_DEFINE(USE_VIRTUAL_DOMAINS,1,[Enable use of virtual domains])
AC_SUBST(SITE_VIRTUAL_PWDDIR)
AC_ARG_WITH(virtual-pwddir,
[ --with-virtual-pwddir=DIR use DIR instead of \$sysconfdir/domain],
[case "${withval}" in
AC_ARG_WITH([virtual-pwddir],
AC_HELP_STRING([--with-virtual-pwddir=DIR],
[use DIR instead of $sysconfdir/domain]),
[
case "${withval}" in
/*) SITE_VIRTUAL_PWDDIR="${withval}";;
*) SITE_VIRTUAL_PWDDIR="\$(sysconfdir)/${withval}";;
esac],
esac],
[SITE_VIRTUAL_PWDDIR="\$(sysconfdir)/domain"])
fi
MU_ENABLE_SUPPORT(imap)
MU_ENABLE_SUPPORT(pop)
AC_SUBST(MH_PROGRAMS)
AC_SUBST(MH_LIBRARIES)
MU_ENABLE_SUPPORT(mh, [MH_PROGRAMS='$(MH_PROGRAMS)'; MH_LIBRARIES='$(MH_LIBRARIES)'])
AC_SUBST(SMTP_PROGRAMS)
MU_ENABLE_SUPPORT(smtp, [SMTP_PROGRAMS='$(SMTP_PROGRAMS)'])
AC_SUBST(MHPROGRAMS)
AC_SUBST(MHLIBRARIES)
MU_ENABLE_SUPPORT(mh, [MHPROGRAMS='$(MHPROGRAMS)'; MHLIBRARIES='$(MHLIBRARIES)'])
AC_SUBST(SMTPPROGRAMS)
MU_ENABLE_SUPPORT(smtp, [SMTPPROGRAMS='$(SMTPPROGRAMS)'])
MU_ENABLE_SUPPORT(sendmail)
if test x"$testpam" = x"yes"; then
......
......@@ -2,7 +2,6 @@
# Copyright (C) 2000,2001,2002 Free Software Foundation
# See file COPYING in the distribution root directory for copying conditions.
AUTOMAKE_OPTIONS = ansi2knr
noinst_LTLIBRARIES = libmailutils.la
SUBDIRS = posix
......
.TH ANSI2KNR 1 "19 Jan 1996"
.SH NAME
ansi2knr \- convert ANSI C to Kernighan & Ritchie C
.SH SYNOPSIS
.I ansi2knr
[--varargs] input_file [output_file]
.SH DESCRIPTION
If no output_file is supplied, output goes to stdout.
.br
There are no error messages.
.sp
.I ansi2knr
recognizes function definitions by seeing a non-keyword identifier at the left
margin, followed by a left parenthesis, with a right parenthesis as the last
character on the line, and with a left brace as the first token on the
following line (ignoring possible intervening comments). It will recognize a
multi-line header provided that no intervening line ends with a left or right
brace or a semicolon. These algorithms ignore whitespace and comments, except
that the function name must be the first thing on the line.
.sp
The following constructs will confuse it:
.br
- Any other construct that starts at the left margin and follows the
above syntax (such as a macro or function call).
.br
- Some macros that tinker with the syntax of the function header.
.sp
The --varargs switch is obsolete, and is recognized only for
backwards compatibility. The present version of
.I ansi2knr
will always attempt to convert a ... argument to va_alist and va_dcl.
.SH AUTHOR
L. Peter Deutsch <ghost@aladdin.com> wrote the original ansi2knr and
continues to maintain the current version; most of the code in the current
version is his work. ansi2knr also includes contributions by Francois
Pinard <pinard@iro.umontreal.ca> and Jim Avera <jima@netcom.com>.
......@@ -23,8 +23,10 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
pushdef([mu_cache_var],[mu_cv_enable_]$1)
AC_ARG_ENABLE($1,
[ --disable-]$1[ disable ]$1[ support],
[case "${enableval}" in
AC_HELP_STRING([--disable-]$1,
[disable ]$1[ support]),
[
case "${enableval}" in
yes) mu_cache_var=yes;;
no) mu_cache_var=no;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-$1) ;;
......
......@@ -5,9 +5,9 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
SMTP_PROGRAMS = mail.remote
SMTPPROGRAMS = mail.remote
EXTRA_PROGRAMS = mail.remote
libexec_PROGRAMS = @SMTP_PROGRAMS@
libexec_PROGRAMS = @SMTPPROGRAMS@
mail_remote_SOURCES = mail.remote.c
mail_remote_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
......
......@@ -2,13 +2,13 @@
# Copyright (C) 2000,2001,2002 Free Software Foundation
# See file COPYING in the distribution root directory for copying conditions.
MH_PROGRAMS = scan inc rmm refile mhpath folder rmf fmtcheck repl
MHPROGRAMS = scan inc rmm refile mhpath folder rmf fmtcheck repl
EXTRA_PROGRAMS = scan inc rmm refile mhpath folder rmf fmtcheck repl
MH_LIBRARIES = libmh.a
MHLIBRARIES = libmh.a
EXTRA_LIBRARIES = libmh.a
bin_PROGRAMS = @MH_PROGRAMS@
noinst_LIBRARIES = @MH_LIBRARIES@
bin_PROGRAMS = @MHPROGRAMS@
noinst_LIBRARIES = @MHLIBRARIES@
libmh_a_SOURCES= \
mh_argp.c\
mh_ctx.c\
......