diff --git a/ChangeLog b/ChangeLog
index d874aa51..080c167e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-04  Eric Blake  <ebb9@byu.net>
+
+	* lib/autoconf/functions.m4 (AC_FUNC_STRERROR_R): Avoid unused
+	variable warning.
+
 2006-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* lib/autoconf/status.m4 (_AC_OUTPUT_HEADER): Force correct
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index efa5c455..3dc8280a 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1521,6 +1521,7 @@ AC_CACHE_CHECK([whether strerror_r returns char *],
 	  char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
 	  char *p = strerror_r (0, buf, sizeof buf);
+	  return !p || x;
 	]])],
 			ac_cv_func_strerror_r_char_p=yes)
     else