summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvoj@mysql.com <>2005-06-23 21:29:44 +0500
committersvoj@mysql.com <>2005-06-23 21:29:44 +0500
commit367017d630d89a9cb6c5b9fc9189b4216ee66dd1 (patch)
tree7e5898f4bccacf80838cba216436eb38c4d2a069
parentb720c6e5354e09ec406b5b400051df985ec27801 (diff)
downloadmariadb-git-367017d630d89a9cb6c5b9fc9189b4216ee66dd1.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Fix for compilation failure with Forte Developer C++.
-rw-r--r--configure.in2
-rw-r--r--innobase/configure.in7
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index ae26a0c44df..58682063593 100644
--- a/configure.in
+++ b/configure.in
@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS)
AC_SUBST(LD)
AC_SUBST(INSTALL_SCRIPT)
-export CC CXX CFLAGS LD LDFLAGS AR
+export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
if test "$GCC" = "yes"
then
diff --git a/innobase/configure.in b/innobase/configure.in
index baf11272ab9..c56bd8274c4 100644
--- a/innobase/configure.in
+++ b/innobase/configure.in
@@ -117,6 +117,13 @@ case "$target" in
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
esac
+# must go in pair with AR as set by MYSQL_CHECK_AR
+if test -z "$ARFLAGS"
+then
+ ARFLAGS="cru"
+fi
+AC_SUBST(ARFLAGS)
+
AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
buf/Makefile data/Makefile dnl
dict/Makefile dyn/Makefile dnl