Commit c2ee9054 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
parents d7caa2a0 e0e74450

acinclude.m4

+4 −1
Original line number Diff line number Diff line
@@ -565,7 +565,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])
@@ -573,6 +574,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

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -881,6 +881,9 @@ AC_SUBST(WRAPLIBS) 
if test "$TARGET_LINUX" = "true"; then

  AC_MSG_CHECKING([for atomic operations])



  AC_LANG_SAVE

  AC_LANG_CPLUSPLUS



  atom_ops=

  AC_TRY_RUN([

#include <asm/atomic.h>
@@ -916,6 +919,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 ],