ncurses 6.1 - patch 20200118

[ncurses.git] / test / aclocal.m4

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 682787dad4acba7b3bd1e224d7f3916097cc1835..423744872bee9f61f41390aa5340c2380c2034df 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.169 2020/01/12 00:01:40 tom Exp $
+dnl $Id: aclocal.m4,v 1.172 2020/01/18 17:30:44 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -3350,9 +3350,9 @@ done
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SIG_ATOMIC_T version: 3 updated: 2012/10/04 20:12:20
+dnl CF_SIG_ATOMIC_T version: 4 updated: 2020/01/18 12:30:44
 dnl ---------------
-dnl signal handler, but there are some gcc depedencies in that recommendation.
+dnl signal handler, but there are some gcc dependencies in that recommendation.
 dnl Try anyway.
 AC_DEFUN([CF_SIG_ATOMIC_T],
 [
@@ -4216,7 +4216,7 @@ if test -z "$cf_x_athena_lib" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_CPPFLAGS version: 7 updated: 2020/01/11 17:15:41
+dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56
 dnl --------------------
 dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
 dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -4249,15 +4249,15 @@ do
                AC_MSG_RESULT($cf_result)
                CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS])
                if test "$cf_result" = yes ; then
-                       cf_x_athena_inc=$cf_path
+                       test "$cf_path"  = default && cf_x_athena_inc=default
+                       test "$cf_path" != default && cf_x_athena_inc=$cf_path/include
                        break
                fi
        fi
 done
 
 if test -z "$cf_x_athena_inc" ; then
-       AC_MSG_WARN(
-[Unable to successfully find Athena header files with test program])
+       AC_MSG_WARN([Unable to find Athena header files])
 elif test "$cf_x_athena_inc" != default ; then
        CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc)
 fi