Browse Source

ENH: add enable language support for PROJECT command, this means that a C only project can be built with cmake, even without a cxx compiler

Bill Hoffman 24 years ago
parent
commit
4ea0f6b949

File diff suppressed because it is too large
+ 546 - 416
CMake.rtf


+ 1 - 1
Example/Demo/CMakeLists.txt

@@ -6,7 +6,7 @@ LINK_DIRECTORIES(${HELLO_BINARY_DIR}/Hello)
 
 # Add executable called "helloDemo" that is built from the source files
 # "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-ADD_EXECUTABLE(helloDemo demo demo_b)
+ADD_EXECUTABLE(helloDemo demo.cxx demo_b.cxx)
 
 # Link the executable to the Hello library.
 TARGET_LINK_LIBRARIES(helloDemo Hello)

+ 1 - 1
Example/Hello/CMakeLists.txt

@@ -1,3 +1,3 @@
 # Create a library called "Hello" which includes the source file "hello.cxx".
 # The extension is already found.  Any number of sources could be listed here.
-ADD_LIBRARY(Hello hello)
+ADD_LIBRARY(Hello hello.cxx)

+ 12 - 5
Source/CMakeLists.txt

@@ -1,4 +1,4 @@
-SOURCE_FILES(SRCS
+SET(SRCS
 cmake.cxx
 cmakewizard.cxx
 cmMakeDepend.cxx
@@ -37,13 +37,15 @@ cmListFileCache.h
 CONFIGURE_FILE(
 ${CMake_SOURCE_DIR}/Source/cmConfigure.cmake.h.in 
 ${CMake_BINARY_DIR}/Source/cmConfigure.h )
+
 # add the include path to find the .h 
 INCLUDE_DIRECTORIES(${CMake_BINARY_DIR}/Source)
+
 # let cmake know it is supposed to use it
 ADD_DEFINITIONS(-DCMAKE_BUILD_WITH_CMAKE)
 
 IF (WIN32)
-  SOURCE_FILES(SRCS 
+  SET(SRCS ${SRCS}
                     cmDSWWriter.cxx 
                     cmDSPWriter.cxx 
                     cmMSProjectGenerator.cxx
@@ -73,17 +75,17 @@ IF (UNIX)
   ENDIF (CURSES_LIBRARY)
 ENDIF (UNIX)
 
-SOURCE_FILES(SRCS cmUnixMakefileGenerator.cxx cmUnixMakefileGenerator.h)
+SET(SRCS ${SRCS} cmUnixMakefileGenerator.cxx cmUnixMakefileGenerator.h)
 
 
 # create a library used by the command line and the GUI
-ADD_LIBRARY(CMakeLib SRCS)
+ADD_LIBRARY(CMakeLib ${SRCS})
 # always link in the library
 LINK_LIBRARIES(CMakeLib)
 # the library is found here
 LINK_DIRECTORIES(${CMake_BINARY_DIR}/Source)
 
-ADD_EXECUTABLE(cmake cmakemain)
+ADD_EXECUTABLE(cmake cmakemain.cxx)
 ADD_EXECUTABLE(DumpDocumentation cmDumpDocumentation)
 
 ADD_EXECUTABLE(ctest ctest.cxx cmSystemTools.cxx cmRegularExpression.cxx)
@@ -106,6 +108,11 @@ IF(BUILD_TESTING)
       ${CMake_BINARY_DIR}/Tests/Simple 
       simple)
 
+    ADD_TEST(conly ${CMake_BINARY_DIR}/Source/cmaketest 
+      ${CMake_SOURCE_DIR}/Tests/COnly 
+      ${CMake_BINARY_DIR}/Tests/COnly 
+      conly)
+
     ADD_TEST(complex ${CMake_BINARY_DIR}/Source/cmaketest 
       ${CMake_SOURCE_DIR}/Tests/Complex 
       ${CMake_BINARY_DIR}/Tests/Complex 

+ 9 - 5
Source/cmBorlandMakefileGenerator.cxx

@@ -36,7 +36,7 @@ cmBorlandMakefileGenerator::~cmBorlandMakefileGenerator()
 }
 
 
-void cmBorlandMakefileGenerator::ComputeSystemInfo()
+void cmBorlandMakefileGenerator::EnableLanguage(const char*)
 {
   // now load the settings
   if(!m_Makefile->GetDefinition("CMAKE_ROOT"))
@@ -53,11 +53,15 @@ void cmBorlandMakefileGenerator::ComputeSystemInfo()
     message += outdir;
     cmSystemTools::Error(message.c_str());
     }
+  if(!this->GetLanguageEnabled("CXX"))
+    {
+    std::string fpath = 
+      m_Makefile->GetDefinition("CMAKE_ROOT");
+    fpath += "/Templates/CMakeBorlandWindowsSystemConfig.cmake";
+    m_Makefile->ReadListFile(NULL,fpath.c_str());
+    this->SetLanguageEnabled("CXX");
+    }
   
-  std::string fpath = 
-    m_Makefile->GetDefinition("CMAKE_ROOT");
-  fpath += "/Templates/CMakeBorlandWindowsSystemConfig.cmake";
-  m_Makefile->ReadListFile(NULL,fpath.c_str());
 }
 
 

+ 1 - 1
Source/cmBorlandMakefileGenerator.h

@@ -41,7 +41,7 @@ public:
     { return new cmBorlandMakefileGenerator;}
 
   ///! figure out about the current system information
-  virtual void ComputeSystemInfo(); 
+  virtual void EnableLanguage(const char*); 
 protected:
   virtual void OutputMakeVariables(std::ostream&);
   

+ 1 - 12
Source/cmDSWWriter.cxx

@@ -121,20 +121,9 @@ void cmDSWWriter::WriteDSWFile(std::ostream& fout)
       k != allListFiles.end(); ++k)
     {
     cmMakefile* mf = *k;
-    cmMSProjectGenerator* pg = 0;
-    // if not this makefile, then create a new generator
-    if(m_Makefile != mf)
-      {
-      // Create an MS generator with DSW off, so it only creates dsp files
-      pg = new cmMSProjectGenerator;
-      }
-    else
-      {
-      pg = (cmMSProjectGenerator*)m_Makefile->GetMakefileGenerator();
-      }
+    cmMSProjectGenerator* pg = (cmMSProjectGenerator*)mf->GetMakefileGenerator();
     // make sure the generator is building dsp files
     pg->BuildDSWOff();
-    mf->SetMakefileGenerator(pg);
     mf->GenerateMakefile();
     // Get the source directory from the makefile
     std::string dir = mf->GetStartDirectory();

+ 11 - 17
Source/cmMSDotNETGenerator.cxx

@@ -88,7 +88,7 @@ void cmMSDotNETGenerator::SetLocal(bool local)
   m_BuildSLN = !local;
 }
 
-void cmMSDotNETGenerator::ComputeSystemInfo()
+void cmMSDotNETGenerator::EnableLanguage(const char*)
 {
   // now load the settings
   if(!m_Makefile->GetDefinition("CMAKE_ROOT"))
@@ -97,10 +97,14 @@ void cmMSDotNETGenerator::ComputeSystemInfo()
       "CMAKE_ROOT has not been defined, bad GUI or driver program");
     return;
     }
-  std::string fpath = 
-    m_Makefile->GetDefinition("CMAKE_ROOT");
-  fpath += "/Templates/CMakeDotNetSystemConfig.cmake";
-  m_Makefile->ReadListFile(NULL,fpath.c_str());
+  if(!this->GetLanguageEnabled("CXX"))
+    {
+    std::string fpath = 
+      m_Makefile->GetDefinition("CMAKE_ROOT");
+    fpath += "/Templates/CMakeDotNetSystemConfig.cmake";
+    m_Makefile->ReadListFile(NULL,fpath.c_str());
+    this->SetLanguageEnabled("CXX");
+    }
 }
 
 
@@ -187,20 +191,10 @@ void cmMSDotNETGenerator::WriteSLNFile(std::ostream& fout)
       k != allListFiles.end(); ++k)
     {
     cmMakefile* mf = *k;
-    cmMSDotNETGenerator* pg = 0;
-    // if not this makefile, then create a new generator
-    if(m_Makefile != mf)
-      {
-      // Create an MS generator with SLN off, so it only creates dsp files
-      pg = new cmMSDotNETGenerator;
-      }
-    else
-      {
-      pg = static_cast<cmMSDotNETGenerator*>(m_Makefile->GetMakefileGenerator());
-      }
+    cmMSDotNETGenerator* pg = 
+      static_cast<cmMSDotNETGenerator*>(mf->GetMakefileGenerator());
     // make sure the generator is building dsp files
     pg->BuildSLNOff();
-    mf->SetMakefileGenerator(pg);
     mf->GenerateMakefile();
     // Get the source directory from the makefile
     std::string dir = mf->GetStartDirectory();

+ 1 - 1
Source/cmMSDotNETGenerator.h

@@ -64,7 +64,7 @@ public:
    * Try to determine system infomation such as shared library
    * extension, pthreads, byte order etc.  
    */
-  virtual void ComputeSystemInfo();
+  virtual void EnableLanguage(const char*);
 
 protected:  
   /**

+ 1 - 1
Source/cmMSProjectGenerator.cxx

@@ -55,7 +55,7 @@ void cmMSProjectGenerator::SetLocal(bool local)
   m_BuildDSW = !local;
 }
 
-void cmMSProjectGenerator::ComputeSystemInfo()
+void cmMSProjectGenerator::EnableLanguage(const char*)
 {
   // now load the settings
   if(!m_Makefile->GetDefinition("CMAKE_ROOT"))

+ 1 - 1
Source/cmMSProjectGenerator.h

@@ -73,7 +73,7 @@ public:
    * Try to determine system infomation such as shared library
    * extension, pthreads, byte order etc.  
    */
-  virtual void ComputeSystemInfo();
+  virtual void EnableLanguage(const char*);
 
 private:
   cmDSWWriter* m_DSWWriter;

+ 13 - 14
Source/cmMakefile.cxx

@@ -431,23 +431,18 @@ void cmMakefile::AddSource(cmSourceFile& cmfile, const char *srclist)
   m_Sources[srclist].push_back(this->AddSource(cmfile));
 }
 
-struct FindSrcByName : std::binary_function<cmSourceFile*, cmSourceFile*, bool>
-{
-  public:
-    bool operator () (const cmSourceFile *f, const cmSourceFile *test) const
-    {
-      return (f->GetSourceName() == test->GetSourceName());
-    }
-};
 
-void cmMakefile::RemoveSource(cmSourceFile& cmfile,const char *srclist)
+void cmMakefile::RemoveSource(cmSourceFile& cmfile, const char *srclist)
 {
   std::vector<cmSourceFile*> &maplist = m_Sources[srclist];
-  std::vector<cmSourceFile*>::iterator f =
-    std::find_if(maplist.begin(), maplist.end(), std::bind2nd(FindSrcByName(),&cmfile));
-  if (f!=maplist.end())
+  for( std::vector<cmSourceFile*>::iterator f = maplist.begin(); 
+       f != maplist.end(); ++f)
     {
+    if((*f)->GetSourceName() == cmfile.GetSourceName())
+      {
       maplist.erase(f);
+      return;
+      }
     }
 }
 
@@ -1079,8 +1074,7 @@ void cmMakefile::RemoveVariablesInString(std::string& source,
 // This is done by reading the sub directory CMakeLists.txt files,
 // then calling this function with the new cmMakefile object
 void 
-cmMakefile::FindSubDirectoryCMakeListsFiles(std::vector<cmMakefile*>&
-                                            makefiles)
+cmMakefile::FindSubDirectoryCMakeListsFiles(std::vector<cmMakefile*>& makefiles)
 { 
   // loop over all the sub directories of this makefile
   const std::vector<std::string>& subdirs = this->GetSubDirectories();
@@ -1102,6 +1096,7 @@ cmMakefile::FindSubDirectoryCMakeListsFiles(std::vector<cmMakefile*>&
     else
       {
       cmMakefile* mf = new cmMakefile;
+      mf->SetMakefileGenerator(m_MakefileGenerator->CreateObject());
       makefiles.push_back(mf);
       // initialize new makefile
       mf->SetHomeOutputDirectory(this->GetHomeOutputDirectory());
@@ -1322,3 +1317,7 @@ cmSourceFile* cmMakefile::AddSource(cmSourceFile const&sf)
 }
 
   
+void cmMakefile::EnableLanguage(const char* lang)
+{
+  m_MakefileGenerator->EnableLanguage(lang);
+}

+ 6 - 1
Source/cmMakefile.h

@@ -501,7 +501,9 @@ public:
   /** Recursivly read and create a cmMakefile object for
    *  all CMakeLists.txt files in the GetSubDirectories list.
    *  Once the file is found, it ReadListFile is called on
-   *  the cmMakefile created for it.
+   *  the cmMakefile created for it.  CreateObject is called on 
+   *  the prototype to create a cmMakefileGenerator for each cmMakefile that 
+   *  is created.
    */
   void FindSubDirectoryCMakeListsFiles(std::vector<cmMakefile*>& makefiles);
   
@@ -523,6 +525,9 @@ public:
   /** Check if a command exists. */
   bool CommandExists(const char* name) const;
     
+  ///! Enable support for the named language, if null then all languages are enabled.
+  void EnableLanguage(const char* );
+  
 protected:
   std::string m_Prefix;
   std::vector<std::string> m_AuxSourceDirectories; // 

+ 23 - 0
Source/cmMakefileGenerator.cxx

@@ -19,6 +19,7 @@
 // static list of registered generators
 std::map<cmStdString, cmMakefileGenerator*>
 cmMakefileGenerator::s_RegisteredGenerators;
+std::map<cmStdString, bool> cmMakefileGenerator::s_LanguageEnabled;
 
 
 void cmMakefileGenerator::SetMakefile(cmMakefile* mf)
@@ -77,3 +78,25 @@ cmMakefileGenerator::CreateGenerator(const char* name)
     }
   return 0;
 }
+
+
+
+void cmMakefileGenerator::SetLanguageEnabled(const char* l)
+{
+  s_LanguageEnabled[l] = true;
+}
+
+
+
+bool cmMakefileGenerator::GetLanguageEnabled(const char* l)
+{
+  return (s_LanguageEnabled.count(l) > 0);
+}
+
+
+
+void cmMakefileGenerator::ClearEnabledLanguages()
+{
+  s_LanguageEnabled.clear();
+}
+

+ 9 - 1
Source/cmMakefileGenerator.h

@@ -69,11 +69,19 @@ public:
    * Try to determine system infomation such as shared library
    * extension, pthreads, byte order etc.  
    */
-  virtual void ComputeSystemInfo() = 0;
+  virtual void EnableLanguage(const char*) = 0;
 
   virtual ~cmMakefileGenerator(){};
+  
+  /**
+   * Set/Get and Clear the enabled languages.  
+   */
+  static void SetLanguageEnabled(const char*);
+  static bool GetLanguageEnabled(const char*);
+  static void ClearEnabledLanguages();
 protected:
   static std::map<cmStdString, cmMakefileGenerator*> s_RegisteredGenerators;
+  static std::map<cmStdString, bool> s_LanguageEnabled;
   cmMakefile* m_Makefile;
 };
 

+ 9 - 5
Source/cmNMakeMakefileGenerator.cxx

@@ -97,7 +97,7 @@ std::string cmNMakeMakefileGenerator::ShortPathCommand(const char* command)
 }
 
 
-void cmNMakeMakefileGenerator::ComputeSystemInfo()
+void cmNMakeMakefileGenerator::EnableLanguage(const char*)
 {
   // now load the settings
   if(!m_Makefile->GetDefinition("CMAKE_ROOT"))
@@ -106,10 +106,14 @@ void cmNMakeMakefileGenerator::ComputeSystemInfo()
       "CMAKE_ROOT has not been defined, bad GUI or driver program");
     return;
     }
-  std::string fpath = 
-    m_Makefile->GetDefinition("CMAKE_ROOT");
-  fpath += "/Templates/CMakeNMakeWindowsSystemConfig.cmake";
-  m_Makefile->ReadListFile(NULL,fpath.c_str());
+  if(!this->GetLanguageEnabled("CXX"))
+    {
+    std::string fpath = 
+      m_Makefile->GetDefinition("CMAKE_ROOT");
+    fpath += "/Templates/CMakeNMakeWindowsSystemConfig.cmake";
+    m_Makefile->ReadListFile(NULL,fpath.c_str());
+    this->SetLanguageEnabled("CXX");
+    }
 }
 
 

+ 1 - 1
Source/cmNMakeMakefileGenerator.h

@@ -41,7 +41,7 @@ public:
     { return new cmNMakeMakefileGenerator;}
 
   ///! figure out about the current system information
-  virtual void ComputeSystemInfo(); 
+  virtual void EnableLanguage(const char*); 
 protected:
   std::string ShortPath(const char* path);
   std::string ShortPathCommand(const char* command);

+ 12 - 1
Source/cmProjectCommand.cxx

@@ -19,7 +19,7 @@
 // cmProjectCommand
 bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() != 1 )
+  if(args.size() < 1 )
     {
     this->SetError("PROJECT called with incorrect number of arguments");
     return false;
@@ -48,6 +48,17 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
 
   m_Makefile->AddDefinition("PROJECT_NAME", args[0].c_str());
 
+  if(args.size() > 1)
+    {
+    for(size_t i =1; i < args.size(); ++i)
+      {
+      m_Makefile->EnableLanguage(args[i].c_str());
+      }
+    }
+  else
+    {
+    m_Makefile->EnableLanguage(0);
+    }
   return true;
 }
 

+ 6 - 1
Source/cmProjectCommand.h

@@ -73,7 +73,12 @@ public:
   virtual const char* GetFullDocumentation()
     {
     return
-      "PROJECT(projectname) Sets the name of the Microsoft workspace .dsw file. Does nothing on UNIX currently\n";
+      "PROJECT(projectname [C++ C Java])\n"
+      "Sets the name of the project.  "
+      "This creates the variables projectname_BINARY_DIR and projectname_SOURCE_DIR.  "
+      "Optionally you can specify which languages your project supports.  "
+      "By default all languages are supported.  If you do not have a C++ compiler, but want" 
+      " to build a c program with cmake, then use this option.";
     }
   
   cmTypeMacro(cmProjectCommand, cmCommand);

+ 1 - 1
Source/cmSetCommand.cxx

@@ -49,7 +49,7 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
     if(args[1] != "CACHE" && args[2] != "CACHE")
       {
       value = args[1];
-      for(unsigned int i =2; i < args.size(); ++i)
+      for(size_t i =2; i < args.size(); ++i)
         {
         value += ";";
         value += args[i];

+ 1 - 1
Source/cmSetSourceFilesPropertiesCommand.h

@@ -53,7 +53,7 @@ public:
   virtual const char* GetFullDocumentation()
     {
       return
-        "SET_SOURCE_FILES_PROPERTIES(flags file1 file2 [ABSTRACT|WRAP_EXCLUDE|GENERATED|COMPILE_FLAGS] [flags]) "
+        "SET_SOURCE_FILES_PROPERTIES(file1 file2 .. filen [ABSTRACT|WRAP_EXCLUDE|GENERATED|COMPILE_FLAGS] [flags]) "
         "Set properties on a file.   The syntax for the command is to list all the files you want "
         "to change, and then provide the values you want to set next.";
     }

+ 12 - 0
Source/cmTarget.cxx

@@ -75,3 +75,15 @@ void cmTarget::MergeLibraries(const LinkLibraries &ll)
 
 }
 
+bool cmTarget::HasCxx() const
+{
+  for(std::vector<cmSourceFile*>::const_iterator i =  m_SourceFiles.begin();
+      i != m_SourceFiles.end(); ++i)
+    {
+    if((*i)->GetSourceExtension() != "c")
+      {
+      return true;
+      }
+    }
+  return false;
+}

+ 2 - 0
Source/cmTarget.h

@@ -71,6 +71,8 @@ public:
     {return m_SourceFiles;}
   std::vector<cmSourceFile*> &GetSourceFiles() {return m_SourceFiles;}
 
+  ///! does this target have a cxx file in it
+  bool HasCxx() const;
   /**
    * Get the list of the source files used by this target
    */

+ 66 - 24
Source/cmUnixMakefileGenerator.cxx

@@ -604,8 +604,17 @@ void cmUnixMakefileGenerator::OutputSharedLibraryRule(std::ostream& fout,
   std::string command = "$(RM) lib";
   command += name;
   command += "$(SHLIB_SUFFIX)";
-  std::string command2 = "$(CMAKE_CXX_COMPILER)  $(CMAKE_SHLIB_LINK_FLAGS) "
-    "$(CMAKE_SHLIB_BUILD_FLAGS) $(CMAKE_CXX_FLAGS) -o \\\n";
+  std::string command2;
+  if(t.HasCxx())
+    {
+    command2 = "$(CMAKE_CXX_COMPILER)  $(CMAKE_SHLIB_LINK_FLAGS) "
+      "$(CMAKE_SHLIB_BUILD_FLAGS) $(CMAKE_CXX_FLAGS) -o \\\n";
+    }
+  else
+    {
+    command2 = "$(CMAKE_C_COMPILER)  $(CMAKE_SHLIB_LINK_FLAGS) "
+      "$(CMAKE_SHLIB_BUILD_FLAGS) $(CMAKE_C_FLAGS) -o \\\n";
+    }
   command2 += "\t  ";
   std::string libName = m_LibraryOutputPath + "lib" + std::string(name) + "$(SHLIB_SUFFIX)";
   libName = this->ConvertToOutputPath(libName.c_str());
@@ -639,8 +648,17 @@ void cmUnixMakefileGenerator::OutputModuleLibraryRule(std::ostream& fout,
   depend += this->CreateMakeVariable(name, "_SRC_OBJS") 
     + ") $(" + this->CreateMakeVariable(name, "_DEPEND_LIBS") + ")";
   std::string command = "$(RM) lib" + std::string(name) + "$(MODULE_SUFFIX)";
-  std::string command2 = "$(CMAKE_CXX_COMPILER)  $(CMAKE_MODULE_LINK_FLAGS) "
-    "$(CMAKE_MODULE_BUILD_FLAGS) $(CMAKE_CXX_FLAGS) -o \\\n";
+  std::string command2;
+  if(t.HasCxx())
+    {
+    command2 = "$(CMAKE_CXX_COMPILER)  $(CMAKE_SHLIB_LINK_FLAGS) "
+      "$(CMAKE_SHLIB_BUILD_FLAGS) $(CMAKE_CXX_FLAGS) -o \\\n";
+    }
+  else
+    {
+    command2 = "$(CMAKE_C_COMPILER)  $(CMAKE_SHLIB_LINK_FLAGS) "
+      "$(CMAKE_SHLIB_BUILD_FLAGS) $(CMAKE_C_FLAGS) -o \\\n";
+    }
   command2 += "\t  ";
   std::string libName = m_LibraryOutputPath + "lib" + std::string(name) + "$(MODULE_SUFFIX)";
   libName = this->ConvertToOutputPath(libName.c_str());
@@ -705,8 +723,17 @@ void cmUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
   std::string depend = "$(";
   depend += this->CreateMakeVariable(name, "_SRC_OBJS") 
     + ") $(" + this->CreateMakeVariable(name, "_DEPEND_LIBS") + ")";
-  std::string command = 
-    "$(CMAKE_CXX_COMPILER) $(CMAKE_SHLIB_LINK_FLAGS) $(CMAKE_CXX_FLAGS) ";
+  std::string command;
+  if(t.HasCxx())
+    {
+    command = 
+      "$(CMAKE_CXX_COMPILER) $(CMAKE_SHLIB_LINK_FLAGS) $(CMAKE_CXX_FLAGS) ";
+    }
+  else
+    {
+    command = 
+      "$(CMAKE_C_COMPILER) $(CMAKE_SHLIB_LINK_FLAGS) $(CMAKE_C_FLAGS) ";
+    }
   command += "$(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") ";
   std::strstream linklibs;
   this->OutputLinkLibraries(linklibs, 0, t);
@@ -1451,10 +1478,9 @@ void cmUnixMakefileGenerator::RecursiveGenerateCacheOnly()
       mf->AddDefinition("RUN_CONFIGURE", true);
       }
     cmUnixMakefileGenerator* gen = 
-      static_cast<cmUnixMakefileGenerator*>(this->CreateObject());
+      static_cast<cmUnixMakefileGenerator*>(mf->GetMakefileGenerator());
     gen->SetCacheOnlyOn();
     gen->SetRecurseOff();
-    mf->SetMakefileGenerator(gen);
     mf->GenerateMakefile();
     }
   // CLEAN up the makefiles created
@@ -1470,7 +1496,6 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
     "# the standard shell for make\n"
     "SHELL = /bin/sh\n"
     "\n"
-    "CMAKE_LIB_EXT       = @CMAKE_LIB_EXT@\n"
     "CMAKE_RANLIB        = @CMAKE_RANLIB@\n"
     "CMAKE_AR            = @CMAKE_AR@\n"
     "CMAKE_AR_ARGS       = @CMAKE_AR_ARGS@\n"
@@ -2034,7 +2059,7 @@ void cmUnixMakefileGenerator::SetLocal (bool local)
     }
 }
 
-void cmUnixMakefileGenerator::ComputeSystemInfo()
+void cmUnixMakefileGenerator::EnableLanguage(const char* lang)
 {
   if (m_CacheOnly)
     {
@@ -2057,21 +2082,38 @@ void cmUnixMakefileGenerator::ComputeSystemInfo()
       envCC[4999] = 0;
       putenv(envCC);
       }
-    // currently we run configure shell script here to determine the info
     std::string output;
-    std::string cmd = "cd ";
-    cmd += this->ConvertToOutputPath(m_Makefile->GetHomeOutputDirectory());
-    cmd += "; ";
-    const char* root
-      = m_Makefile->GetDefinition("CMAKE_ROOT");
-    cmd += root;
-    cmd += "/Templates/configure";
-    cmSystemTools::RunCommand(cmd.c_str(), output);
+    std::string root 
+      = this->ConvertToOutputPath(m_Makefile->GetDefinition("CMAKE_ROOT"));
+    // if no lang specified use CXX
+    if(!lang )
+      {
+      lang = "CXX";
+      }
+    // if CXX or C,  then enable C
+    if((!this->GetLanguageEnabled(lang) && lang[0] == 'C'))
+      {
+      std::string cmd = root;
+      cmd += "/Templates/cconfigure";
+      cmSystemTools::RunCommand(cmd.c_str(), output, 
+                                this->ConvertToOutputPath(m_Makefile->GetHomeOutputDirectory()).c_str());
+      std::string fpath = m_Makefile->GetHomeOutputDirectory();
+      fpath += "/CCMakeSystemConfig.cmake";
+      m_Makefile->ReadListFile(NULL,fpath.c_str());
+      this->SetLanguageEnabled("C");
+      }
+    // if CXX 
+    if(!this->GetLanguageEnabled(lang)  || strcmp(lang, "CXX") == 0)
+      {
+      std::string cmd = root;
+      cmd += "/Templates/cxxconfigure";
+      cmSystemTools::RunCommand(cmd.c_str(), output, 
+                                this->ConvertToOutputPath(m_Makefile->GetHomeOutputDirectory()).c_str());
+      std::string fpath = m_Makefile->GetHomeOutputDirectory();
+      fpath += "/CXXCMakeSystemConfig.cmake";
+      m_Makefile->ReadListFile(NULL,fpath.c_str());
+      this->SetLanguageEnabled("CXX");
+      }
     m_Makefile->AddDefinition("RUN_CONFIGURE", true);
     }
-
-  // now load the settings
-  std::string fpath = m_Makefile->GetHomeOutputDirectory();
-  fpath += "/CMakeSystemConfig.cmake";
-  m_Makefile->ReadListFile(NULL,fpath.c_str());
 }

+ 1 - 1
Source/cmUnixMakefileGenerator.h

@@ -80,7 +80,7 @@ public:
    * Try to determine system infomation such as shared library
    * extension, pthreads, byte order etc.  
    */
-  virtual void ComputeSystemInfo();
+  virtual void EnableLanguage(const char*);
 
 protected:
   virtual void RecursiveGenerateCacheOnly();

+ 2 - 2
Source/cmake.cxx

@@ -399,8 +399,8 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles)
   // setup CMAKE_ROOT and CMAKE_COMMAND
   this->AddCMakePaths(args);
 
-  // compute system info
-  gen->ComputeSystemInfo();
+  // reset any system configuration information
+  cmMakefileGenerator::ClearEnabledLanguages();
 
   std::string lf = mf.GetStartDirectory();
   lf +=  "/CMakeLists.txt";

+ 143 - 0
Templates/CCMakeSystemConfig.cmake.in

@@ -0,0 +1,143 @@
+# 
+# CMakeLocal.make.in should be in the directory where you run configure
+# in, which need not be the source directory
+#
+SET (CMAKE_WORDS_BIGENDIAN    @CMAKE_WORDS_BIGENDIAN@ CACHE BOOL
+     "The system uses big endian byte ordering.")
+
+SET (CMAKE_USE_SPROC          @CMAKE_USE_SPROC@ CACHE BOOL 
+     "Use sproc libs.")
+
+SET (CMAKE_USE_PTHREADS       @CMAKE_USE_PTHREADS@ CACHE BOOL
+     "Use the pthreads library.")
+
+IF(WIN32)
+  SET (CMAKE_USE_WIN32_THREADS  @CMAKE_USE_WIN32_THREADS@ CACHE BOOL
+       "Use the win32 thread library.")
+ENDIF(WIN32)
+
+SET (CMAKE_HP_PTHREADS        @CMAKE_HP_PTHREADS@ CACHE BOOL
+     "Use HP pthreads.")
+
+SET (CMAKE_RANLIB             "@RANLIB@" CACHE FILEPATH 
+     "Library randomizer program used on archive libraries.")
+
+SET (CMAKE_AR                 "@CMAKE_AR@" CACHE FILEPATH 
+     "Archive program used to make archive libraries.")
+
+SET (CMAKE_AR_ARGS            "@CMAKE_AR_ARGS@" CACHE STRING 
+     "Arguments for CMAKE_AR program to create an archive library.")
+
+
+SET (CMAKE_C_COMPILER         "@CC@" CACHE FILEPATH
+     "Name of C compiler used.")
+
+SET (CMAKE_C_FLAGS            "@CFLAGS@" CACHE STRING 
+     "Flags for C compiler.")
+
+SET (CMAKE_SHLIB_CFLAGS       "@CMAKE_SHLIB_CFLAGS@" CACHE STRING
+     "Flag used for building shared library objects.")
+
+SET (CMAKE_SHLIB_BUILD_FLAGS  "@CMAKE_SHLIB_BUILD_FLAGS@" CACHE STRING
+     "Flag used by CXX to build a shared library.")
+
+SET (CMAKE_MODULE_BUILD_FLAGS "@CMAKE_MODULE_BUILD_FLAGS@" CACHE STRING
+     "Flag used by CXX to build a shared library.")
+
+SET (CMAKE_INSTALL_PREFIX     @prefix@ CACHE PATH 
+     "Install path prefix, prepended onto install directories.")
+
+SET (CMAKE_SHLIB_SUFFIX       @CMAKE_SHLIB_SUFFIX@ CACHE STRING 
+     "Shared library suffix.")
+
+SET (CMAKE_MODULE_SUFFIX      @CMAKE_MODULE_SUFFIX@ CACHE STRING 
+     "Module library suffix.")
+
+SET (CMAKE_THREAD_LIBS        "@CMAKE_THREAD_LIBS@" CACHE STRING
+     "Thread library used.")
+
+SET (CMAKE_DL_LIBS            "@CMAKE_DL_LIBS@" CACHE STRING 
+     "Dynamic link library to link in.")
+
+SET (CMAKE_SHLIB_LINK_FLAGS   "@CMAKE_SHLIB_LINK_FLAGS@" CACHE STRING
+     "Flags used to link a shared library.")
+
+SET (CMAKE_MODULE_LINK_FLAGS  "@CMAKE_MODULE_LINK_FLAGS@" CACHE STRING
+     "Flags used to link a shared library.")
+
+SET (CMAKE_SHLIB_LD_LIBS      "@CMAKE_SHLIB_LD_LIBS@" CACHE STRING 
+     "Libraries used by LD for shared libraries.")
+
+SET (CMAKE_SHLIB_RUNTIME_FLAG "@CMAKE_SHLIB_RUNTIME_FLAG@" CACHE STRING
+     "Flag used to specify run-time search paths.")
+
+SET (CMAKE_SHLIB_RUNTIME_SEP "@CMAKE_SHLIB_RUNTIME_SEP@" CACHE STRING
+     "If null, each runtime path is a separate option. Otherwise, they are all joined, separated by this.")
+
+SET (CMAKE_SKIP_RPATH "NO" CACHE BOOL
+     "If set, runtime paths are not added when using shared libraries.")
+
+# support for X11
+
+SET (CMAKE_X_LIBS             "@X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@" CACHE STRING 
+     "Libraries and options used in X11 programs.")
+
+SET (CMAKE_X_CFLAGS           "@X_CFLAGS@" CACHE STRING 
+     "X11 extra flags.")
+
+SET (CMAKE_HAS_X              @CMAKE_HAS_X@ CACHE INTERNAL 
+     "Is X11 around.")
+
+SET (CMAKE_SYSTEM @CMAKE_SYSTEM@ CACHE INTERNAL 
+     "What system is this.  Result of uname.")
+
+SET (CMAKE_BUILD_TOOL make CACHE INTERNAL 
+     "What is the target build tool cmake is generating for.")
+
+SET (CMAKE_ANSI_CFLAGS        "@CMAKE_ANSI_CFLAGS@" CACHE INTERNAL 
+     "What flags are required by the c++ compiler to make it ansi.")
+
+
+SET (CMAKE_SIZEOF_INT       @CMAKE_SIZEOF_INT@   CACHE INTERNAL "Size of int data type")
+SET (CMAKE_SIZEOF_LONG      @CMAKE_SIZEOF_LONG@   CACHE INTERNAL "Size of long data type")
+SET (CMAKE_SIZEOF_VOID_P    @CMAKE_SIZEOF_VOID_P@  CACHE INTERNAL "Size of void* data type")
+SET (CMAKE_SIZEOF_CHAR      @CMAKE_SIZEOF_CHAR@  CACHE INTERNAL "Size of char data type")
+SET (CMAKE_SIZEOF_SHORT     @CMAKE_SIZEOF_SHORT@  CACHE INTERNAL "Size of short data type")
+SET (CMAKE_SIZEOF_FLOAT     @CMAKE_SIZEOF_FLOAT@  CACHE INTERNAL "Size of float data type")
+SET (CMAKE_SIZEOF_DOUBLE    @CMAKE_SIZEOF_DOUBLE@  CACHE INTERNAL "Size of double data type")
+
+FIND_PROGRAM(CMAKE_MAKE_PROGRAM NAMES gmake make )
+
+# The following variables are advanced 
+
+MARK_AS_ADVANCED(
+CMAKE_X_LIBS
+CMAKE_USE_WIN32_THREADS
+CMAKE_USE_SPROC
+CMAKE_USE_PTHREADS
+CMAKE_OBJECT_FILE_SUFFIX
+CMAKE_EXECUTABLE_SUFFIX
+CMAKE_STATICLIB_SUFFIX
+CMAKE_SHLIB_SUFFIX
+CMAKE_MODULE_SUFFIX
+CMAKE_C_COMPILER
+CMAKE_HP_PTHREADS
+CMAKE_WORDS_BIGENDIAN
+CMAKE_RANLIB
+CMAKE_AR
+CMAKE_AR_ARGS
+CMAKE_SHLIB_CFLAGS
+CMAKE_SHLIB_BUILD_FLAGS
+CMAKE_MODULE_BUILD_FLAGS
+CMAKE_THREAD_LIBS
+CMAKE_DL_LIBS
+CMAKE_SHLIB_LINK_FLAGS
+CMAKE_MODULE_LINK_FLAGS
+CMAKE_SHLIB_LD_LIBS
+CMAKE_SHLIB_RUNTIME_FLAG
+CMAKE_SHLIB_RUNTIME_SEP
+CMAKE_SKIP_RPATH
+CMAKE_X_CFLAGS
+CMAKE_ANSI_CFLAGS
+CMAKE_MAKE_PROGRAM
+)

+ 51 - 0
Templates/CXXCMakeSystemConfig.cmake.in

@@ -0,0 +1,51 @@
+# 
+# CMakeLocal.make.in should be in the directory where you run configure
+# in, which need not be the source directory
+#
+SET (CMAKE_AR                 "@CMAKE_AR@" CACHE FILEPATH 
+     "Archive program used to make archive libraries.")
+
+SET (CMAKE_AR_ARGS            "@CMAKE_AR_ARGS@" CACHE STRING 
+     "Arguments for CMAKE_AR program to create an archive library.")
+
+SET (CMAKE_CXX_COMPILER       "@CXX@" CACHE FILEPATH 
+     "Name of C++ compiler used.")
+
+SET (CMAKE_CXX_FLAGS          "@CXXFLAGS@" CACHE STRING 
+     "Flags used by CXX compiler.")
+
+SET (CMAKE_TEMPLATE_FLAGS     "@CMAKE_TEMPLATE_FLAGS@" CACHE STRING
+     "CXX template flags used by compiler.")
+
+SET (CMAKE_NO_ANSI_STREAM_HEADERS @CMAKE_NO_ANSI_STREAM_HEADERS@ CACHE INTERNAL 
+     "Does the compiler support headers like iostream.")
+
+SET (CMAKE_NO_STD_NAMESPACE   @CMAKE_NO_STD_NAMESPACE@  CACHE INTERNAL 
+     "Does the compiler support std::.")
+
+SET (CMAKE_NO_ANSI_FOR_SCOPE  @CMAKE_NO_ANSI_FOR_SCOPE@  CACHE INTERNAL 
+     "Does the compiler support ansi for scoping.")
+
+SET (CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@ CACHE INTERNAL 
+     "Is the compile GNU C++.")
+
+SET (CMAKE_ANSI_CXXFLAGS      "@CMAKE_ANSI_CXXFLAGS@" CACHE INTERNAL 
+     "What flags are required by the c++ compiler to make it ansi.")
+
+SET (CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION       @CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION@  CACHE INTERNAL 
+     "Does the compiler not support explicit template instantiation.")
+
+# The following variables are advanced 
+
+MARK_AS_ADVANCED(
+CMAKE_CXX_COMPILER
+CMAKE_AR
+CMAKE_AR_ARGS
+CMAKE_TEMPLATE_FLAGS
+CMAKE_NO_ANSI_STREAM_HEADERS
+CMAKE_NO_ANSI_FOR_SCOPE
+CMAKE_NO_STD_NAMESPACE
+CMAKE_COMPILER_IS_GNUCXX
+CMAKE_ANSI_CXXFLAGS
+CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION
+)

File diff suppressed because it is too large
+ 99 - 246
Templates/cconfigure


+ 8 - 142
Templates/configure.in → Templates/cconfigure.in

@@ -1,8 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-CMAKE_CONFIG_DIR=`pwd`
-AC_SUBST(CMAKE_CONFIG_DIR)
 
 #
 # check for some programs we use
@@ -10,16 +8,13 @@ AC_SUBST(CMAKE_CONFIG_DIR)
 
 # save the CFLAGS and CXXFLAGS specified by the user
 save_CFLAGS=$CFLAGS
-save_CXXFLAGS=$CXXFLAGS
 
 AC_PROG_CC
-AC_PROG_CXX
 
 
 # restore the flags specified by the user and get rid of any flags
 # found by autoconf (we do not want -02 -g by default)
 CFLAGS=$save_CFLAGS
-CXXFLAGS=$save_CXXFLAGS
 
 
 AC_PROG_RANLIB
@@ -163,7 +158,7 @@ case $system in
 	CMAKE_MODULE_LINK_FLAGS=""
         CMAKE_SHLIB_RUNTIME_FLAG=""
         CMAKE_SHLIB_RUNTIME_SEP=""  
-        if test $ac_cv_prog_gxx = yes; then
+        if test $ac_cv_prog_gcc = yes; then
   	  CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-G'
   	  CMAKE_MODULE_BUILD_FLAGS='-shared -Wl,-G'
 	  CMAKE_SHLIB_LINK_FLAGS='-Wl,-brtl'
@@ -197,7 +192,7 @@ case $system in
 	CMAKE_MODULE_LINK_FLAGS='-Wl,+s'
         CMAKE_SHLIB_RUNTIME_FLAG='-Wl,+b,'
         CMAKE_SHLIB_RUNTIME_SEP=':'
-        if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
+        if test $ac_cv_prog_gcc = yes; then
 	  CMAKE_SHLIB_CFLAGS="-fPIC"
   	  CMAKE_SHLIB_BUILD_FLAGS='-shared -Wl,-E -Wl,-b'
 	  CMAKE_SHLIB_LINK_FLAGS='-Wl,+s'
@@ -358,7 +353,7 @@ case $system in
 	CMAKE_SHLIB_LINK_FLAGS=''
 	CMAKE_MODULE_BUILD_FLAGS='-shared -Wl,-expect_unresolved,\\*'
 	CMAKE_MODULE_LINK_FLAGS=''
-        if test $ac_cv_prog_gxx = yes; then
+        if test $ac_cv_prog_gcc = yes; then
           CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-rpath,"
         else
           CMAKE_SHLIB_RUNTIME_FLAG="-rpath "
@@ -426,7 +421,7 @@ case $system in
 	CMAKE_MODULE_LINK_FLAGS=''
         CMAKE_SHLIB_RUNTIME_FLAG="-R "
         CMAKE_SHLIB_RUNTIME_SEP=":"
-        if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
+        if test $ac_cv_prog_gcc = yes; then
 	  CMAKE_SHLIB_BUILD_FLAGS='-shared -nostdlib'
 	  CMAKE_SHLIB_LINK_FLAGS=''
 	  CMAKE_MODULE_BUILD_FLAGS='-shared -nostdlib'
@@ -464,7 +459,7 @@ export CMAKE_MODULE_SUFFIX
 # If we're running gcc, then change the C flags for compiling shared
 # libraries to the right flags for gcc, instead of those for the
 # standard manufacturer compiler.
-if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
+if test $ac_cv_prog_gcc = yes; then
   CMAKE_SHLIB_CFLAGS="-fPIC"
 fi
 # if running on cygwin remove -fPIC flag
@@ -477,27 +472,6 @@ case $system in
     ;;
 esac
 
-CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION=""
-if test $ac_cv_prog_gxx = no; then
-    echo $ac_n "checking whether ${CXX} supports explicit instantiation""... $ac_c" 1>&6
-  echo 'template<class T>class x{};template class x<int>;' > conftest.cc
-  if test -z "`${CXX} -c conftest.cc 2>&1`"; then
-    echo "$ac_t""yes" 1>&6
-  else
-    echo "$ac_t""no" 1>&6
-    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
-  fi
-  rm -f conftest*
-fi
-# if running on darwin no explicit template instantiations even though
-# syntax is supported.
-case $system in 
-  Darwin*) 
-    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
-    ;;
-esac
-AC_SUBST(CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 # If the user has supplied C flags for compiling shared objects, use
 # those instead
 if test "${SHLIB_CFLAGS}" != ""; then
@@ -511,7 +485,6 @@ AC_SUBST(CMAKE_SHLIB_BUILD_FLAGS)
 AC_SUBST(CMAKE_MODULE_LINK_FLAGS)
 AC_SUBST(CMAKE_MODULE_BUILD_FLAGS)
 AC_SUBST(CMAKE_SHLIB_CFLAGS)
-AC_SUBST(CMAKE_LIB_EXT)
 AC_SUBST(CMAKE_DL_LIBS)
 AC_SUBST(CMAKE_SHLIB_LD_LIBS)
 AC_SUBST(CMAKE_SHLIB_SUFFIX)
@@ -612,9 +585,8 @@ AC_SUBST(CMAKE_THREAD_LIBS)
 
 
 CMAKE_ANSI_CFLAGS=""
-CMAKE_ANSI_CXXFLAGS=""
 # on hp use -Aa for ansi
-if test $ac_cv_prog_gxx = no; then
+if test $ac_cv_prog_gcc = no; then
 case $system in
     HP-UX-*)
         echo $ac_n "checking whether ${CC} accepts -Aa""... $ac_c" 1>&6
@@ -634,132 +606,26 @@ case $system in
         fi
         rm -f conftest*
 	;;   
-     IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
-        echo $ac_n "checking whether ${CXX} accepts -LANG:std""... $ac_c" 1>&6
-        echo 'void f(){}' > conftest.c
-        if test -z "`${CXX} -LANG:std -c conftest.c 2>&1`"; then
-          echo "$ac_t""yes" 1>&6
-	  CMAKE_ANSI_CXXFLAGS="-LANG:std"
-        else
-          echo "$ac_t""no" 1>&6
-        fi
-        rm -f conftest*
-	;;  
 esac
 fi
 AC_SUBST(CMAKE_ANSI_CFLAGS)
-AC_SUBST(CMAKE_ANSI_CXXFLAGS)
-
-# if we are not running g++ then we might need some other flags
-# to get the templates compiled correctly
-CMAKE_TEMPLATE_FLAGS=""
-if test $ac_cv_prog_gxx = no; then
-    echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6
-  echo 'void f(){}' > conftest.cc
-  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
-    echo "$ac_t""yes" 1>&6
-    CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink"
-  else
-    echo "$ac_t""no" 1>&6
-  fi
-  rm -f conftest*
-fi
-AC_SUBST(CMAKE_TEMPLATE_FLAGS)
-
-
-# check no g++ compilers to see if they have the standard 
-# ansi stream files (without the .h)
-if test $ac_cv_prog_gxx = no; then
-  AC_MSG_CHECKING( ansi standard C++ stream headers ) 
-  rm -rf conftest.*
-  cat > conftest.cc <<!
-#include <iostream>
-!
-  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
-    echo "$ac_t""yes" 1>&6
-  else
-    CMAKE_NO_ANSI_STREAM_HEADERS="1"
-    echo "$ac_t""no" 1>&6
-  fi
-fi
-AC_SUBST(CMAKE_NO_ANSI_STREAM_HEADERS)
-
-# check to see if stl is in the std namespace
-if test $ac_cv_prog_gxx = no; then
-  AC_MSG_CHECKING( ansi standard namespace support ) 
-  rm -rf conftest.*
-  cat > conftest.cc <<!
-#include <list>
-void foo() { std::list<int> l; }
-!
-  if test -z "`${CXX}  ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
-    echo "$ac_t""yes" 1>&6
-  else
-    CMAKE_NO_STD_NAMESPACE="1"
-    echo "$ac_t""no" 1>&6
-  fi
-fi
-AC_SUBST(CMAKE_NO_STD_NAMESPACE)
-
-# check to see if for scoping is supported
-if test $ac_cv_prog_gxx = no; then
-  AC_MSG_CHECKING( ansi for scope support ) 
-  rm -rf conftest.*
-  cat > conftest.cc <<!
-void foo() { for(int i;;); for(int i;;); }
-!
-  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
-    echo "$ac_t""yes" 1>&6
-  else
-    CMAKE_NO_ANSI_FOR_SCOPE="1"
-    echo "$ac_t""no" 1>&6
-  fi
-fi
-AC_SUBST(CMAKE_NO_ANSI_FOR_SCOPE)
 
 
-if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
+if test $ac_cv_prog_gcc = yes; then
   SHLIB_CFLAGS="-fPIC"
 fi
 
 # find make to use to build cmake, prefer gmake
-AC_PATH_PROGS(RUNMAKE, gmake make)
 AC_PATH_PROGS(CMAKE_AR_TMP, ar)
 CMAKE_AR="$CMAKE_AR_TMP"
 CMAKE_AR_ARGS="cr"
-# if on SunOS and not using gXX then use the compiler to make .a libs
-case $system in 
-   SunOS-5*)
-   if test $ac_cv_prog_gxx = yes; then
-	:
-   else
-      echo "Using $CXX -xar -o for creating .a libraries"
-      CMAKE_AR="$CXX"
-      CMAKE_AR_ARGS="-xar -o"
-   fi
-   ;;
-   IRIX*)
-   if test $ac_cv_prog_gxx = yes; then
-	:
-   else
-      echo "Using $CXX -xar -o for creating .a libraries"
-      CMAKE_AR="$CXX"
-      CMAKE_AR_ARGS="-ar -o"
-   fi
-   ;;
-esac
 AC_SUBST(CMAKE_AR)
 AC_SUBST(CMAKE_AR_ARGS)
 
-CMAKE_COMPILER_IS_GNUGXX=0
-if test $ac_cv_prog_gxx = yes; then
-	CMAKE_COMPILER_IS_GNUCXX=1
-fi
 
 CMAKE_SYSTEM="$system"
 AC_SUBST(CMAKE_SYSTEM)
-AC_SUBST(CMAKE_COMPILER_IS_GNUCXX)
 # generate output files.
 # create mkdir files just to make some of the directories
 
-AC_OUTPUT( CMakeSystemConfig.cmake )
+AC_OUTPUT( CCMakeSystemConfig.cmake )

+ 1131 - 0
Templates/cxxconfigure

@@ -0,0 +1,1131 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says [email protected].
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+
+#
+# check for some programs we use
+#
+
+# save the CXXFLAGS specified by the user
+save_CXXFLAGS=$CXXFLAGS
+
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:539: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CXX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CXX="$ac_cv_prog_CXX"
+if test -n "$CXX"; then
+  echo "$ac_t""$CXX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CXX" && break
+done
+test -n "$CXX" || CXX="gcc"
+
+
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:571: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 582 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cxx_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cxx_cross=no
+  else
+    ac_cv_prog_cxx_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cxx_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+if test $ac_cv_prog_cxx_works = no; then
+  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:613: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+echo "configure:618: checking whether we are using GNU C++" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gxx=yes
+else
+  ac_cv_prog_gxx=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:646: checking whether ${CXX-g++} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.cc
+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+  ac_cv_prog_cxx_g=yes
+else
+  ac_cv_prog_cxx_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+
+
+
+# restore the flags specified by the user and get rid of any flags
+# found by autoconf (we do not want -02 -g by default)
+CXXFLAGS=$save_CXXFLAGS
+
+
+CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION=""
+if test $ac_cv_prog_gxx = no; then
+    echo $ac_n "checking whether ${CXX} supports explicit instantiation""... $ac_c" 1>&6
+  echo 'template<class T>class x{};template class x<int>;' > conftest.cc
+  if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    echo "$ac_t""no" 1>&6
+    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
+  fi
+  rm -f conftest*
+fi
+# if running on darwin no explicit template instantiations even though
+# syntax is supported.
+case $system in 
+  Darwin*) 
+    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
+    ;;
+esac
+
+
+CMAKE_ANSI_CXXFLAGS=""
+# on hp use -Aa for ansi
+if test $ac_cv_prog_gxx = no; then
+case $system in
+     IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
+        echo $ac_n "checking whether ${CXX} accepts -LANG:std""... $ac_c" 1>&6
+        echo 'void f(){}' > conftest.c
+        if test -z "`${CXX} -LANG:std -c conftest.c 2>&1`"; then
+          echo "$ac_t""yes" 1>&6
+	  CMAKE_ANSI_CXXFLAGS="-LANG:std"
+        else
+          echo "$ac_t""no" 1>&6
+        fi
+        rm -f conftest*
+	;;  
+esac
+fi
+
+
+# if we are not running g++ then we might need some other flags
+# to get the templates compiled correctly
+CMAKE_TEMPLATE_FLAGS=""
+if test $ac_cv_prog_gxx = no; then
+    echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6
+  echo 'void f(){}' > conftest.cc
+  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+    CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink"
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+  rm -f conftest*
+fi
+
+
+
+# check no g++ compilers to see if they have the standard 
+# ansi stream files (without the .h)
+if test $ac_cv_prog_gxx = no; then
+  echo $ac_n "checking ansi standard C++ stream headers ""... $ac_c" 1>&6
+echo "configure:745: checking ansi standard C++ stream headers " >&5 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+#include <iostream>
+!
+  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_ANSI_STREAM_HEADERS="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+
+
+# check to see if stl is in the std namespace
+if test $ac_cv_prog_gxx = no; then
+  echo $ac_n "checking ansi standard namespace support ""... $ac_c" 1>&6
+echo "configure:762: checking ansi standard namespace support " >&5 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+#include <list>
+void foo() { std::list<int> l; }
+!
+  if test -z "`${CXX}  ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_STD_NAMESPACE="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+
+
+# check to see if for scoping is supported
+if test $ac_cv_prog_gxx = no; then
+  echo $ac_n "checking ansi for scope support ""... $ac_c" 1>&6
+echo "configure:780: checking ansi for scope support " >&5 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+void foo() { for(int i;;); for(int i;;); }
+!
+  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_ANSI_FOR_SCOPE="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+
+
+
+# find make to use to build cmake, prefer gmake
+for ac_prog in ar
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:801: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_CMAKE_AR_TMP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$CMAKE_AR_TMP" in
+  /*)
+  ac_cv_path_CMAKE_AR_TMP="$CMAKE_AR_TMP" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_CMAKE_AR_TMP="$CMAKE_AR_TMP" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_CMAKE_AR_TMP="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+CMAKE_AR_TMP="$ac_cv_path_CMAKE_AR_TMP"
+if test -n "$CMAKE_AR_TMP"; then
+  echo "$ac_t""$CMAKE_AR_TMP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CMAKE_AR_TMP" && break
+done
+
+CMAKE_AR="$CMAKE_AR_TMP"
+CMAKE_AR_ARGS="cr"
+# if on SunOS and not using gXX then use the compiler to make .a libs
+case $system in 
+   SunOS-5*)
+   if test $ac_cv_prog_gxx = yes; then
+	:
+   else
+      echo "Using $CXX -xar -o for creating .a libraries"
+      CMAKE_AR="$CXX"
+      CMAKE_AR_ARGS="-xar -o"
+   fi
+   ;;
+   IRIX*)
+   if test $ac_cv_prog_gxx = yes; then
+	:
+   else
+      echo "Using $CXX -xar -o for creating .a libraries"
+      CMAKE_AR="$CXX"
+      CMAKE_AR_ARGS="-ar -o"
+   fi
+   ;;
+esac
+
+
+
+CMAKE_COMPILER_IS_GNUGXX=0
+if test $ac_cv_prog_gxx = yes; then
+	CMAKE_COMPILER_IS_GNUCXX=1
+fi
+
+
+# generate output files.
+# create mkdir files just to make some of the directories
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+
+trap 'rm -fr `echo "CXXCMakeSystemConfig.cmake " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@CXX@%$CXX%g
+s%@CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION@%$CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION%g
+s%@CMAKE_ANSI_CXXFLAGS@%$CMAKE_ANSI_CXXFLAGS%g
+s%@CMAKE_TEMPLATE_FLAGS@%$CMAKE_TEMPLATE_FLAGS%g
+s%@CMAKE_NO_ANSI_STREAM_HEADERS@%$CMAKE_NO_ANSI_STREAM_HEADERS%g
+s%@CMAKE_NO_STD_NAMESPACE@%$CMAKE_NO_STD_NAMESPACE%g
+s%@CMAKE_NO_ANSI_FOR_SCOPE@%$CMAKE_NO_ANSI_FOR_SCOPE%g
+s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g
+s%@CMAKE_AR@%$CMAKE_AR%g
+s%@CMAKE_AR_ARGS@%$CMAKE_AR_ARGS%g
+s%@CMAKE_COMPILER_IS_GNUCXX@%$CMAKE_COMPILER_IS_GNUCXX%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"CXXCMakeSystemConfig.cmake "}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+

+ 165 - 0
Templates/cxxconfigure.in

@@ -0,0 +1,165 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT()
+
+
+#
+# check for some programs we use
+#
+
+# save the CXXFLAGS specified by the user
+save_CXXFLAGS=$CXXFLAGS
+
+AC_PROG_CXX
+
+
+# restore the flags specified by the user and get rid of any flags
+# found by autoconf (we do not want -02 -g by default)
+CXXFLAGS=$save_CXXFLAGS
+
+
+CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION=""
+if test $ac_cv_prog_gxx = no; then
+    echo $ac_n "checking whether ${CXX} supports explicit instantiation""... $ac_c" 1>&6
+  echo 'template<class T>class x{};template class x<int>;' > conftest.cc
+  if test -z "`${CXX} -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    echo "$ac_t""no" 1>&6
+    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
+  fi
+  rm -f conftest*
+fi
+# if running on darwin no explicit template instantiations even though
+# syntax is supported.
+case $system in 
+  Darwin*) 
+    CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION="1"
+    ;;
+esac
+AC_SUBST(CMAKE_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+CMAKE_ANSI_CXXFLAGS=""
+# on hp use -Aa for ansi
+if test $ac_cv_prog_gxx = no; then
+case $system in
+     IRIX-5* | IRIX-6* | IRIX64-6* | IRIX-64-6*)
+        echo $ac_n "checking whether ${CXX} accepts -LANG:std""... $ac_c" 1>&6
+        echo 'void f(){}' > conftest.c
+        if test -z "`${CXX} -LANG:std -c conftest.c 2>&1`"; then
+          echo "$ac_t""yes" 1>&6
+	  CMAKE_ANSI_CXXFLAGS="-LANG:std"
+        else
+          echo "$ac_t""no" 1>&6
+        fi
+        rm -f conftest*
+	;;  
+esac
+fi
+AC_SUBST(CMAKE_ANSI_CXXFLAGS)
+
+# if we are not running g++ then we might need some other flags
+# to get the templates compiled correctly
+CMAKE_TEMPLATE_FLAGS=""
+if test $ac_cv_prog_gxx = no; then
+    echo $ac_n "checking whether ${CXX} accepts -ptused -no_prelink""... $ac_c" 1>&6
+  echo 'void f(){}' > conftest.cc
+  if test -z "`${CXX} -ptused -no_prelink -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+    CMAKE_TEMPLATE_FLAGS="-ptused -no_prelink"
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+  rm -f conftest*
+fi
+AC_SUBST(CMAKE_TEMPLATE_FLAGS)
+
+
+# check no g++ compilers to see if they have the standard 
+# ansi stream files (without the .h)
+if test $ac_cv_prog_gxx = no; then
+  AC_MSG_CHECKING( ansi standard C++ stream headers ) 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+#include <iostream>
+!
+  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_ANSI_STREAM_HEADERS="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+AC_SUBST(CMAKE_NO_ANSI_STREAM_HEADERS)
+
+# check to see if stl is in the std namespace
+if test $ac_cv_prog_gxx = no; then
+  AC_MSG_CHECKING( ansi standard namespace support ) 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+#include <list>
+void foo() { std::list<int> l; }
+!
+  if test -z "`${CXX}  ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_STD_NAMESPACE="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+AC_SUBST(CMAKE_NO_STD_NAMESPACE)
+
+# check to see if for scoping is supported
+if test $ac_cv_prog_gxx = no; then
+  AC_MSG_CHECKING( ansi for scope support ) 
+  rm -rf conftest.*
+  cat > conftest.cc <<!
+void foo() { for(int i;;); for(int i;;); }
+!
+  if test -z "`${CXX} ${CMAKE_ANSI_CXXFLAGS} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>&1`"; then
+    echo "$ac_t""yes" 1>&6
+  else
+    CMAKE_NO_ANSI_FOR_SCOPE="1"
+    echo "$ac_t""no" 1>&6
+  fi
+fi
+AC_SUBST(CMAKE_NO_ANSI_FOR_SCOPE)
+
+
+# find make to use to build cmake, prefer gmake
+AC_PATH_PROGS(CMAKE_AR_TMP, ar)
+CMAKE_AR="$CMAKE_AR_TMP"
+CMAKE_AR_ARGS="cr"
+# if on SunOS and not using gXX then use the compiler to make .a libs
+case $system in 
+   SunOS-5*)
+   if test $ac_cv_prog_gxx = yes; then
+	:
+   else
+      echo "Using $CXX -xar -o for creating .a libraries"
+      CMAKE_AR="$CXX"
+      CMAKE_AR_ARGS="-xar -o"
+   fi
+   ;;
+   IRIX*)
+   if test $ac_cv_prog_gxx = yes; then
+	:
+   else
+      echo "Using $CXX -xar -o for creating .a libraries"
+      CMAKE_AR="$CXX"
+      CMAKE_AR_ARGS="-ar -o"
+   fi
+   ;;
+esac
+AC_SUBST(CMAKE_AR)
+AC_SUBST(CMAKE_AR_ARGS)
+
+CMAKE_COMPILER_IS_GNUGXX=0
+if test $ac_cv_prog_gxx = yes; then
+	CMAKE_COMPILER_IS_GNUCXX=1
+fi
+
+AC_SUBST(CMAKE_COMPILER_IS_GNUCXX)
+# generate output files.
+# create mkdir files just to make some of the directories
+
+AC_OUTPUT( CXXCMakeSystemConfig.cmake )

+ 3 - 0
Tests/COnly/CMakeLists.txt

@@ -0,0 +1,3 @@
+# a simple C only test case
+PROJECT (conly C)
+ADD_EXECUTABLE (conly conly.c)

+ 4 - 0
Tests/COnly/conly.c

@@ -0,0 +1,4 @@
+int main ()
+{
+  return 0;
+}

Some files were not shown because too many files changed in this diff