[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-205-ga6766e1

[Mats Erik Andersson]

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 Inetutils ".

The branch, master has been updated
       via  a6766e1a0e7b4fb9403f64b548b8c32701692673 (commit)
      from  3299ba83d9bac4ea2dae81cb6adcc5d04187f79f (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=a6766e1a0e7b4fb9403f64b548b8c32701692673


commit a6766e1a0e7b4fb9403f64b548b8c32701692673
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Nov 15 21:02:45 2012 +0100

    Disable targets robustly.
    
    The source builds with clang on FreeBSD.

diff --git a/ChangeLog b/ChangeLog
index 4b9bb6f..8f242a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-15  Mats Erik Andersson  <address@hidden>
+
+       Disable targets robustly.
+
+       * am/enable.m4 (IU_DISABLE_TARGET): New macro.
+       * configure.ac <ftpd, rlogind, rshd, talk, talkd, telnetd>
+       <uucpd>: Use IU_DISABLE_TARGET to disable unbuildable targets,
+       avoiding the incomplete manipulations used so far.
+
 2012-11-14  Mats Erik Andersson  <address@hidden>
 
        * libinetutils/daemon.c (waitdaemon) [_SC_OPEN_MAX]:
diff --git a/am/enable.m4 b/am/enable.m4
index 217699d..7076fbf 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -37,3 +37,8 @@ fi;]
 
 AC_DEFUN([IU_ENABLE_CLIENT], [IU_ENABLE_FOO($1, clients)])
 AC_DEFUN([IU_ENABLE_SERVER], [IU_ENABLE_FOO($1, servers)])
+
+AC_DEFUN([IU_DISABLE_TARGET],
+  [enable_$1=no $1_BUILD='' $1_INSTALL_HOOK=''
+  AM_CONDITIONAL([ENABLE_$1], test "$enable_$1" != no)
+])
diff --git a/configure.ac b/configure.ac
index 4ce360f..296db8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,10 +232,8 @@ AC_CHECK_HEADER(protocols/talkd.h, , ,
 
 if test "$ac_cv_header_protocols_talkd_h" = no; then
   AC_MSG_WARN([protocols/talkd.h is not available, not building talk, nor 
talkd])
-  enable_talk=no
-  talk_BUILD=''
-  enable_talkd=no
-  talkd_BUILD=''
+  IU_DISABLE_TARGET(talk)
+  IU_DISABLE_TARGET(talkd)
 fi
 
 # Only talk uses curses, so only check for it if we want that
@@ -248,8 +246,7 @@ else
   if test "$enable_talk" = yes; then
     AC_MSG_WARN([curses is not available, so not building talk])
   fi
-  enable_talk=no
-  talk_BUILD=''
+  IU_DISABLE_TARGET(talk)
 fi
 
 # NetBSD offers orcmd() and orcmd_af() for getting
@@ -302,10 +299,8 @@ else
     fi
   else
     AC_MSG_WARN([Disabling rlogind and rshd, since no iruserok and no 
ruserok.])
-    enable_rlogind=no
-    rlogind_BUILD=''
-    enable_rshd=no
-    rshd_BUILD=''
+    IU_DISABLE_TARGET(rlogind)
+    IU_DISABLE_TARGET(rshd)
   fi
 fi
 
@@ -964,10 +959,10 @@ case "$host" in
   # FreeBSD 9.0 has implemented a non-standard and singular
   # UTMPX interface.  We do not support it, nor does the
   # readutmp module from GNUlib.
-  enable_ftpd=no  ftpd_BUILD=''
-  enable_rlogind=no  rlogind_BUILD=''
-  enable_telnetd=no  telnetd_BUILD=''
-  enable_uucpd=no  uucpd_BUILD=''
+  IU_DISABLE_TARGET(ftpd)
+  IU_DISABLE_TARGET(rlogind)
+  IU_DISABLE_TARGET(telnetd)
+  IU_DISABLE_TARGET(uucpd)
   ;;
 *olaris*)
   AC_DEFINE([SOLARIS], 1, [FIXME])

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

Summary of changes:
 ChangeLog    |    9 +++++++++
 am/enable.m4 |    5 +++++
 configure.ac |   23 +++++++++--------------
 3 files changed, 23 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU Inetutils