diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-04-10 22:00:03 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-04-10 22:00:03 +0300 |
| commit | 3d3595d66d9f07fbc13f3f7c48530a727f07b49d (patch) | |
| tree | 8b023b347f85926bbd6841491a5b4865ceb9d8e2 | |
| parent | 747f81c22c3099860ed0babe1993083d3c827013 (diff) | |
| parent | 4a2eef5c7440df6fb39f29f8bc5a7e6e7bd6e5d9 (diff) | |
| download | mariadb-git-3d3595d66d9f07fbc13f3f7c48530a727f07b49d.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
| -rw-r--r-- | acinclude.m4 | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f36940670a6..ddc50d2972b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -373,7 +373,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]) @@ -381,6 +382,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 diff --git a/configure.in b/configure.in index df4b0fbd5af..0445f7a05e9 100644 --- a/configure.in +++ b/configure.in @@ -830,6 +830,9 @@ AC_SUBST(WRAPLIBS) if test "$IS_LINUX" = "true"; then AC_MSG_CHECKING([for atomic operations]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + atom_ops= AC_TRY_RUN([ #include <asm/atomic.h> @@ -859,6 +862,8 @@ int main() if test -z "$atom_ops"; then atom_ops="no"; fi AC_MSG_RESULT($atom_ops) + AC_LANG_RESTORE + AC_ARG_WITH(pstack, [ --with-pstack Use the pstack backtrace library], [ USE_PSTACK=$withval ], |