- Issue #3754: Use AC_PATH_TOOL and AC_CHECK_TOOLS instead of
AC_PATH_PROG and AC_CHECK_PROGS for the target tools.
This commit is contained in:
parent
93df16bb16
commit
51f6594054
10
configure.ac
10
configure.ac
|
@ -608,9 +608,9 @@ preset_cxx="$CXX"
|
||||||
if test -z "$CXX"
|
if test -z "$CXX"
|
||||||
then
|
then
|
||||||
case "$CC" in
|
case "$CC" in
|
||||||
gcc) AC_PATH_PROG(CXX, [g++], [g++], [notfound]) ;;
|
gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
|
||||||
cc) AC_PATH_PROG(CXX, [c++], [c++], [notfound]) ;;
|
cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
|
||||||
clang|*/clang) AC_PATH_PROG(CXX, [clang++], [clang++], [notfound]) ;;
|
clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
|
||||||
esac
|
esac
|
||||||
if test "$CXX" = "notfound"
|
if test "$CXX" = "notfound"
|
||||||
then
|
then
|
||||||
|
@ -619,7 +619,7 @@ then
|
||||||
fi
|
fi
|
||||||
if test -z "$CXX"
|
if test -z "$CXX"
|
||||||
then
|
then
|
||||||
AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
|
AC_CHECK_TOOLS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, notfound)
|
||||||
if test "$CXX" = "notfound"
|
if test "$CXX" = "notfound"
|
||||||
then
|
then
|
||||||
CXX=""
|
CXX=""
|
||||||
|
@ -916,7 +916,7 @@ AC_MSG_RESULT($LDLIBRARY)
|
||||||
|
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_SUBST(AR)
|
AC_SUBST(AR)
|
||||||
AC_CHECK_PROGS(AR, ar aal, ar)
|
AC_CHECK_TOOLS(AR, ar aal, ar)
|
||||||
|
|
||||||
# tweak ARFLAGS only if the user didn't set it on the command line
|
# tweak ARFLAGS only if the user didn't set it on the command line
|
||||||
AC_SUBST(ARFLAGS)
|
AC_SUBST(ARFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue