completely separated the two gnulibs to avoid conflicts

3 files changed, 63 insertions, 2 deletions

diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index 2d31405d9d..7775983601 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files accept bind close connect getaddrinfo getpass inet_ntop inet_pton listen parse-datetime progname recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files accept bind close connect getaddrinfo getpass inet_ntop inet_pton listen minmax parse-datetime progname read-file recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
 
 AUTOMAKE_OPTIONS = 1.9.6 gnits
 
@@ -307,6 +307,24 @@ EXTRA_libgnu_gpl_la_SOURCES += fstat.c
 
 ## end   gnulib module fstat
 
+## begin gnulib module ftell
+
+
+EXTRA_DIST += ftell.c
+
+EXTRA_libgnu_gpl_la_SOURCES += ftell.c
+
+## end   gnulib module ftell
+
+## begin gnulib module ftello
+
+
+EXTRA_DIST += ftello.c stdio-impl.h
+
+EXTRA_libgnu_gpl_la_SOURCES += ftello.c
+
+## end   gnulib module ftello
+
 ## begin gnulib module getaddrinfo
 
 
@@ -442,6 +460,12 @@ EXTRA_libgnu_gpl_la_SOURCES += memchr.c
 
 ## end   gnulib module memchr
 
+## begin gnulib module minmax
+
+libgnu_gpl_la_SOURCES += minmax.h
+
+## end   gnulib module minmax
+
 ## begin gnulib module mktime
 
 
@@ -563,6 +587,14 @@ libgnu_gpl_la_SOURCES += progname.h progname.c
 
 ## end   gnulib module progname
 
+## begin gnulib module read-file
+
+libgnu_gpl_la_SOURCES += read-file.c
+
+EXTRA_DIST += read-file.h
+
+## end   gnulib module read-file
+
 ## begin gnulib module realloc-posix
 
 
diff --git a/src/gl/m4/gnulib-cache.m4 b/src/gl/m4/gnulib-cache.m4
index 956a9ed738..07fc9386ac 100644
--- a/src/gl/m4/gnulib-cache.m4
+++ b/src/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files accept bind close connect getaddrinfo getpass inet_ntop inet_pton listen parse-datetime progname recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
+#   gnulib-tool --import --dir=. --local-dir=src/gl/override --lib=libgnu_gpl --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=ggl --no-vc-files accept bind close connect getaddrinfo getpass inet_ntop inet_pton listen minmax parse-datetime progname read-file recv recvfrom select send sendto servent setsockopt shutdown socket sockets socklen
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([src/gl/override])
@@ -41,8 +41,10 @@ gl_MODULES([
   inet_ntop
   inet_pton
   listen
+  minmax
   parse-datetime
   progname
+  read-file
   recv
   recvfrom
   select
diff --git a/src/gl/m4/gnulib-comp.m4 b/src/gl/m4/gnulib-comp.m4
index 8dae6a8d3e..8a5db823d9 100644
--- a/src/gl/m4/gnulib-comp.m4
+++ b/src/gl/m4/gnulib-comp.m4
@@ -62,6 +62,9 @@ AC_DEFUN([ggl_EARLY],
   # Code from module fseeko:
   AC_REQUIRE([AC_FUNC_FSEEKO])
   # Code from module fstat:
+  # Code from module ftell:
+  # Code from module ftello:
+  AC_REQUIRE([AC_FUNC_FSEEKO])
   # Code from module getaddrinfo:
   # Code from module getdelim:
   # Code from module getline:
@@ -82,6 +85,7 @@ AC_DEFUN([ggl_EARLY],
   # Code from module malloc-posix:
   # Code from module malloca:
   # Code from module memchr:
+  # Code from module minmax:
   # Code from module mktime:
   # Code from module msvc-inval:
   # Code from module msvc-nothrow:
@@ -90,6 +94,7 @@ AC_DEFUN([ggl_EARLY],
   # Code from module netinet_in:
   # Code from module parse-datetime:
   # Code from module progname:
+  # Code from module read-file:
   # Code from module realloc-posix:
   # Code from module recv:
   # Code from module recvfrom:
@@ -226,6 +231,17 @@ AC_SUBST([LTALLOCA])
     gl_PREREQ_FSTAT
   fi
   gl_SYS_STAT_MODULE_INDICATOR([fstat])
+  gl_FUNC_FTELL
+  if test $REPLACE_FTELL = 1; then
+    AC_LIBOBJ([ftell])
+  fi
+  gl_STDIO_MODULE_INDICATOR([ftell])
+  gl_FUNC_FTELLO
+  if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
+    AC_LIBOBJ([ftello])
+    gl_PREREQ_FTELLO
+  fi
+  gl_STDIO_MODULE_INDICATOR([ftello])
   gl_GETADDRINFO
   if test $HAVE_GETADDRINFO = 0; then
     AC_LIBOBJ([getaddrinfo])
@@ -301,6 +317,7 @@ AC_SUBST([LTALLOCA])
     gl_PREREQ_MEMCHR
   fi
   gl_STRING_MODULE_INDICATOR([memchr])
+  gl_MINMAX
   gl_FUNC_MKTIME
   if test $REPLACE_MKTIME = 1; then
     AC_LIBOBJ([mktime])
@@ -322,6 +339,7 @@ AC_SUBST([LTALLOCA])
   gl_PARSE_DATETIME
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+  gl_PREREQ_READ_FILE
   gl_FUNC_REALLOC_POSIX
   if test $REPLACE_REALLOC = 1; then
     AC_LIBOBJ([realloc])
@@ -612,6 +630,8 @@ AC_DEFUN([ggl_FILE_LIST], [
   lib/fseek.c
   lib/fseeko.c
   lib/fstat.c
+  lib/ftell.c
+  lib/ftello.c
   lib/gai_strerror.c
   lib/getaddrinfo.c
   lib/getdelim.c
@@ -634,6 +654,7 @@ AC_DEFUN([ggl_FILE_LIST], [
   lib/malloca.valgrind
   lib/memchr.c
   lib/memchr.valgrind
+  lib/minmax.h
   lib/mktime-internal.h
   lib/mktime.c
   lib/msvc-inval.c
@@ -650,6 +671,8 @@ AC_DEFUN([ggl_FILE_LIST], [
   lib/printf-parse.h
   lib/progname.c
   lib/progname.h
+  lib/read-file.c
+  lib/read-file.h
   lib/realloc.c
   lib/recv.c
   lib/recvfrom.c
@@ -721,6 +744,8 @@ AC_DEFUN([ggl_FILE_LIST], [
   m4/fseek.m4
   m4/fseeko.m4
   m4/fstat.m4
+  m4/ftell.m4
+  m4/ftello.m4
   m4/getaddrinfo.m4
   m4/getdelim.m4
   m4/getline.m4
@@ -741,6 +766,7 @@ AC_DEFUN([ggl_FILE_LIST], [
   m4/malloca.m4
   m4/math_h.m4
   m4/memchr.m4
+  m4/minmax.m4
   m4/mktime.m4
   m4/mmap-anon.m4
   m4/msvc-inval.m4
@@ -751,6 +777,7 @@ AC_DEFUN([ggl_FILE_LIST], [
   m4/off_t.m4
   m4/parse-datetime.m4
   m4/printf.m4
+  m4/read-file.m4
   m4/realloc.m4
   m4/select.m4
   m4/servent.m4