From: Yang Kun <91833768+ikspress@users.noreply.github.com>
Date: Tue, 3 Sep 2024 14:38:57 +0000 (+0800)
Subject: more: fix compilation
X-Git-Tag: v2.42-start~215^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83efe3463293de6a79c35bf33e5bdc4764fa35a8;p=thirdparty%2Futil-linux.git

more: fix compilation
---

diff --git a/configure.ac b/configure.ac
index b5748b9a9..0ca2ebcf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2501,7 +2501,7 @@ AC_ARG_ENABLE([more],
 )
 UL_BUILD_INIT([more])
 UL_REQUIRES_HAVE([more], [ncursesw, ncurses], [ncursesw or ncurses libraries])
-UL_REQUIRES_LINUX([more])
+UL_REQUIRES_HAVE([more], [sys_signalfd_h], [sys/signalfd.h header])
 AM_CONDITIONAL([BUILD_MORE], [test "x$build_more" = xyes])
 
 
diff --git a/text-utils/more.c b/text-utils/more.c
index 953e94db1..da26fdbc2 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -57,7 +57,6 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <sys/ttydefaults.h>
 #include <sys/wait.h>
 #include <regex.h>
 #include <assert.h>
@@ -66,6 +65,10 @@
 #include <paths.h>
 #include <getopt.h>
 
+#ifdef HAVE_SYS_TTYDEFAULTS_H
+# include <sys/ttydefaults.h>
+#endif
+
 #if defined(HAVE_NCURSESW_TERM_H)
 # include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_TERM_H)