From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 11 Jul 2022 06:59:33 +0000 (+0400)
Subject: cmake/autotools: remove HAVE_DIRFD/HAVE_DDFD
X-Git-Tag: dbus-1.15.0~32^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95df73b4638b754a069e423ffe03041241b2de8c;p=thirdparty%2Fdbus.git

cmake/autotools: remove HAVE_DIRFD/HAVE_DDFD

dirfd() is assumed to be present on Linux, dd_fd is never used.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 57986d084..e15406532 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -134,32 +134,6 @@ int main() {
 }
 " DBUS_USE_SYNC)
 
-CHECK_C_SOURCE_COMPILES("
-#include <sys/types.h>
-#include <dirent.h>
-int main(
-    DIR *dirp;
-    dirp = opendir(\".\");
-    dirfd(dirp);
-    closedir(dirp);
-)
-" HAVE_DIRFD)
-
-if(NOT HAVE_DIRFD)
-    CHECK_C_SOURCE_COMPILES("
-    #include <sys/types.h>
-    #include <dirent.h>
-    int main()
-    {
-        DIR *dirp;
-        int fd;
-        dirp = opendir(\".\");
-        fd = dirp->dd_fd;
-        closedir(dirp);
-    }
-    " HAVE_DDFD)
-endif()
-
 check_type_size("short"     SIZEOF_SHORT)
 check_type_size("int"       SIZEOF_INT)
 check_type_size("long"      SIZEOF_LONG)
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 69f88feab..a0acc5b76 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -201,12 +201,6 @@
 
 #cmakedefine HAVE_ACCEPT4 1
 
-/* Have dirfd function */
-#cmakedefine HAVE_DIRFD 1
-
-/* Have the ddfd member of DIR */
-#cmakedefine HAVE_DDFD 1
-
 #cmakedefine HAVE_INOTIFY_INIT1 1
 #cmakedefine HAVE_GETRANDOM 1
 #cmakedefine HAVE_GETRLIMIT 1
diff --git a/configure.ac b/configure.ac
index 3b225a299..d72d8f7c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,41 +647,6 @@ if test "x$ac_cv_header_syslog_h" = "xyes"; then
   AC_CHECK_DECLS([LOG_PERROR], [], [], [[#include <syslog.h>]])
 fi
 
-AC_MSG_CHECKING(for dirfd)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h>
-#include <dirent.h>
-]], [[
-DIR *dirp;
-dirp = opendir(".");
-dirfd(dirp);
-closedir(dirp);
-]])],
-[dbus_have_dirfd=yes],
-[dbus_have_dirfd=no])
-AC_MSG_RESULT($dbus_have_dirfd)
-if test "$dbus_have_dirfd" = yes; then
-	AC_DEFINE(HAVE_DIRFD,1,[Have dirfd function])
-else
-	AC_MSG_CHECKING(for DIR *dirp->dd_fd)
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h>
-#include <dirent.h>
-	]], [[
-DIR *dirp;
-int fd;
-dirp = opendir(".");
-fd = dirp->dd_fd;
-closedir(dirp);
-        ]])],
-        [dbus_have_ddfd=yes],
-        [dbus_have_ddfd=no])
-	AC_MSG_RESULT($dbus_have_ddfd)
-	if test "$dbus_have_ddfd" = yes; then
-		AC_DEFINE(HAVE_DDFD,1,[Have the ddfd member of DIR])
-	fi
-fi
-
 AC_CHECK_HEADERS([execinfo.h],
 	[AC_SEARCH_LIBS([backtrace], [execinfo],
 		[AC_DEFINE([HAVE_BACKTRACE], [1],