From a069db06a64a34b64a8cdb944042eccf7e66cacb Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Sun, 27 May 2007 23:21:03 +0200
Subject: sql_parse.cc, config-win.h, config-netware.h:   Don't try determine
 stack direction at configure time compiler_flag.m4:   Use AC_TRY_COMPILE and
 AC_TRY_LINK instead of AC_TRY_RUN where possible misc.m4, configure.in:   Use
 fourth argument to AC_TRY_RUN, to be used in cross compilation   Don't try
 determine stack direction at configure time

---
 config/ac-macros/compiler_flag.m4 |  2 +-
 config/ac-macros/misc.m4          | 27 +++------------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

(limited to 'config')

diff --git a/config/ac-macros/compiler_flag.m4 b/config/ac-macros/compiler_flag.m4
index 88097c7a62e..ce2ce6cbdfa 100644
--- a/config/ac-macros/compiler_flag.m4
+++ b/config/ac-macros/compiler_flag.m4
@@ -7,7 +7,7 @@ AC_DEFUN([AC_SYS_COMPILER_FLAG],
   AC_CACHE_VAL(mysql_cv_option_$2,
   [
     CFLAGS="[$]OLD_CFLAGS $1"
-    AC_TRY_RUN([int main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
+    AC_TRY_LINK([int main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
  ])
 
   CFLAGS="[$]OLD_CFLAGS"
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index a20db96a950..0619a52fbbf 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -450,29 +450,6 @@ 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=0)])
- 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)
@@ -488,7 +465,9 @@ int main()
   fprintf(file,"%g\n",f);
   fclose(file);
   return (0);
-}], ac_cv_conv_longlong_to_float=`cat conftestval`, ac_cv_conv_longlong_to_float=0, ifelse([$2], , , ac_cv_conv_longlong_to_float=$2))])dnl
+}], ac_cv_conv_longlong_to_float=`cat conftestval`,
+    ac_cv_conv_longlong_to_float=0,
+    ac_cv_conv_longlong_to_float="yes")])dnl  # Cross compiling, assume can convert
 if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
 then
   ac_cv_conv_longlong_to_float=yes
-- 
cgit v1.2.1