[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-57-g0f16be1

[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  0f16be18bae91af41a2ae538e0066f2c9ee7d907 (commit)
      from  1a12dcb381d7e64439e95d47938b6a427b10d5b8 (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=0f16be18bae91af41a2ae538e0066f2c9ee7d907


commit 0f16be18bae91af41a2ae538e0066f2c9ee7d907
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Jan 13 20:33:58 2020 +0100

    Attempt to build correctly on Cygwin.
    
    Solution suggested by Bruno Haible for release candidate 1.9.5 rc1.

diff --git a/ChangeLog b/ChangeLog
index dbae841..89dcb86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-01-13  Mats Erik Andersson  <address@hidden>
+
+       Attempt to build correctly on Cygwin, new and old. Reported
+       and suggested by Bruno Haible in
+       https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00013.html
+
+       * configure.ac: Check for header <arpa/tftp.h>.  When it is
+       missing disable the targets `tftp', and `tftpd'.
+       * am/enable.m4 (IU_ENABLE_FOO): Append $EXEEXT to `target_BUILD'.
+
 2020-01-12  Mats Erik Andersson  <address@hidden>
 
        Suppress building of remote execution commands on systems that
diff --git a/am/enable.m4 b/am/enable.m4
index 05b864e..8158f82 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -22,7 +22,7 @@ AC_DEFUN([IU_ENABLE_FOO],
  [AC_ARG_ENABLE($1, AS_HELP_STRING([--disable-$1], [don't compile $1]), ,
                 [enable_]$1[=$enable_]$2)
 [if test "$enable_$1" = yes; then
-   $1_BUILD=$1
+   $1_BUILD=$1$EXEEXT
    $1_INSTALL_HOOK="install-$1-hook"
 else
    $1_BUILD=''
diff --git a/configure.ac b/configure.ac
index d6c4410..671e175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,7 +615,7 @@ AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_DIRENT
 
-AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \
+AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \
                  glob.h memory.h netinet/ether.h netinet/in_systm.h \
                  netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
                  security/pam_appl.h shadow.h \
@@ -639,9 +639,16 @@ AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h 
features.h \
 # include <sys/param.h>
 #endif
 ]
-
 )
 
+# Recent Cygwin 2.9 has dropped <arpa/tftp.h>.  Other systems
+# might take similar steps.
+if test "$ac_cv_header_arpa_tftp_h" = no; then
+  AC_MSG_WARN([arpa/tftp.h is not available: not building tftp, nor tftpd])
+  IU_DISABLE_TARGET(tftp)
+  IU_DISABLE_TARGET(tftpd)
+fi
+
 ### Checks for types.
 
 # Checks return type of signal handlers

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

Summary of changes:
 ChangeLog    | 10 ++++++++++
 am/enable.m4 |  2 +-
 configure.ac | 11 +++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU Inetutils