Mercurial > hg > octave-shane > gnulib-hg

changeset 15066:554c82adb9b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 17:24:06 +0200
parents 580ad7c3aa8c
children 9ef4a2568d37
files ChangeLog m4/pty.m4 modules/openpty
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	forkpty: Move AC_LIBOBJ invocations to module description.
--- 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 @@
       ])
     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
 ])
--- a/modules/openpty
+++ b/modules/openpty
@@ -13,6 +13,9 @@
 
 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: