Cygwin-1.7 places curses headers into /usr/include/ncurses.
Tested on Debian, MinGW with pdcurses and Cygwin.
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
configure.ac | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index e662040..b2b4021 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,33 +30,19 @@ dnl
AC_HEADER_STDC
AC_CHECK_HEADER([regex.h], [], AC_MSG_ERROR([Cannot find regex.h.]))
-
AC_SEARCH_LIBS(regcomp, [regex gnuregex],,
AC_MSG_ERROR([POSIX regex required.]))
CONF_LIBS=${LIBS}
AC_SUBST(CONF_LIBS)
+AC_CHECK_HEADERS(ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h
pdcurses/pdcurses.h pdcurses/curses.h pdcurses.h,
+ [CURSES_LOC="<$ac_header>"; break])
+AC_SUBST(CURSES_LOC)
AC_SEARCH_LIBS(mvaddch, [ncurses curses pdcurses], [CURSES_LIB=$ac_lib],
[AC_MSG_ERROR([ncurses development library not found, please install
libncurses-dev])])
MCONF_LIBS=${LIBS}
AC_SUBST(MCONF_LIBS)
-if test "$CURSES_LIB" = "ncurses"
-then
- AC_CHECK_HEADER(
- [ncurses.h],
- [CURSES_LOC='<ncurses.h>'],
- AC_MSG_ERROR([Cannot find ncurses.h.])
- )
-else
- AC_CHECK_HEADER(
- [curses.h],
- [CURSES_LOC='<curses.h>'],
- AC_MSG_ERROR([Cannot find curses.h.])
- )
-fi
-AC_SUBST(CURSES_LOC)
-
AC_SYS_INTERPRETER
if test "$interpval" != yes ; then
AC_MSG_WARN([no
--
ptxdist mailing list
ptxdist@pengutronix.de
