New configuration options to disable groups of utilities.

* am/enable.m4 (MU_ENABLE_BUILD): Take optional 6th argument.  If
given, append $1 to it.
* configure.ac: New options: --enable-build-servers and
--enable-build-clients.
Print a list of selected utilities at the end of the run.
* README: Document new options.

@@ -303,8 +303,20 @@ features:
                           Disables support for authentication using
                           virtual mail domains.
 
-Special options are provided that control whether each particular
-Mailutils program is built. These are:
+Mailutils is shipped with a set of various utilities, which are built
+by default.  These utilities fall into two groups:
+
+a) Server utilities: pop3d, imap4d and comsat.
+b) Client utilities: frm, maidag, mail, sieve, messages, readmsg,
+   dotlock, movemail mimeview, and MH utilities.
+
+The following options disable each group:
+   
+    --disable-build-servers    do not build server utilities
+    --disable-build-clients    do not build client utilities
+    	       
+Each particular program can be disabled using its individual
+`--disable-build' option:
 
     --disable-build-frm        do not build frm
     --disable-build-pop3d      do not build pop3d
@@ -319,7 +331,7 @@ Mailutils program is built. These are:
     --disable-build-dotlock    do not build dotlock
     --disable-build-movemail   do not build movemail
     --disable-build-mimeview   do not build mimeview
-    --disable-build-mh         do not build mh utilities
+    --disable-build-mh         do not build MH utilities
 
 Several environment variables affect the configuration. Currently,
 the only mailutils-specific variable is DEFAULT_CUPS_CONFDIR. It

@@ -53,7 +53,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
 ])
 
 dnl MU_ENABLE_BUILD(feature, [action-if-true], [action-if-false],
-dnl                 [additional-cond], [default-value])
+dnl                 [additional-cond], [default-value], [listvar])
 AC_DEFUN([MU_ENABLE_BUILD], [
 	pushdef([mu_upcase],translit($1,[a-z+-],[A-ZX_]))
 	pushdef([mu_cache_var],[mu_cv_enable_build_]translit($1,[+-],[x_]))
@@ -73,6 +73,7 @@ AC_DEFUN([MU_ENABLE_BUILD], [
 
 	  if test "[$]mu_cache_var" = "yes"; then
 		  ifelse([$2],,:,[$2])
+		  ifelse([$6],,,[$6="$[]$6 $1"])
 	  ifelse([$3],,,else
                  [$3])
 	  fi

@@ -1180,20 +1180,36 @@ dnl ***********************************************************************
 dnl Configure particular utilities
 dnl ***********************************************************************
 
-MU_ENABLE_BUILD(frm)
-MU_ENABLE_BUILD(pop3d)
-MU_ENABLE_BUILD(imap4d)
-MU_ENABLE_BUILD(comsat)
-MU_ENABLE_BUILD(maidag)
-MU_ENABLE_BUILD(mail)
-MU_ENABLE_BUILD(sieve)
-MU_ENABLE_BUILD(messages)
-MU_ENABLE_BUILD(readmsg)
-MU_ENABLE_BUILD(dotlock)
-MU_ENABLE_BUILD(movemail)
-MU_ENABLE_BUILD(mimeview)
-
-MU_ENABLE_BUILD(mh,,,["$mu_cv_enable_mh" = yes])
+AC_ARG_ENABLE([build-servers],
+              AC_HELP_STRING([--enable-build-servers],
+                             [build servers]),
+              [mu_build_servers="${enableval}"],
+              [mu_build_servers=yes])
+
+AC_ARG_ENABLE([build-clients],
+              AC_HELP_STRING([--enable-build-clients],
+                             [build client utilities]),
+              [mu_build_clients="${enableval}"],
+              [mu_build_clients=yes])
+
+server_list=
+client_list=
+
+MU_ENABLE_BUILD(pop3d,,,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(imap4d,,,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(comsat,,,["$mu_build_servers" = yes],,[server_list])
+
+MU_ENABLE_BUILD(frm,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(maidag,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(mail,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(sieve,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(messages,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(readmsg,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(dotlock,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(movemail,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(mimeview,,,["$mu_build_clients" = yes],,[client_list])
+
+MU_ENABLE_BUILD(mh,,,["$mu_build_clients$mu_cv_enable_mh" = yesyes],,[client_list])
 
 AC_SUBST(MH_BIN_DIR)
 
@@ -1206,7 +1222,9 @@ AC_ARG_WITH([mh-bindir],
                      esac],
                     [MH_BIN_DIR='${exec_prefix}/bin/mu-mh'])
 
-
+test -z "$server_list" && server_list=" [NONE]"
+test -z "$client_list" && client_list=" [NONE]"
+		    
 # Initialize the (autotest) test suite.
 AC_CONFIG_TESTDIR(libmailutils/tests)
 AC_CONFIG_TESTDIR(testsuite)
@@ -1309,6 +1327,11 @@ Mailers:
 SMTP .......................... $status_smtp
 Sendmail ...................... $status_sendmail
 
+Utilities to build:
+
+Servers .......................$server_list
+Clients .......................$client_list
+
 *******************************************************************
 
 Before proceeding, verify if these satisfy your requirements. 
@@ -1339,6 +1362,8 @@ status_maildir=$mu_cv_enable_maildir
 status_smtp=$mu_cv_enable_smtp
 status_sendmail=$mu_cv_enable_sendmail
 status_ipv6=$status_ipv6
+server_list="$server_list"
+client_list="$client_list"
 ])
 
 dnl Output Makefiles