Merge 8.6

2 files changed, 33 insertions, 0 deletions

diff --git a/unix/configure b/unix/configure
index 3d24f28..26126b9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8238,6 +8238,36 @@ printf "%s\n" "#define NO_WAIT3 1" >>confdefs.h
 
 fi
 
+ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+if test "x$ac_cv_func_fork" = xyes
+then :
+
+else $as_nop
+
+printf "%s\n" "#define NO_FORK 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod"
+if test "x$ac_cv_func_mknod" = xyes
+then :
+
+else $as_nop
+
+printf "%s\n" "#define NO_MKNOD 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "tcdrain" "ac_cv_func_tcdrain"
+if test "x$ac_cv_func_tcdrain" = xyes
+then :
+
+else $as_nop
+
+printf "%s\n" "#define NO_TCDRAIN 1" >>confdefs.h
+
+fi
+
 ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
 if test "x$ac_cv_func_uname" = xyes
 then :
diff --git a/unix/configure.ac b/unix/configure.ac
index 7acb5ce..de44ed7 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -233,6 +233,9 @@ AC_REPLACE_FUNCS(mkstemp opendir strtol waitpid)
 AC_CHECK_FUNC(strerror, , [AC_DEFINE(NO_STRERROR, 1, [Do we have strerror()])])
 AC_CHECK_FUNC(getwd, , [AC_DEFINE(NO_GETWD, 1, [Do we have getwd()])])
 AC_CHECK_FUNC(wait3, , [AC_DEFINE(NO_WAIT3, 1, [Do we have wait3()])])
+AC_CHECK_FUNC(fork, , [AC_DEFINE(NO_FORK, 1, [Do we have fork()])])
+AC_CHECK_FUNC(mknod, , [AC_DEFINE(NO_MKNOD, 1, [Do we have mknod()])])
+AC_CHECK_FUNC(tcdrain, , [AC_DEFINE(NO_TCDRAIN, 1, [Do we have tcdrain()])])
 AC_CHECK_FUNC(uname, , [AC_DEFINE(NO_UNAME, 1, [Do we have uname()])])
 
 if test "`uname -s`" = "Darwin" && \