From: Jim Meyering <meyering@redhat.com>
Date: Sat, 18 Sep 2010 18:24:41 +0000 (+0200)
Subject: build: use gnulib's new termios module
X-Git-Tag: v8.6~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c12d83920f8d00cf3401d74559bb193d5760e9f8;p=thirdparty%2Fcoreutils.git

build: use gnulib's new termios module

With it, we can remove the two sole tests of HAVE_TERMIOS_H.
* bootstrap.conf (gnulib_modules): Add termios.
* src/ls.c: Don't test HAVE_TERMIOS_H.
* src/stty.c: Likewise.
* m4/jm-macros.m4 (gl_CHECK_ALL_TYPES): Remove configure-time
test for termios.h.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index e84424a99b..920fe63dbf 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -207,6 +207,7 @@ gnulib_modules="
   sys_ioctl
   sys_stat
   sys_wait
+  termios
   timespec
   tzset
   uname
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 20b9af9a42..6faf08ac0c 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 109   -*- autoconf -*-
+#serial 110   -*- autoconf -*-
 
 dnl Misc type-related macros for coreutils.
 
@@ -176,7 +176,6 @@ AC_DEFUN([gl_CHECK_ALL_HEADERS],
     sys/resource.h \
     sys/systeminfo.h \
     syslog.h \
-    termios.h \
   )
   AC_CHECK_HEADERS([sys/sysctl.h], [], [],
     [AC_INCLUDES_DEFAULT
diff --git a/src/ls.c b/src/ls.c
index 6e3e836cb0..f861df91a9 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -39,9 +39,7 @@
 #include <config.h>
 #include <sys/types.h>
 
-#if HAVE_TERMIOS_H
-# include <termios.h>
-#endif
+#include <termios.h>
 #if HAVE_STROPTS_H
 # include <stropts.h>
 #endif
diff --git a/src/stty.c b/src/stty.c
index 71045c2813..5d9d4f0c02 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -36,9 +36,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#if HAVE_TERMIOS_H
-# include <termios.h>
-#endif
+#include <termios.h>
 #if HAVE_STROPTS_H
 # include <stropts.h>
 #endif