X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffts.m4;h=cceb48fbea78d08b554b04fbb9fd3f8531a80662;hb=83732d64f5f0c5ef866510b1f683870d175d9c73;hp=f9f5f6b7b8257bc213f6d30d1b1e0ef73d4386ec;hpb=d76a6493392c315ba9da4a262efaa430b1a72476;p=gnulib.git

diff --git a/m4/fts.m4 b/m4/fts.m4
index f9f5f6b7b..cceb48fbe 100644
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,33 +1,28 @@
-#serial 7
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#serial 13
+dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_FTS],
 [
-  AC_REQUIRE([gl_FUNC_FTS_CORE])
-  AC_LIBSOURCES([fts-cycle.c])
+  gl_FUNC_FTS_CORE
 ])
 
 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.])
+  gl_FUNC_FTS_CORE
 ])
 
 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.
   AC_LIBOBJ([fts])
 
   dnl Prerequisites of lib/fts.c.
+  gl_FUNC_OPENAT
 
   # Checks for header files.
-  AC_CHECK_HEADERS_ONCE([dirent.h sys/param.h])dnl
+  AC_CHECK_HEADERS_ONCE([sys/param.h])dnl
 ])