Merge branch 'topic/lsfd'

diff --cc configure.ac
Simple merge

diff --cc include/Makemodule.am
Simple merge

diff --cc lib/Makemodule.am
Simple merge

diff --cc lib/meson.build
Simple merge

diff --cc misc-utils/Makemodule.am
Simple merge

diff --cc misc-utils/hardlink.c
index 7c11f644a5c4d31256adf85781bdc11e5a649768,88959caf0259969774f3196da03e3cc2314c6cee..2abd6d66442293a08e80ae179162597e58e3a1c5
--- 1/misc-utils/hardlink.c
--- 2/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@@ -43,13 -43,11 +43,13 @@@
  #include "strutils.h"
  #include "monotonic.h"
  #include "optutils.h"
 +#include "fileeq.h"
  
- #include <regex.h>            /* regcomp(), regsearch() */
+ #include <regex.h>            /* regcomp(), regexec() */
  
 -#ifdef HAVE_SYS_XATTR_H
 -# include <sys/xattr.h>               /* listxattr, getxattr */
 +#if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LLISTXATTR) && defined(HAVE_LGETXATTR)
 +# include <sys/xattr.h>
 +# define USE_XATTR 1
  #endif
  
  static int quiet;             /* don't print anything */

diff --cc misc-utils/meson.build
Simple merge