From fde39927f0a462aee0bb63f89afc9cf2349ebdc5 Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Thu, 8 Mar 2012 11:07:12 +0100 Subject: configure.ac: Improve curses searching This is a resend of an older patch: http://www.mail-archive.com/ptxdist@pengutronix.de/msg03400.html Cygwin-1.7 places curses headers into /usr/include/ncurses. Tested on Debian, MinGW with pdcurses and Cygwin. Signed-off-by: Ladislav Michl Signed-off-by: Michael Olbrich --- configure.ac | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) mode change 100644 => 100755 configure.ac (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac old mode 100644 new mode 100755 index 780bf28aa..78597cc4e --- a/configure.ac +++ b/configure.ac @@ -36,25 +36,16 @@ AC_SEARCH_LIBS(regcomp, [regex gnuregex],, CONF_LIBS=${LIBS} AC_SUBST(CONF_LIBS) -AC_SEARCH_LIBS(mvaddch, [ncurses curses pdcurses], [CURSES_LIB=$ac_lib], - [AC_MSG_ERROR([ncurses development library not found, please install libncurses-dev])]) +AC_SEARCH_LIBS(mvaddch, [curses ncurses pdcurses], [CURSES_LIB=$ac_lib], + [AC_MSG_ERROR([curses 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=''], - AC_MSG_ERROR([Cannot find ncurses.h.]) - ) -else - AC_CHECK_HEADER( - [curses.h], - [CURSES_LOC=''], - AC_MSG_ERROR([Cannot find curses.h.]) - ) -fi +AC_CHECK_HEADERS( + [curses.h ncurses.h ncurses/curses.h ncurses/ncurses.h pdcurses.h pdcurses/curses.h pdcurses/pdcurses.h], + [CURSES_LOC="<$ac_header>";found_curses_headers=yes; break;]) +AS_IF([test "x$CURSES_LOC" = "x"], + [AC_MSG_ERROR([curses headers not found])]) AC_SUBST(CURSES_LOC) AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses],[Include path to the ncurses headers]), -- cgit v1.2.3