From 1b12190af8b466a4bf081b5e798b4d7bde322123 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Mon, 26 Mar 2012 23:17:13 +0200 Subject: [PATCH] Switch to standard autoconf macro for checking d_type field in struct dirent. Merged from nmh. Thanks to Ken Hornstein. --- aclocal.m4 | 52 ---------------------------------------------------- configure.ac | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b678f47..89e6f97 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -9,55 +9,3 @@ AC_DEFUN([AC_CHECK_NETLIBS], [AC_MSG_ERROR([gethostbyname not found])]) AC_SEARCH_LIBS([connect], [socket], , [AC_MSG_ERROR([connect not found])]) ])dnl - -dnl ---------------- -dnl CHECK FOR d_type -dnl ---------------- -dnl -dnl From Jim Meyering. -dnl -dnl Check whether struct dirent has a member named d_type. -dnl - -# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free Software -# Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -AC_DEFUN([CHECK_TYPE_STRUCT_DIRENT_D_TYPE], - [AC_REQUIRE([AC_HEADER_DIRENT])dnl - AC_CACHE_CHECK([for d_type member in directory struct], - jm_cv_struct_dirent_d_type, - [AC_TRY_LINK(dnl - [ -#include -#ifdef HAVE_DIRENT_H -# include -#else /* not HAVE_DIRENT_H */ -# define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include -# endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ - ], - [struct dirent dp; dp.d_type = 0;], - - jm_cv_struct_dirent_d_type=yes, - jm_cv_struct_dirent_d_type=no) - ] - ) - if test $jm_cv_struct_dirent_d_type = yes; then - AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1, - [Define if there is a member named d_type in the struct describing - directory headers.]) - fi - ] -) diff --git a/configure.ac b/configure.ac index ac57b9c..1cdbf9d 100644 --- a/configure.ac +++ b/configure.ac @@ -564,7 +564,7 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include ]) -CHECK_TYPE_STRUCT_DIRENT_D_TYPE() +AC_STRUCT_DIRENT_D_TYPE dnl ------------- dnl CHECK SIGNALS -- 1.7.10.4