From 619c123a9a4d76e128a446867d337b7e3e2b9775 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 23 Sep 2022 16:12:16 +0300
Subject: [PATCH] generic: remove checks for system headers that should be
 present

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 jovie/CMakeLists.txt       | 5 -----
 jovie/config-jovie.h.cmake | 2 --
 jovie/jovie/speaker.h      | 4 ----
 kuser/CMakeLists.txt       | 2 --
 kuser/ku_adduser.cpp       | 2 --
 kuser/ku_config.h.cmake    | 6 ------
 kuser/ku_groupfiles.cpp    | 3 ---
 kuser/ku_misc.cpp          | 4 ----
 kuser/ku_user.cpp          | 8 ++------
 kuser/ku_userfiles.cpp     | 2 --
 10 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 jovie/config-jovie.h.cmake

diff --git a/jovie/CMakeLists.txt b/jovie/CMakeLists.txt
index 8462f54d..36d4f682 100644
--- a/jovie/CMakeLists.txt
+++ b/jovie/CMakeLists.txt
@@ -29,11 +29,6 @@ if(NOT Q_WS_X11)
     message(FATAL_ERROR "Jovie requires a X11-based system.")
 endif()
 
-configure_file(
-    config-jovie.h.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/config-jovie.h
-)
-
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/libkttsd
diff --git a/jovie/config-jovie.h.cmake b/jovie/config-jovie.h.cmake
deleted file mode 100644
index a13a93f9..00000000
--- a/jovie/config-jovie.h.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-#cmakedefine SPEECHD_FOUND ${SPEECHD_FOUND}
-
diff --git a/jovie/jovie/speaker.h b/jovie/jovie/speaker.h
index 5b9b388e..4435c788 100644
--- a/jovie/jovie/speaker.h
+++ b/jovie/jovie/speaker.h
@@ -35,11 +35,7 @@
 
 #include <kspeech.h>
 
-// KTTSD includes.
-#include <config-jovie.h>
-#if defined(SPEECHD_FOUND)
 #include <libspeechd.h>
-#endif
 
 #include "filtermgr.h"
 #include "appdata.h"
diff --git a/kuser/CMakeLists.txt b/kuser/CMakeLists.txt
index d796a373..24a4d41d 100644
--- a/kuser/CMakeLists.txt
+++ b/kuser/CMakeLists.txt
@@ -30,8 +30,6 @@ set(KU_USERPRIVATEGROUP true CACHE STRING "User private groups by default")
 
 check_include_files(shadow.h HAVE_SHADOW_H)
 check_include_files(crypt.h HAVE_CRYPT_H)
-check_include_files(sys/stat.h HAVE_SYS_STAT_H)
-check_include_files(unistd.h HAVE_UNISTD_H)
 check_include_files(paths.h HAVE_PATHS_H)
 check_library_exists(crypt crypt "" HAVE_CRYPT_LIBRARY)
 
diff --git a/kuser/ku_adduser.cpp b/kuser/ku_adduser.cpp
index fcacb5af..924c067d 100644
--- a/kuser/ku_adduser.cpp
+++ b/kuser/ku_adduser.cpp
@@ -22,9 +22,7 @@
 #include "globals.h"
 
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/kuser/ku_config.h.cmake b/kuser/ku_config.h.cmake
index 6288c7d8..ee92e00c 100644
--- a/kuser/ku_config.h.cmake
+++ b/kuser/ku_config.h.cmake
@@ -15,9 +15,3 @@
 
 /* Define to 1 if you have the <paths.h> header file. */
 #cmakedefine HAVE_PATHS_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H 1
diff --git a/kuser/ku_groupfiles.cpp b/kuser/ku_groupfiles.cpp
index 51c80344..9cf0c4cf 100644
--- a/kuser/ku_groupfiles.cpp
+++ b/kuser/ku_groupfiles.cpp
@@ -25,9 +25,7 @@
 
 #include <ku_config.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -35,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kuser/ku_misc.cpp b/kuser/ku_misc.cpp
index ef7c8bdc..ce16fdaa 100644
--- a/kuser/ku_misc.cpp
+++ b/kuser/ku_misc.cpp
@@ -22,14 +22,10 @@
 #include "globals.h"
 #include <ku_config.h>
 
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif
 #include <errno.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
diff --git a/kuser/ku_user.cpp b/kuser/ku_user.cpp
index e2437309..f1791986 100644
--- a/kuser/ku_user.cpp
+++ b/kuser/ku_user.cpp
@@ -24,13 +24,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/file.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif
+#include <stdlib.h>
+#include <unistd.h>
 #include <fcntl.h>
 
 #include <QDir>
diff --git a/kuser/ku_userfiles.cpp b/kuser/ku_userfiles.cpp
index 10b9cbd5..0cc712fc 100644
--- a/kuser/ku_userfiles.cpp
+++ b/kuser/ku_userfiles.cpp
@@ -23,9 +23,7 @@
 #include <ku_config.h>
 
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>