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.
This commit is contained in:
Simon Josefsson
2021-01-28 09:01:47 +01:00
parent 0b897f624d
commit b6bfaf9630
5 changed files with 14 additions and 14 deletions

View File

@@ -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.

View File

@@ -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.

View File

@@ -34,7 +34,8 @@ AM_CPPFLAGS = \
LDADD = \
$(iu_LIBRARIES) \
$(LIBUTIL)
$(LIBUTIL) \
$(PTY_LIB)
inetdaemondir = @inetdaemondir@

View File

@@ -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)

View File

@@ -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