From 89391e2a50718d6c7ab01059ab9f183b9220c244 Mon Sep 17 00:00:00 2001
From: mazze <mazze@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Tue, 22 Jul 2014 17:19:50 +0000
Subject: [PATCH] Fix for the problem that the mesa libraries (e.g. gl.library)
 weren't built when --with-aros-toolchain was given in order to build it with
 external toolchain.

The mesa libraries are only built when the define AROS_TARGET_TOOLCHAIN
ist set to "yes". Therefore we must set the configure variable
aros_target_toolchain to "yes" when --with-aros-toolchain was used.


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

diff --git a/configure b/configure
index ec706e9b46..5755ffb336 100755
--- a/configure
+++ b/configure
@@ -1630,7 +1630,8 @@ Optional Packages:
                           Specify crosscompile toolchain prefix to wrap for
                           AROS objects
   --with-aros-toolchain=PREFIX
-                          Specify prebuilt AROS toolchain
+                          Specify prebuilt AROS toolchain. Use yes for default
+                          name
   --with-aros-toolchain-install=DIR
                           Where to install or search for cross tools binaries
   --with-gcc-version=VERSION
@@ -14403,10 +14404,10 @@ if test "$use_kernel_cc_wrapper" = "yes" ; then
     aros_kernel_cc="${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-elf-gcc"
 fi
 
-if test "${crosstools}" != "yes" ; then
-    aros_target_toolchain=no
-else
+if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
     aros_target_toolchain=yes
+else
+    aros_target_toolchain=no
 fi
 
 
diff --git a/configure.in b/configure.in
index 87fa22d8bb..8a1a749421 100644
--- a/configure.in
+++ b/configure.in
@@ -1520,7 +1520,7 @@ AC_ARG_WITH(elf-toolchain-prefix,AC_HELP_STRING([--with-elf-toolchain-prefix=...
 AC_MSG_RESULT($elf_tool_prefix)
 
 AC_MSG_CHECKING([AROS toolchain prefix])
-AC_ARG_WITH(aros-toolchain,AC_HELP_STRING([--with-aros-toolchain=PREFIX],[Specify prebuilt AROS toolchain]),[aros_tool_prefix="$withval"
+AC_ARG_WITH(aros-toolchain,AC_HELP_STRING([--with-aros-toolchain=PREFIX],[Specify prebuilt AROS toolchain. Use yes for default name]),[aros_tool_prefix="$withval"
                 crosstools_guess=no])
 if test "$aros_tool_prefix" = "yes" ; then
     aros_tool_prefix=$aros_target_cpu-aros-
@@ -2568,10 +2568,10 @@ if test "$use_kernel_cc_wrapper" = "yes" ; then
     aros_kernel_cc="${PWD}/${aros_tools_dir}/${aros_target_cpu}-${aros_target_arch}${aros_target_suffix}-elf-gcc"
 fi
 
-if test "${crosstools}" != "yes" ; then
-    aros_target_toolchain=no
-else
+if test "${crosstools}" = "yes" || test "${crosstools_guess}" = "no"; then
     aros_target_toolchain=yes
+else
+    aros_target_toolchain=no
 fi
 
 dnl --------------------------------------------------------------------
-- 
2.11.4.GIT