bk commit into 4.1 tree (bell:1.2504)

[sanja]

Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2504 06/04/11 14:49:33 bell@stripped +2 -0
  Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

  configure.in
    1.405 06/04/11 14:49:29 bell@stripped +0 -0
    Auto merged

  acinclude.m4
    1.140 06/04/11 14:49:29 bell@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-4.1/RESYNC

--- 1.139/acinclude.m4	2006-04-01 04:22:01 +03:00
+++ 1.140/acinclude.m4	2006-04-11 14:49:29 +03:00
@@ -565,7 +565,8 @@
 [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 @@
 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

--- 1.404/configure.in	2006-01-27 13:09:14 +02:00
+++ 1.405/configure.in	2006-04-11 14:49:29 +03:00
@@ -881,6 +881,9 @@
 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>
@@ -915,6 +918,8 @@
 
   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],