Automerge

c1c30f9f · Alexey Kopytov · b9965ca6 · 4ee0f6a6 · c1c30f9f
Commit c1c30f9f authored Mar 25, 2009 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

config/ac-macros/misc.m4 config/ac-macros/misc.m4 +8 -5

No files found.
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -231,16 +231,19 @@ esac
 AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP],
 [
 AC_CACHE_VAL(mysql_cv_termcap_lib,
-[AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
-    [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,
-	[AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,
-          [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,
-	    mysql_cv_termcap_lib=NOT_FOUND)])])])])
+    [AC_CHECK_LIB(ncursesw, tgetent, mysql_cv_termcap_lib=libncursesw,
+        [AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
+            [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,
+                [AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,
+                    [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,
+                        mysql_cv_termcap_lib=NOT_FOUND)])])])])])
 AC_MSG_CHECKING(for termcap functions library)
 if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then
 AC_MSG_ERROR([No curses/termcap library found])
 elif test "$mysql_cv_termcap_lib" = "libtermcap"; then
 TERMCAP_LIB=-ltermcap
+elif test "$mysql_cv_termcap_lib" = "libncursesw"; then
+TERMCAP_LIB=-lncursesw
 elif test "$mysql_cv_termcap_lib" = "libncurses"; then
 TERMCAP_LIB=-lncurses
 elif test "$mysql_cv_termcap_lib" = "libtinfo"; then