From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 1 Dec 2016 08:57:51 +0000 (+0100)
Subject: agetty: re-add utmp.h for Debian GNU/kFreeBSD
X-Git-Tag: v2.30-rc1~364
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77835be2;p=thirdparty%2Futil-linux.git

agetty: re-add utmp.h for Debian GNU/kFreeBSD

It's needed there to get login_tty(). On normal FreeBSD we would
need libutil.h.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/configure.ac b/configure.ac
index afb255e93a..e9901bc81e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,6 +208,7 @@ AC_CHECK_HEADERS([ \
 	getopt.h \
 	inttypes.h \
 	lastlog.h \
+	libutil.h \
 	linux/btrfs.h \
 	linux/cdrom.h \
 	linux/falloc.h \
@@ -257,6 +258,7 @@ AC_CHECK_HEADERS([ \
 	sys/un.h \
 	unistd.h \
 	shadow.h \
+	utmp.h \
 	utmpx.h \
 ])
 
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 46eea0122b..95236ce977 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -55,7 +55,13 @@
 #endif
 
 #if defined(__FreeBSD_kernel__)
-#include <pty.h>
+# include <pty.h>
+# ifdef HAVE_UTMPX_H
+#  include <utmp.h>
+# endif
+# ifdef HAVE_LIBUTIL_H
+#  include <libutil.h>
+# endif
 #endif
 
 #ifdef __linux__