diff options
| author | unknown <kaa@polly.local> | 2004-12-17 17:31:16 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2004-12-17 17:31:16 +0300 |
| commit | 969cebfddc1358750b81bd7bf1781789b37b1ef4 (patch) | |
| tree | b9334954eb6ce28344a6c0705c7f2d0c09539c4f /configure.in | |
| parent | 31c7faaca466f1fac9afd5c90460b79a0afaea61 (diff) | |
| parent | 526fbcbbc551495d1fed482fbfa9b4f7496a935c (diff) | |
| download | mariadb-git-969cebfddc1358750b81bd7bf1781789b37b1ef4.tar.gz | |
Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 5e2ecae7d83..5c16dd2063c 100644 --- a/configure.in +++ b/configure.in @@ -749,7 +749,7 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.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 \ unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \ - sys/ioctl.h malloc.h sys/malloc.h linux/config.h) + sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h) #-------------------------------------------------------------------- # Check for system libraries. Adds the library to $LIBS @@ -776,6 +776,22 @@ AC_CHECK_FUNC(crypt, AC_DEFINE([HAVE_CRYPT], [1], [crypt])) AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) MYSQL_CHECK_ZLIB_WITH_COMPRESS +# For large pages support +if test "$IS_LINUX" = "true" +then + # For SHM_HUGETLB on Linux + AC_CHECK_DECLS(SHM_HUGETLB, + AC_DEFINE([HAVE_LARGE_PAGES], [1], + [Define if you have large pages support]) + AC_DEFINE([HUGETLB_USE_PROC_MEMINFO], [1], + [Define if /proc/meminfo shows the huge page size (Linux only)]) + , , + [ +#include <sys/shm.h> + ] + ) +fi + #-------------------------------------------------------------------- # Check for TCP wrapper support #-------------------------------------------------------------------- |