diff options
author | unknown <jimw@mysql.com> | 2005-08-31 19:12:16 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-31 19:12:16 -0700 |
commit | d1c80dd648ecfdea14af7332395facec2d0552a4 (patch) | |
tree | d1f472d71ff75d1aa210d6a6e3c0a0ade588ac60 /configure.in | |
parent | bdddd8c089c05ac8e74ab4996c601175d52a5dc8 (diff) | |
parent | 1b6fdf86f93c63b10841d16da5fd403302c259da (diff) | |
download | mariadb-git-d1c80dd648ecfdea14af7332395facec2d0552a4.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
include/my_global.h:
Auto merged
myisam/mi_extra.c:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysys/my_access.c:
Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
Auto merged
sql/examples/ha_tina.cc:
Resolve conflict
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 849127661bb..97e07baffd4 100644 --- a/configure.in +++ b/configure.in @@ -1957,6 +1957,13 @@ AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, AC_LANG_SAVE AC_LANG_CPLUSPLUS +# Test whether madvise() is declared in C++ code -- it is not on some +# systems, such as Solaris +AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H +#include <sys/types.h> +#include <sys/mman.h> +#endif]) + # Do not treat warnings as errors if we are linking against other libc # this is to work around gcc not being permissive on non-system includes # with respect to ANSI C++ |