ENH: Remove things from bootstrap

1 files changed, 9 insertions, 2 deletions

diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 84a7fbf19d..d4bbd8d76e 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -14,12 +14,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "cmakewizard.h"
 #include "cmake.h"
 #include "cmCacheManager.h"
 #include "cmListFileCache.h"
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
+#include "cmakewizard.h"
 #include "cmDynamicLoader.h"
 #include "cmDocumentation.h"
 
@@ -182,7 +182,9 @@ int do_cmake(int ac, char** av)
     }
 #endif
   
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   bool wiz = false;
+#endif
   bool command = false;
   bool list_cached = false;
   bool list_all_cached = false;
@@ -192,13 +194,16 @@ int do_cmake(int ac, char** av)
   std::vector<std::string> args;
   for(int i =0; i < ac; ++i)
     {
+#if defined(CMAKE_BUILD_WITH_CMAKE)
     if(strcmp(av[i], "-i") == 0)
       {
       wiz = true;
       }
+    else
+#endif
     // if command has already been set, then
     // do not eat the -E 
-    else if (!command && strcmp(av[i], "-E") == 0)
+    if (!command && strcmp(av[i], "-E") == 0)
       {
       command = true;
       }
@@ -246,11 +251,13 @@ int do_cmake(int ac, char** av)
     int ret = cmake::ExecuteCMakeCommand(args);
     return ret;
     }
+#if defined(CMAKE_BUILD_WITH_CMAKE)
   if (wiz)
     {
     cmakewizard wizard;
     return wizard.RunWizard(args); 
     }
+#endif
   cmake cm;  
   cm.SetProgressCallback(updateProgress, 0);
   cm.SetScriptMode(script_mode);