summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2015-06-03 23:53:47 +0200
committerOliver Kiddle <opk@zsh.org>2015-06-03 23:54:09 +0200
commit4804a7c5ff144fc7cc974484d16f2f88cc131264 (patch)
tree7bbb254d5d427818e8dd5dd43b086d21ced2f81b
parentbfac7f09df6224581dcd66c30e78a440ed22b812 (diff)
downloadzsh-4804a7c5ff144fc7cc974484d16f2f88cc131264.tar.gz
zsh-4804a7c5ff144fc7cc974484d16f2f88cc131264.tar.xz
zsh-4804a7c5ff144fc7cc974484d16f2f88cc131264.zip
35360 (replacing 35357): fix for configuring zpty on FreeBSD without
pty.ko loaded
-rw-r--r--ChangeLog5
-rw-r--r--Src/Modules/zpty.c2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ee19b99d..24ec700f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-03  Oliver Kiddle  <opk@zsh.org>
+
+	* 35360 (replacing 35357): configure.ac, Src/Modules/zpty.c:
+	fix for configuring zpty on FreeBSD without pty.ko loaded
+
 2015-06-03  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 35374: Test/D07multibyte.ztst: add tab expansion test with
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index a77b0df75..7b6130c6f 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -154,7 +154,7 @@ getptycmd(char *name)
     return NULL;
 }
 
-#if defined(USE_DEV_PTMX) || defined(HAVE_POSIX_OPENPT)
+#ifdef USE_DEV_PTMX
 
 #ifdef HAVE_SYS_STROPTS_H
 #include <sys/stropts.h>
diff --git a/configure.ac b/configure.ac
index 6a99aec1d..d7db8ba8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2526,7 +2526,7 @@ dnl these is by defining _GNU_SOURCE.
 dnl -------
 AH_TEMPLATE([USE_DEV_PTMX],
 [Define to 1 if all the kit for using /dev/ptmx for ptys is available.])
-if test x$ac_cv_have_dev_ptmx = xyes && \
+if test x$ac_cv_have_dev_ptmx = xyes -o x$ac_cv_func_posix_openpt = xyes && \
    test x$ac_cv_func_grantpt = xyes && \
    test x$ac_cv_func_unlockpt = xyes && \
    test x$ac_cv_func_ptsname = xyes; then