[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-157-g910a251

[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  910a251821bd879991cc11f73908402e575c3d5e (commit)
      from  1bf2a40a9b36d84c0931b0308f163d4ba7cb8576 (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=910a251821bd879991cc11f73908402e575c3d5e


commit 910a251821bd879991cc11f73908402e575c3d5e
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Aug 30 02:28:36 2012 +0200

    Configuration impovements.

diff --git a/ChangeLog b/ChangeLog
index 9cf0df7..87b909a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-08-30  Mats Erik Andersson  <address@hidden>
+
+       * configure.ac: Add a final AC_MSG_NOTICE, containing a summary
+       of established compilation tasks.
+       (KERBEROS_VERSION): Assign values `krb4' and `krb5'.  Change test
+       values in case patterns.
+       (enable_authentication, enable_encryption) [-n KERBEROS_VERSION]:
+       Assign `yes' as default value in two separate tests.
+       <KERBEROS_VERSION == Shishi>: Have `--without-shishi' bypass
+       the feature checks for libshishi.  Set KERBEROS_VERSION empty
+       when AC_CHECK_LIB fails.  Empty INCAUTH, LIBAUTH, and also
+       KERBEROS_VERSION when AC_CHECK_HEADER fails.
+
+       * tests/Makefile.am (bin_PROGRAMS): Remove variable.
+       (check_PROGRAMS): New variable replaces bin_PROGRAMS, not added
+       to variable TESTS.
+
+       * tests/syslogd.sh (silence): New variable, decreases verbosity.
+
 2012-08-24  Mats Erik Andersson  <address@hidden>
 
        * tests/tftp.sh (silence, bucket): New variables.
diff --git a/configure.ac b/configure.ac
index a32dc9d..d147fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,12 +39,12 @@ AC_SUBST(inetdaemondir)
 AC_ARG_WITH([krb4],
             AC_HELP_STRING([--with-krb4[[=PATH]]],
                            [Compile with Kerberos IV]),
-            [KERBEROS_VERSION=4
+            [KERBEROS_VERSION=krb4
              KERBEROS_DIR=$withval])
 AC_ARG_WITH([krb5],
             AC_HELP_STRING([--with-krb5[[=PATH]]],
                            [Compile with Kerberos V]),
-            [KERBEROS_VERSION=5
+            [KERBEROS_VERSION=krb5
              KERBEROS_DIR=$withval])
 AC_ARG_WITH([shishi],
             AC_HELP_STRING([--with-shishi[[=PATH]]],
@@ -54,11 +54,11 @@ AC_ARG_WITH([shishi],
 
 AC_ARG_ENABLE([servers],
               AC_HELP_STRING([--disable-servers],
-                             [Don't compile servers]),
+                             [Do not compile servers]),
              , [enable_servers=yes])
 AC_ARG_ENABLE([clients],
               AC_HELP_STRING([--disable-clients],
-                             [Don't compile clients]),
+                             [Do not compile clients]),
              , [enable_clients=yes])
 AC_ARG_ENABLE([libls],
               AC_HELP_STRING([--disable-libls],
@@ -67,19 +67,17 @@ AC_ARG_ENABLE([libls],
 AC_ARG_ENABLE([encryption],
               AC_HELP_STRING([--enable-encryption],
                              [Enable encryption]),
-              [test -z "$KERBEROS_VERSION" && 
AC_MSG_ERROR([--enable-encryption is given but no Kerberos version is 
required])],
+              [test -z "$KERBEROS_VERSION" && 
AC_MSG_ERROR([--enable-encryption is given, but a Kerberos version is not 
provided])],
               [test -z "$KERBEROS_VERSION" && enable_encryption=no])
 AC_ARG_ENABLE([authentication],
               AC_HELP_STRING([--enable-authentication],
                              [Enable connection authentication]),
-              [test -z "$KERBEROS_VERSION" && 
AC_MSG_ERROR([--enable-authentication is given but no Kerberos version is 
required])],
+              [test -z "$KERBEROS_VERSION" && 
AC_MSG_ERROR([--enable-authentication is given, but a Kerberos version is not 
provided])],
              [test -z "$KERBEROS_VERSION" && enable_authentication=no])
 
 if test -n "$KERBEROS_VERSION"; then
-  if test -z "$enable_authentication$enable_encryption"; then
-    enable_authentication=yes
-    enable_encryption=yes
-  fi
+  test -n "$enable_authentication" || enable_authentication=yes
+  test -n "$enable_encryption" || enable_encryption=yes
 fi
 
 AC_ARG_WITH([wrap],
@@ -318,7 +316,7 @@ if test "$enable_encryption" = yes \
   AH_TEMPLATE(DES_ENCRYPTION, [FIXME])
 
   case $KERBEROS_VERSION in
-  4)
+  krb4)
     AC_CHECK_LIB(krb, krb_mk_req,
                  LIBAUTH=-lkrb
                   AC_DEFINE([KRB4]),
@@ -341,31 +339,38 @@ if test "$enable_encryption" = yes \
       && AC_DEFINE([DES_ENCRYPTION])
     fi
     ;;
-  5)
-    IU_CHECK_KRB5($KERBEROS_VERSION,$KERBEROS_DIR)
+  krb5)
+    IU_CHECK_KRB5([5],$KERBEROS_DIR)
     LIBAUTH="$KRB5_LIBS" # FIXME
-    INCAUTH=$KRB5_CFLAGS
+    INCAUTH="$KRB5_CFLAGS"
     if test ".$LIBAUTH" != . ;then
       AC_DEFINE([KERBEROS])
       AC_DEFINE([KRB5])
     fi
     ;;
   *)
-    if test x$KERBEROS_DIR != x; then
-      LIBAUTH=-L$KERBEROS_DIR/lib
-      INCAUTH=-I$KERBEROS_DIR/include
+    # Properly handle --without-shishi.
+    if test x$KERBEROS_DIR = xno; then
+      KERBEROS_VERSION=
+    else
+      if test x$KERBEROS_DIR != x \
+         && test x$KERBEROS_DIR != xyes; then
+       LIBAUTH=-L$KERBEROS_DIR/lib
+       INCAUTH=-I$KERBEROS_DIR/include
+      fi
+      LIBAUTH="$LIBAUTH -lshishi"
+      save_LIBS=$LIBS
+      LIBS="$LIBS $LIBAUTH"
+      save_CPPFLAGS=$CPPFLAGS
+      CPPFLAGS="$CPPFLAGS $INCAUTH"
+      AC_CHECK_HEADER(shishi.h,
+       AC_CHECK_LIB(shishi, shishi_check_version,
+         AC_DEFINE([SHISHI]),
+         [INCAUTH= LIBAUTH= KERBEROS_VERSION=]),
+       [INCAUTH= LIBAUTH= KERBEROS_VERSION=])
+      LIBS=$save_LIBS
+      CPPFLAGS=$save_CPPFLAGS
     fi
-    LIBAUTH="$LIBAUTH -lshishi"
-    save_LIBS=$LIBS
-    LIBS="$LIBS $LIBAUTH"
-    save_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $INCAUTH"
-    AC_CHECK_HEADER(shishi.h,
-      AC_CHECK_LIB(shishi, shishi_check_version,
-        AC_DEFINE([SHISHI]),
-        [INCAUTH= LIBAUTH=]))
-    LIBS=$save_LIBS
-    CPPFLAGS=$save_CPPFLAGS
   esac
 fi
 AC_SUBST(LIBAUTH)
@@ -893,7 +898,7 @@ if test "$inetutils_cv_macro_fd_set_macros" = no; then
     FD_ZERO FD_CLR FD_SET FD_ISSET)
 fi
 
-# Set convinience variables for inetutils.
+# Set convenience variables for inetutils.
 iu_LIBRARIES='$(top_builddir)/libinetutils/libinetutils.a 
$(top_builddir)/lib/libgnu.a'
 iu_INCLUDES='-I$(top_srcdir)/lib -I$(top_builddir)/lib 
-I$(top_srcdir)/libinetutils'
 AC_SUBST(iu_LIBRARIES)
@@ -946,3 +951,49 @@ tests/Makefile
 confpaths.h:confpaths.h.in
 ])
 AC_OUTPUT
+
+# Collect informational status.
+AC_MSG_NOTICE([summary of build decisions:
+
+  Clients:
+
+    dnsdomainname  ${enable_dnsdomainname}
+    ftp            ${enable_ftp}  \
+${ftp_BUILD:+${LIBREADLINE:+$LIBREADLINE }$LIBTERMCAP}
+    hostname       ${enable_hostname}
+    ifconfig       ${enable_ifconfig}
+    logger         ${enable_logger}
+    ping           ${enable_ping}
+    ping6          ${enable_ping6}
+    rcp            ${enable_rcp}  \
+${rcp_BUILD:+$KERBEROS_VERSION}
+    rexec          ${enable_rexec}
+    rlogin         ${enable_rlogin}  \
+${rlogin_BUILD:+$KERBEROS_VERSION}
+    rsh            ${enable_rsh}  \
+${rshd_BUILD:+$KERBEROS_VERSION}
+    talk           ${enable_talk}
+    telnet         ${enable_telnet}  \
+${telnet_BUILD:+${KERBEROS_VERSION:+$KERBEROS_VERSION }$LIBTERMCAP}
+    tftp           ${enable_tftp}
+    traceroute     ${enable_traceroute}
+    whois          ${enable_whois}
+
+  Servers:
+
+    ftpd           ${enable_ftpd}  \
+${ftpd_BUILD:+${FTPD_LIBPAM:+PAM }$LIBWRAP}
+    inetd          ${enable_inetd}
+    rexecd         ${enable_rexecd}  \
+${rexecd_BUILD:+${LIBPAM:+PAM}}
+    rlogind        ${enable_rlogind}  \
+${rlogind_BUILD:+$KERBEROS_VERSION}
+    rshd           ${enable_rshd}  \
+${rshd_BUILD:+${KERBEROS_VERSION:+$KERBEROS_VERSION }${LIBPAM:+PAM}}
+    syslogd        ${enable_syslogd}
+    talkd          ${enable_talkd}
+    telnetd        ${enable_telnetd}  \
+${telnetd_BUILD:+${KERBEROS_VERSION:+$KERBEROS_VERSION }$LIBTERMCAP}
+    tftpd          ${enable_tftpd}
+    uucpd          ${enable_uucpd}
+])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b3c60a..0a9ba70 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,9 +21,9 @@ AM_CPPFLAGS = $(iu_INCLUDES)
 
 LDADD = $(iu_LIBRARIES)
 
-bin_PROGRAMS = localhost
+check_PROGRAMS = localhost
 if ENABLE_inetd
-bin_PROGRAMS += addrpeek
+check_PROGRAMS += addrpeek
 endif
 
 dist_check_SCRIPTS =
@@ -68,7 +68,7 @@ if ENABLE_dnsdomainname
 dist_check_SCRIPTS += dnsdomainname.sh
 endif
 
-TESTS = $(bin_PROGRAMS) $(dist_check_SCRIPTS)
+TESTS = $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
 
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 0409d8b..08f8cb7 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -58,6 +58,10 @@ fi
 
 . ./tools.sh
 
+if test -z "${VERBOSE+set}"; then
+    silence=:
+fi
+
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
 
@@ -274,7 +278,7 @@ rm -f "$OUT" "$PID" "$CONF"
 test `func_id_uid` = 0 || do_standard_port=false
 
 if test `func_id_uid` != 0 && test $PORT -le 1023; then
-    cat <<-EOT >&2
+    $silence cat <<-EOT >&2
        WARNING!!  The preset port $PORT/$PROTO is not usable,
        since you are underprivileged.  Now attempting
        a randomised higher port.
@@ -503,7 +507,8 @@ if [ -n "${VERBOSE+yes}" ]; then
        EOT
 fi
 
-echo "Registered $SUCCESSES successes out of $TESTCASES."
+test $SUCCESSES -eq $TESTCASES && $silence false \
+    || echo "Registered $SUCCESSES successes out of $TESTCASES."
 
 # Report incomplete test setup.
 $do_inet_socket ||
@@ -512,10 +517,10 @@ $do_standard_port ||
     echo 'NOTICE: Standard port test was not run.' >&1
 
 if [ "$SUCCESSES" -eq "$TESTCASES" ]; then
-    echo "Successful testing."
+    $silence echo "Successful testing."
     EXITCODE=0
 else
-    echo "Failing some tests."
+    $silence echo "Failing some tests."
 fi
 
 # Remove the daemon process.

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

Summary of changes:
 ChangeLog         |   19 +++++++++
 configure.ac      |  109 +++++++++++++++++++++++++++++++++++++++--------------
 tests/Makefile.am |    6 +-
 tests/syslogd.sh  |   13 ++++--
 4 files changed, 111 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
GNU Inetutils