X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstrsignal.m4;h=f4b0143355a3276ae3cd83eb877b7274295230a3;hb=effe7821374f8b7e22e9de3df9cc4e5f285712bd;hp=856f8af8fef2e5ca566b51a2db1d852a168fe501;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index 856f8af8f..f4b014335 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -1,4 +1,4 @@
-# strsignal.m4 serial 5
+# strsignal.m4 serial 8
 dnl Copyright (C) 2008-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,
@@ -19,6 +19,7 @@ AC_DEFUN([gl_FUNC_STRSIGNAL],
 
   AC_CHECK_FUNCS([strsignal])
   if test $ac_cv_func_strsignal = yes; then
+    HAVE_STRSIGNAL=1
     dnl Check if strsignal behaves reasonably for out-of-range signal numbers.
     dnl On Solaris it returns NULL; on AIX 5.1 it returns (char *) -1.
     AC_CACHE_CHECK([whether strsignal always returns a string],
@@ -42,21 +43,17 @@ AC_DEFUN([gl_FUNC_STRSIGNAL],
             solaris* | aix*) gl_cv_func_working_strsignal=no;;
             *)               gl_cv_func_working_strsignal="guessing yes";;
           esac])])
-  else
-    gl_cv_func_working_strsignal=no
-  fi
-
-  if test "$gl_cv_func_working_strsignal" = no; then
-    if test $ac_cv_func_strsignal = yes; then
+    if test "$gl_cv_func_working_strsignal" = no; then
       REPLACE_STRSIGNAL=1
     fi
-    AC_LIBOBJ([strsignal])
-    gl_PREREQ_STRSIGNAL
+  else
+    HAVE_STRSIGNAL=0
   fi
 ])
 
 # Prerequisites of lib/strsignal.c.
 AC_DEFUN([gl_PREREQ_STRSIGNAL], [
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_REQUIRE([AC_DECL_SYS_SIGLIST])
-  AC_CHECK_DECLS([_sys_siglist], [], [], [#include <signal.h>])
+  AC_CHECK_DECLS([_sys_siglist], [], [], [[#include <signal.h>]])
 ])