From e6752e9afcd103c7aa32d383e7248e31ab9bc9ca Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 2 Aug 2020 06:19:17 -0600
Subject: [PATCH] configure: switch default from BC to CS

This change brings the top-level makefile and `configure` back in
sync, but it affect source distributions by changing the `configure`
default there.
---
 .github/workflows/ci-push_linux.yml             | 1 +
 .github/workflows/ci-push_macos.yml             | 1 +
 .github/workflows/ci_win.yml                    | 1 +
 .github/workflows/scanbuild_static-analysis.yml | 1 +
 racket/src/ac/vm.m4                             | 4 ++--
 racket/src/bc/configure                         | 4 ++--
 racket/src/cfg-bc                               | 4 ++--
 racket/src/configure                            | 8 ++------
 racket/src/cs/c/configure                       | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci-push_linux.yml b/.github/workflows/ci-push_linux.yml
index f9f4fe426f..443d4e9c23 100644
--- a/.github/workflows/ci-push_linux.yml
+++ b/.github/workflows/ci-push_linux.yml
@@ -114,6 +114,7 @@ jobs:
         ./configure
         --prefix=/usr/local/racket3m
         --enable-werror
+        --enable-bcdefault
         --enable-racket=/usr/local/racketcgc/bin/racket
         --enable-foreign
         --enable-float
diff --git a/.github/workflows/ci-push_macos.yml b/.github/workflows/ci-push_macos.yml
index de283a9a56..30b3747f61 100644
--- a/.github/workflows/ci-push_macos.yml
+++ b/.github/workflows/ci-push_macos.yml
@@ -99,6 +99,7 @@ jobs:
         --prefix=$GITHUB_WORKSPACE/racket3m 
         $RACKET_EXTRA_CONFIGURE_ARGS 
         --enable-racket=$GITHUB_WORKSPACE/racketcgc/bin/racket 
+        --enable-bcdefault 
         --enable-jit 
         --enable-foreign
         --enable-macprefix
diff --git a/.github/workflows/ci_win.yml b/.github/workflows/ci_win.yml
index 4ed8ac2805..b8ba0ca846 100644
--- a/.github/workflows/ci_win.yml
+++ b/.github/workflows/ci_win.yml
@@ -28,6 +28,7 @@ jobs:
       shell: cmd
       run: |
         call msvcprep.bat x86_amd64
+        set UNDERSCORE_BC_SUFFIX=_
         call build.bat
     - name: Build CS
       working-directory: .\racket\src\worksp
diff --git a/.github/workflows/scanbuild_static-analysis.yml b/.github/workflows/scanbuild_static-analysis.yml
index 3e1b76c9b4..31296ebbba 100644
--- a/.github/workflows/scanbuild_static-analysis.yml
+++ b/.github/workflows/scanbuild_static-analysis.yml
@@ -101,6 +101,7 @@ jobs:
         ./configure
         CFLAGS="-O0 -g"
         CPPFLAGS="-DMZ_PRECISE_RETURN_SPEC"
+        --enable-bcdefault
         --disable-strip
         --enable-racket=/usr/bin/racket
         --enable-werror
diff --git a/racket/src/ac/vm.m4 b/racket/src/ac/vm.m4
index 82bfd03130..3e34c5a908 100644
--- a/racket/src/ac/vm.m4
+++ b/racket/src/ac/vm.m4
@@ -44,8 +44,8 @@ fi
 if test "${enable_csdefault}" = "" ; then
    if test "${enable_bcdefault}" = "" ; then
       # Pick a default default here, but make it consistent with "src/configure"
-      enable_bcdefault=yes
-      enable_csdefault=no
+      enable_csdefault=yes
+      enable_bcdefault=no
    fi
 fi
 
diff --git a/racket/src/bc/configure b/racket/src/bc/configure
index 433f32593f..5dac2804bb 100755
--- a/racket/src/bc/configure
+++ b/racket/src/bc/configure
@@ -3275,8 +3275,8 @@ fi
 if test "${enable_csdefault}" = "" ; then
    if test "${enable_bcdefault}" = "" ; then
       # Pick a default default here, but make it consistent with "src/configure"
-      enable_bcdefault=yes
-      enable_csdefault=no
+      enable_csdefault=yes
+      enable_bcdefault=no
    fi
 fi
 
diff --git a/racket/src/cfg-bc b/racket/src/cfg-bc
index 90823df971..8a8ac6f63e 100755
--- a/racket/src/cfg-bc
+++ b/racket/src/cfg-bc
@@ -2299,8 +2299,8 @@ fi
 if test "${enable_csdefault}" = "" ; then
    if test "${enable_bcdefault}" = "" ; then
       # Pick a default default here, but make it consistent with "src/configure"
-      enable_bcdefault=yes
-      enable_csdefault=no
+      enable_csdefault=yes
+      enable_bcdefault=no
    fi
 fi
 
diff --git a/racket/src/configure b/racket/src/configure
index 8042dcbd00..c9f3ba4419 100755
--- a/racket/src/configure
+++ b/racket/src/configure
@@ -54,8 +54,8 @@ done
 # Select default build if none specified:
 if test "$use_bc" = maybe ; then
     if test "$use_cs" = maybe ; then
-        use_cs=no
-        use_bc=yes
+        use_cs=yes
+        use_bc=no
     elif test "$use_cs" = no ; then
         use_bc=yes
     elif test -d "$pb_dir" -o $supplied_racket = yes ; then
@@ -70,10 +70,6 @@ elif test "$use_cs" = "maybe" ; then
 fi
 
 if test "$use_cs" = "yes" ; then
-    # The "cs/c/configure" script doesn't report the installation
-    # configuration, so we run it first and let "cfg-cs" or
-    # "cfg-bc" report that information.
-
     if test $use_bc = no  -a $supplied_racket = no -a ! -d "$pb_dir" ; then
         echo $0: must have $pb_dir or --enable-racket=... for --enable-csonly
         exit 1
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 6659b22e98..6927e7ae09 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -2845,8 +2845,8 @@ fi
 if test "${enable_csdefault}" = "" ; then
    if test "${enable_bcdefault}" = "" ; then
       # Pick a default default here, but make it consistent with "src/configure"
-      enable_bcdefault=yes
-      enable_csdefault=no
+      enable_csdefault=yes
+      enable_bcdefault=no
    fi
 fi