From: Bruno Haible Date: Sun, 22 May 2011 12:59:53 +0000 (+0200) Subject: tcgetsid: Move AC_LIBOBJ invocations to module description. X-Git-Tag: v0.1~2402 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=1ba926b8e0433000aa9183a2c68f4f8a4fcc5d40;p=gnulib.git tcgetsid: Move AC_LIBOBJ invocations to module description. * m4/tcgetsid.m4 (gl_FUNC_TCGETSID): Set HAVE_TCGETSID. Move AC_LIBOBJ and gl_PREREQ_TCGETSID invocations from here... * modules/tcgetsid (configure.ac): ... to here. (Depends-on): Update conditions. --- diff --git a/ChangeLog b/ChangeLog index b30a82b8c..fb057cf74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-22 Bruno Haible + tcgetsid: Move AC_LIBOBJ invocations to module description. + * m4/tcgetsid.m4 (gl_FUNC_TCGETSID): Set HAVE_TCGETSID. Move AC_LIBOBJ + and gl_PREREQ_TCGETSID invocations from here... + * modules/tcgetsid (configure.ac): ... to here. + (Depends-on): Update conditions. + +2011-05-22 Bruno Haible + symlinkat: Move AC_LIBOBJ invocations to module description. * m4/symlinkat.m4 (gl_FUNC_SYMLINKAT): Move AC_LIBOBJ invocation from here... diff --git a/m4/tcgetsid.m4 b/m4/tcgetsid.m4 index f8ab91e21..31e034a76 100644 --- a/m4/tcgetsid.m4 +++ b/m4/tcgetsid.m4 @@ -1,4 +1,4 @@ -# tcgetsid.m4 serial 2 +# tcgetsid.m4 serial 3 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, @@ -17,9 +17,10 @@ AC_DEFUN([gl_FUNC_TCGETSID], fi AC_CHECK_FUNCS([tcgetsid]) - if test $ac_cv_func_tcgetsid = no; then - AC_LIBOBJ([tcgetsid]) - gl_PREREQ_TCGETSID + if test $ac_cv_func_tcgetsid = yes; then + HAVE_TCGETSID=1 + else + HAVE_TCGETSID=0 fi ]) diff --git a/modules/tcgetsid b/modules/tcgetsid index 6dddb6eb3..38fc9e3e5 100644 --- a/modules/tcgetsid +++ b/modules/tcgetsid @@ -9,10 +9,14 @@ m4/tcgetsid.m4 Depends-on: termios extensions -sys_ioctl [test $ac_cv_func_tcgetsid = no] +sys_ioctl [test $HAVE_TCGETSID = 0] configure.ac: gl_FUNC_TCGETSID +if test $HAVE_TCGETSID = 0; then + AC_LIBOBJ([tcgetsid]) + gl_PREREQ_TCGETSID +fi gl_TERMIOS_MODULE_INDICATOR([tcgetsid]) Makefile.am: