diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-02 14:01:26 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-02 14:01:26 +0400 |
| commit | 6633d23f0254f8d614debce16ffa90a61ed4935f (patch) | |
| tree | c68d67987c26b2d664b5cdab6edf6a8a37f06c58 /configure.in | |
| parent | 7d9eaa3fce8b69ea9ed656b4adef71365a2a3c24 (diff) | |
| parent | 36d2769928f7e9f14a9d5d2040b4197a57bcba0a (diff) | |
| download | mariadb-git-6633d23f0254f8d614debce16ffa90a61ed4935f.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict configure.in
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index c2770536d1f..26f31dfd844 100644 --- a/configure.in +++ b/configure.in @@ -844,8 +844,8 @@ AC_TYPE_SIZE_T AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h ieeefp.h limits.h \ - memory.h pwd.h select.h poll.h \ +AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h fpu_control.h \ + ieeefp.h limits.h memory.h pwd.h select.h poll.h \ stdlib.h stddef.h \ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \ |