Commit 8790b00c authored by unknown's avatar unknown

Better AR guessing.


configure.in:
  Move AR guessing to misc.m4.
parent 6bd6b0db
...@@ -737,3 +737,32 @@ then ...@@ -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)
])
...@@ -354,15 +354,7 @@ then ...@@ -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")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment