From 3e75ff64553e0efdfb189314f86b26ad41792147 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sat, 26 Sep 2009 00:38:22 +0200
Subject: [PATCH] always try to link with ncursesw

---
 configure.in | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 6fe9dccc..ae20d5f7 100644
--- a/configure.in
+++ b/configure.in
@@ -76,35 +76,45 @@ dnl ========================
 dnl = checking for ncurses =
 dnl ========================
 if test "$pdcurses" = "no" ; then
-	pdcurses=XCurses
 	if test "$unicode" = "yes" ; then
 		curses_config_bin=ncursesw5-config
-		curses_lib=ncursesw
 		AC_DEFINE([_UTF8], [1], [enables unicode support])
 	else
 		curses_config_bin=ncurses5-config
-		curses_lib=ncurses
 	fi
 else
 	if test "$pdcurses" = "yes" ; then
-		pdcurses=XCurses
+		pdcurses_lib=XCurses
+		curses_config_bin=xcurses-config
+	else
+		pdcurses_lib=$pdcurses
 	fi
-	curses_config_bin=xcurses-config
-	curses_lib=$pdcurses
 	AC_DEFINE([USE_PDCURSES], [1], [enables pdcurses support])
 fi
 AC_PATH_PROG(CURSES_CONFIG, $curses_config_bin)
-if test "$pdcurses" = "XCurses" && test "$CURSES_CONFIG" != "" ; then
+if test "$CURSES_CONFIG" != "" ; then
 	CPPFLAGS="$CPPFLAGS `$CURSES_CONFIG --cflags`"
 	LDFLAGS="$LDFLAGS `$CURSES_CONFIG --libs`"
-	AC_CHECK_LIB($curses_lib, initscr, , AC_MSG_ERROR([$curses_lib library is required]))
-else
-	AC_CHECK_LIB($curses_lib, initscr, LDFLAGS="$LDFLAGS -l$curses_lib", AC_MSG_ERROR([$curses_lib library is required]))
 fi
+if test "$pdcurses" = "no" ; then
+	AC_CHECK_LIB(ncursesw, initscr,
+		curses_lib=ncursesw,
+		curses_lib=ncurses
+	)
+else
+	curses_lib=$pdcurses_lib
+fi
+AC_CHECK_LIB($curses_lib, initscr,
+	if test "$CURSES_CONFIG" = "" ; then
+		LDFLAGS="$LDFLAGS -l$curses_lib"
+	fi
+	,
+	AC_MSG_ERROR([$curses_lib library is required])
+	)
 if test "$pdcurses" != "no" ; then
 	AC_CHECK_LIB($curses_lib, Xinitscr, AC_DEFINE([XCURSES], [1], [x11 pdcurses available]), )
 fi
-AC_CHECK_HEADERS([curses.h], , AC_MSG_ERROR([missing ncurses.h header]))
+AC_CHECK_HEADERS([curses.h], , AC_MSG_ERROR([missing curses.h header]))
 
 dnl ======================
 dnl = checking for fftw3 =