diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-25 16:23:47 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-25 16:23:47 +0300 |
| commit | 2c357f1515a80087dfb4b5825b8f0f36484a970b (patch) | |
| tree | e4cc99596db9ea6d5c9136b1284975d163a6a531 /config | |
| parent | aa6c8799446971451d9fa80a0263e22f58d218fe (diff) | |
| parent | 1517db6ba13a6ce79e215b33afac2402130ea897 (diff) | |
| download | mariadb-git-2c357f1515a80087dfb4b5825b8f0f36484a970b.tar.gz | |
Automerge
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/misc.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 2fbb30383bd..2e62a4b3c88 100644 --- 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 |