[SCM] GNU Mailutils branch, master, updated. release-2.2-363-gc722ac4

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=c722ac44a25551e82eadb03b622e1b23d70d8b40

The branch, master has been updated
       via  c722ac44a25551e82eadb03b622e1b23d70d8b40 (commit)
       via  fca5c9e3f62ade28bffcef684c78d0bbff869667 (commit)
      from  adca074d616ac562095a92e01f2b181e6d3593c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c722ac44a25551e82eadb03b622e1b23d70d8b40
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Mar 30 17:45:59 2011 +0300

    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.

commit fca5c9e3f62ade28bffcef684c78d0bbff869667
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Mar 30 16:30:03 2011 +0300

    Bugfix
    
    * libmailutils/sockaddr/fromnode.c [!MAILUTILS_IPV6] Handle
    AF_UNSPEC same way as AF_INET.
    Do not bail out if service is not given, assume port = 0 instead.
    * mailutils/base/version.c (mu_conf_option): Reflect IPv6 support.

-----------------------------------------------------------------------

Summary of changes:
 README                           |   18 ++++++++++--
 am/enable.m4                     |    3 +-
 configure.ac                     |   55 +++++++++++++++++++++++++++----------
 libmailutils/base/version.c      |    3 ++
 libmailutils/sockaddr/fromnode.c |    6 ++--
 5 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/README b/README
index 247a7ea..8bb2112 100644
--- a/README
+++ b/README
@@ -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
diff --git a/am/enable.m4 b/am/enable.m4
index 5a2d8d0..6422517 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -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
diff --git a/configure.ac b/configure.ac
index 2edb494..9dc8855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/libmailutils/base/version.c b/libmailutils/base/version.c
index 76d202c..2184e05 100644
--- a/libmailutils/base/version.c
+++ b/libmailutils/base/version.c
@@ -37,6 +37,9 @@ static struct mu_conf_option mu_conf_option[] = {
   { "MAILSPOOLDIR=" MU_PATH_MAILDIR, N_("Default mail spool directory") },
   { "SCHEME=" MU_DEFAULT_SCHEME, N_("Default mailbox type") },
   { "LOG_FACILITY=" LOG_FACILITY_STRING, N_("Default syslog facility") },
+#ifdef MAILUTILS_IPV6
+  { "IPV6", N_("IPv6 support") },
+#endif
 #ifdef USE_LIBPAM
   { "USE_LIBPAM", N_("PAM support") },
 #endif
diff --git a/libmailutils/sockaddr/fromnode.c b/libmailutils/sockaddr/fromnode.c
index d79b952..1135a8f 100644
--- a/libmailutils/sockaddr/fromnode.c
+++ b/libmailutils/sockaddr/fromnode.c
@@ -162,7 +162,7 @@ mu_sockaddr_from_node (struct mu_sockaddr **retval, const 
char *node,
       freeaddrinfo (res);
     }
 #else
-  if (mh->family == AF_INET)
+  if (mh->family == AF_INET || mh->family == AF_UNSPEC)
     {
       short port;
       struct hostent *hp;
@@ -200,8 +200,8 @@ mu_sockaddr_from_node (struct mu_sockaddr **retval, const 
char *node,
       else if (mh->port)
        port = htons (mh->port);
       else
-       return MU_ERR_NONAME;
-
+       port = 0;
+      
       if (!node)
        {
          struct sockaddr_in s_in;


hooks/post-receive
-- 
GNU Mailutils