From 87b0e84c4c747d1c29df645debfce815f6e09466 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 25 May 2011 00:59:48 +0200 Subject: [PATCH] strerror_r-posix: Respect rules for use of AC_LIBOBJ. * m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Move AC_LIBOBJ and gl_PREREQ_STRERROR_R invocations from here... * modules/strerror_r-posix (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/strerror_r.m4 | 6 +----- modules/strerror_r-posix | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dc7091aff..1f0ac8b198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-24 Bruno Haible + + strerror_r-posix: Respect rules for use of AC_LIBOBJ. + * m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Move AC_LIBOBJ and + gl_PREREQ_STRERROR_R invocations from here... + * modules/strerror_r-posix (configure.ac): ... to here. + 2011-05-24 Eric Blake strerror_r: fix missing header diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index ddaf10f526..1c0af3691d 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,4 +1,4 @@ -# strerror_r.m4 serial 8 +# strerror_r.m4 serial 9 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, @@ -100,10 +100,6 @@ changequote([,])dnl REPLACE_STRERROR_R=1 fi fi - if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then - AC_LIBOBJ([strerror_r]) - gl_PREREQ_STRERROR_R - fi ]) # Prerequisites of lib/strerror_r.c. diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix index a36f2e6f94..90c98064a3 100644 --- a/modules/strerror_r-posix +++ b/modules/strerror_r-posix @@ -13,6 +13,10 @@ lock [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1] configure.ac: gl_FUNC_STRERROR_R +if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then + AC_LIBOBJ([strerror_r]) + gl_PREREQ_STRERROR_R +fi gl_STRING_MODULE_INDICATOR([strerror_r]) Makefile.am: -- 2.30.2