X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=61457e3ced3b58399b982d6843bd86521f4c1f9f;hb=c4f00b7d32160f83e4fb811c6584e8f4e48dfa2e;hp=e549305a9d15d4105d0e38672d54de04f8f7e6a6;hpb=13824a982b94792b64fcc917b6cdbb384c6344f9;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index e549305a9..61457e3ce 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 6
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,21 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_FTS],
 [
-  AC_LIBSOURCES([fts.c, fts_.h, intprops.h])
+  AC_REQUIRE([gl_FUNC_FTS_CORE])
+  AC_LIBSOURCES([fts-cycle.c])
+])
+
+AC_DEFUN([gl_FUNC_FTS_LGPL],
+[
+  AC_REQUIRE([gl_FUNC_FTS_CORE])
+  AC_DEFINE([_LGPL_PACKAGE], 1,
+    [Define to 1 if compiling for a package to be distributed under the
+     GNU Lesser Public License.])
+])
+
+AC_DEFUN([gl_FUNC_FTS_CORE],
+[
+  AC_LIBSOURCES([fts.c, fts_.h])
 
   dnl Use this version of fts unconditionally, since the GNU libc and
   dnl NetBSD versions have bugs and/or unnecessary limitations.
@@ -16,21 +30,5 @@ AC_DEFUN([gl_FUNC_FTS],
 
   # Checks for header files.
   AC_REQUIRE([AC_HEADER_DIRENT])
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h stddef.h stdint.h])
-  AC_CHECK_HEADERS_ONCE([stdlib.h string.h sys/param.h unistd.h])
-
-  # Checks for typedefs, structures, and compiler characteristics.
-  AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([AC_C_CONST])
-  AC_REQUIRE([AC_TYPE_SIZE_T])
-  AC_REQUIRE([gt_INTTYPES_PRI])
-  AC_CHECK_TYPES([ptrdiff_t])
-
-  # Checks for library functions.
-  AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-  AC_REQUIRE([AC_FUNC_LSTAT])
-  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
-  AC_REQUIRE([AC_FUNC_STAT])
-  AC_CHECK_FUNCS_ONCE([fchdir memmove memset strrchr])
+  AC_CHECK_HEADERS_ONCE([sys/param.h])
 ])