ncurses 6.0

[ncurses.git] / test / aclocal.m4

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 9e6de5a6a54f13fe1649fe57467b30336b4d3d43..0ea83b55135771270f1b5c89e76a05f564809375 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.116 2015/05/30 00:58:37 tom Exp $
+dnl $Id: aclocal.m4,v 1.120 2015/08/08 14:27:27 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -1912,7 +1912,7 @@ printf("old\n");
        ,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 15 updated: 2015/05/28 20:56:07
+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 +1926,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)
@@ -1947,10 +1947,10 @@ if test "x$PKG_CONFIG" != xnone; then
                                { char *xx = curses_version(); return (xx == 0); }],
                                [cf_have_ncuconfig=yes],
                                [cf_have_ncuconfig=no],
-                               [cf_have_ncuconfig=unknown])],
+                               [cf_have_ncuconfig=maybe])],
                        [cf_have_ncuconfig=no])
-
                AC_MSG_RESULT($cf_have_ncuconfig)
+               test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
                if test "$cf_have_ncuconfig" != "yes"
                then
                        CPPFLAGS="$cf_save_CPPFLAGS"