From: Bruno Haible <bruno@clisp.org>
Date: Sun, 14 Jan 2007 16:15:49 +0000 (+0100)
Subject: Enable use of gnulib's new fchdir module.
X-Git-Tag: COREUTILS-6_8~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb4112b4075b82009f307367756c9689d8772592;p=thirdparty%2Fcoreutils.git

Enable use of gnulib's new fchdir module.
* bootstrap.conf (avoided_gnulib_modules): Avoid canonicalize-lgpl,
since we use canonicalize.
(gnulib_modules): Add fchdir.
* m4/jm-macros.m4 (coreutils_MACROS): Remove fchdir-stub.
---

diff --git a/ChangeLog b/ChangeLog
index da894d391c..19801a2fd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-14  Bruno Haible  <bruno@clisp.org>
+
+	Enable use of gnulib's new fchdir module.
+	* bootstrap.conf (avoided_gnulib_modules): Avoid canonicalize-lgpl,
+	since we use canonicalize.
+	(gnulib_modules): Add fchdir.
+	* m4/jm-macros.m4 (coreutils_MACROS): Remove fchdir-stub.
+
 2007-01-13  Jim Meyering  <jim@meyering.net>
 
 	* Transform all Makefile.am files so that when running "make check",
diff --git a/bootstrap.conf b/bootstrap.conf
index 41d925fa96..a606b425d2 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,11 +19,12 @@
 
 
 # We don't need these modules, even though gnulib-tool mistakenly
-# includes them because of gettext dependencies.
+# includes them because of gettext and fchdir dependencies.
 avoided_gnulib_modules='
 	--avoid=lock
 	--avoid=size_max
 	--avoid=xsize
+	--avoid=canonicalize-gpl
 '
 
 # These modules are obsolete and can probably be removed soon,
@@ -41,8 +42,8 @@ gnulib_modules="
 	c-strtold calloc canon-host canonicalize chown cloexec
 	config-h configmake
 	closeout cycle-check d-ino d-type diacrit dirfd dirname dup2
-	error euidaccess exclude exitfail fcntl fcntl-safer fdl file-type
-	fileblocks filemode filenamecat fnmatch-gnu fopen-safer
+	error euidaccess exclude exitfail fchdir fcntl fcntl-safer fdl
+	file-type fileblocks filemode filenamecat fnmatch-gnu fopen-safer
 	fprintftime fsusage ftruncate fts getdate getgroups gethrxtime
 	getline getloadavg getndelim2 getopt getpagesize getpass-gnu
 	gettext gettime gettimeofday getugroups getusershell gnupload
diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index fe9970b508..2595542f9b 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -109,10 +109,6 @@ AC_DEFUN([coreutils_MACROS],
   if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
     DF_PROG='df$(EXEEXT)'
   fi
-
-  # If any of these functions don't exist (e.g. DJGPP 2.03),
-  # use the corresponding stub.
-  AC_CHECK_FUNC([fchdir], , [AC_LIBOBJ(fchdir-stub)])
 ])
 
 AC_DEFUN([gl_CHECK_ALL_HEADERS],