X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fpty_h.m4;h=32b1c75b060436a66af09043170db0e757b1456f;hb=4c70b27d0ef674b04f414b8e7f6717e6a1d73a46;hp=33cb43c4fadb045d0971264c7a83c455c8d6725a;hpb=c6681a7759d6c2ef9578d57ca8e05d0ae613ff09;p=gnulib.git diff --git a/m4/pty_h.m4 b/m4/pty_h.m4 index 33cb43c4f..32b1c75b0 100644 --- a/m4/pty_h.m4 +++ b/m4/pty_h.m4 @@ -1,5 +1,5 @@ -# pty_h.m4 serial 7 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# pty_h.m4 serial 10 +dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,6 +32,8 @@ AC_DEFUN_ONCE([gl_PTY_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[ +/* is a prerequisite of on FreeBSD 8.0. */ +#include #if HAVE_PTY_H # include #endif @@ -48,9 +50,9 @@ AC_DEFUN([gl_PTY_MODULE_INDICATOR], [ dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_PTY_H_DEFAULTS]) - GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR([$1]) + gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) AC_DEFUN([gl_PTY_H_DEFAULTS], @@ -60,6 +62,7 @@ AC_DEFUN([gl_PTY_H_DEFAULTS], dnl Assume proper GNU behavior unless another module says otherwise. HAVE_UTIL_H=0; AC_SUBST([HAVE_UTIL_H]) HAVE_LIBUTIL_H=0; AC_SUBST([HAVE_LIBUTIL_H]) + HAVE_FORKPTY=1; AC_SUBST([HAVE_FORKPTY]) HAVE_OPENPTY=1; AC_SUBST([HAVE_OPENPTY]) REPLACE_FORKPTY=0; AC_SUBST([REPLACE_FORKPTY]) REPLACE_OPENPTY=0; AC_SUBST([REPLACE_OPENPTY])