--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	relocatable-prog-wrapper: Assume strerror() exists.
+	* modules/relocatable-prog-wrapper (Files): Remove lib/strerror.c,
+	m4/strerror.m4.
+	(configure.ac): Don't invoke gl_FUNC_STRERROR_SEPARATE.
+	* lib/relocwrapper.c: Remove mention of strerror module.
+	* lib/strerror.c: Assume REPLACE_STRERROR is 1.
+	* m4/strerror.m4 (gl_FUNC_STRERROR_SEPARATE): Remove macro.
+	(gl_FUNC_STRERROR): Inline it here. Don't define REPLACE_STRERROR as a
+	C macro.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	select: Simplify replacement idiom.

--- a/lib/relocwrapper.c
+++ b/lib/relocwrapper.c
@@ -29,7 +29,6 @@
     -> relocatable
     -> setenv
        -> malloca
-    -> strerror
     -> c-ctype
 
    Macros that need to be set while compiling this file:

--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -20,18 +20,14 @@
 /* Specification.  */
 #include <string.h>
 
-#if REPLACE_STRERROR
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-# include <errno.h>
-# include <stdio.h>
-# include <stdlib.h>
-
-# include "intprops.h"
-# include "verify.h"
+#include "intprops.h"
+#include "verify.h"
 
 /* Use the system functions, not the gnulib overrides in this file.  */
-# undef sprintf
+#undef sprintf
 
-# include "strerror-impl.h"
-
-#endif
+#include "strerror-impl.h"

--- a/m4/strerror.m4
+++ b/m4/strerror.m4
@@ -1,4 +1,4 @@
-# strerror.m4 serial 10
+# strerror.m4 serial 11
 dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,17 +6,6 @@
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [
-  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
-  if test $REPLACE_STRERROR = 1; then
-    AC_LIBOBJ([strerror])
-    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
-      [Define this to 1 if strerror is broken.])
-  fi
-])
-
-# Like gl_FUNC_STRERROR, except prepare for separate compilation (no AC_LIBOBJ).
-AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
-[
   AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REQUIRE([gl_HEADER_ERRNO_H])
   if test -z "$ERRNO_H"; then
@@ -49,6 +38,7 @@
     REPLACE_STRERROR=1
   fi
   if test $REPLACE_STRERROR = 1; then
+    AC_LIBOBJ([strerror])
     gl_PREREQ_STRERROR
   fi
 ])

--- a/modules/relocatable-prog-wrapper
+++ b/modules/relocatable-prog-wrapper
@@ -21,7 +21,6 @@
 lib/relocatable.h
 lib/relocatable.c
 lib/setenv.c
-lib/strerror.c
 lib/c-ctype.h
 lib/c-ctype.c
 m4/malloca.m4
@@ -32,7 +31,6 @@
 m4/readlink.m4
 m4/relocatable-lib.m4
 m4/setenv.m4
-m4/strerror.m4
 
 Depends-on:
 alloca-opt
@@ -54,7 +52,6 @@
 gl_MALLOCA
 gl_RELOCATABLE_LIBRARY_SEPARATE
 gl_FUNC_SETENV_SEPARATE
-gl_FUNC_STRERROR_SEPARATE
 
 Makefile.am: