From 403c91f8d575003b1b6396bcbb60a0fe5c3683fa Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Tue, 3 Jan 2012 22:21:07 -0500 Subject: [PATCH] Switch to standard autoconf macro for checking d_type field in struct dirent. --- aclocal.m4 | 52 ---------------------------------------------------- configure.in | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 20d123f..eada924 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -74,55 +74,3 @@ else : fi ])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.in b/configure.in index 0a27c85..942e6ca 100644 --- a/configure.in +++ b/configure.in @@ -794,7 +794,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