From 66142aa77cb930d2fb6848b6515efb185a7e1c68 Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Wed, 6 Feb 2008 06:41:05 +0100 Subject: [PATCH] configure --disable-pty also disabled option waitlock --- CHANGES | 2 ++ VERSION | 2 +- xioopts.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 25cb4a8..a500366 100644 --- a/CHANGES +++ b/CHANGES @@ -29,6 +29,8 @@ corrections: corrected option handling with STDIO; usecase: cool-write + configure --disable-pty also disabled option waitlock + fixed small bugs on systems with struct ip_mreq without struct ip_mreqn (thanks to Roland Illig for sending a patch) diff --git a/VERSION b/VERSION index eece788..53312dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval+mreq_help" +"1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval+mreq_help+waitlock" diff --git a/xioopts.c b/xioopts.c index 57c4f47..1ccdca3 100644 --- a/xioopts.c +++ b/xioopts.c @@ -1535,7 +1535,9 @@ const struct optname optionnames[] = { #endif #if HAVE_PTY && HAVE_POLL IF_PTY ("wait-slave", &opt_pty_wait_slave) +#endif /* HAVE_PTY && HAVE_POLL */ IF_ANY ("waitlock", &opt_waitlock) +#if HAVE_PTY && HAVE_POLL IF_PTY ("waitslave", &opt_pty_wait_slave) #endif /* HAVE_PTY && HAVE_POLL */ #ifdef VWERASE