summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-25 22:44:27 +0300
committerunknown <monty@donna.mysql.fi>2001-04-25 22:44:27 +0300
commit97907ee8d723a9143734655151153e2c6243ab28 (patch)
tree681105409812886e617023277721945b0d24d385 /configure.in
parent028c259d0cf1c9b7d1d0819c10c689e602bb8482 (diff)
downloadmariadb-git-97907ee8d723a9143734655151153e2c6243ab28.tar.gz
Portability fixes for Ia64 and Sgi compiler
DROP DATABASE in mysqladmin asks for confirmation (again) Added examined_rows to slow query log SHOW CREATE for TEMPORARY table BitKeeper/deleted/.del-shw000001.result~8b20b03d8319b9a5: Delete: mysql-test/r/shw000001.result BitKeeper/deleted/.del-shw000001.test~770d96a2c1c65b20: Delete: mysql-test/t/shw000001.test Docs/manual.texi: Added information about InnoDB and TEMPORARY tables acinclude.m4: Portability fixes client/errmsg.c: merge with libmysqd/errmsg.c client/mysqladmin.c: DROP DATABASE asks for confirmation (again) client/mysqltest.c: Portability fixes configure.in: Portability fixes for SGI compiler on Ia64 extra/resolve_stack_dump.c: Portability fixes include/global.h: Portability fixes isam/_dbug.c: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes mysql-test/r/show_check.result: New test for SHOW CREATE mysql-test/t/show_check.test: New test for SHOW CREATE scripts/make_binary_distribution.sh: Added missing files sql/filesort.cc: Added examined_rows to slow query log sql/log.cc: Added examined_rows to slow query log sql/mysql_priv.h: Added examined_rows to slow query log sql/mysqlbinlog.cc: Fixed core dump when using wrong option sql/mysqld.cc: Removed not used argument sql/sql_base.cc: Fixed name problem with SHOW CREATE for TEMPORARY table sql/sql_class.h: Added examined_rows to slow query log sql/sql_parse.cc: Added examined_rows to slow query log sql/sql_select.cc: Added examined_rows to slow query log sql/sql_select.h: Added examined_rows to slow query log sql/sql_show.cc: Fixed SHOW CREATE for TEMPORARY table sql/sql_table.cc: Added examined_rows to slow query log
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index c22014eaa19..021f25308d8 100644
--- a/configure.in
+++ b/configure.in
@@ -119,6 +119,17 @@ AC_PROG_AWK
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
+
+# Fix for sgi gcc / sgiCC which tries to emulate gcc
+if test "$CC" = "sgicc"
+then
+ ac_cv_prog_gcc="no"
+fi
+if test "$CXX" = "sgi++"
+then
+ GXX="no"
+fi
+
if test "$ac_cv_prog_gcc" = "yes"
then
AS="$CC -c"
@@ -390,7 +401,7 @@ AM_PROG_CC_STDC
if test "$am_cv_prog_cc_stdc" = "no"
then
- AC_MSG_ERROR([MySQL requiers a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
+ AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
fi
NOINST_LDFLAGS=
@@ -1215,7 +1226,7 @@ fi
AC_SUBST(COMPILATION_COMMENT)
AC_MSG_CHECKING("need of special linking flags")
-if test "$IS_LINUX" = "true" -a "$all_is_static" != "yes"
+if test "$IS_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
then
LDFLAGS="$LDFLAGS -rdynamic"
AC_MSG_RESULT("-rdynamic")