From e3f25a615988409727312c61ccce70c08657901f Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 21 Oct 2018 08:07:45 -0600
Subject: [PATCH] reorder configure scripts

Run last one of the scripts that can show the
installation-directory information correctly.
---
 racket/src/cfg-cs                   |  3 ++
 racket/src/configure                | 44 +++++++++++++++--------------
 racket/src/cs/c/configure           |  3 --
 racket/src/cs/c/configure-parent.ac |  3 ++
 racket/src/cs/c/configure.ac        |  3 --
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/racket/src/cfg-cs b/racket/src/cfg-cs
index 40d7eb1cd9..99a77ea1dd 100755
--- a/racket/src/cfg-cs
+++ b/racket/src/cfg-cs
@@ -3350,3 +3350,6 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+# From "../ac/path.m4":
+show_path_results
diff --git a/racket/src/configure b/racket/src/configure
index 5f9cc97599..aaddb3c7e8 100755
--- a/racket/src/configure
+++ b/racket/src/configure
@@ -55,29 +55,31 @@ if test "$use_cs" = "yes" ; then
       exit 1
     fi
   fi
+
+  if test "$use_racket" = "no" ; then
+    if test "$supplied_racket" = "no" ; then
+      echo $0: --enable-csonly needs --enable-racket=...
+      exit 1
+    fi
+  fi
+
+  # The "cs/c/configure" script doesn't report the installation
+  # configuration, so we run it first and let "cfg-cs" or
+  # "cfg-racket" report that information.
+
+  mkdir -p cs
+  case "$dir" in
+    /*)
+     cd cs && "$dir/cs/c/configure" ${1+"$@"} && cd ..
+     ;;
+    *)
+     cd cs && "../$dir/cs/c/configure" ${1+"$@"} && cd ..
+     ;;
+  esac
 fi
 
 if test "$use_racket" = "no" ; then
-  if test "$supplied_racket" = "no" ; then
-    echo $0: --enable-csonly needs --enable-racket=...
-    exit 1
-  fi
-  "$dir/cfg-cs" ${1+"$@"}
-  mkdir -p cs
-  # continue below
-elif test "$use_cs" = "no" ; then
-  exec "$dir/cfg-racket" ${1+"$@"}
+  exec "$dir/cfg-cs" ${1+"$@"}
 else
-  "$dir/cfg-racket" ${1+"$@"}
-  # continue below
+  exec "$dir/cfg-racket" ${1+"$@"}
 fi
-
-mkdir -p cs
-case "$dir" in
-  /*)
-   cd cs && exec "$dir/cs/c/configure" ${1+"$@"}
-   ;;
-  *)
-   cd cs && exec "../$dir/cs/c/configure" ${1+"$@"}
-   ;;
-esac
diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure
index 911280aaf0..d6ac12f6e3 100755
--- a/racket/src/cs/c/configure
+++ b/racket/src/cs/c/configure
@@ -5724,6 +5724,3 @@ mkdir -p rktio
 abssrcdir=`(cd ${srcdir}; pwd)`
 echo "=== configuring in rktio (${abssrcdir}/../../rktio)"
 cd rktio; eval "${abssrcdir}/../../rktio/configure ${SUB_CONFIGURE_EXTRAS}"
-
-# From "../ac/path.m4":
-show_path_results
diff --git a/racket/src/cs/c/configure-parent.ac b/racket/src/cs/c/configure-parent.ac
index 3c5166facc..bfbed03c75 100644
--- a/racket/src/cs/c/configure-parent.ac
+++ b/racket/src/cs/c/configure-parent.ac
@@ -35,3 +35,6 @@ AC_SUBST(RUN_RACKET_CGC)
 makefiles="Makefile"
 
 AC_OUTPUT($makefiles)
+
+# From "../ac/path.m4":
+show_path_results
diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac
index a37148374d..5dd68ca0d2 100644
--- a/racket/src/cs/c/configure.ac
+++ b/racket/src/cs/c/configure.ac
@@ -428,6 +428,3 @@ mkdir -p rktio
 abssrcdir=`(cd ${srcdir}; pwd)`
 echo "=== configuring in rktio (${abssrcdir}/../../rktio)"
 cd rktio; eval "${abssrcdir}/../../rktio/configure ${SUB_CONFIGURE_EXTRAS}"
-
-# From "../ac/path.m4":
-show_path_results