From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 May 2011 11:51:37 +0000 (+0200)
Subject: strsignal: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2415
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b33b83e2a70c60ae757212c807ec67629ae7ef1e;p=gnulib.git

strsignal: Move AC_LIBOBJ invocations to module description.

* m4/strsignal.m4 (gl_FUNC_STRSIGNAL): Set HAVE_STRSIGNAL. Move
AC_LIBOBJ and gl_PREREQ_STRSIGNAL invocations from here...
* modules/strsignal (configure.ac): ... to here.
(Depends-on): Update conditions.
---

diff --git a/ChangeLog b/ChangeLog
index aa3235614..b2b677a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
+	strsignal: Move AC_LIBOBJ invocations to module description.
+	* m4/strsignal.m4 (gl_FUNC_STRSIGNAL): Set HAVE_STRSIGNAL. Move
+	AC_LIBOBJ and gl_PREREQ_STRSIGNAL invocations from here...
+	* modules/strsignal (configure.ac): ... to here.
+	(Depends-on): Update conditions.
+
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
 	strsep: Move AC_LIBOBJ invocations to module description.
 	* m4/strsep.m4 (gl_FUNC_STRSEP): Call AC_CHECK_FUNCS instead of
 	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRSEP invocations from
diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index 856f8af8f..f5c70ef1c 100644
--- a/m4/strsignal.m4
+++ b/m4/strsignal.m4
@@ -1,4 +1,4 @@
-# strsignal.m4 serial 5
+# strsignal.m4 serial 6
 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,16 +43,11 @@ 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
 ])
 
diff --git a/modules/strsignal b/modules/strsignal
index c8e3bfab7..bdb68fad2 100644
--- a/modules/strsignal
+++ b/modules/strsignal
@@ -9,14 +9,18 @@ m4/strsignal.m4
 Depends-on:
 string
 extensions
-gettext-h       [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
-lock            [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
-tls             [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
-snprintf        [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
-memset          [test $ac_cv_func_strsignal = no || test $REPLACE_STRSIGNAL = 1]
+gettext-h       [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
+lock            [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
+tls             [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
+snprintf        [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
+memset          [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
 
 configure.ac:
 gl_FUNC_STRSIGNAL
+if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then
+  AC_LIBOBJ([strsignal])
+  gl_PREREQ_STRSIGNAL
+fi
 gl_STRING_MODULE_INDICATOR([strsignal])
 
 Makefile.am: