diff options
| author |  Keith Winstein <keithw@mit.edu> | 2012-04-24 18:04:01 -0400 |
|---|---|---|
| committer | Keith Winstein <keithw@mit.edu> | 2012-04-24 18:04:01 -0400 |
| commit | 3ccfe64bfbe5c150999a9336680c5c75a2fa8238 (patch) | |
| tree | 0e962afff10845bc74f06e3ebeecdc1ae4d6ddd5 /configure.ac | |
| parent | 6cd21080ef958ada304088fbea17c10ac9ae7c19 (diff) | |
Rewrite Cygwin test again
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e682ba0..24ec440 100644 --- a/configure.ac +++ b/configure.ac @@ -227,9 +227,6 @@ AC_CHECK_FUNCS([gettimeofday setrlimit inet_ntoa iswprint memchr memset nl_langi AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Define if clock_gettime is available.])]) -AS_IF([test x"$__CYGWIN__" != x && test x"$TINFO_CPPFLAGS" = x], - [AC_SUBST([CPPFLAGS], ["$CPPFLAGS -I/usr/include/ncurses"])]) - PKG_CHECK_MODULES([TINFO], [tinfo], , [PKG_CHECK_MODULES([TINFO], [ncurses], , [AX_CHECK_LIBRARY([TINFO], [curses.h], [tinfo], @@ -238,7 +235,11 @@ PKG_CHECK_MODULES([TINFO], [tinfo], , [AX_CHECK_LIBRARY([NCURSES], [curses.h], [ncurses], [AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS"]) AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -lncurses"])], - [AC_MSG_ERROR([Unable to find libtinfo or libncurses])])])])]) + [AC_SUBST([CPPFLAGS], ["$CPPFLAGS -I/usr/include/ncurses"]) + AX_CHECK_LIBRARY([CYGWINNCURSES], [term.h], [ncurses], + [AC_SUBST([TINFO_CFLAGS], ["$TINFO_CPPFLAGS -I/usr/include/ncurses"]) + AC_SUBST([TINFO_LIBS], ["$TINFO_LDFLAGS -lncurses"])], + [AC_MSG_ERROR([Unable to find libtinfo or libncurses.])])])])])]) AC_CHECK_DECL([forkpty], [AC_DEFINE([FORKPTY_IN_LIBUTIL], [1], |