From 19c3ee456b2bcb1de12fc6fead0b93d6de02498f Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 19 Feb 2021 09:21:01 -0700
Subject: [PATCH] configure: fix --collectsdir and --appsdir handling

Thanks to @tgbugs for the report an initial repair.

Closes #3692
---
 racket/src/ac/make-configure | 5 +++--
 racket/src/ac/rktio_keep.m4  | 2 +-
 racket/src/bc/configure      | 2 +-
 racket/src/cs/c/configure    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/racket/src/ac/make-configure b/racket/src/ac/make-configure
index 5c291448e9..c1e79bfa34 100755
--- a/racket/src/ac/make-configure
+++ b/racket/src/ac/make-configure
@@ -50,8 +50,9 @@ exit 0
 	 runstatedir
 	 infodir
          htmldir
-         ;; dvidir - converted to "collectsdir"
-         ;; pdfdir - converted to "appsdir"
+         ;; Note: any arguments converted this way need to be excluded in "rktio_keep.m4"
+         ;;  dvidir - converted to "collectsdir"
+         ;;  pdfdir - converted to "appsdir"
          psdir
          localedir)))
 
diff --git a/racket/src/ac/rktio_keep.m4 b/racket/src/ac/rktio_keep.m4
index abfb18b219..f5f6488281 100644
--- a/racket/src/ac/rktio_keep.m4
+++ b/racket/src/ac/rktio_keep.m4
@@ -7,7 +7,7 @@ for fixup_arg
 do
   case $fixup_arg in
   # Strip away all feature choices
-  -enable* | --enable* | -disable* | --disable*)
+  -enable* | --enable* | -disable* | --disable* | -collects* | --collects* | -apps* | --apps*)
     ;;
   *)
     case $fixup_arg in
diff --git a/racket/src/bc/configure b/racket/src/bc/configure
index f9d8567454..7c1c18efa1 100755
--- a/racket/src/bc/configure
+++ b/racket/src/bc/configure
@@ -7283,7 +7283,7 @@ for fixup_arg
 do
   case $fixup_arg in
   # Strip away all feature choices
-  -enable* | --enable* | -disable* | --disable*)
+  -enable* | --enable* | -disable* | --disable* | -collects* | --collects* | -apps* | --apps*)
     ;;
   *)
     case $fixup_arg in
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 81fc52f3b8..221d1806e5 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -5643,7 +5643,7 @@ for fixup_arg
 do
   case $fixup_arg in
   # Strip away all feature choices
-  -enable* | --enable* | -disable* | --disable*)
+  -enable* | --enable* | -disable* | --disable* | -collects* | --collects* | -apps* | --apps*)
     ;;
   *)
     case $fixup_arg in