[PATCH] Depend on gnulib modules appropriate to features we already use.

[James Youngman]

* import-gnulib.config (modules): Add c-casestr, errno, fdopendir,
fflush, getdelim, gettimeofday, locale, modf, perror, snprintf,
stat, stdarg, stddef, stdio, stdlib, string, strpbrk, sys_time,
sys_wait.
Also add comments about other modules we may also want to use
which would require other code changes (for example dirent-safer).
* find/Makefile.am (LDADD): Add  $(LIB_EACCESS) $(LIB_SELINUX)
$(MODF_LIBM) which are needed by gnulib modules we now depend on.

Signed-off-by: James Youngman <address@hidden>
---
 ChangeLog            |   11 +++++++++++
 find/Makefile.am     |    2 +-
 import-gnulib.config |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d33471a..efb83d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2010-04-06  James Youngman  <address@hidden>
 
+       * find/Makefile.am (LDADD): Add  $(LIB_EACCESS) $(LIB_SELINUX)
+       $(MODF_LIBM) which are needed by gnulib modules we now depend on.
+
+       Depend on gnulib modules appropriate to features we already use.
+       * import-gnulib.config (modules): Add c-casestr, errno, fdopendir,
+       fflush, getdelim, gettimeofday, locale, modf, perror, snprintf,
+       stat, stdarg, stddef, stdio, stdlib, string, strpbrk, sys_time,
+       sys_wait.
+       Also add comments about other modules we may also want to use
+       which would require other code changes (for example dirent-safer).
+
        * import-gnulib.config (modules): Use the getopt-gnu module from
        gnulib rather than the (obsolete) getopt module.
 
diff --git a/find/Makefile.am b/find/Makefile.am
index ff38c82..e3f62a6 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -27,7 +27,7 @@ endif
 
 EXTRA_DIST = defs.h sharefile.h $(man_MANS)
 INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib 
-I../intl -DLOCALEDIR=\"$(localedir)\"
-LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIBINTL) 
$(LIB_CLOCK_GETTIME) $(LIB_CLOSE) @FINDLIBS@ @LIB_SELINUX@
+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a $(LIBINTL) 
$(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) $(LIB_CLOSE) $(MODF_LIBM) 
@FINDLIBS@
 man_MANS = find.1
 SUBDIRS = . testsuite
 
diff --git a/import-gnulib.config b/import-gnulib.config
index 4c93be7..5a3f32a 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -24,6 +24,35 @@ maintainer-makefile
 update-copyright
 '
 
+# consider using autobuild
+# consider using d-ino
+# consider using d-type
+# consider using dirent-safer
+# consider using do-release-commit-and-tag
+# consider using faccessat
+# consider using gendocs
+# consider using getdelim
+# consider using gethrxtime
+# consider using getsubopt (for -D)
+# consider using gnu-web-doc-update
+# consider using idprov-drop and privset for locate
+# consider using isblank in xargs
+# consider using long-options
+# consider using manywarnings
+# consider using nproc in xargs
+# consider using pmccabe2html
+# consider using readlink
+# consider using same-inode
+# consider using selinux-h
+# consider using gendocs
+# consider using sig2str in xargs
+# consider using signal (why not: maybe we don't need those features)
+# consider using the dev-ino moduile to support -samefile.
+
+# consider removing stpcpy
+# We have rpmatch, either use it for -ok and xargs or remove the dependency
+# use fileblocks, filemode properly.
+
 # Modules needed for findutils.
 # We need regex to ensure that we can build on platforms like
 # Solaris which lack those functions.
@@ -31,6 +60,7 @@ modules='
 alloca
 argmatch
 assert
+c-strcasestr
 c-strstr
 canonicalize
 cloexec
@@ -38,25 +68,31 @@ closein
 closeout
 ctype
 dirname
+errno
 error
 fchdir
 fcntl
 fdl
+fdopendir
+fflush
 fileblocks
 filemode
 fnmatch-gnu
 fopen-safer
 fts
 getdate
+getdelim
 getline
 getopt-gnu
 gettext
+gettimeofday
 gpl-3.0
 hash
 human
 idcache
 inline
 inttypes
+locale
 lstat
 malloc
 math
@@ -65,9 +101,11 @@ mbscasestr
 mbsstr
 mktime
 modechange
+modf
 mountlist
 open
 pathmax
+perror
 progname
 quotearg
 realloc
@@ -75,19 +113,29 @@ regex
 rpmatch
 savedir
 selinux-at
+snprintf
+stat
 stat-macros
 stat-time
+stdarg
 stdbool
+stddef
+stdio
 stdint
+stdlib
 stpcpy
 strcasestr
 strdup-posix
 strftime
+string
+strpbrk
 strtol
 strtoul
 strtoull
 strtoumax
 sys_stat
+sys_time
+sys_wait
 timespec
 verify
 version-etc
-- 
1.7.0