From 165e5c06a664c525b665bf224e702a00c1e7cdb0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 17:10:24 +0200 Subject: [PATCH] ttyname_r: Move AC_LIBOBJ invocations to module description. * m4/ttyname_r.m4 (gl_FUNC_TTYNAME_R): Move AC_LIBOBJ and gl_PREREQ_TTYNAME_R invocations from here... * modules/ttyname_r (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/ttyname_r.m4 | 6 +----- modules/ttyname_r | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7dc3c1b4..84009ea71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + ttyname_r: Move AC_LIBOBJ invocations to module description. + * m4/ttyname_r.m4 (gl_FUNC_TTYNAME_R): Move AC_LIBOBJ and + gl_PREREQ_TTYNAME_R invocations from here... + * modules/ttyname_r (configure.ac): ... to here. + +2011-05-22 Bruno Haible + tsearch: Move AC_LIBOBJ invocations to module description. * m4/tsearch.m4 (gl_FUNC_TSEARCH): Move AC_LIBOBJ and gl_PREREQ_TSEARCH invocations from here... diff --git a/m4/ttyname_r.m4 b/m4/ttyname_r.m4 index 5d26bc93b..a0308a6c3 100644 --- a/m4/ttyname_r.m4 +++ b/m4/ttyname_r.m4 @@ -1,4 +1,4 @@ -# ttyname_r.m4 serial 7 +# ttyname_r.m4 serial 8 dnl Copyright (C) 2010-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, @@ -93,10 +93,6 @@ main (void) esac fi fi - if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then - AC_LIBOBJ([ttyname_r]) - gl_PREREQ_TTYNAME_R - fi ]) # Prerequisites of lib/ttyname_r.c. diff --git a/modules/ttyname_r b/modules/ttyname_r index 8e79bf32c..f68d9b19a 100644 --- a/modules/ttyname_r +++ b/modules/ttyname_r @@ -11,6 +11,10 @@ extensions configure.ac: gl_FUNC_TTYNAME_R +if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then + AC_LIBOBJ([ttyname_r]) + gl_PREREQ_TTYNAME_R +fi gl_UNISTD_MODULE_INDICATOR([ttyname_r]) Makefile.am: -- 2.11.0