diff options
| author | unknown <acurtis@xiphis.org> | 2006-06-28 09:54:40 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-06-28 09:54:40 -0700 |
| commit | 76d0badd895c7a1a56ccf68b16bf944f93bd9870 (patch) | |
| tree | ce9c2a45a95b57ab64b04f05a47f6c0b411a1d5d /configure.in | |
| parent | 2f45384bf1eb48b9fab73bf413ceb2dc557f29b7 (diff) | |
| parent | edcba74415fc7a2ead3d65628d22efab598a61b8 (diff) | |
| download | mariadb-git-76d0badd895c7a1a56ccf68b16bf944f93bd9870.tar.gz | |
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
configure.in:
Auto merged
sql/mysqld.cc:
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 fd2cf3baf97..fe111b8a671 100644 --- a/configure.in +++ b/configure.in @@ -515,6 +515,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 |