From 207ca136e48759175e9920d9c51d53450a528477 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 6 Jun 2011 15:11:04 -0600
Subject: [PATCH] strerror-override: avoid bloating errno module

* modules/errno (Files, configure.ac): Move replacement strings...
* modules/strerror-override: ...to new module.
* modules/strerror (Depends-on): Add strerror-override.
* modules/strerror_r-posix (Depends-on): Likewise.
* MODULES.html.sh: Document new module.
Reported by Bruno Haible.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 ChangeLog                 | 10 ++++++++++
 MODULES.html.sh           |  1 +
 modules/errno             |  5 -----
 modules/strerror          |  1 +
 modules/strerror-override | 26 ++++++++++++++++++++++++++
 modules/strerror_r-posix  |  1 +
 6 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 modules/strerror-override

diff --git a/ChangeLog b/ChangeLog
index 799cdb9114..363ee1f01e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-06-06  Eric Blake  <eblake@redhat.com>
+
+	strerror-override: avoid bloating errno module
+	* modules/errno (Files, configure.ac): Move replacement strings...
+	* modules/strerror-override: ...to new module.
+	* modules/strerror (Depends-on): Add strerror-override.
+	* modules/strerror_r-posix (Depends-on): Likewise.
+	* MODULES.html.sh: Document new module.
+	Reported by Bruno Haible.
+
 2011-06-06  Bruno Haible  <bruno@clisp.org>
 
 	spawn-pipe tests: Rename program.
diff --git a/MODULES.html.sh b/MODULES.html.sh
index f929ecfbc1..26c3fa97cf 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1626,6 +1626,7 @@ func_all_modules ()
   func_module atexit
   func_module strtod
   func_module strerror
+  func_module strerror-override
   func_module mktime
   func_end_table
 
diff --git a/modules/errno b/modules/errno
index 2640ec8bbd..2fee35d5b1 100644
--- a/modules/errno
+++ b/modules/errno
@@ -3,8 +3,6 @@ A POSIX-like <errno.h>.
 
 Files:
 lib/errno.in.h
-lib/strerror-override.h
-lib/strerror-override.c
 m4/errno_h.m4
 
 Depends-on:
@@ -12,9 +10,6 @@ include_next
 
 configure.ac:
 gl_HEADER_ERRNO_H
-if test -n "$ERRNO_H"; then
-  AC_LIBOBJ([strerror-override])
-fi
 
 Makefile.am:
 BUILT_SOURCES += $(ERRNO_H)
diff --git a/modules/strerror b/modules/strerror
index d4d9c79fb0..3c83cf9905 100644
--- a/modules/strerror
+++ b/modules/strerror
@@ -9,6 +9,7 @@ Depends-on:
 string
 errno            [test $REPLACE_STRERROR = 1]
 intprops         [test $REPLACE_STRERROR = 1]
+strerror-override [test $REPLACE_STRERROR = 1]
 verify           [test $REPLACE_STRERROR = 1]
 
 configure.ac:
diff --git a/modules/strerror-override b/modules/strerror-override
new file mode 100644
index 0000000000..a31e8a1ec3
--- /dev/null
+++ b/modules/strerror-override
@@ -0,0 +1,26 @@
+Description:
+strerror_override() function: provide strings for gnulib-specific errno values
+
+Files:
+lib/strerror-override.h
+lib/strerror-override.c
+
+Depends-on:
+errno
+
+configure.ac:
+AC_REQUIRE([gl_HEADER_ERRNO_H])
+if test -n "$ERRNO_H"; then
+  AC_LIBOBJ([strerror-override])
+fi
+
+Makefile.am:
+
+Include:
+"strerror-override.h"
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix
index 90c98064a3..c7f18b2843 100644
--- a/modules/strerror_r-posix
+++ b/modules/strerror_r-posix
@@ -10,6 +10,7 @@ string
 extensions
 errno           [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
 lock            [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
+strerror-override [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1]
 
 configure.ac:
 gl_FUNC_STRERROR_R
-- 
2.30.2