Avoid duplicate modules.

2 files changed, 3 insertions, 37 deletions

diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 207fadf26c..73268e54bc 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,12 +15,12 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --libtool --macro-prefix=gl arpa_inet fdl gendocs getaddrinfo getline getpass gettext gpl inet_ntop inet_pton lgpl maintainer-makefile memmove minmax read-file readline
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --avoid=snprintf --libtool --macro-prefix=gl arpa_inet fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline vasnprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
-gl_MODULES([arpa_inet fdl gendocs getaddrinfo getline getpass gettext gpl inet_ntop inet_pton lgpl maintainer-makefile memmove minmax read-file readline])
-gl_AVOID([])
+gl_MODULES([arpa_inet fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline vasnprintf])
+gl_AVOID([snprintf])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
 gl_DOC_BASE([doc])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 02e72e6fdc..21e4d8dd8b 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -44,17 +44,11 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_GETDELIM
   gl_FUNC_GETLINE
   gl_FUNC_GETPASS
-  dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
-  AM_GNU_GETTEXT_VERSION([0.15])
   gl_INET_NTOP
   gl_INET_PTON
-  gl_FUNC_MEMMOVE
-  gl_MINMAX
   gl_HEADER_NETINET_IN
-  gl_FUNC_READ_FILE
   gl_FUNC_READLINE
   gl_SIZE_MAX
-  gl_FUNC_SNPRINTF
   gl_TYPE_SOCKLEN_T
   AM_STDBOOL_H
   gl_FUNC_STRDUP
@@ -117,19 +111,13 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/inet_ntop.h
   lib/inet_pton.c
   lib/inet_pton.h
-  lib/memmove.c
-  lib/minmax.h
   lib/printf-args.c
   lib/printf-args.h
   lib/printf-parse.c
   lib/printf-parse.h
-  lib/read-file.c
-  lib/read-file.h
   lib/readline.c
   lib/readline.h
   lib/size_max.h
-  lib/snprintf.c
-  lib/snprintf.h
   lib/socket_.h
   lib/stdbool_.h
   lib/strdup.c
@@ -139,53 +127,31 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/xsize.h
   m4/alloca.m4
   m4/arpa_inet_h.m4
-  m4/codeset.m4
   m4/eoverflow.m4
   m4/getaddrinfo.m4
   m4/getdelim.m4
   m4/getline.m4
   m4/getpass.m4
-  m4/gettext.m4
-  m4/glibc2.m4
-  m4/glibc21.m4
-  m4/iconv.m4
   m4/inet_ntop.m4
   m4/inet_pton.m4
-  m4/intdiv0.m4
-  m4/intmax.m4
   m4/intmax_t.m4
-  m4/inttypes-h.m4
-  m4/inttypes-pri.m4
   m4/inttypes_h.m4
-  m4/lcmessage.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
-  m4/lock.m4
   m4/longdouble.m4
   m4/longlong.m4
-  m4/memmove.m4
-  m4/minmax.m4
   m4/netinet_in_h.m4
-  m4/nls.m4
-  m4/po.m4
-  m4/printf-posix.m4
-  m4/progtest.m4
-  m4/read-file.m4
   m4/readline.m4
   m4/signed.m4
   m4/size_max.m4
-  m4/snprintf.m4
   m4/socklen.m4
   m4/sockpfaf.m4
   m4/stdbool.m4
   m4/stdint_h.m4
   m4/strdup.m4
   m4/sys_socket_h.m4
-  m4/uintmax_t.m4
-  m4/ulonglong.m4
   m4/vasnprintf.m4
-  m4/visibility.m4
   m4/wchar_t.m4
   m4/wint_t.m4
   m4/xsize.m4