1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
This commit is contained in:
svoj@mysql.com 2005-06-22 17:17:40 +05:00
commit 1b59ffb8a8
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/ac-macros/misc.m4
View File

@ -737,3 +737,32 @@ then
fi fi
AC_SUBST(CXX_VERSION) AC_SUBST(CXX_VERSION)
]) ])
AC_DEFUN([MYSQL_PROG_AR], [
AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
case $CXX_VERSION in
MIPSpro*)
AR=$CXX
ARFLAGS="-ar -o"
;;
*Forte*)
AR=$CXX
ARFLAGS="-xar -o"
;;
*)
if test -z "$AR"
then
AC_CHECK_PROG([AR], [ar], [ar])
fi
if test -z "$AR"
then
AC_MSG_ERROR([You need ar to build the library])
fi
if test -z "$ARFLAGS"
then
ARFLAGS="cru"
fi
esac
AC_SUBST(AR)
AC_SUBST(ARFLAGS)
])

10
configure.in
View File

@ -354,15 +354,7 @@ then
[1], [Defined by configure. Use explicit template instantiation.]) [1], [Defined by configure. Use explicit template instantiation.])
fi fi
case $CXX_VERSION in MYSQL_PROG_AR
MIPSpro*)
AR=$CXX
ARFLAGS="-ar -o"
;;
*Forte*)
AR=$CXX
ARFLAGS="-xar -o"
esac
# Avoid bug in fcntl on some versions of linux # Avoid bug in fcntl on some versions of linux
AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os") AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")