diff options
author | unknown <acurtis@ltamd64.xiphis.org> | 2006-06-22 11:00:01 -0700 |
---|---|---|
committer | unknown <acurtis@ltamd64.xiphis.org> | 2006-06-22 11:00:01 -0700 |
commit | 27066f4f53a083c2a5005d6a628159ee3457730f (patch) | |
tree | e048be8b5b1a43f0ea120dbd3ddf1458e9f4f901 /configure.in | |
parent | 54b38dd6b514a4a683dfd5376be3cb70b45b9a20 (diff) | |
parent | edcba74415fc7a2ead3d65628d22efab598a61b8 (diff) | |
download | mariadb-git-27066f4f53a083c2a5005d6a628159ee3457730f.tar.gz |
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into xiphis.org:/home/antony/work2/p4-bug12096.3
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 120863dafbd..1306a3cc74d 100644 --- a/configure.in +++ b/configure.in @@ -482,6 +482,10 @@ AM_PROG_CC_STDC # We need an assembler, too AM_PROG_AS +CCASFLAGS="$CCASFLAGS $ASFLAGS" + +# Check if we need noexec stack for assembler +AC_CHECK_NOEXECSTACK if test "$am_cv_prog_cc_stdc" = "no" then |