summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-04-27 10:01:41 -0700
committerunknown <jimw@mysql.com>2005-04-27 10:01:41 -0700
commit4bbbba02c21020a3daae71f81dd990de639175cf (patch)
treef1fb5e28cc9711d545fa7ccc3e512d5ab85b455d /config
parent5a720d4e6841b8a03c95a2d251b206cb6e78ac42 (diff)
downloadmariadb-git-4bbbba02c21020a3daae71f81dd990de639175cf.tar.gz
Carry over change to fix build on ICC that was lost in merge from 4.1.
config/ac-macros/misc.m4: Try exit-related declarations before including stdlib.h, as this is how the actual code is structured.
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/misc.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index 201702e5379..d75dedafa2a 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -646,8 +646,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
'void exit (int);' \
'#include <stdlib.h>'
do
- _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <stdlib.h>
-$ac_declaration],
+ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration
+@%:@include <stdlib.h>],
[exit (42);])],
[],
[continue])