From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 30 Oct 2008 21:18:58 +0000 (+0100)
Subject: Update gnulib files.
X-Git-Tag: gnutls_2_7_1~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31e7c4e3589effaad9f346103e784f877b5e1600;p=thirdparty%2Fgnutls.git

Update gnulib files.
---

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 83d0ec21c2..78eb8f9f1c 100644
--- a/gl/Makefile.am
+++ b/gl/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=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close error fdl gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile minmax progname read-file readline select setsockopt shutdown socket version-etc-fsf
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close error fdl gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile minmax perror progname read-file readline select setsockopt shutdown socket version-etc-fsf
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -386,6 +386,15 @@ EXTRA_DIST += netinet_in.in.h
 
 ## end   gnulib module netinet_in
 
+## begin gnulib module perror
+
+
+EXTRA_DIST += perror.c
+
+EXTRA_libgnu_la_SOURCES += perror.c
+
+## end   gnulib module perror
+
 ## begin gnulib module progname
 
 libgnu_la_SOURCES += progname.h progname.c
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index c79d9dfdc1..009a919aa5 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # 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 --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close error fdl gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile minmax progname read-file readline select setsockopt shutdown socket version-etc-fsf
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files accept arpa_inet autobuild bind close error fdl gendocs getaddrinfo getline getpass-gnu gnupload gpl-3.0 inet_ntop inet_pton lgpl-2.1 listen maintainer-makefile minmax perror progname read-file readline select setsockopt shutdown socket version-etc-fsf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -39,6 +39,7 @@ gl_MODULES([
   listen
   maintainer-makefile
   minmax
+  perror
   progname
   read-file
   readline
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index c5e022b521..276e3802a3 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -112,6 +112,8 @@ AC_SUBST([LTALLOCA])
   gl_HEADER_NETDB
   gl_HEADER_NETINET_IN
   AC_PROG_MKDIR_P
+  gl_FUNC_PERROR
+  gl_STRING_MODULE_INDICATOR([perror])
   gl_FUNC_READ_FILE
   gl_FUNC_READLINE
   gl_FUNC_REALLOC_POSIX
@@ -210,8 +212,6 @@ AC_SUBST([LTALLOCA])
   fi
   gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
   gl_MODULE_INDICATOR([ioctl])
-  gl_FUNC_PERROR
-  gl_STRING_MODULE_INDICATOR([perror])
   gl_SOCKETS
   gt_TYPE_WCHAR_T
   gt_TYPE_WINT_T
@@ -348,6 +348,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/minmax.h
   lib/netdb.in.h
   lib/netinet_in.in.h
+  lib/perror.c
   lib/printf-args.c
   lib/printf-args.h
   lib/printf-parse.c
@@ -476,7 +477,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-wchar.c
   tests=lib/connect.c
   tests=lib/ioctl.c
-  tests=lib/perror.c
   tests=lib/sockets.c
   tests=lib/sockets.h
   tests=lib/sys_ioctl.in.h
diff --git a/gl/tests/perror.c b/gl/perror.c
similarity index 100%
rename from gl/tests/perror.c
rename to gl/perror.c
diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index 8a07e408d3..1f25063919 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -160,15 +160,6 @@ EXTRA_DIST += test-netinet_in.c
 
 ## end   gnulib module netinet_in-tests
 
-## begin gnulib module perror
-
-
-EXTRA_DIST += perror.c
-
-EXTRA_libtests_a_SOURCES += perror.c
-
-## end   gnulib module perror
-
 ## begin gnulib module perror-tests
 
 TESTS += test-perror.sh