From cb92aa47a1edad9b2c41aa297ec00c351105e99d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 17:21:17 +0200 Subject: [PATCH] forkpty: Move AC_LIBOBJ invocations to module description. * m4/pty.m4 (gl_FUNC_FORKPTY): Move AC_LIBOBJ invocations from here... * modules/forkpty (configure.ac): ... to here. --- ChangeLog | 6 ++++++ m4/pty.m4 | 4 +--- modules/forkpty | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee420e7e..8b1d34cb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-21 Bruno Haible + forkpty: Move AC_LIBOBJ invocations to module description. + * m4/pty.m4 (gl_FUNC_FORKPTY): Move AC_LIBOBJ invocations from here... + * modules/forkpty (configure.ac): ... to here. + +2011-05-21 Bruno Haible + ptsname: Move AC_LIBOBJ invocations to module description. * m4/ptsname.m4 (gl_FUNC_PTSNAME): Move AC_LIBOBJ and gl_PREREQ_PTSNAME invocations from here... diff --git a/m4/pty.m4 b/m4/pty.m4 index 399c34018..1042a4061 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -1,4 +1,4 @@ -# pty.m4 serial 9 +# pty.m4 serial 10 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, @@ -67,12 +67,10 @@ AC_DEFUN([gl_FUNC_FORKPTY], ]) if test $gl_cv_func_forkpty_const != yes; then REPLACE_FORKPTY=1 - AC_LIBOBJ([forkpty]) fi else dnl The system does not have forkpty. HAVE_FORKPTY=0 - AC_LIBOBJ([forkpty]) fi ]) diff --git a/modules/forkpty b/modules/forkpty index 78ba5043a..b04a4dade 100644 --- a/modules/forkpty +++ b/modules/forkpty @@ -13,6 +13,9 @@ login_tty configure.ac: gl_FUNC_FORKPTY +if test $HAVE_FORKPTY = 0 || test $REPLACE_FORKPTY = 1; then + AC_LIBOBJ([forkpty]) +fi gl_PTY_MODULE_INDICATOR([forkpty]) Makefile.am: -- 2.11.0