diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-04-24 13:32:07 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-04-24 13:32:07 +0300 |
| commit | 4cfc649d2564ffda3de451e4f9073b6d1266f596 (patch) | |
| tree | b4b53f9873d5ee576a5ea0a905753163cd7fc022 /config/ac-macros | |
| parent | c7a5f503420c56522ccc63fdcac80177e00dabb1 (diff) | |
| parent | 8dc06e0f064194489ab5cb56b11537a822ad844c (diff) | |
| download | mariadb-git-4cfc649d2564ffda3de451e4f9073b6d1266f596.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/share/errmsg.txt:
merge
Diffstat (limited to 'config/ac-macros')
| -rw-r--r-- | config/ac-macros/misc.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 5346b81fb03..d8199f5970e 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -361,7 +361,8 @@ 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, - mysql_cv_termcap_lib=NOT_FOUND)])])]) + [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]) @@ -369,6 +370,8 @@ elif test "$mysql_cv_termcap_lib" = "libtermcap"; then TERMCAP_LIB=-ltermcap elif test "$mysql_cv_termcap_lib" = "libncurses"; then TERMCAP_LIB=-lncurses +elif test "$mysql_cv_termcap_lib" = "libtinfo"; then +TERMCAP_LIB=-ltinfo else TERMCAP_LIB=-lcurses fi |