ncurses 6.0 - patch 20151017

[ncurses.git] / test / aclocal.m4

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 577f419176a39e922d9c0303f4fde7cf00bdc8f8..d4f72400729338faa0abbc250d605de58a18a1bd 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.119 2015/06/06 18:01:51 tom Exp $
+dnl $Id: aclocal.m4,v 1.122 2015/10/17 23:06:10 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1297,6 +1297,34 @@ rm -f core])
 test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
 ])
 dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
+dnl ---------------
+dnl Check for openpty() function, along with <pty.h> header.  It may need the
+dnl "util" library as well.
+AC_DEFUN([CF_FUNC_OPENPTY],
+[
+AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
+AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
+       cf_save_LIBS="$LIBS"
+       test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
+       for cf_header in pty.h libutil.h util.h
+       do
+       AC_TRY_LINK([
+#include <$cf_header>
+],[
+       int x = openpty((int *)0, (int *)0, (char *)0,
+                                  (struct termios *)0, (struct winsize *)0);
+],[
+               cf_cv_func_openpty=$cf_header
+               break
+],[
+               cf_cv_func_openpty=no
+])
+       done
+       LIBS="$cf_save_LIBS"
+])
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
@@ -1912,7 +1940,7 @@ printf("old\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 16 updated: 2015/06/06 14:00:48
+dnl CF_NCURSES_CONFIG version: 17 updated: 2015/07/07 04:22:07
 dnl -----------------
 dnl Tie together the configure-script macros for ncurses, preferring these in
 dnl order:
@@ -1926,7 +1954,7 @@ AC_REQUIRE([CF_PKG_CONFIG])
 cf_ncuconfig_root=ifelse($1,,ncurses,$1)
 cf_have_ncuconfig=no
 
-if test "x$PKG_CONFIG" != xnone; then
+if test "x${PKG_CONFIG:=none}" != xnone; then
        AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root)
        if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
                AC_MSG_RESULT(yes)
@@ -3278,7 +3306,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3348,6 +3376,9 @@ case $host_os in
 (openbsd*)
        # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
        ;;
+(os2*)
+       cf_XOPEN_SOURCE=
+       ;;
 (osf[[45]]*)
        cf_xopen_source="-D_OSF_SOURCE"
        ;;