From e7dc853e1931ca79e4a63a4d3710a9ddf7260c90 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Tue, 16 Apr 2019 04:01:44 +0000
Subject: [PATCH] rename to *plain_ar for consistency. remove an erroneous
 space.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@56271 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 configure    | 26 +++++++++++++-------------
 configure.in |  8 ++++----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 63a3a8f43a..541a8502be 100755
--- a/configure
+++ b/configure
@@ -848,7 +848,7 @@ CP
 RM
 aros_host_strip
 aros_host_ranlib
-aros_host_full_ar
+aros_host_plain_ar
 aros_host_cmd_ar
 aros_host_automake
 aros_host_autoheader
@@ -5148,12 +5148,12 @@ fi
 set dummy $aros_host_cmd_ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_aros_host_full_ar+:} false; then :
+if ${ac_cv_path_aros_host_plain_ar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $aros_host_full_ar in
+  case $aros_host_plain_ar in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_aros_host_full_ar="$aros_host_full_ar" # Let the user override the test with a path.
+  ac_cv_path_aros_host_plain_ar="$aros_host_plain_ar" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5163,7 +5163,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_aros_host_full_ar="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_aros_host_plain_ar="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5171,21 +5171,21 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_aros_host_full_ar" && ac_cv_path_aros_host_full_ar="$aros_host_cmd_ar "
+  test -z "$ac_cv_path_aros_host_plain_ar" && ac_cv_path_aros_host_plain_ar="$aros_host_cmd_ar "
   ;;
 esac
 fi
-aros_host_full_ar=$ac_cv_path_aros_host_full_ar
-if test -n "$aros_host_full_ar"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $aros_host_full_ar" >&5
-$as_echo "$aros_host_full_ar" >&6; }
+aros_host_plain_ar=$ac_cv_path_aros_host_plain_ar
+if test -n "$aros_host_plain_ar"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $aros_host_plain_ar" >&5
+$as_echo "$aros_host_plain_ar" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-aros_host_ar=`echo $aros_host_cmd_ar | sed -e "s|$base_ar_name|$aros_host_full_ar|g"`
+aros_host_ar=`echo $aros_host_cmd_ar | sed -e "s|$base_ar_name|$aros_host_plain_ar|g"`
 req_avail=yes
 if test "$aros_host_ar" = ""; then
     req_avail=no
@@ -9463,7 +9463,7 @@ if ${ax_cv_gcc_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-    ax_cv_gcc_version="`$AROS_CROSSTOOLSDIR/${aros_tool_prefix}${toolchain_cpp_preprocessor} $(toolchain_cpp_opts) -dumpversion`"
+    ax_cv_gcc_version="`$AROS_CROSSTOOLSDIR/${aros_tool_prefix}${toolchain_cpp_preprocessor}$(toolchain_cpp_opts) -dumpversion`"
     if test "x$ax_cv_gcc_version" = "x"; then :
 
       ax_cv_gcc_version=""
@@ -10903,7 +10903,7 @@ if test "$req_avail" = "no"; then
     as_fn_error $? "as is required to build AROS. Please install and run configure again." "$LINENO" 5
 fi
         if test "x$aros_kernel_ar" = "x"; then
-            aros_kernel_ar=$aros_host_full_ar
+            aros_kernel_ar=$aros_host_plain_ar
         fi
 
 if test "$aros_kernel_ar" = ""; then
diff --git a/configure.in b/configure.in
index 4bdc92542b..8692e25e9c 100644
--- a/configure.in
+++ b/configure.in
@@ -519,8 +519,8 @@ esac
 
 base_ar_name=${HOST_TOOLCHAIN_PREFIX}ar${HOST_TOOLCHAIN_SUFFIX}
 AROS_PROG(aros_host_cmd_ar,$base_ar_name,[cr])
-AROS_PATH_PROG(aros_host_full_ar,$aros_host_cmd_ar)
-aros_host_ar=`echo $aros_host_cmd_ar | sed -e "s|$base_ar_name|$aros_host_full_ar|g"`
+AROS_PATH_PROG(aros_host_plain_ar,$aros_host_cmd_ar)
+aros_host_ar=`echo $aros_host_cmd_ar | sed -e "s|$base_ar_name|$aros_host_plain_ar|g"`
 AROS_REQUIRED(ar,$aros_host_ar)
 base_ranlib_name=${HOST_TOOLCHAIN_PREFIX}ranlib${HOST_TOOLCHAIN_SUFFIX}
 AROS_PATH_PROG(aros_host_ranlib,$base_ranlib_name)
@@ -2009,7 +2009,7 @@ fi
 AC_DEFUN([CROSS_GCC_VERSION], [
   target_gcc_version=""
   AC_CACHE_CHECK([gcc version],[ax_cv_gcc_version],[
-    ax_cv_gcc_version="`$AROS_CROSSTOOLSDIR/${aros_tool_prefix}${toolchain_cpp_preprocessor} $(toolchain_cpp_opts) -dumpversion`"
+    ax_cv_gcc_version="`$AROS_CROSSTOOLSDIR/${aros_tool_prefix}${toolchain_cpp_preprocessor}$(toolchain_cpp_opts) -dumpversion`"
     AS_IF([test "x$ax_cv_gcc_version" = "x"],[
       ax_cv_gcc_version=""
     ])
@@ -2393,7 +2393,7 @@ else
         AROS_TOOL_KERNEL(aros_kernel_as,as,$aros_kernel_as)
         AROS_REQUIRED(as,$aros_kernel_as)
         if test "x$aros_kernel_ar" = "x"; then
-            aros_kernel_ar=$aros_host_full_ar
+            aros_kernel_ar=$aros_host_plain_ar
         fi
         AROS_TOOL_KERNEL(aros_kernel_ar,ar,$aros_kernel_ar)
         AROS_REQUIRED(ar,$aros_kernel_ar)
-- 
2.11.4.GIT