From 100404ba47f37bde11028cf1b5aaba5a13b4a5e1 Mon Sep 17 00:00:00 2001
From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
Date: Fri, 1 Jan 2021 08:52:49 +0100
Subject: [PATCH] bootstrap: Use ./pre-inst-env mescc default.

* configure.sh: When CC is mescc, M2-Planet or unset, use
"./pre-inst-env mescc" as default.
---
 configure.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.sh b/configure.sh
index 8f802877..10be08a6 100755
--- a/configure.sh
+++ b/configure.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # GNU Mes --- Maxwell Equations of Software
-# Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2018,2019,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Mes.
 #
@@ -221,7 +221,13 @@ elif $CC --version | grep tcc; then
     compiler=gcc
 else
     compiler=mescc
-    AR=${AR-$PWD/scripts/mesar}
+    if ! $CC --version; then
+        CC="$PWD/pre-inst-env mescc"
+    fi
+    if test "$CC" = "M2-Planet"; then
+        CC="$PWD/pre-inst-env mescc"
+    fi
+    AR=${AR-$PWD/pre-inst-env mesar}
 fi
 
 AR=${AR-$(command -v ar)} || true