From e505df2eb5e7ae209a020b107d7aeb649258db01 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 1 Oct 2017 12:45:29 -0600
Subject: [PATCH] tools/configure.c:  Duplicate new functionaity added to
 configure.sh.

---
 tools/configure.c  | 53 +++++++++++++++++++++++++++++++++++-----------
 tools/configure.sh |  6 +++---
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/tools/configure.c b/tools/configure.c
index 3fcfbedf4bf..63dbf432445 100644
--- a/tools/configure.c
+++ b/tools/configure.c
@@ -99,6 +99,7 @@ static char       *g_srcdefconfig  = NULL;  /* Source defconfig file */
 static char       *g_srcmakedefs   = NULL;  /* Source Make.defs file */
 
 static bool        g_winnative     = false; /* True: Windows native configuration */
+static bool        g_oldnative     = false; /* True: Was Windows native configuration */
 static bool        g_needapppath   = true;  /* Need to add app path to the .config file */
 
 static uint8_t     g_host          = HOST_NOCHANGE;
@@ -652,24 +653,35 @@ static void check_appdir(void)
 
   if (!g_appdir)
     {
-      /* No, was the path provided in the configuration? */
+      /* If no application directory was provided on the command line and we
+       * are switching between a windows native host and some other host then
+       * ignore any path to the apps/ directory in the defconfig file.  It
+       * will most certainly not be in a usable form.
+       */
 
-      struct variable_s *var = find_variable("CONFIG_APP_DIR", g_configvars);
-      if (var)
+      if (g_winnative == g_oldnative)
         {
-          debug("check_appdir: Config file appdir=%s\n",
-                var->val ? var->val : "<null>");
+          /* No, was the path provided in the configuration? */
 
-          /* Yes.. does this directory exist? */
+          struct variable_s *var =
+            find_variable("CONFIG_APPS_DIR", g_configvars);
 
-          if (var->val && verify_appdir(var->val))
+          if (var != NULL)
             {
-              /* We are using the CONFIG_APP_DIR setting already
-               * in the defconfig file.
-               */
+              debug("check_appdir: Config file appdir=%s\n",
+                    var->val ? var->val : "<null>");
 
-              g_needapppath = false;
-              return;
+              /* Yes.. does this directory exist? */
+
+              if (var->val && verify_appdir(var->val))
+                {
+                  /* We are using the CONFIG_APPS_DIR setting already in the
+                   * defconfig file.
+                   */
+
+                  g_needapppath = false;
+                  return;
+                }
             }
         }
 
@@ -718,6 +730,23 @@ static void check_configuration(void)
   if (var && var->val && strcmp("y", var->val) == 0)
     {
       debug("check_configuration: Windows native configuration\n");
+      g_oldnative = true;
+    }
+
+  /* If we are going to some host other then windows native or to a windows
+   * native host, then don't ignore what is in the defconfig file.
+   */
+
+  if (g_host == HOST_NOCHANGE)
+    {
+      /* Use whatever we found in the configuration file */
+
+      g_winnative = g_oldnative;
+    }
+  else if (g_host == HOST_WINDOWS && g_windows == WINDOWS_NATIVE)
+    {
+      /* The new configuration is windows native */
+
       g_winnative = true;
     }
 
diff --git a/tools/configure.sh b/tools/configure.sh
index af23c7af330..429548f5ef5 100755
--- a/tools/configure.sh
+++ b/tools/configure.sh
@@ -183,10 +183,10 @@ else
   fi
 fi
 
-# If not application direction was specified on the command line and we are
+# If no application directory was provided on the command line and we are
 # switching between a windows native host and some other host then ignore the
-# path to the apps/ direction in the defconfig file.  It will most certainly
-# not be a usable forma.
+# path to the apps/ directory in the defconfig file.  It will most certainly
+# not be in a usable form.
 
 defappdir=y
 if [ -z "${appdir}" -a "X$oldnative" = "$winnative" ]; then