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 aa32356140a4429b28f6833bef14ec8093ffc3a9..b2b677a66c1719100c5ebf40c3ec0d87e5f7375a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/m4/strsignal.m4 b/m4/strsignal.m4
index 856f8af8fef2e5ca566b51a2db1d852a168fe501..f5c70ef1c9e2440f94a3d59181de68931edcc32e 100644 (file)
--- 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 c8e3bfab74c291c0186fa3a4b4359bc28a67ea77..bdb68fad2f48ced5bb2f5892e9e96b7445ed6729 100644 (file)
--- 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: