Update.

diff --git a/gl/gnulib.mk b/gl/gnulib.mk
index b9f6d7091a49d527261725539a97c804ff5ff96e..98d1a9f3888e3d8ac52f032199a8050a4cd7a43c 100644 (file)
--- a/gl/gnulib.mk
+++ b/gl/gnulib.mk
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline
 
 
 MOSTLYCLEANFILES += core *.stackdump
@@ -40,15 +40,6 @@ MOSTLYCLEANDIRS += arpa
 
 ## end   gnulib module arpa_inet
 
-## begin gnulib module error
-
-
-EXTRA_DIST += error.c error.h
-
-EXTRA_libgnu_la_SOURCES += error.c
-
-## end   gnulib module error
-
 ## begin gnulib module getaddrinfo
 
 

diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index dbd0aadedb6a481d753cb5c71d52fa1925091ff8..aaaea4360dee0d390acbd3f803788586c8703c00 100644 (file)
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,11 +15,11 @@
 
 
 # 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=. --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile 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 --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
-gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline])
+gl_MODULES([arpa_inet fdl gendocs getaddrinfo getline getpass gpl inet_ntop inet_pton lgpl maintainer-makefile readline])
 gl_AVOID([snprintf vasnprintf])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])

diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 94af58ca0c76a95207ad0de22e7bc35474254351..016598a70094eacd6cd1712883a9923dcedbb1c5 100644 (file)
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -41,7 +41,6 @@ AC_DEFUN([gl_INIT],
   gl_source_base='gl'
   gl_HEADER_ARPA_INET
   AC_PROG_MKDIR_P
-  gl_ERROR
   gl_GETADDRINFO
   gl_FUNC_GETDELIM
   gl_FUNC_GETLINE
@@ -104,8 +103,6 @@ AC_DEFUN([gl_FILE_LIST], [
   doc/gpl.texi
   doc/lgpl.texi
   lib/dummy.c
-  lib/error.c
-  lib/error.h
   lib/gai_strerror.c
   lib/getaddrinfo.c
   lib/getaddrinfo.h
@@ -128,7 +125,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/string_.h
   m4/absolute-header.m4
   m4/arpa_inet_h.m4
-  m4/error.m4
   m4/extensions.m4
   m4/getaddrinfo.m4
   m4/getdelim.m4

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 00171894d4ace89656e1c2960df2bf75ce187fa5..fefef9c02b8fc4bb313c5c859ba842e024563737 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=src/lib --m4-base=src/lib/m4 --doc-base=doc --aux-dir=. --libtool --macro-prefix=gl error progname
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=src/lib --m4-base=src/lib/m4 --doc-base=doc --aux-dir=. --libtool --macro-prefix=sgl error progname
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -30,8 +30,8 @@ AM_CPPFLAGS =
 noinst_LTLIBRARIES += libgnu.la
 
 libgnu_la_SOURCES =
-libgnu_la_LIBADD = $(gl_LTLIBOBJS)
-libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
+libgnu_la_LIBADD = $(sgl_LTLIBOBJS)
+libgnu_la_DEPENDENCIES = $(sgl_LTLIBOBJS)
 EXTRA_libgnu_la_SOURCES =
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
 

diff --git a/src/lib/m4/gnulib-cache.m4 b/src/lib/m4/gnulib-cache.m4
index 58185dbc3139163596de1e259dee75b1b7171df4..469ec401f8b0546d54cdf84e1a02fd247080fe55 100644 (file)
--- a/src/lib/m4/gnulib-cache.m4
+++ b/src/lib/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=src/lib --m4-base=src/lib/m4 --doc-base=doc --aux-dir=. --libtool --macro-prefix=gl error progname
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=src/lib --m4-base=src/lib/m4 --doc-base=doc --aux-dir=. --libtool --macro-prefix=sgl error progname
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -28,4 +28,4 @@ gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
 gl_LIBTOOL
-gl_MACRO_PREFIX([gl])
+gl_MACRO_PREFIX([sgl])

diff --git a/src/lib/m4/gnulib-comp.m4 b/src/lib/m4/gnulib-comp.m4
index a9d3c79ae720a3cd70ab4deefcf66ce227e93de0..0f65912ca996ece3f2d0a9df5cfc5249c88ae90a 100644 (file)
--- a/src/lib/m4/gnulib-comp.m4
+++ b/src/lib/m4/gnulib-comp.m4
@@ -18,7 +18,7 @@
 # This macro should be invoked from ./configure.in, in the section
 # "Checks for programs", right after AC_PROG_CC, and certainly before
 # any checks for libraries, header files, types and library functions.
-AC_DEFUN([gl_EARLY],
+AC_DEFUN([sgl_EARLY],
 [
   m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
@@ -29,11 +29,11 @@ AC_DEFUN([gl_EARLY],
 
 # This macro should be invoked from ./configure.in, in the section
 # "Check for header files, types and library functions".
-AC_DEFUN([gl_INIT],
+AC_DEFUN([sgl_INIT],
 [
-  m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
-  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
-  m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
+  m4_pushdef([AC_LIBOBJ], m4_defn([sgl_LIBOBJ]))
+  m4_pushdef([AC_REPLACE_FUNCS], m4_defn([sgl_REPLACE_FUNCS]))
+  m4_pushdef([AC_LIBSOURCES], m4_defn([sgl_LIBSOURCES]))
   AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
   gl_cond_libtool=true
   gl_source_base='src/lib'
@@ -42,39 +42,39 @@ AC_DEFUN([gl_INIT],
   m4_popdef([AC_REPLACE_FUNCS])
   m4_popdef([AC_LIBOBJ])
   AC_CONFIG_COMMANDS_PRE([
-    gl_libobjs=
-    gl_ltlibobjs=
-    if test -n "$gl_LIBOBJS"; then
+    sgl_libobjs=
+    sgl_ltlibobjs=
+    if test -n "$sgl_LIBOBJS"; then
       # Remove the extension.
       sed_drop_objext='s/\.o$//;s/\.obj$//'
-      for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
-        gl_libobjs="$gl_libobjs $i.$ac_objext"
-        gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+      for i in `for i in $sgl_LIBOBJS; do echo "$i"; done | sed "$sed_drop_objext" | sort | uniq`; do
+        sgl_libobjs="$sgl_libobjs $i.$ac_objext"
+        sgl_ltlibobjs="$sgl_ltlibobjs $i.lo"
       done
     fi
-    AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
-    AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+    AC_SUBST([sgl_LIBOBJS], [$sgl_libobjs])
+    AC_SUBST([sgl_LTLIBOBJS], [$sgl_ltlibobjs])
   ])
 ])
 
 # Like AC_LIBOBJ, except that the module name goes
-# into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_LIBOBJ],
-  [gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"])
+# into sgl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([sgl_LIBOBJ],
+  [sgl_LIBOBJS="$sgl_LIBOBJS $1.$ac_objext"])
 
 # Like AC_REPLACE_FUNCS, except that the module name goes
-# into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_REPLACE_FUNCS],
-  [AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])])
+# into sgl_LIBOBJS instead of into LIBOBJS.
+AC_DEFUN([sgl_REPLACE_FUNCS],
+  [AC_CHECK_FUNCS([$1], , [sgl_LIBOBJ($ac_func)])])
 
 # Like AC_LIBSOURCES, except that it does nothing.
 # We rely on EXTRA_lib..._SOURCES instead.
-AC_DEFUN([gl_LIBSOURCES],
+AC_DEFUN([sgl_LIBSOURCES],
   [])
 
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
-AC_DEFUN([gl_FILE_LIST], [
+AC_DEFUN([sgl_FILE_LIST], [
   lib/error.c
   lib/error.h
   lib/progname.c