From 68441033136c6c48709f28a69e2e004cf23a5497 Mon Sep 17 00:00:00 2001
From: jay <jay>
Date: Mon, 2 Jul 2007 08:57:58 +0000
Subject: [PATCH] Include <fcntl.h> unconditionally; also, avoid passing
 nonexistent option --gpl3 to gnulib-tool

---
 ChangeLog            | 14 ++++++++++++++
 find/find.c          |  4 ----
 find/fstype.c        |  4 +---
 find/ftsfind.c       |  4 ----
 find/parser.c        |  5 +----
 find/util.c          |  4 ----
 import-gnulib.config |  1 +
 import-gnulib.sh     |  2 +-
 locate/locate.c      |  3 ---
 9 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9ec55a..a74743a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-02  James Youngman  <jay@gnu.org>
 
+	* import-gnulib.sh: (run_gnulib_tool): Don't pass --gpl3 to
+	gnulib-tool, since the program does not have that option (that was
+	a local change which proved not to be necessary).
+
 	GPL3 migration.
 	* COPYING: Migrate to version 3 of the GNU General Public license.
 	* Makefile.am: ditto
@@ -66,6 +70,16 @@
 	* doc/find.texi (Updating A Timestamp File): Indicate that %A@ now
 	includes a sub-second part on many systems.
 
+	Include <fcntl.h> unconditionally.
+	* import-gnulib.config (modules): Also use the fcntl module.
+	* find/find.c: #include <fcntl.h> unconditionally, since
+	gnulib provides it if it is absent.
+	* find/fstype.c: Likewise.
+	* find/ftsfind.c: Likewise.
+	* find/parser.c: Likewise.
+	* find/util.c: Likewise.
+	* locate/locate.c: Likewise.
+
 2007-06-30  Eric Blake  <ebb9@byu.net>
 
 	* find/pred.c (pred_timewindow): Avoid gcc warnings.
diff --git a/find/find.c b/find/find.c
index aa12950..8dcf001 100644
--- a/find/find.c
+++ b/find/find.c
@@ -36,11 +36,7 @@
 #include <assert.h>
 
 #include <sys/stat.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
 #include <openat.h>
 
 #include "xalloc.h"
diff --git a/find/fstype.c b/find/fstype.c
index e448e9e..75b3371 100644
--- a/find/fstype.c
+++ b/find/fstype.c
@@ -36,10 +36,8 @@
  */
 #include <unistd.h>
 
-#ifdef HAVE_SYS_MNTIO_H
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
+#ifdef HAVE_SYS_MNTIO_H
 #include <sys/mntio.h>
 #endif
 #ifdef HAVE_SYS_MKDEV_H
diff --git a/find/ftsfind.c b/find/ftsfind.c
index e50896a..7f882a6 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -38,11 +38,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
 #include <sys/stat.h>
 
 #include <unistd.h>
diff --git a/find/parser.c b/find/parser.c
index c085c2d..4ecef66 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -43,11 +43,8 @@
 #include "error.h"
 #include "gnulib-version.h"
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
+
 
 /* The presence of unistd.h is assumed by gnulib these days, so we 
  * might as well assume it too. 
diff --git a/find/util.c b/find/util.c
index 0ec37b3..8cd7ef9 100644
--- a/find/util.c
+++ b/find/util.c
@@ -18,11 +18,7 @@
 #include <config.h>
 #include "defs.h"
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
-#include <sys/file.h>
-#endif
 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
 #endif
diff --git a/import-gnulib.config b/import-gnulib.config
index 4d394df..b52aa03 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -38,6 +38,7 @@ closeout
 dirname
 error
 fchdir
+fcntl
 fileblocks
 filemode
 fnmatch-gnu
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 3d64059..2dbb9fc 100644
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -137,7 +137,7 @@ run_gnulib_tool() {
     fi
 
     set -x
-    if "$tool" --import --symlink --with-tests --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 --gpl3 $modules
+    if "$tool" --import --symlink --with-tests --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 $modules
     then
 	set +x
     else
diff --git a/locate/locate.c b/locate/locate.c
index 1f7bab4..71e0265 100644
--- a/locate/locate.c
+++ b/locate/locate.c
@@ -79,10 +79,7 @@
 /* We need <unistd.h> for isatty(). */
 #include <unistd.h>
 
-#if HAVE_FCNTL_H
-/* We use fcntl() */
 #include <fcntl.h>
-#endif
 
 #define NDEBUG
 #include <assert.h>
-- 
2.11.4.GIT