summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-08 12:05:18 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-08 12:05:18 +0300
commitca1875f54033c5ea067ec3ec07b00375de6975d7 (patch)
treee4fd56548f8b7114557c187ad8aa70c1c5c26d52 /configure.in
parenta6b15fdd7682bffc2e197ac50e21332bb9bcf297 (diff)
parenta9c47d8cfc9d93dd93409c3d3681a4f726a456e5 (diff)
downloadmariadb-git-ca1875f54033c5ea067ec3ec07b00375de6975d7.tar.gz
merge
configure.in: Auto merged include/my_pthread.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 48252847f53..508ad113a55 100644
--- a/configure.in
+++ b/configure.in
@@ -1554,6 +1554,17 @@ AC_SUBST(TERMCAP_LIB)
#########################################################################
dnl Checks for library functions.
+
+#
+# The following code disables intrinsic function support while we test for
+# library functions. This is to avoid configure problems with Intel ecc
+# compiler
+
+ORG_CFLAGS="$CFLAGS"
+if test "$GCC" != "yes"; then
+ AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
+fi
+
AC_FUNC_MMAP
AC_TYPE_SIGNAL
MYSQL_TYPE_QSORT
@@ -1576,6 +1587,8 @@ AC_CHECK_FUNCS(alarm bmove \
pthread_condattr_create rwlock_init pthread_rwlock_rdlock \
fchmod getpass getpassphrase initgroups mlockall)
+CFLAGS="$ORG_CFLAGS"
+
# Sanity check: We chould not have any fseeko symbol unless
# large_file_support=yes
AC_CHECK_FUNCS(fseeko,