From d32091d448be95c7c2223541a26a4508465e3637 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 17:24:06 +0200 Subject: [PATCH] openpty: Move AC_LIBOBJ invocations to module description. * m4/pty.m4 (gl_FUNC_OPENPTY): Move AC_LIBOBJ invocations from here... * modules/openpty (configure.ac): ... to here. --- ChangeLog | 6 ++++++ m4/pty.m4 | 5 ++--- modules/openpty | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1d34cb5..f8324999c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-05-21 Bruno Haible + openpty: Move AC_LIBOBJ invocations to module description. + * m4/pty.m4 (gl_FUNC_OPENPTY): Move AC_LIBOBJ invocations from here... + * modules/openpty (configure.ac): ... to here. + +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. diff --git a/m4/pty.m4 b/m4/pty.m4 index 1042a4061..fc99e73b6 100644 --- a/m4/pty.m4 +++ b/m4/pty.m4 @@ -1,4 +1,4 @@ -# pty.m4 serial 10 +# pty.m4 serial 11 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, @@ -124,14 +124,13 @@ AC_DEFUN([gl_FUNC_OPENPTY], ]) if test $gl_cv_func_openpty_const != yes; then REPLACE_OPENPTY=1 - AC_LIBOBJ([openpty]) AC_DEFINE([HAVE_OPENPTY], [1], [Define to 1 if the system has the 'openpty' function.]) fi else dnl The system does not have openpty. HAVE_OPENPTY=0 - AC_LIBOBJ([openpty]) + dnl Prerequisites of lib/openpty.c in this case. AC_CHECK_FUNCS([_getpty posix_openpt]) fi ]) diff --git a/modules/openpty b/modules/openpty index b2d96857e..27a8bfc04 100644 --- a/modules/openpty +++ b/modules/openpty @@ -13,6 +13,9 @@ ioctl configure.ac: gl_FUNC_OPENPTY +if test $HAVE_OPENPTY = 0 || test $REPLACE_OPENPTY = 1; then + AC_LIBOBJ([openpty]) +fi gl_PTY_MODULE_INDICATOR([openpty]) Makefile.am: -- 2.11.0