diff options
author | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
commit | c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9 (patch) | |
tree | 31119bae32d48d3c415144eb5aed588455eefa1a /configure.in | |
parent | dcf4e49369d91b78ab73b9de038d2729afb3a2a6 (diff) | |
parent | 9a846a52ae62f701c2d54d3f468e2ead393acf91 (diff) | |
download | mariadb-git-c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9.tar.gz |
merge
configure.in:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 4a8b5dbfa4c..6811404bc35 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.27-beta) +AM_INIT_AUTOMAKE(mysql, 3.23.28-gamma) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -687,6 +687,8 @@ case $SYSTEM_TYPE in then CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS" CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS" + CFLAGS="$CFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE" + CXXFLAGS="$CXXFLAGS -traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE" MAX_C_OPTIMIZE="-O" with_named_curses="" fi @@ -1235,13 +1237,13 @@ AC_FUNC_UTIME_NULL AC_FUNC_VPRINTF AC_CHECK_FUNCS(alarm bmove \ chsize ftruncate rint finite fpsetmask fpresetsticky\ - cuserid fcntl fconvert \ + cuserid fcntl fconvert poll \ getrusage getpwuid getcwd getrlimit getwd index stpcpy locking longjmp \ perror pread realpath rename \ socket strnlen madvise mkstemp \ strtol strtoul strtoull snprintf tempnam thr_setconcurrency \ gethostbyaddr_r gethostbyname_r getpwnam \ - bfill bzero bcmp strstr strpbrk strerror\ + bfill bzero bcmp strstr strpbrk strerror \ tell atod memcpy memmove \ setupterm strcasecmp sighold \ vidattr setupterm lrand48 localtime_r \ |