Commit c80c290e authored by Alexandre Julliard's avatar Alexandre Julliard

In assembler check, try to use gas first (based on a patch by Robert

Lunnon).
parent 2eab8afa
...@@ -4189,8 +4189,10 @@ echo "$as_me: error: no suitable lex found. Please install the 'flex' package." ...@@ -4189,8 +4189,10 @@ echo "$as_me: error: no suitable lex found. Please install the 'flex' package."
fi fi
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. for ac_prog in gas as
set dummy ${ac_tool_prefix}as; ac_word=$2 do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5 echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AS+set}" = set; then if test "${ac_cv_prog_AS+set}" = set; then
...@@ -4206,7 +4208,7 @@ do ...@@ -4206,7 +4208,7 @@ do
test -z "$as_dir" && as_dir=. test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AS="${ac_tool_prefix}as" ac_cv_prog_AS="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2 break 2
fi fi
...@@ -4224,11 +4226,15 @@ else ...@@ -4224,11 +4226,15 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
test -n "$AS" && break
done
fi fi
if test -z "$ac_cv_prog_AS"; then if test -z "$AS"; then
ac_ct_AS=$AS ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args. for ac_prog in gas as
set dummy as; ac_word=$2 do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5 echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_AS+set}" = set; then if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
...@@ -4244,14 +4250,13 @@ do ...@@ -4244,14 +4250,13 @@ do
test -z "$as_dir" && as_dir=. test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_AS="as" ac_cv_prog_ac_ct_AS="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2 break 2
fi fi
done done
done done
test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="as"
fi fi
fi fi
ac_ct_AS=$ac_cv_prog_ac_ct_AS ac_ct_AS=$ac_cv_prog_ac_ct_AS
...@@ -4263,9 +4268,11 @@ else ...@@ -4263,9 +4268,11 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
test -n "$ac_ct_AS" && break
done
test -n "$ac_ct_AS" || ac_ct_AS="as"
AS=$ac_ct_AS AS=$ac_ct_AS
else
AS="$ac_cv_prog_AS"
fi fi
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
......
...@@ -83,7 +83,7 @@ then ...@@ -83,7 +83,7 @@ then
AC_MSG_ERROR([no suitable lex found. Please install the 'flex' package.]) AC_MSG_ERROR([no suitable lex found. Please install the 'flex' package.])
fi fi
AC_CHECK_TOOL(AS,as,as) AC_CHECK_TOOLS(AS,[gas as],as)
AC_CHECK_TOOL(LD,ld,ld) AC_CHECK_TOOL(LD,ld,ld)
AC_CHECK_TOOL(AR,ar,ar) AC_CHECK_TOOL(AR,ar,ar)
AC_PROG_RANLIB AC_PROG_RANLIB
......
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