diff options
| author | monsta <[email protected]> | 2019-08-30 15:08:46 +0300 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2019-08-31 13:39:03 +0100 |
| commit | 407956e1f924dc0c1da1d3784706aaa014e91fc0 (patch) | |
| tree | 52015cbd98d14f3ab740bd9fb13cb05c7ddd2316 | |
| parent | efcb4f1d1f233eeb8db5014b698bcf5c308a83c6 (diff) | |
| download | mate-panel-407956e1f924dc0c1da1d3784706aaa014e91fc0.tar.bz2 mate-panel-407956e1f924dc0c1da1d3784706aaa014e91fc0.tar.xz | |
build: use AC_STRUCT_DIRENT_D_TYPE instead of custom macro
it defines the same HAVE_STRUCT_DIRENT_D_TYPE as before
taken from:
https://github.com/GNOME/gnome-panel/commit/56b8d88bf467f8a332947930338e7c4f43b4751e
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | m4/d-type.m4 | 49 |
2 files changed, 5 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index debe5d09..5941720f 100644 --- a/configure.ac +++ b/configure.ac @@ -172,8 +172,11 @@ AM_CONDITIONAL(FISH_INPROCESS, test -n "$FISH_COMPILE_INPROCESS") AM_CONDITIONAL(NOTIFICATION_AREA_INPROCESS, test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS") AM_CONDITIONAL(WNCKLET_INPROCESS, test -n "$WNCKLET_COMPILE_INPROCESS") -# For the run dialog -gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE +dnl ************************************************************************** +dnl Check if struct dirent contains a d_type member, for run dialog +dnl ************************************************************************** + +AC_STRUCT_DIRENT_D_TYPE # $enable_x11 and $enable_wayland will be set to "yes", "no" or "auto" AC_ARG_ENABLE(x11, diff --git a/m4/d-type.m4 b/m4/d-type.m4 deleted file mode 100644 index 6f3125c7..00000000 --- a/m4/d-type.m4 +++ /dev/null @@ -1,49 +0,0 @@ -#serial 8 - -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([gl_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 <sys/types.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#else /* not HAVE_DIRENT_H */ -# define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include <sys/ndir.h> -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include <sys/dir.h> -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include <ndir.h> -# 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 - ] -) |