summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <tsmith@ramayana.hindu.god>2007-08-01 18:32:01 -0600
committerunknown <tsmith@ramayana.hindu.god>2007-08-01 18:32:01 -0600
commitc2fa38b930caf77fee12ac798bd0a7a861692b4d (patch)
treeeb2053de1b6449a6f3fd4310899214b77a02da84 /config
parent5161bc9e5327fb26447ec9faa9f1f93d0cc8ac50 (diff)
parenta328234f607dc19fed4cb5dc97f957ee70294080 (diff)
downloadmariadb-git-c2fa38b930caf77fee12ac798bd0a7a861692b4d.tar.gz
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged CMakeLists.txt: Auto merged configure.in: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/misc.m424
1 files changed, 23 insertions, 1 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 0619a52fbbf..791cd754bc4 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -450,6 +450,29 @@ AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
fi
])dnl
+AC_DEFUN([MYSQL_STACK_DIRECTION],
+ [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+ [AC_TRY_RUN([#include <stdlib.h>
+ int find_stack_direction ()
+ {
+ static char *addr = 0;
+ auto char dummy;
+ if (addr == 0)
+ {
+ addr = &dummy;
+ return find_stack_direction ();
+ }
+ else
+ return (&dummy > addr) ? 1 : -1;
+ }
+ int main ()
+ {
+ exit (find_stack_direction() < 0);
+ }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+ ac_cv_c_stack_direction=)])
+ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+])dnl
+
AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
[
AC_MSG_CHECKING(if conversion of longlong to float works)
@@ -615,7 +638,6 @@ AC_SUBST(CXX_VERSION)
])
AC_DEFUN([MYSQL_PROG_AR], [
-AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
case $CXX_VERSION in
MIPSpro*)
AR=$CXX