From: David CARLIER <devne...@gmail.com>
Instead of using an OS-specific ifdef test to select the "openpty()
is in pty.h" codepath, make configure check for the existence of
the header and use the new CONFIG_PTY instead.
This is necessary to build on Haiku, which also provides openpty()
via pty.h.
Signed-off-by: David Carlier <devne...@gmail.com>
[PMM: Expanded commit message]
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
configure | 9 +++++++++
util/qemu-openpty.c | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index c9c135b70bc..5455ae10d05 100755
--- a/configure
+++ b/configure
@@ -2386,6 +2386,12 @@ else
l2tpv3=no
fi
+if check_include "pty.h" ; then
+ pty_h=yes
+else
+ pty_h=no
+fi
+
#########################################
# vhost interdependencies and host support
@@ -7856,6 +7862,9 @@ fi
if test "$sheepdog" = "yes" ; then
echo "CONFIG_SHEEPDOG=y" >> $config_host_mak
fi
+if test "$pty_h" = "yes" ; then
+ echo "CONFIG_PTY=y" >> $config_host_mak
+fi
if test "$fuzzing" = "yes" ; then
if test "$have_fuzzer" = "yes"; then
FUZZ_LDFLAGS=" -fsanitize=address,fuzzer"
diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
index 2e8b43bdf57..9d8ad6905e0 100644
--- a/util/qemu-openpty.c
+++ b/util/qemu-openpty.c
@@ -35,7 +35,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#if defined(__GLIBC__)
+#if defined CONFIG_PTY
# include <pty.h>
#elif defined CONFIG_BSD
# include <termios.h>
--
2.20.1
