diff --git a/racket/src/ac/path.m4 b/racket/src/ac/path.m4
index fa0cdc799f..79d8c676ad 100644
--- a/racket/src/ac/path.m4
+++ b/racket/src/ac/path.m4
@@ -76,9 +76,9 @@ if test "${unixstyle}" = "no" ; then
   GR_APP_CONFIG_PATH="../../../../etc"
   INSTALL_ORIG_TREE=yes
   if test "${enable_sharezo}" = "yes" ; then
-    enable_sharezo=no
     echo WARNING: --enable-sharezo is ignored for an origtree installation
   fi
+  INSTALL_LIBZO=no
 else
   if test "${prefix}" = "NONE" ; then
     # Set prefix explicitly so we can use it during configure
@@ -100,17 +100,16 @@ else
   GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
   GR_APP_CONFIG_PATH="${CONFIG_PATH}"
   INSTALL_ORIG_TREE=no
+  if test "${enable_sharezo}" = "yes" ; then
+    INSTALL_LIBZO=no
+  else
+    INSTALL_LIBZO=libzo
+  fi
 fi
 
 GUI_COLLECTS_PATH="${COLLECTS_PATH}"
 GUI_CONFIG_PATH="${CONFIG_PATH}"
 
-if test "${enable_sharezo}" = "yes" ; then
-  INSTALL_LIBZO=no
-else
-  INSTALL_LIBZO=libzo
-fi
-
 ########################################
 
 AC_SUBST(collectsdir)
diff --git a/racket/src/bc/configure b/racket/src/bc/configure
index 473c40633a..5ed6baab25 100755
--- a/racket/src/bc/configure
+++ b/racket/src/bc/configure
@@ -3122,9 +3122,9 @@ if test "${unixstyle}" = "no" ; then
   GR_APP_CONFIG_PATH="../../../../etc"
   INSTALL_ORIG_TREE=yes
   if test "${enable_sharezo}" = "yes" ; then
-    enable_sharezo=no
     echo WARNING: --enable-sharezo is ignored for an origtree installation
   fi
+  INSTALL_LIBZO=no
 else
   if test "${prefix}" = "NONE" ; then
     # Set prefix explicitly so we can use it during configure
@@ -3146,17 +3146,16 @@ else
   GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
   GR_APP_CONFIG_PATH="${CONFIG_PATH}"
   INSTALL_ORIG_TREE=no
+  if test "${enable_sharezo}" = "yes" ; then
+    INSTALL_LIBZO=no
+  else
+    INSTALL_LIBZO=libzo
+  fi
 fi
 
 GUI_COLLECTS_PATH="${COLLECTS_PATH}"
 GUI_CONFIG_PATH="${CONFIG_PATH}"
 
-if test "${enable_sharezo}" = "yes" ; then
-  INSTALL_LIBZO=no
-else
-  INSTALL_LIBZO=libzo
-fi
-
 ########################################
 
 
diff --git a/racket/src/cfg-bc b/racket/src/cfg-bc
index 1018946a1b..d56a0a8996 100755
--- a/racket/src/cfg-bc
+++ b/racket/src/cfg-bc
@@ -2172,9 +2172,9 @@ if test "${unixstyle}" = "no" ; then
   GR_APP_CONFIG_PATH="../../../../etc"
   INSTALL_ORIG_TREE=yes
   if test "${enable_sharezo}" = "yes" ; then
-    enable_sharezo=no
     echo WARNING: --enable-sharezo is ignored for an origtree installation
   fi
+  INSTALL_LIBZO=no
 else
   if test "${prefix}" = "NONE" ; then
     # Set prefix explicitly so we can use it during configure
@@ -2196,17 +2196,16 @@ else
   GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
   GR_APP_CONFIG_PATH="${CONFIG_PATH}"
   INSTALL_ORIG_TREE=no
+  if test "${enable_sharezo}" = "yes" ; then
+    INSTALL_LIBZO=no
+  else
+    INSTALL_LIBZO=libzo
+  fi
 fi
 
 GUI_COLLECTS_PATH="${COLLECTS_PATH}"
 GUI_CONFIG_PATH="${CONFIG_PATH}"
 
-if test "${enable_sharezo}" = "yes" ; then
-  INSTALL_LIBZO=no
-else
-  INSTALL_LIBZO=libzo
-fi
-
 ########################################
 
 
diff --git a/racket/src/cfg-cs b/racket/src/cfg-cs
index 665efa52b2..1299ba273a 100755
--- a/racket/src/cfg-cs
+++ b/racket/src/cfg-cs
@@ -2135,9 +2135,9 @@ if test "${unixstyle}" = "no" ; then
   GR_APP_CONFIG_PATH="../../../../etc"
   INSTALL_ORIG_TREE=yes
   if test "${enable_sharezo}" = "yes" ; then
-    enable_sharezo=no
     echo WARNING: --enable-sharezo is ignored for an origtree installation
   fi
+  INSTALL_LIBZO=no
 else
   if test "${prefix}" = "NONE" ; then
     # Set prefix explicitly so we can use it during configure
@@ -2159,17 +2159,16 @@ else
   GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
   GR_APP_CONFIG_PATH="${CONFIG_PATH}"
   INSTALL_ORIG_TREE=no
+  if test "${enable_sharezo}" = "yes" ; then
+    INSTALL_LIBZO=no
+  else
+    INSTALL_LIBZO=libzo
+  fi
 fi
 
 GUI_COLLECTS_PATH="${COLLECTS_PATH}"
 GUI_CONFIG_PATH="${CONFIG_PATH}"
 
-if test "${enable_sharezo}" = "yes" ; then
-  INSTALL_LIBZO=no
-else
-  INSTALL_LIBZO=libzo
-fi
-
 ########################################
 
 
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 779defefe4..91ee4c58e6 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -3087,9 +3087,9 @@ if test "${unixstyle}" = "no" ; then
   GR_APP_CONFIG_PATH="../../../../etc"
   INSTALL_ORIG_TREE=yes
   if test "${enable_sharezo}" = "yes" ; then
-    enable_sharezo=no
     echo WARNING: --enable-sharezo is ignored for an origtree installation
   fi
+  INSTALL_LIBZO=no
 else
   if test "${prefix}" = "NONE" ; then
     # Set prefix explicitly so we can use it during configure
@@ -3111,17 +3111,16 @@ else
   GR_APP_COLLECTS_PATH="${COLLECTS_PATH}"
   GR_APP_CONFIG_PATH="${CONFIG_PATH}"
   INSTALL_ORIG_TREE=no
+  if test "${enable_sharezo}" = "yes" ; then
+    INSTALL_LIBZO=no
+  else
+    INSTALL_LIBZO=libzo
+  fi
 fi
 
 GUI_COLLECTS_PATH="${COLLECTS_PATH}"
 GUI_CONFIG_PATH="${CONFIG_PATH}"
 
-if test "${enable_sharezo}" = "yes" ; then
-  INSTALL_LIBZO=no
-else
-  INSTALL_LIBZO=libzo
-fi
-
 ########################################