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 /configure.in | |
| 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 'configure.in')
| -rw-r--r-- | configure.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 44e9d286e1f..2fde26d5930 100644 --- a/configure.in +++ b/configure.in @@ -775,6 +775,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> @@ -810,6 +813,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 ], |