[SCM] GNU Inetutils branch, master, updated. v1.9.4.90-6-gb6bfaf9

[Simon Josefsson]

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  b6bfaf96303b089eff2ad01c1bbe07f9855e6fb8 (commit)
      from  0b897f624d8968088ab61d1b957e9dbfa5f003db (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=b6bfaf96303b089eff2ad01c1bbe07f9855e6fb8


commit b6bfaf96303b089eff2ad01c1bbe07f9855e6fb8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 28 09:01:47 2021 +0100

    Fix link failure with absent -lutil on Solaris 10.
    
    * configure.ac (LIBUTIL): Prefer PTY_LIBS in Makefile.am over
    adding -lutil for pty-functions.
    * src/Makefile.am (LDADD): Add PTY_LIB.
    * telnetd/Makefile.am (LDADD): Likewise.
    * tests/Makefile.am (identify_LDADD): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6ad3e44..112fb95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-01-28  Simon Josefsson  <simon@josefsson.org>
+
+       Fix link failure with absent -lutil on Solaris 10.
+
+       * configure.ac (LIBUTIL): Prefer PTY_LIBS in Makefile.am over
+       adding -lutil for pty-functions.
+       * src/Makefile.am (LDADD): Add PTY_LIB.
+       * telnetd/Makefile.am (LDADD): Likewise.
+       * tests/Makefile.am (identify_LDADD): Likewise.
+
 2021-01-27  Simon Josefsson  <simon@josefsson.org>
 
        * bootstrap.conf (buildreq): Add gzip and xz.
diff --git a/configure.ac b/configure.ac
index c65572e..b1f41c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,17 +183,6 @@ AC_CHECK_LIB(util, logwtmp, LIBUTIL=-lutil)
 AC_CHECK_LIB(util, logwtmpx, LIBUTIL=-lutil)
 AC_SUBST(LIBUTIL)
 
-# FreeBSD 9.0 has changed access to wtmp system, abolishing
-# logout(), logwtmp(), etcetera.  We need to use LIBUTIL
-# for rpl_openpty() and forkpty() in libgnu.a.
-if test "$ac_cv_func_login_tty" = yes \
-   || test "$ac_cv_have_decl_openpty" = yes; then
-  # Make sure that linking contains `-lutil'.
-  if test -z "$LIBUTIL"; then
-    LIBUTIL=-lutil
-  fi
-fi
-
 # Check if they want support for PAM.  Certain daemons like ftpd have
 # support for it.
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5037440..635842a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,8 @@ AM_CPPFLAGS = \
 
 LDADD = \
        $(iu_LIBRARIES) \
-       $(LIBUTIL)
+       $(LIBUTIL) \
+       $(PTY_LIB)
 
 inetdaemondir = @inetdaemondir@
 
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index 0658337..520d168 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -29,7 +29,7 @@ AM_CPPFLAGS = \
 LDADD = \
        $(top_builddir)/libtelnet/libtelnet.a \
        $(iu_LIBRARIES) \
-       $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+       $(LIBTERMCAP) $(LIBUTIL) $(PTY_LIB) $(LIBCRYPT) $(LIBAUTH)
 
 if ENABLE_hstrerror
 LDADD += $(LIBRESOLV)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0d201eb..82235b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS = $(iu_INCLUDES)
 LDADD = $(iu_LIBRARIES)
 
 noinst_PROGRAMS = identify
-identify_LDADD = $(top_builddir)/lib/libgnu.a $(LIBUTIL)
+identify_LDADD = $(top_builddir)/lib/libgnu.a $(LIBUTIL) $(PTY_LIB)
 
 check_PROGRAMS = localhost readutmp runtime-ipv6 test-snprintf waitdaemon
 

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

Summary of changes:
 ChangeLog           | 10 ++++++++++
 configure.ac        | 11 -----------
 src/Makefile.am     |  3 ++-
 telnetd/Makefile.am |  2 +-
 tests/Makefile.am   |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU Inetutils