diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-07 22:11:25 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-06-07 22:11:25 +0300 |
commit | c3f0967df21bf94f43e7f0b52cefebbbaa1c6318 (patch) | |
tree | a2cad35849665c6ca5c7de6b9943d808330fd247 /configure.ac | |
parent | c14f3c4856d75624641ffa1d62d6e0c87217036f (diff) | |
download | smap-c3f0967df21bf94f43e7f0b52cefebbbaa1c6318.tar.gz smap-c3f0967df21bf94f43e7f0b52cefebbbaa1c6318.tar.bz2 |
Merge modules mbq and mu-auth into a single modules: mailutils.
* configure.ac: Remove --with-mbq & --with-mu-auth
(MBQ_COND, MU_AUTH_COND): Remove condition.
(MAILUTILS_COND): New condition.
(AC_CONFIG_FILES): Remove mbq/ and mu-auth/, add mailutils instead.
* modules/Makefile.am (SUBDIRS): Remove mbq and mu-auth, add mailutils.
* modules/mailutils/Makefile.am: New file.
* modules/mailutils/mailutils.c: New file.
* modules/mailutils/mbq/*: Remove.
* modules/mailutils/mu-auth/*: Remove.
* include/smap/ostr.h (smap_ostream_write): Buffer is const.
* lib/ostr.c: Likewise.
* modules/guile/guile.c: Add missing includes.
* src/smap.h (MAX_DEBUG_COUNT): Fix constant.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 47 |
1 files changed, 15 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 0efb12b..8afc812 100644 --- a/configure.ac +++ b/configure.ac @@ -93,32 +93,22 @@ if test "$status_tcpwrap" = "yes"; then [Define to 1 to use tcp wrappers.]) fi -AC_ARG_ENABLE([mbq], - AC_HELP_STRING([--enable-mbq], - [compile mailbox quota module (requires GNU Mailutils)]), - [status_mbq=${withval}], - [status_mbq=maybe]) - -AC_ARG_ENABLE([mu-auth], - AC_HELP_STRING([--enable-mu-auth], - [compile mailutils auth module (requires GNU Mailutils)]), - [status_mu_auth=${withval}], - [status_mu_auth=maybe]) - -case $status_mbq$status_mu_auth in -nono) status_mailutils=no;; -*) AM_GNU_MAILUTILS(2.0, [all cfg auth], - [status_mailutils=yes], - [if test $status_mbq = yes -o $status_mu_auth = yes; then +AC_ARG_WITH([mailutils], + AC_HELP_STRING([--with-mailutils], + [use GNU Mailutils]), + [status_mailutils=${withval}], + [status_mailutils=maybe]) + +if test $status_mailutils != no; then + AM_GNU_MAILUTILS(2.0, [all cfg auth], + [status_mailutils=yes], + [if test $status_mailutils = yes; then AC_MSG_ERROR([GNU Mailutils not found]) - fi - status_mailutils=no]) - status_mbq=$status_mailutils - status_mu_auth=$status_mailutils -esac + fi + status_mailutils=no]) +fi -AM_CONDITIONAL([MBQ_COND],[test $status_mbq = yes]) -AM_CONDITIONAL([MU_AUTH_COND],[test $status_mu_auth = yes]) +AM_CONDITIONAL([MAILUTILS_COND],[test $status_mailutils = yes]) # Guile GINT_INIT([gint],[1.8 with-guile nodoc], @@ -137,10 +127,6 @@ TCP wrappers ............................. $status_tcpwrap Mailutils ................................ $status_mailutils Guile .................................... $status_guile -Modules: - -mbq ...................................... $status_mbq -mu-auth .................................. $status_mu_auth ******************************************************************* EOF @@ -151,8 +137,6 @@ if test $status_mailutils = yes; then else status_mailutils=$status_mailutils fi -status_mbq=$status_mbq -status_mu_auth=$status_mu_auth status_guile=$status_guile ]) @@ -164,8 +148,7 @@ AC_CONFIG_FILES([Makefile gint/Makefile modules/Makefile modules/echo/Makefile - modules/mbq/Makefile - modules/mu-auth/Makefile + modules/mailutils/Makefile modules/guile/Makefile ]) AC_OUTPUT |