From reid at x10sys.com  Mon Aug 30 00:57:09 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 00:57:09 -0500
Subject: [llvm-commits] CVS: llvm/docs/CommandLine.html 
Message-ID: <200408300557.AAA02045@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

CommandLine.html updated: 1.25 -> 1.26
---
Log message:

Add a blurb about exploiting the use of external storage.


---
Diffs of the changes:  (+10 -2)

Index: llvm/docs/CommandLine.html
diff -u llvm/docs/CommandLine.html:1.25 llvm/docs/CommandLine.html:1.26
--- llvm/docs/CommandLine.html:1.25	Fri Aug 13 15:19:14 2004
+++ llvm/docs/CommandLine.html	Mon Aug 30 00:56:51 2004
@@ -1740,8 +1740,16 @@
 </div>
 
 <div class="doc_text">
+  <p>Several of the LLVM libraries define static <tt>cl::opt</tt> instances that
+  will automatically be included in any program that links with that library.
+  This is a feature. However, sometimes it is necessary to know the value of the
+  command line option outside of the library. In these cases the library does or
+  should provide an external storage location that is accessible to users of the
+  library. Examples of this include the <tt>llvm::DebugFlag</tt> exported by the
+  <tt>lib/Support/Debug.cpp</tt> file and the <tt>llvm::TimePassesIsEnabled</tt>
+  flag exported by the <tt>lib/VMCore/Pass.cpp</tt> file.</p>
 
-<p>TODO: fill in this section</p>
+<p>TODO: complete this section</p>
 
 </div>
 
@@ -1767,7 +1775,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/08/13 20:19:14 $
+  Last modified: $Date: 2004/08/30 05:56:51 $
 </address>
 
 </body>





From reid at x10sys.com  Mon Aug 30 01:27:43 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 01:27:43 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/llvmc.cpp 
Message-ID: <200408300627.BAA02280@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

llvmc.cpp updated: 1.12 -> 1.13
---
Log message:

Pass lists of -I and -D options through to the Compiler Driver.
Handle -g and -Wxxx for GCC compatibility 


---
Diffs of the changes:  (+17 -0)

Index: llvm/tools/llvmc/llvmc.cpp
diff -u llvm/tools/llvmc/llvmc.cpp:1.12 llvm/tools/llvmc/llvmc.cpp:1.13
--- llvm/tools/llvmc/llvmc.cpp:1.12	Sun Aug 29 19:06:52 2004
+++ llvm/tools/llvmc/llvmc.cpp	Mon Aug 30 01:27:32 2004
@@ -100,6 +100,14 @@
 cl::list<std::string> Libraries("l", cl::Prefix,
   cl::desc("Specify libraries to link to"), cl::value_desc("library prefix"));
 
+cl::list<std::string> Includes("I", cl::Prefix,
+  cl::desc("Specify location to search for included source"), 
+  cl::value_desc("include directory"));
+
+cl::list<std::string> Defines("D", cl::Prefix,
+  cl::desc("Specify a symbol to define for source configuration"),
+  cl::value_desc("symbol definition"));
+
 
 //===------------------------------------------------------------------------===
 //===          OUTPUT OPTIONS
@@ -117,6 +125,9 @@
 cl::opt<bool> Native("native", cl::init(false),
   cl::desc("Generative native object and executables instead of bytecode"));
 
+cl::opt<bool> DebugOutput("g", cl::init(false),
+  cl::desc("Generate objects that include debug symbols"));
+
 //===------------------------------------------------------------------------===
 //===          INFORMATION OPTIONS
 //===------------------------------------------------------------------------===
@@ -145,6 +156,10 @@
 cl::opt<bool> ShowStats("stats", cl::Optional, cl::init(false),
   cl::desc("Print statistics accumulated during optimization"));
 
+cl::list<std::string> Warnings("W", cl::Prefix,
+  cl::desc("Provide warnings for additional classes of errors"),
+  cl::value_desc("warning category"));
+
 //===------------------------------------------------------------------------===
 //===          ADVANCED OPTIONS
 //===------------------------------------------------------------------------===
@@ -255,6 +270,8 @@
     CD->setFinalPhase(FinalPhase);
     CD->setOptimization(OptLevel);
     CD->setOutputMachine(OutputMachine);
+    CD->setIncludePaths(Includes);
+    CD->setSymbolDefines(Defines);
     CD->setLibraryPaths(LibPaths);
 
     // Provide additional tool arguments





From reid at x10sys.com  Mon Aug 30 01:29:17 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 01:29:17 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/CompilerDriver.cpp
	CompilerDriver.h ConfigLexer.h ConfigLexer.l Configuration.cpp 
Message-ID: <200408300629.BAA02313@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

CompilerDriver.cpp updated: 1.12 -> 1.13
CompilerDriver.h updated: 1.10 -> 1.11
ConfigLexer.h updated: 1.6 -> 1.7
ConfigLexer.l updated: 1.7 -> 1.8
Configuration.cpp updated: 1.11 -> 1.12
---
Log message:

Implement the "setIncludePaths" and "setSymbolDefines" interface methods.
Revise token substitution to be a little faster.
Clean up exception throwing, make sure its always a std::string.


---
Diffs of the changes:  (+157 -50)

Index: llvm/tools/llvmc/CompilerDriver.cpp
diff -u llvm/tools/llvmc/CompilerDriver.cpp:1.12 llvm/tools/llvmc/CompilerDriver.cpp:1.13
--- llvm/tools/llvmc/CompilerDriver.cpp:1.12	Sun Aug 29 15:02:28 2004
+++ llvm/tools/llvmc/CompilerDriver.cpp	Mon Aug 30 01:29:06 2004
@@ -123,6 +123,21 @@
         AdditionalArgs[phase] = opts;
       }
 
+      virtual void setIncludePaths(const StringVector& paths) {
+        StringVector::const_iterator I = paths.begin();
+        StringVector::const_iterator E = paths.end();
+        while (I != E) {
+          sys::Path tmp;
+          tmp.set_directory(*I);
+          IncludePaths.push_back(tmp);
+          ++I;
+        }
+      }
+
+      virtual void setSymbolDefines(const StringVector& defs) {
+        Defines = defs;
+      }
+
       virtual void setLibraryPaths(const StringVector& paths) {
         StringVector::const_iterator I = paths.begin();
         StringVector::const_iterator E = paths.end();
@@ -193,45 +208,116 @@
         StringVector::iterator PI = pat->args.begin();
         StringVector::iterator PE = pat->args.end();
         while (PI != PE) {
-          if ((*PI)[0] == '%') {
-            if (*PI == "%in%") {
-              action->args.push_back(input.get());
-            } else if (*PI == "%out%") {
-              action->args.push_back(output.get());
-            } else if (*PI == "%time%") {
-              if (isSet(TIME_PASSES_FLAG))
-                action->args.push_back("-time-passes");
-            } else if (*PI == "%stats%") {
-              if (isSet(SHOW_STATS_FLAG))
-                action->args.push_back("-stats");
-            } else if (*PI == "%force%") {
-              if (isSet(FORCE_FLAG))
-                action->args.push_back("-f");
-            } else if (*PI == "%verbose%") {
-              if (isSet(VERBOSE_FLAG))
-                action->args.push_back("-v");
-            } else if (*PI == "%target%") {
-              // FIXME: Ignore for now
-            } else if (*PI == "%opt%") {
-              if (!isSet(EMIT_RAW_FLAG)) {
-                if (cd->opts.size() > static_cast<unsigned>(optLevel) && 
-                    !cd->opts[optLevel].empty())
-                  action->args.insert(action->args.end(), cd->opts[optLevel].begin(),
-                      cd->opts[optLevel].end());
-                else
-                  throw std::string("Optimization options for level ") + 
-                        utostr(unsigned(optLevel)) + " were not specified";
+          if ((*PI)[0] == '%' && PI->length() >2) {
+            bool found = true;
+            switch ((*PI)[1]) {
+              case 'a':
+                if (*PI == "%args%") {
+                  if (AdditionalArgs.size() > unsigned(phase))
+                    if (!AdditionalArgs[phase].empty()) {
+                      // Get specific options for each kind of action type
+                      StringVector& addargs = AdditionalArgs[phase];
+                      // Add specific options for each kind of action type
+                      action->args.insert(action->args.end(), addargs.begin(), addargs.end());
+                    }
+                } else
+                  found = false;
+                break;
+              case 'd':
+                if (*PI == "%defs%") {
+                  StringVector::iterator I = Defines.begin();
+                  StringVector::iterator E = Defines.end();
+                  while (I != E) {
+                    action->args.push_back( std::string("-D") + *I);
+                    ++I;
+                  }
+                } else
+                  found = false;
+                break;
+              case 'f':
+                if (*PI == "%force%") {
+                  if (isSet(FORCE_FLAG))
+                    action->args.push_back("-f");
+                } else
+                  found = false;
+                break;
+              case 'i':
+                if (*PI == "%in%") {
+                  action->args.push_back(input.get());
+                } else if (*PI == "%incls%") {
+                  PathVector::iterator I = IncludePaths.begin();
+                  PathVector::iterator E = IncludePaths.end();
+                  while (I != E) {
+                    action->args.push_back( std::string("-I") + I->get() );
+                    ++I;
+                  }
+                } else
+                  found = false;
+                break;
+              case 'l':
+                if (*PI == "%libs%") {
+                  PathVector::iterator I = LibraryPaths.begin();
+                  PathVector::iterator E = LibraryPaths.end();
+                  while (I != E) {
+                    action->args.push_back( std::string("-L") + I->get() );
+                    ++I;
+                  }
+                } else
+                  found = false;
+                break;
+              case 'o':
+                if (*PI == "%out%") {
+                  action->args.push_back(output.get());
+                } else if (*PI == "%opt%") {
+                  if (!isSet(EMIT_RAW_FLAG)) {
+                    if (cd->opts.size() > static_cast<unsigned>(optLevel) && 
+                        !cd->opts[optLevel].empty())
+                      action->args.insert(action->args.end(), cd->opts[optLevel].begin(),
+                          cd->opts[optLevel].end());
+                    else
+                      throw std::string("Optimization options for level ") + 
+                            utostr(unsigned(optLevel)) + " were not specified";
+                  }
+                } else
+                  found = false;
+                break;
+              case 's':
+                if (*PI == "%stats%") {
+                  if (isSet(SHOW_STATS_FLAG))
+                    action->args.push_back("-stats");
+                } else
+                  found = false;
+                break;
+              case 't':
+                if (*PI == "%target%") {
+                  action->args.push_back(std::string("-march=") + machine);
+                } else if (*PI == "%time%") {
+                  if (isSet(TIME_PASSES_FLAG))
+                    action->args.push_back("-time-passes");
+                } else
+                  found = false;
+                break;
+              case 'v':
+                if (*PI == "%verbose%") {
+                  if (isSet(VERBOSE_FLAG))
+                    action->args.push_back("-v");
+                } else
+                  found  = false;
+                break;
+              default:
+                found = false;
+                break;
+            }
+            if (!found) {
+              // Did it even look like a substitution?
+              if (PI->length()>1 && (*PI)[0] == '%' && 
+                  (*PI)[PI->length()-1] == '%') {
+                throw std::string("Invalid substitution token: '") + *PI +
+                      "' for command '" + pat->program.get() + "'";
+              } else {
+                // It's not a legal substitution, just pass it through
+                action->args.push_back(*PI);
               }
-            } else if (*PI == "%args%") {
-              if (AdditionalArgs.size() > unsigned(phase))
-                if (!AdditionalArgs[phase].empty()) {
-                  // Get specific options for each kind of action type
-                  StringVector& addargs = AdditionalArgs[phase];
-                  // Add specific options for each kind of action type
-                  action->args.insert(action->args.end(), addargs.begin(), addargs.end());
-                }
-            } else {
-              throw "Invalid substitution name" + *PI;
             }
           } else {
             // Its not a substitution, just put it in the action
@@ -240,7 +326,6 @@
           PI++;
         }
 
-
         // Finally, we're done
         return action;
       }
@@ -252,7 +337,7 @@
         if (!isSet(DRY_RUN_FLAG)) {
           action->program = sys::Program::FindProgramByName(action->program.get());
           if (action->program.is_empty())
-            throw "Can't find program '" + action->program.get() + "'";
+            throw std::string("Can't find program '") + action->program.get() + "'";
 
           // Invoke the program
           return 0 == action->program.ExecuteAndWait(action->args);
@@ -571,7 +656,7 @@
           std::vector<Action*>::iterator AE = actions.end();
           while (AI != AE) {
             if (!DoAction(*AI))
-              throw "Action failed";
+              throw std::string("Action failed");
             AI++;
           }
 
@@ -579,7 +664,8 @@
           actions.clear();
           if (finalPhase == LINKING) {
             if (isSet(EMIT_NATIVE_FLAG)) {
-              throw "llvmc doesn't know how to link native code yet";
+              throw std::string(
+                "llvmc doesn't know how to link native code yet");
             } else {
               // First, we need to examine the files to ensure that they all contain
               // bytecode files. Since the final output is bytecode, we can only
@@ -646,6 +732,8 @@
       unsigned Flags;               ///< The driver flags
       std::string machine;          ///< Target machine name
       PathVector LibraryPaths;      ///< -L options
+      PathVector IncludePaths;      ///< -I options
+      StringVector Defines;         ///< -D options
       sys::Path TempDir;            ///< Name of the temporary directory.
       StringTable AdditionalArgs;   ///< The -Txyz options
 


Index: llvm/tools/llvmc/CompilerDriver.h
diff -u llvm/tools/llvmc/CompilerDriver.h:1.10 llvm/tools/llvmc/CompilerDriver.h:1.11
--- llvm/tools/llvmc/CompilerDriver.h:1.10	Sun Aug 29 14:26:56 2004
+++ llvm/tools/llvmc/CompilerDriver.h	Mon Aug 30 01:29:06 2004
@@ -161,6 +161,12 @@
       virtual void setPhaseArgs(Phases phase, const StringVector& opts) = 0; 
 
       /// @brief Set Library Paths
+      virtual void setIncludePaths(const StringVector& paths) = 0;
+
+      /// @brief Set Library Paths
+      virtual void setSymbolDefines(const StringVector& paths) = 0;
+
+      /// @brief Set Library Paths
       virtual void setLibraryPaths(const StringVector& paths) = 0;
 
       /// @brief Set the list of library paths to be searched for


Index: llvm/tools/llvmc/ConfigLexer.h
diff -u llvm/tools/llvmc/ConfigLexer.h:1.6 llvm/tools/llvmc/ConfigLexer.h:1.7
--- llvm/tools/llvmc/ConfigLexer.h:1.6	Sun Aug 29 14:26:56 2004
+++ llvm/tools/llvmc/ConfigLexer.h	Mon Aug 30 01:29:06 2004
@@ -55,14 +55,17 @@
   ASSEMBLER,    ///< The name "assembler" (and variants)
   BYTECODE,     ///< The value "bytecode" (and variants)
   COMMAND,      ///< The name "command" (and variants)
+  DEFS_SUBST,   ///< The substitution item %defs%
   EQUALS,       ///< The equals sign, =
   FALSETOK,     ///< A boolean false value (false/no/off)
   FORCE_SUBST,  ///< The substitution item %force%
   IN_SUBST,     ///< The substitution item %in%
+  INCLS_SUBST,  ///< The substitution item %incls%
   INTEGER,      ///< An integer 
   LANG,         ///< The name "lang" (and variants)
   LIBPATHS,     ///< The name "libpaths" (and variants)
   LIBS,         ///< The name "libs" (and variants)
+  LIBS_SUBST,   ///< The substitution item %libs%
   LINKER,       ///< The name "linker" (and variants)
   NAME,         ///< The name "name" (and variants)
   OPT_SUBST,    ///< The substitution item %opt%


Index: llvm/tools/llvmc/ConfigLexer.l
diff -u llvm/tools/llvmc/ConfigLexer.l:1.7 llvm/tools/llvmc/ConfigLexer.l:1.8
--- llvm/tools/llvmc/ConfigLexer.l:1.7	Sun Aug 29 14:26:56 2004
+++ llvm/tools/llvmc/ConfigLexer.l	Mon Aug 30 01:29:06 2004
@@ -160,8 +160,11 @@
 {LINKER}        { return handleNameContext(LINKER); }
 
 %args%          { return handleSubstitution(ARGS_SUBST); }
+%defs%          { return handleSubstitution(DEFS_SUBST); }
 %force%         { return handleSubstitution(FORCE_SUBST); }
 %in%            { return handleSubstitution(IN_SUBST); }
+%incls%         { return handleSubstitution(INCLS_SUBST); }
+%libs%          { return handleSubstitution(LIBS_SUBST); }
 %opt%           { return handleSubstitution(OPT_SUBST); }
 %out%           { return handleSubstitution(OUT_SUBST); }
 %stats%         { return handleSubstitution(STATS_SUBST); }


Index: llvm/tools/llvmc/Configuration.cpp
diff -u llvm/tools/llvmc/Configuration.cpp:1.11 llvm/tools/llvmc/Configuration.cpp:1.12
--- llvm/tools/llvmc/Configuration.cpp:1.11	Sun Aug 29 14:26:56 2004
+++ llvm/tools/llvmc/Configuration.cpp	Mon Aug 30 01:29:06 2004
@@ -156,13 +156,16 @@
     bool parseSubstitution(CompilerDriver::StringVector& optList) {
       switch (token) {
         case ARGS_SUBST:        optList.push_back("%args%"); break;
+        case DEFS_SUBST:        optList.push_back("%defs%"); break;
+        case FORCE_SUBST:       optList.push_back("%force%"); break;
         case IN_SUBST:          optList.push_back("%in%"); break;
-        case OUT_SUBST:         optList.push_back("%out%"); break;
-        case TIME_SUBST:        optList.push_back("%time%"); break;
-        case STATS_SUBST:       optList.push_back("%stats%"); break;
+        case INCLS_SUBST:       optList.push_back("%incls%"); break;
+        case LIBS_SUBST:        optList.push_back("%libs%"); break;
         case OPT_SUBST:         optList.push_back("%opt%"); break;
+        case OUT_SUBST:         optList.push_back("%out%"); break;
         case TARGET_SUBST:      optList.push_back("%target%"); break;
-        case FORCE_SUBST:       optList.push_back("%force%"); break;
+        case STATS_SUBST:       optList.push_back("%stats%"); break;
+        case TIME_SUBST:        optList.push_back("%time%"); break;
         case VERBOSE_SUBST:     optList.push_back("%verbose%"); break;
         default:
           return false;
@@ -425,7 +428,8 @@
       confFile.set_directory(conf);
       confFile.append_file(ftype);
       if (!confFile.readable())
-        throw "Configuration file for '" + ftype + "' is not available.";
+        throw std::string("Configuration file for '") + ftype + 
+                          "' is not available.";
     } else {
       // Try the user's home directory
       confFile = sys::Path::GetUserHomeDirectory();
@@ -445,7 +449,8 @@
           confFile = sys::Path::GetLLVMDefaultConfigDir();
           confFile.append_file(ftype);
           if (!confFile.readable()) {
-            throw "Configuration file for '" + ftype + "' is not available.";
+            throw std::string("Configuration file for '") + ftype + 
+                              "' is not available.";
           }
         }
       }
@@ -454,11 +459,13 @@
     confFile = configDir;
     confFile.append_file(ftype);
     if (!confFile.readable())
-      throw "Configuration file for '" + ftype + "' is not available.";
+      throw std::string("Configuration file for '") + ftype + 
+                        "' is not available.";
   }
   FileInputProvider fip( confFile.get() );
   if (!fip.okay()) {
-    throw "Configuration file for '" + ftype + "' is not available.";
+    throw std::string("Configuration file for '") + ftype + 
+                      "' is not available.";
   }
   result = new CompilerDriver::ConfigData();
   ParseConfigData(fip,*result);





From reid at x10sys.com  Mon Aug 30 01:32:34 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 01:32:34 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/cpp 
Message-ID: <200408300632.BAA02353@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

cpp added (r1.1)
---
Log message:

Initial commit of a configuration file for compiling C++ programs with
the file name pattern *.cpp


---
Diffs of the changes:  (+61 -0)

Index: llvm/tools/llvmc/cpp
diff -c /dev/null llvm/tools/llvmc/cpp:1.1
*** /dev/null	Mon Aug 30 01:32:34 2004
--- llvm/tools/llvmc/cpp	Mon Aug 30 01:32:24 2004
***************
*** 0 ****
--- 1,61 ----
+ # Stacker Configuration File For llvmc
+ 
+ ##########################################################
+ # Language definitions
+ ##########################################################
+   lang.name=C++ 
+   lang.opt1=-O1
+   lang.opt2=-O2
+   lang.opt3=-O3
+   lang.opt4=-O3
+   lang.opt5=-O3
+ 
+ ##########################################################
+ # Pre-processor definitions
+ ##########################################################
+ 
+   # Stacker doesn't have a preprocessor but the following
+   # allows the -E option to be supported
+   preprocessor.command=g++ -E %in% -o %out% %incls% %defs%
+   preprocessor.required=false
+ 
+ ##########################################################
+ # Translator definitions
+ ##########################################################
+ 
+   # To compile stacker source, we just run the stacker
+   # compiler with a default stack size of 2048 entries.
+   translator.command=g++ -c -x c++ %in% -o %out% %opt% %incls% %libs% %defs%
+ 
+   # stkrc doesn't preprocess but we set this to true so
+   # that we don't run the cp command by default.
+   translator.preprocesses=true
+ 
+   # The translator is required to run.
+   translator.required=false
+ 
+   # stkrc doesn't handle the -On options
+   translator.output=bytecode
+ 
+ ##########################################################
+ # Optimizer definitions
+ ##########################################################
+   
+   # For optimization, we use the LLVM "opt" program
+   optimizer.command=g++ -c -x c++ %in% -o %out% %opt% %args% %incls% %libs% %defs%
+ 
+   optimizer.required = true
+ 
+   # opt doesn't translate
+   optimizer.translates = true
+ 
+   # opt doesn't preprocess
+   optimizer.preprocesses=true
+ 
+   # opt produces bytecode
+   optimizer.output = bc
+ 
+ ##########################################################
+ # Assembler definitions
+ ##########################################################
+   assembler.command=llc %in% -o %out% %target% %time% %stats%





From reid at x10sys.com  Mon Aug 30 11:04:04 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 11:04:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Unix.h 
Message-ID: <200408301604.LAA09089@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix:

Unix.h updated: 1.2 -> 1.3
---
Log message:

Add inclusion of assert.h


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/System/Unix/Unix.h
diff -u llvm/lib/System/Unix/Unix.h:1.2 llvm/lib/System/Unix/Unix.h:1.3
--- llvm/lib/System/Unix/Unix.h:1.2	Sun Aug 29 14:24:20 2004
+++ llvm/lib/System/Unix/Unix.h	Mon Aug 30 11:03:54 2004
@@ -24,6 +24,7 @@
 #include <cerrno>
 #include <sys/types.h>
 #include <sys/param.h>
+#include <assert.h>
 
 inline void ThrowErrno(const std::string& prefix) {
 #if defined __USE_XOPEN2K || defined __USE_MISC





From gaeke at cs.uiuc.edu  Mon Aug 30 14:56:51 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon, 30 Aug 2004 14:56:51 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/include/reopt/UnpackTraceFunction.h 
Message-ID: <200408301956.OAA12408@seraph.cs.uiuc.edu>



Changes in directory reopt/include/reopt:

UnpackTraceFunction.h updated: 1.16 -> 1.17
---
Log message:

Add prototype for new private method getRealRegType.


---
Diffs of the changes:  (+2 -0)

Index: reopt/include/reopt/UnpackTraceFunction.h
diff -u reopt/include/reopt/UnpackTraceFunction.h:1.16 reopt/include/reopt/UnpackTraceFunction.h:1.17
--- reopt/include/reopt/UnpackTraceFunction.h:1.16	Sun Aug 22 22:10:31 2004
+++ reopt/include/reopt/UnpackTraceFunction.h	Mon Aug 30 14:56:40 2004
@@ -55,6 +55,8 @@
   void PrintValueAIs (const std::string &ValueName, const AllocInfo &MatrixAI,
                       const AllocInfo &TraceAI) const;
 
+  unsigned getRealRegType (unsigned R) const;
+
   MachineBasicBlock::iterator rewriteProlog (MachineBasicBlock &MBB);
   void copyConstantToRegister (MachineFunction &MF, Constant *C, unsigned Reg,
                                unsigned SpareReg,





From gaeke at cs.uiuc.edu  Mon Aug 30 14:56:51 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon, 30 Aug 2004 14:56:51 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/FirstTrigger.cpp 
Message-ID: <200408301956.OAA12410@seraph.cs.uiuc.edu>



Changes in directory reopt/lib/LightWtProfiling:

FirstTrigger.cpp updated: 1.19 -> 1.20
---
Log message:

Save and load fp double registers. Maybe it will help?


---
Diffs of the changes:  (+2 -2)

Index: reopt/lib/LightWtProfiling/FirstTrigger.cpp
diff -u reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.19 reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.20
--- reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.19	Fri Jan 16 11:02:00 2004
+++ reopt/lib/LightWtProfiling/FirstTrigger.cpp	Mon Aug 30 14:56:41 2004
@@ -45,7 +45,7 @@
   SAVE_I_REGS(i_reg_save);
   SAVE_G1_REG(g1_reg);
   SAVE_F_REGS_1(f_reg_save);
-  // SAVE_F_REGS_2(f_reg_save);
+  SAVE_F_REGS_2(f_reg_save);
   SAVE_FD_REGS(fd_reg_save);
   SAVE_FSR_REG(fsr_reg);
   SAVE_FPRS_REG(fprs_reg);
@@ -109,7 +109,7 @@
   LOAD_FPRS_REG(fprs_reg);
   LOAD_G1_REG(g1_reg);
   LOAD_F_REGS_1(f_reg_save);
-  // LOAD_F_REGS_2(f_reg_save);
+  LOAD_F_REGS_2(f_reg_save);
   LOAD_FD_REGS(fd_reg_save);
   LOAD_FSR_REG(fsr_reg);
 }





From gaeke at cs.uiuc.edu  Mon Aug 30 14:56:52 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon, 30 Aug 2004 14:56:52 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/SecondTrigger.cpp 
Message-ID: <200408301956.OAA12418@seraph.cs.uiuc.edu>



Changes in directory reopt/lib/LightWtProfiling:

SecondTrigger.cpp updated: 1.32 -> 1.33
---
Log message:

Save and load fp double registers. Maybe it will help?
When giving up on a trace, try to get rid of the SLI trace as well, to
avoid infinite loops.


---
Diffs of the changes:  (+9 -5)

Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp
diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.32 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.33
--- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.32	Thu Jul 29 23:04:44 2004
+++ reopt/lib/LightWtProfiling/SecondTrigger.cpp	Mon Aug 30 14:56:42 2004
@@ -83,7 +83,7 @@
   SAVE_G1_REG(g1_reg);
   SAVE_G5_REG(g5_reg);
   SAVE_F_REGS_1(f_reg_save);
-  // SAVE_F_REGS_2(f_reg_save);
+  SAVE_F_REGS_2(f_reg_save);
   SAVE_FD_REGS(fd_reg_save);
   SAVE_FSR_REG(fsr_reg);
   SAVE_FPRS_REG(fprs_reg);
@@ -126,7 +126,7 @@
   LOAD_G5_REG(g5_reg);
   LOAD_FPRS_REG(fprs_reg);
   LOAD_F_REGS_1(f_reg_save);
-  // LOAD_F_REGS_2(f_reg_save);
+  LOAD_F_REGS_2(f_reg_save);
   LOAD_FD_REGS(fd_reg_save);
   LOAD_FSR_REG(fsr_reg);
 }
@@ -194,7 +194,7 @@
   SAVE_I_REGS(i_reg_save);
   SAVE_G1_REG(g1_reg);
   SAVE_F_REGS_1(f_reg_save);
-  // SAVE_F_REGS_2(f_reg_save);
+  SAVE_F_REGS_2(f_reg_save);
   SAVE_FD_REGS(fd_reg_save);
   SAVE_FSR_REG(fsr_reg);
   SAVE_FPRS_REG(fprs_reg);
@@ -335,7 +335,7 @@
   LOAD_G1_REG(g1_reg);
   LOAD_FPRS_REG(fprs_reg);
   LOAD_F_REGS_1(f_reg_save);
-  // LOAD_F_REGS_2(f_reg_save);
+  LOAD_F_REGS_2(f_reg_save);
   LOAD_FD_REGS(fd_reg_save);
   LOAD_FSR_REG(fsr_reg);
 }
@@ -527,8 +527,12 @@
     std::vector<BasicBlock *> vBB;
     constructVBB (paths[0], start, vBB);
     if (vBB.empty()) return;
-    if (!optimizeTrace (vBB, firstLevelTraceStartAddr))
+    if (!optimizeTrace (vBB, firstLevelTraceStartAddr)) {
+      // give up.
       tr->patchTrace(firstLevelTraceStartAddr);
+	  vm->writeBranchInstruction(firstLevelTraceStartAddr, start);
+	  doFlush(firstLevelTraceStartAddr-8, firstLevelTraceStartAddr+8);
+    }
     return;
   }
   





From gaeke at cs.uiuc.edu  Mon Aug 30 14:56:53 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon, 30 Aug 2004 14:56:53 -0500 (CDT)
Subject: [llvm-commits] 
	CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200408301956.OAA12424@seraph.cs.uiuc.edu>



Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.109 -> 1.110
---
Log message:

Sort includes.
If we can guess that a pair of single-fp registers is being used to hold a
double-fp value, then use the fp double save/restore instructions instead of
the fp single save/restore instructions on it.


---
Diffs of the changes:  (+26 -15)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.109 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.110
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.109	Wed Aug 25 13:43:18 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Mon Aug 30 14:56:43 2004
@@ -13,22 +13,22 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "reopt/UnpackTraceFunction.h"
-#include "reopt/TraceToFunction.h"
-#include "reopt/MappingInfo.h"
-#include "../../../../lib/Target/SparcV9/MachineFunctionInfo.h"
 #include "../../../../lib/Target/SparcV9/MachineCodeForInstruction.h"
-#include "llvm/Support/CFG.h"
-#include "llvm/Module.h"
-#include "llvm/Instructions.h"
-#include "llvm/Assembly/Writer.h"
-#include "Support/StringExtras.h"                   // for utostr()
-#include "Support/Debug.h"
+#include "../../../../lib/Target/SparcV9/MachineFunctionInfo.h"
 #include "../../../../lib/Target/SparcV9/RegAlloc/AllocInfo.h"
+#include "../../../../lib/Target/SparcV9/SparcV9BurgISel.h"
 #include "../../../../lib/Target/SparcV9/SparcV9RegInfo.h"
 #include "../../../../lib/Target/SparcV9/SparcV9TargetMachine.h"
 #include "../../../../lib/Target/SparcV9/SparcV9TmpInstr.h"
-#include "../../../../lib/Target/SparcV9/SparcV9BurgISel.h"
+#include "Support/Debug.h"
+#include "Support/StringExtras.h"                   // for utostr()
+#include "llvm/Assembly/Writer.h"
+#include "llvm/Instructions.h"
+#include "llvm/Module.h"
+#include "llvm/Support/CFG.h"
+#include "reopt/MappingInfo.h"
+#include "reopt/TraceToFunction.h"
+#include "reopt/UnpackTraceFunction.h"
 
 namespace llvm {
 
@@ -192,6 +192,17 @@
   std::cerr << " in TraceFn\n";
 }
 
+unsigned UnpackTraceFunction::getRealRegType (unsigned R) const {
+  const SparcV9RegInfo &TRI = *TM->getRegInfo ();
+  unsigned rawRegType = TRI.getRegType (R);
+  if ((rawRegType == SparcV9RegInfo::FPSingleRegType)
+      && (R % 2 == 0)
+      && (RegsToSave.find (R+1) == RegsToSave.end ()))
+    return SparcV9RegInfo::FPDoubleRegType;
+  else
+    return rawRegType;
+}
+
 MachineBasicBlock::iterator
 UnpackTraceFunction::rewriteProlog (MachineBasicBlock &EntryBB) {
   // UTF prolog: start out by clearing SAVE and stack-load instructions out
@@ -221,7 +232,7 @@
     mvec.clear ();
     unsigned R = *i;
     DEBUG (std::cerr << "rewriteProlog: Saving " << RegStr (R) << "\n");
-    TRI.cpReg2MemMI (mvec, R, sp, stackOffsetForReg (R), TRI.getRegType (R),
+    TRI.cpReg2MemMI (mvec, R, sp, stackOffsetForReg (R), getRealRegType (R),
                      g2);
     for (std::vector<MachineInstr *>::iterator vi = mvec.begin (),
            ve = mvec.end (); vi != ve; ++vi)
@@ -250,7 +261,7 @@
     else if (Target.AllocState == AllocInfo::Spilled)
       // We'll save the value first in a register and then on TraceFn's stack
       R = SparcV9::g3;
-    unsigned RegType = TRI.getRegType (R);
+    unsigned RegType = getRealRegType (R);
     if (Source.AllocState == AllocInfo::Allocated)
       // Copy live-in value from where we saved its reg. on TraceFn's stack
       TRI.cpMem2RegMI (mvec, sp, stackOffsetForReg (Source.Placement), R,
@@ -377,7 +388,7 @@
   // in a register in the TraceFn.
   if (Source.AllocState == AllocInfo::Allocated)
     R = Source.Placement;
-  RegType = TRI.getRegType (R);
+  RegType = getRealRegType (R);
   if (Source.AllocState == AllocInfo::NotAllocated) {
     assert (liveOutValue && isa<Constant> (liveOutTraceValue)
             && "Non-allocated live-out value in TraceFn must be constant");
@@ -584,7 +595,7 @@
     mvec.clear ();
     unsigned R = *i;
     DEBUG (std::cerr << "rewriteEpilog: Reloading " << RegStr (R) << "\n");
-    TRI.cpMem2RegMI (mvec, sp, stackOffsetForReg (R), R, TRI.getRegType (R),
+    TRI.cpMem2RegMI (mvec, sp, stackOffsetForReg (R), R, getRealRegType (R),
                      g2);
     for (std::vector<MachineInstr *>::iterator vi = mvec.begin (),
            ve = mvec.end (); vi != ve; ++vi)





From gaeke at cs.uiuc.edu  Mon Aug 30 14:56:54 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon, 30 Aug 2004 14:56:54 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/test/run-tests 
Message-ID: <200408301956.OAA12430@seraph.cs.uiuc.edu>



Changes in directory reopt/test:

run-tests updated: 1.19 -> 1.20
---
Log message:

Add more tests.


---
Diffs of the changes:  (+14 -5)

Index: reopt/test/run-tests
diff -u reopt/test/run-tests:1.19 reopt/test/run-tests:1.20
--- reopt/test/run-tests:1.19	Sun Aug 22 22:10:33 2004
+++ reopt/test/run-tests	Mon Aug 30 14:56:44 2004
@@ -70,19 +70,23 @@
   d) SUBDIR=MultiSource/Applications/d ;;
   sim) SUBDIR=MultiSource/Benchmarks/sim ;;
 
+  pifft) SUBDIR=MultiSource/Benchmarks/FreeBench/pifft ;;
+
   shootout) SUBDIR=SingleSource/Benchmarks/Shootout ;;
   stanford) SUBDIR=SingleSource/Benchmarks/Stanford ;;
   olden) SUBDIR=MultiSource/Benchmarks/Olden ;;
-  power) SUBDIR=MultiSource/Benchmarks/Olden/power ;;
-  tsp) SUBDIR=MultiSource/Benchmarks/Olden/tsp ;;
-  imp) SUBDIR=MultiSource/Benchmarks/McCat/18-imp ;;
+  ptrdist) SUBDIR=MultiSource/Benchmarks/Ptrdist ;;
+  mccat) SUBDIR=MultiSource/Benchmarks/McCat ;;
+  freebench) SUBDIR=MultiSource/Benchmarks/FreeBench ;;
 
-  hackedmst) SUBDIR=SingleSource/Reoptimizer/Mst ;;
+  specint) SUBDIR=External/SPEC/CINT2000; spectest=1 ;;
+  specfp) SUBDIR=External/SPEC/CFP2000; spectest=1 ;;
 
   mcf) SUBDIR=External/SPEC/CINT2000/181.mcf; spectest=1 ;;
   art) SUBDIR=External/SPEC/CFP2000/179.art; spectest=1;;
   equake) SUBDIR=External/SPEC/CFP2000/183.equake; spectest=1 ;;
   gzip) SUBDIR=External/SPEC/CINT2000/164.gzip; spectest=1 ;;
+  gap) SUBDIR=External/SPEC/CINT2000/254.gap; spectest=1 ;;
   bzip2) SUBDIR=External/SPEC/CINT2000/256.bzip2; spectest=1 ;;
   crafty) SUBDIR=External/SPEC/CINT2000/186.crafty; spectest=1 ;;
   parser) SUBDIR=External/SPEC/CINT2000/197.parser; spectest=1 ;;
@@ -90,6 +94,11 @@
   twolf) SUBDIR=External/SPEC/CINT2000/300.twolf; spectest=1 ;;
   ammp) SUBDIR=External/SPEC/CFP2000/188.ammp; spectest=1 ;;
 
+  go) SUBDIR=External/SPEC/CINT95/099.go; spectest=1 ;;
+  m88ksim) SUBDIR=External/SPEC/CINT95/124.m88ksim; spectest=1 ;;
+  compress) SUBDIR=External/SPEC/CINT95/129.compress; spectest=1 ;;
+  li) SUBDIR=External/SPEC/CINT95/130.li; spectest=1 ;;
+
   *) ucname=`echo $benchmk | perl -pe '$_ = ucfirst lc $_;'`
      SUBDIR=$EXTRATESTSUBDIR/$ucname
      if [ ! -d $objroot/test/Programs/$SUBDIR ]
@@ -137,7 +146,7 @@
 	export LLVM_REOPT
     exec gmake SUBDIR=$SUBDIR SPECTEST=1 RUNTIMELIMIT=900
   else
-    exec gmake SUBDIR=$SUBDIR
+    exec gmake SUBDIR=$SUBDIR RUNTIMELIMIT=900
   fi
 }
 





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Path.cpp 
Message-ID: <200408302147.QAA10981@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix:

Path.cpp updated: 1.2 -> 1.3
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+0 -12)

Index: llvm/lib/System/Unix/Path.cpp
diff -u llvm/lib/System/Unix/Path.cpp:1.2 llvm/lib/System/Unix/Path.cpp:1.3
--- llvm/lib/System/Unix/Path.cpp:1.2	Sun Aug 29 00:24:01 2004
+++ llvm/lib/System/Unix/Path.cpp	Mon Aug 30 16:46:55 2004
@@ -43,18 +43,6 @@
   return result;
 }
 
-Path
-Path::GetTemporaryDirectory() {
-  char pathname[MAXPATHLEN];
-  strcpy(pathname,"/tmp/llvm_XXXXXX");
-  if (0 == mkdtemp(pathname))
-    ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
-  Path result;
-  result.set_directory(pathname);
-  assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
-  return result;
-}
-
 Path 
 Path::GetSystemLibraryPath1() {
   return Path("/lib/");





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Linux/Path.cpp 
Message-ID: <200408302147.QAA10984@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Linux:

Path.cpp updated: 1.2 -> 1.3
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+12 -0)

Index: llvm/lib/System/Linux/Path.cpp
diff -u llvm/lib/System/Linux/Path.cpp:1.2 llvm/lib/System/Linux/Path.cpp:1.3
--- llvm/lib/System/Linux/Path.cpp:1.2	Sun Aug 29 00:24:01 2004
+++ llvm/lib/System/Linux/Path.cpp	Mon Aug 30 16:46:55 2004
@@ -33,6 +33,18 @@
   return true;
 }
 
+Path
+Path::GetTemporaryDirectory() {
+  char pathname[MAXPATHLEN];
+  strcpy(pathname,"/tmp/llvm_XXXXXX");
+  if (0 == mkdtemp(pathname))
+    ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+  Path result;
+  result.set_directory(pathname);
+  assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+  return result;
+}
+
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/Path.cpp 
Message-ID: <200408302147.QAA10987@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Cygwin:

Path.cpp added (r1.1)
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+50 -0)

Index: llvm/lib/System/Cygwin/Path.cpp
diff -c /dev/null llvm/lib/System/Cygwin/Path.cpp:1.1
*** /dev/null	Mon Aug 30 16:47:05 2004
--- llvm/lib/System/Cygwin/Path.cpp	Mon Aug 30 16:46:55 2004
***************
*** 0 ****
--- 1,50 ----
+ //===- Cygwin/Path.cpp - Cygwin Path Implementation -------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Cygwin specific implementation of the Path class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Cygwin specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Path.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic Unix implementation
+ #include "../Unix/Path.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ bool 
+ Path::is_valid() const {
+   if (path.empty()) 
+     return false;
+   char pathname[MAXPATHLEN];
+   if (0 == realpath(path.c_str(), pathname))
+     if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
+       return false;
+   return true;
+ }
+ 
+ Path
+ Path::GetTemporaryDirectory() {
+   char pathname[MAXPATHLEN];
+   strcpy(pathname,"/tmp/llvm_XXXXXX");
+   if (0 == mkdtemp(pathname))
+     ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+   Path result;
+   result.set_directory(pathname);
+   assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+   return result;
+ }
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/Path.cpp 
Message-ID: <200408302147.QAA10988@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/SunOS:

Path.cpp updated: 1.1 -> 1.2
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+14 -0)

Index: llvm/lib/System/SunOS/Path.cpp
diff -u llvm/lib/System/SunOS/Path.cpp:1.1 llvm/lib/System/SunOS/Path.cpp:1.2
--- llvm/lib/System/SunOS/Path.cpp:1.1	Sun Aug 29 00:24:01 2004
+++ llvm/lib/System/SunOS/Path.cpp	Mon Aug 30 16:46:55 2004
@@ -33,6 +33,20 @@
   return true;
 }
 
+Path
+Path::GetTemporaryDirectory() {
+  char* pathname = tempnam(0,"llvm_");
+  if (0 == pathname)
+    ThrowErrno(std::string("Can't create temporary directory name"));
+  Path result;
+  result.set_directory(pathname);
+  free(pathname);
+  assert(result.is_valid() && "tempnam didn't create a valid pathname!");
+  if (0 != mkdir(result.c_str(), S_IRWXU))
+    ThrowErrno(result.get() + ": Can't create temporary directory");
+  return result;
+}
+
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/AIX/Path.cpp 
Message-ID: <200408302147.QAA10993@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/AIX:

Path.cpp updated: 1.2 -> 1.3
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+12 -0)

Index: llvm/lib/System/AIX/Path.cpp
diff -u llvm/lib/System/AIX/Path.cpp:1.2 llvm/lib/System/AIX/Path.cpp:1.3
--- llvm/lib/System/AIX/Path.cpp:1.2	Sun Aug 29 14:25:54 2004
+++ llvm/lib/System/AIX/Path.cpp	Mon Aug 30 16:46:55 2004
@@ -31,6 +31,18 @@
   return true;
 }
 
+Path
+Path::GetTemporaryDirectory() {
+  char pathname[MAXPATHLEN];
+  strcpy(pathname,"/tmp/llvm_XXXXXX");
+  if (0 == mkdtemp(pathname))
+    ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+  Path result;
+  result.set_directory(pathname);
+  assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+  return result;
+}
+
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Mon Aug 30 16:47:06 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 16:47:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/Path.cpp 
Message-ID: <200408302147.QAA10996@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Darwin:

Path.cpp updated: 1.1 -> 1.2
---
Log message:

Move the GetTemporaryDirectory function from "generic Unix" to platform
specific.


---
Diffs of the changes:  (+12 -0)

Index: llvm/lib/System/Darwin/Path.cpp
diff -u llvm/lib/System/Darwin/Path.cpp:1.1 llvm/lib/System/Darwin/Path.cpp:1.2
--- llvm/lib/System/Darwin/Path.cpp:1.1	Sun Aug 29 00:24:01 2004
+++ llvm/lib/System/Darwin/Path.cpp	Mon Aug 30 16:46:55 2004
@@ -31,6 +31,18 @@
   return true;
 }
 
+Path
+Path::GetTemporaryDirectory() {
+  char pathname[MAXPATHLEN];
+  strcpy(pathname,"/tmp/llvm_XXXXXX");
+  if (0 == mkdtemp(pathname))
+    ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+  Path result;
+  result.set_directory(pathname);
+  assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+  return result;
+}
+
 }
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Mon Aug 30 20:34:21 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 20:34:21 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200408310134.UAA12231@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.105 -> 1.106
---
Log message:

Recognize Interix systems as if they were SunOS and make sure we don't
attempt to configure for "Unknown" system types.


---
Diffs of the changes:  (+39 -28)

Index: llvm/configure
diff -u llvm/configure:1.105 llvm/configure:1.106
--- llvm/configure:1.105	Sun Aug 29 14:35:28 2004
+++ llvm/configure	Mon Aug 30 20:34:10 2004
@@ -1925,6 +1925,11 @@
 
              platform_type="AIX"
              ;;
+        *-*-interix*)
+             OS=SunOS
+
+             platform_type="SunOS"
+             ;;
         *-*-win32*)
              OS=Win32
 
@@ -1937,6 +1942,12 @@
 	     ;;
 esac
 
+if test $platform_type -eq "Unknown" ; then
+  { { echo "$as_me:$LINENO: error: Platform is unknown, configure can't continue" >&5
+echo "$as_me: error: Platform is unknown, configure can't continue" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
           ac_config_links="$ac_config_links lib/System/platform:lib/System/$platform_type"
 
 
@@ -4237,7 +4248,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4240 "configure"' > conftest.$ac_ext
+  echo '#line 4251 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5111,7 +5122,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5114:" \
+echo "$as_me:5125:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6142,11 +6153,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6145: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6156: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6149: \$? = $ac_status" >&5
+   echo "$as_me:6160: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6374,11 +6385,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6377: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6388: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6381: \$? = $ac_status" >&5
+   echo "$as_me:6392: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6441,11 +6452,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6444: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6455: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6448: \$? = $ac_status" >&5
+   echo "$as_me:6459: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8559,7 +8570,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8562 "configure"
+#line 8573 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8657,7 +8668,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8660 "configure"
+#line 8671 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10813,11 +10824,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10816: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10827: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10820: \$? = $ac_status" >&5
+   echo "$as_me:10831: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10880,11 +10891,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10883: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10894: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10887: \$? = $ac_status" >&5
+   echo "$as_me:10898: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12209,7 +12220,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12212 "configure"
+#line 12223 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12307,7 +12318,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12310 "configure"
+#line 12321 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13129,11 +13140,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13132: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13143: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13136: \$? = $ac_status" >&5
+   echo "$as_me:13147: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13196,11 +13207,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13199: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13210: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13203: \$? = $ac_status" >&5
+   echo "$as_me:13214: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15162,11 +15173,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15176: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15169: \$? = $ac_status" >&5
+   echo "$as_me:15180: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15394,11 +15405,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15397: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15408: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15401: \$? = $ac_status" >&5
+   echo "$as_me:15412: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15461,11 +15472,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15464: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15475: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15468: \$? = $ac_status" >&5
+   echo "$as_me:15479: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17579,7 +17590,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17582 "configure"
+#line 17593 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17677,7 +17688,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17680 "configure"
+#line 17691 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H





From reid at x10sys.com  Mon Aug 30 20:34:21 2004
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 30 Aug 2004 20:34:21 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200408310134.UAA12234@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.101 -> 1.102
---
Log message:

Recognize Interix systems as if they were SunOS and make sure we don't
attempt to configure for "Unknown" system types.


---
Diffs of the changes:  (+9 -0)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.101 llvm/autoconf/configure.ac:1.102
--- llvm/autoconf/configure.ac:1.101	Sun Aug 29 14:18:05 2004
+++ llvm/autoconf/configure.ac	Mon Aug 30 20:34:10 2004
@@ -128,6 +128,10 @@
              AC_SUBST(OS,[AIX])
              platform_type="AIX"
              ;;
+        *-*-interix*)
+             AC_SUBST(OS,[SunOS])
+             platform_type="SunOS"
+             ;;
         *-*-win32*)
              AC_SUBST(OS,[Win32])
              platform_type="Win32"
@@ -138,6 +142,11 @@
 	     ;;
 esac
 
+dnl Make sure we aren't attempting to configure for an unknown system
+if test $platform_type -eq "Unknown" ; then
+  AC_MSG_ERROR([Platform is unknown, configure can't continue])
+fi
+
 dnl Make a link from lib/System/platform to lib/System/$platform_type
 dnl This helps the #inclusion of the system specific include files
 dnl for the operating system abstraction library





From natebegeman at mac.com  Mon Aug 30 21:28:19 2004
From: natebegeman at mac.com (Nate Begeman)
Date: Mon, 30 Aug 2004 21:28:19 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PowerPCInstrFormats.td
	PowerPCInstrInfo.td 
Message-ID: <200408310228.VAA12484@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PowerPCInstrFormats.td updated: 1.17 -> 1.18
PowerPCInstrInfo.td updated: 1.31 -> 1.32
---
Log message:

convert M and MD form instructions to generated asm writer

---
Diffs of the changes:  (+41 -20)

Index: llvm/lib/Target/PowerPC/PowerPCInstrFormats.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.17 llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.18
--- llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.17	Sun Aug 29 21:28:06 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrFormats.td	Mon Aug 30 21:28:08 2004
@@ -339,8 +339,8 @@
   let L = ppc64;
 }
 
-class XForm_17<string name, bits<6> opcode, bits<10> xo, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class XForm_17<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
+               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   field bits<3> BF;
   field bits<5> FRA;
   field bits<5> FRB;
@@ -358,6 +358,8 @@
   let Inst{16-20} = FRB;
   let Inst{21-30} = xo;
   let Inst{31}    = 0;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
 class XForm_25<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
@@ -573,8 +575,8 @@
 }
 
 // 1.7.13 M-Form
-class MForm_1<string name, bits<6> opcode, bit rc, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class MForm_1<bits<6> opcode, bit rc, bit ppc64, bit vmx,
+              dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   let ArgCount = 5;
   field bits<5>  RS;
   field bits<5>  RA;
@@ -594,16 +596,19 @@
   let Inst{21-25} = MB;
   let Inst{26-30} = ME;
   let Inst{31}    = rc;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
-class MForm_2<string name, bits<6> opcode, bit rc, bit ppc64, bit vmx> 
-  : MForm_1<name, opcode, rc, ppc64, vmx> {
+class MForm_2<bits<6> opcode, bit rc, bit ppc64, bit vmx, 
+              dag OL, string asmstr>
+  : MForm_1<opcode, rc, ppc64, vmx, OL, asmstr> {
   let Arg2Type = Imm5.Value;
 }
 
 // 1.7.14 MD-Form
-class MDForm_1<string name, bits<6> opcode, bits<3> xo, bit rc, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class MDForm_1<bits<6> opcode, bits<3> xo, bit rc, bit ppc64, bit vmx,
+               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   let ArgCount = 4;
   field bits<5>  RS;
   field bits<5>  RA;
@@ -623,6 +628,8 @@
   let Inst{27-29} = xo;
   let Inst{30}    = SH{0};
   let Inst{31}    = rc;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Target/PowerPC/PowerPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.31 llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.32
--- llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.31	Sun Aug 29 21:28:06 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrInfo.td	Mon Aug 30 21:28:08 2004
@@ -96,20 +96,12 @@
 def STD : DSForm_2<"std", 62, 0, 1, 0>;
 def STDU : DSForm_2<"stdu", 62, 1, 1, 0>;
 
-def RLWNM : MForm_1<"rlwnm", 23, 0, 0, 0>;
-def RLWIMI : MForm_2<"rlwimi", 20, 0, 0, 0>;
-def RLWINM : MForm_2<"rlwinm", 21, 0, 0, 0>;
-def SRWI : MForm_2<"srwi", 21, 0, 0, 0>;
-def RLDICL : MDForm_1<"rldicl", 30, 0, 0, 1, 0>;
-def RLDICR : MDForm_1<"rldicr", 30, 1, 0, 1, 0>;
-
 def CMP : XForm_16<"cmp", 31, 0, 0, 0>;
 def CMPL : XForm_16<"cmpl", 31, 32, 0, 0>;
 def CMPW : XForm_16_ext<"cmpw", 31, 0, 0, 0>;
 def CMPD : XForm_16_ext<"cmpd", 31, 0, 1, 0>;
 def CMPLW : XForm_16_ext<"cmplw", 31, 32, 0, 0>;
 def CMPLD : XForm_16_ext<"cmpld", 31, 32, 1, 0>;
-def FCMPU : XForm_17<"fcmpu", 63, 0, 0, 0>;
 
 // D-Form instructions.  Most instructions that perform an operation on a
 // register and an immediate are of this type.
@@ -208,10 +200,12 @@
                       "extsh $rA, $rS">;
 def EXTSW  : XForm_11<31, 986, 0, 1, 0, (ops GPRC:$rA, GPRC:$rS),
                       "extsw $rA, $rS">;
-def LFSX : XForm_25<31, 535, 0, 0, (ops FPRC:$dst, GPRC:$base, GPRC:$index),
-                   "lfsx $dst, $base, $index">;
-def LFDX : XForm_25<31, 599, 0, 0, (ops FPRC:$dst, GPRC:$base, GPRC:$index),
-                   "lfdx $dst, $base, $index">;
+def FCMPU  : XForm_17<63, 0, 0, 0, (ops CRRC:$crD, FPRC:$fA, FPRC:$fB),
+                      "fcmpu $crD, $fA, $fB">;
+def LFSX   : XForm_25<31, 535, 0, 0, (ops FPRC:$dst, GPRC:$base, GPRC:$index),
+                      "lfsx $dst, $base, $index">;
+def LFDX   : XForm_25<31, 599, 0, 0, (ops FPRC:$dst, GPRC:$base, GPRC:$index),
+                      "lfdx $dst, $base, $index">;
 def FCFID  : XForm_26<63, 846, 0, 1, 0, (ops FPRC:$frD, FPRC:$frB),
                       "fcfid $frD, $frB">;
 def FCTIDZ : XForm_26<63, 815, 0, 1, 0, (ops FPRC:$frD, FPRC:$frB),
@@ -322,3 +316,23 @@
                     (ops FPRC:$FRT, FPRC:$FRA, FPRC:$FRB),
                     "fsubs $FRT, $FRA, $FRB">;
 
+// M-Form instructions.  rotate and mask instructions.
+//
+def RLWIMI : MForm_2<20, 0, 0, 0,
+                     (ops GPRC:$rA, GPRC:$rS, u5imm:$SH, u5imm:$MB, u5imm:$ME),
+                     "rlwimi $rA, $rS, $SH, $MB, $ME">;
+def RLWINM : MForm_2<21, 0, 0, 0,
+                     (ops GPRC:$rA, GPRC:$rS, u5imm:$SH, u5imm:$MB, u5imm:$ME),
+                     "rlwinm $rA, $rS, $SH, $MB, $ME">;
+
+
+// MD-Form instructions.  64 bit rotate instructions.
+//
+def RLDICL : MDForm_1<30, 0, 0, 1, 0, 
+                      (ops GPRC:$rA, GPRC:$rS, u6imm:$SH, u6imm:$MB),
+                      "rldicl $rA, $rS, $SH, $MB">;
+def RLDICR : MDForm_1<30, 1, 0, 1, 0, 
+                      (ops GPRC:$rA, GPRC:$rS, u6imm:$SH, u6imm:$ME),
+                      "rldicr $rA, $rS, $SH, $ME">;
+
+





From reid at x10sys.com  Tue Aug 31 09:20:54 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 09:20:54 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200408311420.JAA19910@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.102 -> 1.103
---
Log message:

Fix a "test" botch.
Alphabetize the platform list
Install some AC_MSG_CHECKING/AC_MSG_RESULT pairs.


---
Diffs of the changes:  (+44 -25)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.102 llvm/autoconf/configure.ac:1.103
--- llvm/autoconf/configure.ac:1.102	Mon Aug 30 20:34:10 2004
+++ llvm/autoconf/configure.ac	Tue Aug 31 09:20:36 2004
@@ -99,7 +99,29 @@
 
 dnl Set the "OS" Makefile variable based on the system we are building on.
 dnl We will use the build machine information to set some variables.
+
+AC_MSG_CHECKING([support for generic build operating system])
 case $build in
+	*-*-aix*)
+             AC_SUBST(OS,[AIX])
+             platform_type="AIX"
+             ;;
+	*-*-cygwin*)
+             AC_SUBST(OS,[Cygwin])
+             platform_type="Cygwin"
+             ;;
+	*-*-darwin*)
+             AC_SUBST(OS,[Darwin])
+             platform_type="Darwin"
+             ;;
+        *-*-freebsd*)
+             AC_SUBST(OS,[Linux])
+             platform_type="Linux"
+             ;;
+        *-*-interix*)
+             AC_SUBST(OS,[SunOS])
+             platform_type="SunOS"
+             ;;
 	*-*-linux*)
              AC_SUBST(OS,[Linux])
              platform_type="Linux"
@@ -116,22 +138,6 @@
                AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
              fi
              ;;
-	*-*-cygwin*)
-             AC_SUBST(OS,[Cygwin])
-             platform_type="Cygwin"
-             ;;
-	*-*-darwin*)
-             AC_SUBST(OS,[Darwin])
-             platform_type="Darwin"
-             ;;
-	*-*-aix*)
-             AC_SUBST(OS,[AIX])
-             platform_type="AIX"
-             ;;
-        *-*-interix*)
-             AC_SUBST(OS,[SunOS])
-             platform_type="SunOS"
-             ;;
         *-*-win32*)
              AC_SUBST(OS,[Win32])
              platform_type="Win32"
@@ -143,7 +149,7 @@
 esac
 
 dnl Make sure we aren't attempting to configure for an unknown system
-if test $platform_type -eq "Unknown" ; then
+if test "$platform_type" = "Unknown" ; then
   AC_MSG_ERROR([Platform is unknown, configure can't continue])
 fi
 
@@ -152,6 +158,9 @@
 dnl for the operating system abstraction library
 AC_CONFIG_LINKS(lib/System/platform:lib/System/$platform_type)
 
+AC_MSG_RESULT($platform_type)
+
+AC_MSG_CHECKING(target architecture)
 dnl If we are targetting a Sparc machine running Solaris, pretend that it is
 dnl V9, since that is all that we support at the moment, and autoconf will only
 dnl tell us we're a sparc.
@@ -164,16 +173,26 @@
 dnl This will allow Makefiles to make a distinction between the hardware and
 dnl the OS.
 case $target in
-	i*86-*)           AC_SUBST(ARCH,[x86])
-	                  ;;
-	sparc*-*)         AC_SUBST(ARCH,[Sparc])
-	                  ;;
-	powerpc*-*)       AC_SUBST(ARCH,[PowerPC])
-	                  ;;
-	*)                AC_SUBST(ARCH,[Unknown])
-	                  ;;
+	i*86-*)       
+          ARCH="x86"
+          AC_SUBST(ARCH,[x86])
+	  ;;
+	sparc*-*)         
+          ARCH="Sparc"
+          AC_SUBST(ARCH,[Sparc])
+	  ;;
+	powerpc*-*)       
+          ARCH="PowerPC"
+          AC_SUBST(ARCH,[PowerPC])
+	  ;;
+	*)                
+          ARCH="Unknown"
+          AC_SUBST(ARCH,[Unknown])
+	  ;;
 esac
 
+AC_MSG_RESULT($ARCH)
+
 dnl Check for compilation tools
 AC_PROG_CXX
 AC_PROG_CC(gcc)





From reid at x10sys.com  Tue Aug 31 09:20:54 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 09:20:54 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200408311420.JAA19911@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.106 -> 1.107
---
Log message:

Fix a "test" botch.
Alphabetize the platform list
Install some AC_MSG_CHECKING/AC_MSG_RESULT pairs.


---
Diffs of the changes:  (+81 -57)

Index: llvm/configure
diff -u llvm/configure:1.106 llvm/configure:1.107
--- llvm/configure:1.106	Mon Aug 30 20:34:10 2004
+++ llvm/configure	Tue Aug 31 09:20:36 2004
@@ -1889,7 +1889,35 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
 
+
+echo "$as_me:$LINENO: checking support for generic build operating system" >&5
+echo $ECHO_N "checking support for generic build operating system... $ECHO_C" >&6
 case $build in
+	*-*-aix*)
+             OS=AIX
+
+             platform_type="AIX"
+             ;;
+	*-*-cygwin*)
+             OS=Cygwin
+
+             platform_type="Cygwin"
+             ;;
+	*-*-darwin*)
+             OS=Darwin
+
+             platform_type="Darwin"
+             ;;
+        *-*-freebsd*)
+             OS=Linux
+
+             platform_type="Linux"
+             ;;
+        *-*-interix*)
+             OS=SunOS
+
+             platform_type="SunOS"
+             ;;
 	*-*-linux*)
              OS=Linux
 
@@ -1910,26 +1938,6 @@
 
              fi
              ;;
-	*-*-cygwin*)
-             OS=Cygwin
-
-             platform_type="Cygwin"
-             ;;
-	*-*-darwin*)
-             OS=Darwin
-
-             platform_type="Darwin"
-             ;;
-	*-*-aix*)
-             OS=AIX
-
-             platform_type="AIX"
-             ;;
-        *-*-interix*)
-             OS=SunOS
-
-             platform_type="SunOS"
-             ;;
         *-*-win32*)
              OS=Win32
 
@@ -1942,7 +1950,7 @@
 	     ;;
 esac
 
-if test $platform_type -eq "Unknown" ; then
+if test "$platform_type" = "Unknown" ; then
   { { echo "$as_me:$LINENO: error: Platform is unknown, configure can't continue" >&5
 echo "$as_me: error: Platform is unknown, configure can't continue" >&2;}
    { (exit 1); exit 1; }; }
@@ -1951,6 +1959,11 @@
           ac_config_links="$ac_config_links lib/System/platform:lib/System/$platform_type"
 
 
+echo "$as_me:$LINENO: result: $platform_type" >&5
+echo "${ECHO_T}$platform_type" >&6
+
+echo "$as_me:$LINENO: checking target architecture" >&5
+echo $ECHO_N "checking target architecture... $ECHO_C" >&6
 case $target in
 	sparc*-*-solaris*)  target=sparcv9-sun-solaris2.8
 
@@ -1958,20 +1971,31 @@
 esac
 
 case $target in
-	i*86-*)           ARCH=x86
+	i*86-*)
+          ARCH="x86"
+          ARCH=x86
 
-	                  ;;
-	sparc*-*)         ARCH=Sparc
+	  ;;
+	sparc*-*)
+          ARCH="Sparc"
+          ARCH=Sparc
 
-	                  ;;
-	powerpc*-*)       ARCH=PowerPC
+	  ;;
+	powerpc*-*)
+          ARCH="PowerPC"
+          ARCH=PowerPC
 
-	                  ;;
-	*)                ARCH=Unknown
+	  ;;
+	*)
+          ARCH="Unknown"
+          ARCH=Unknown
 
-	                  ;;
+	  ;;
 esac
 
+echo "$as_me:$LINENO: result: $ARCH" >&5
+echo "${ECHO_T}$ARCH" >&6
+
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4248,7 +4272,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4251 "configure"' > conftest.$ac_ext
+  echo '#line 4275 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5122,7 +5146,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5125:" \
+echo "$as_me:5149:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6153,11 +6177,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6156: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6180: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6160: \$? = $ac_status" >&5
+   echo "$as_me:6184: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6385,11 +6409,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6412: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6392: \$? = $ac_status" >&5
+   echo "$as_me:6416: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6452,11 +6476,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6455: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6479: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6459: \$? = $ac_status" >&5
+   echo "$as_me:6483: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8570,7 +8594,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8573 "configure"
+#line 8597 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8668,7 +8692,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8671 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10824,11 +10848,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10827: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10831: \$? = $ac_status" >&5
+   echo "$as_me:10855: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10891,11 +10915,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10894: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10918: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10898: \$? = $ac_status" >&5
+   echo "$as_me:10922: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12220,7 +12244,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12223 "configure"
+#line 12247 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12318,7 +12342,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12321 "configure"
+#line 12345 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13140,11 +13164,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13143: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13147: \$? = $ac_status" >&5
+   echo "$as_me:13171: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13207,11 +13231,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13210: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13214: \$? = $ac_status" >&5
+   echo "$as_me:13238: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15173,11 +15197,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15200: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15180: \$? = $ac_status" >&5
+   echo "$as_me:15204: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15405,11 +15429,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15408: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15432: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15412: \$? = $ac_status" >&5
+   echo "$as_me:15436: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15472,11 +15496,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15475: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15499: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15479: \$? = $ac_status" >&5
+   echo "$as_me:15503: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17590,7 +17614,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17593 "configure"
+#line 17617 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17688,7 +17712,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17691 "configure"
+#line 17715 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H





From alkis at cs.uiuc.edu  Tue Aug 31 12:39:26 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Tue, 31 Aug 2004 12:39:26 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp 
Message-ID: <200408311739.MAA21180@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.120 -> 1.121
---
Log message:

Minor code clarity changes.


---
Diffs of the changes:  (+6 -4)

Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.120 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.121
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.120	Fri Aug 27 13:59:22 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Tue Aug 31 12:39:15 2004
@@ -329,8 +329,9 @@
     // of the defining block, potentially live across some blocks, then is
     // live into some number of blocks, but gets killed.  Start by adding a
     // range that goes from this definition to the end of the defining block.
-    LiveRange NewLR(defIndex, getInstructionIndex(&mbb->back()) +
-                    InstrSlots::NUM, ValNum);
+    LiveRange NewLR(defIndex,
+                    getInstructionIndex(&mbb->back()) + InstrSlots::NUM,
+                    ValNum);
     DEBUG(std::cerr << " +" << NewLR);
     interval.addRange(NewLR);
 
@@ -342,7 +343,7 @@
         MachineBasicBlock* mbb = mf_->getBlockNumbered(i);
         if (!mbb->empty()) {
           LiveRange LR(getInstructionIndex(&mbb->front()),
-                       getInstructionIndex(&mbb->back())+InstrSlots::NUM,
+                       getInstructionIndex(&mbb->back()) + InstrSlots::NUM,
                        ValNum);
           interval.addRange(LR);
           DEBUG(std::cerr << " +" << LR);
@@ -355,7 +356,8 @@
     for (unsigned i = 0, e = vi.Kills.size(); i != e; ++i) {
       MachineInstr *Kill = vi.Kills[i];
       LiveRange LR(getInstructionIndex(Kill->getParent()->begin()),
-                   getUseIndex(getInstructionIndex(Kill))+1, ValNum);
+                   getUseIndex(getInstructionIndex(Kill))+1,
+                   ValNum);
       interval.addRange(LR);
       DEBUG(std::cerr << " +" << LR);
     }





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/SysConfig.cpp Unix.h 
Message-ID: <200408311743.MAA21270@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix:

SysConfig.cpp added (r1.1)
Unix.h updated: 1.3 -> 1.4
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+36 -0)

Index: llvm/lib/System/Unix/SysConfig.cpp
diff -c /dev/null llvm/lib/System/Unix/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/Unix/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,35 ----
+ //===- SysConfig.cpp - Generic UNIX System Configuration --------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines some functions for managing system configuration on Unix
+ // systems.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "Unix.h"
+ #include <sys/resource.h>
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ 
+ // Some LLVM programs such as bugpoint produce core files as a normal part of
+ // their operation. To prevent the disk from filling up, this configuration item
+ // does what's necessary to prevent their generation.
+ void PreventCoreFiles() {
+   struct rlimit rlim;
+   rlim.rlim_cur = rlim.rlim_max = 0;
+   int res = setrlimit(RLIMIT_CORE, &rlim);
+   if (res != 0)
+     ThrowErrno("Can't prevent core file generation");
+ }
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/Unix/Unix.h
diff -u llvm/lib/System/Unix/Unix.h:1.3 llvm/lib/System/Unix/Unix.h:1.4
--- llvm/lib/System/Unix/Unix.h:1.3	Mon Aug 30 11:03:54 2004
+++ llvm/lib/System/Unix/Unix.h	Tue Aug 31 12:43:29 2004
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <assert.h>
+#include <string>
 
 inline void ThrowErrno(const std::string& prefix) {
 #if defined __USE_XOPEN2K || defined __USE_MISC





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/SysConfig.cpp 
Message-ID: <200408311743.MAA21267@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/SunOS:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+27 -0)

Index: llvm/lib/System/SunOS/SysConfig.cpp
diff -c /dev/null llvm/lib/System/SunOS/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/SunOS/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- SunOS/SysConfig.cpp - SunOS SysConfig Implementation -----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the SunOS specific implementation of the SysConfig class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only SunOS specific code 
+ //===          and must not be generic UNIX code (see ../Unix/SysConfig.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/SysConfig.cpp 
Message-ID: <200408311743.MAA21274@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Cygwin:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+27 -0)

Index: llvm/lib/System/Cygwin/SysConfig.cpp
diff -c /dev/null llvm/lib/System/Cygwin/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/Cygwin/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- Cygwin/SysConfig.cpp - Cygwin SysConfig Implementation ---*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Cygwin specific implementation of the SysConfig class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Cygwin specific code 
+ //===          and must not be generic UNIX code (see ../Unix/SysConfig.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/SysConfig.cpp 
Message-ID: <200408311743.MAA21283@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Darwin:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+27 -0)

Index: llvm/lib/System/Darwin/SysConfig.cpp
diff -c /dev/null llvm/lib/System/Darwin/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/Darwin/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- Darwin/SysConfig.cpp - Darwin SysConfig Implementation ---*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Darwin specific implementation of the SysConfig class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Darwin specific code 
+ //===          and must not be generic UNIX code (see ../Unix/SysConfig.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/AIX/SysConfig.cpp 
Message-ID: <200408311743.MAA21281@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/AIX:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+27 -0)

Index: llvm/lib/System/AIX/SysConfig.cpp
diff -c /dev/null llvm/lib/System/AIX/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/AIX/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- AIX/SysConfig.cpp - AIX SysConfig Implementation ---------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the AIX specific implementation of the SysConfig class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only AIX specific code 
+ //===          and must not be generic UNIX code (see ../Unix/SysConfig.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Linux/SysConfig.cpp 
Message-ID: <200408311743.MAA21271@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Linux:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+27 -0)

Index: llvm/lib/System/Linux/SysConfig.cpp
diff -c /dev/null llvm/lib/System/Linux/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/Linux/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- Linux/SysConfig.cpp - Linux SysConfig Implementation -----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Linux specific implementation of the Signals class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Linux specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Signals.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:43:40 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:43:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/SysConfig.cpp 
Message-ID: <200408311743.MAA21282@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System:

SysConfig.cpp added (r1.1)
---
Log message:

Add a new abstraction, SysConfig for platform independent system
configuration calls. Right now this just contains PreventCoreFiles so that
bugpoint can by platform independent.


---
Diffs of the changes:  (+29 -0)

Index: llvm/lib/System/SysConfig.cpp
diff -c /dev/null llvm/lib/System/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 12:43:39 2004
--- llvm/lib/System/SysConfig.cpp	Tue Aug 31 12:43:29 2004
***************
*** 0 ****
--- 1,29 ----
+ //===- SysConfig.cpp - System Configuration Support ---------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencerand is distributed under the University 
+ // of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines the operating system independent SysConfig abstraction.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/System/SysConfig.h"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only TRULY operating system
+ //===          independent code. 
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // Include the platform-specific parts of this class.
+ #include "platform/SysConfig.cpp"
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 12:53:52 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 12:53:52 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/SysConfig.cpp 
Message-ID: <200408311753.MAA21509@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix:

SysConfig.cpp updated: 1.1 -> 1.2
---
Log message:

Actually define PreventCoreFiles in the sys namespace.


---
Diffs of the changes:  (+1 -3)

Index: llvm/lib/System/Unix/SysConfig.cpp
diff -u llvm/lib/System/Unix/SysConfig.cpp:1.1 llvm/lib/System/Unix/SysConfig.cpp:1.2
--- llvm/lib/System/Unix/SysConfig.cpp:1.1	Tue Aug 31 12:43:29 2004
+++ llvm/lib/System/Unix/SysConfig.cpp	Tue Aug 31 12:53:41 2004
@@ -16,13 +16,11 @@
 #include <sys/resource.h>
 
 namespace llvm {
-using namespace sys;
-
 
 // Some LLVM programs such as bugpoint produce core files as a normal part of
 // their operation. To prevent the disk from filling up, this configuration item
 // does what's necessary to prevent their generation.
-void PreventCoreFiles() {
+void sys::PreventCoreFiles() {
   struct rlimit rlim;
   rlim.rlim_cur = rlim.rlim_max = 0;
   int res = setrlimit(RLIMIT_CORE, &rlim);





From llvm at cs.uiuc.edu  Tue Aug 31 12:55:19 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 31 Aug 2004 12:55:19 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Interix/
Message-ID: <200408311755.MAA21552@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Interix:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Interix added to the repository


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Tue Aug 31 13:01:57 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Tue, 31 Aug 2004 13:01:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/
Message-ID: <200408311801.NAA21743@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/FreeBSD:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/FreeBSD added to the repository


---
Diffs of the changes:  (+0 -0)




From reid at x10sys.com  Tue Aug 31 13:03:33 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 13:03:33 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Interix/Path.cpp Program.cpp
	Signals.cpp SysConfig.cpp 
Message-ID: <200408311803.NAA21800@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Interix:

Path.cpp added (r1.1)
Program.cpp added (r1.1)
Signals.cpp added (r1.1)
SysConfig.cpp added (r1.1)
---
Log message:

Add support for Interix and FreeBSD


---
Diffs of the changes:  (+126 -0)

Index: llvm/lib/System/Interix/Path.cpp
diff -c /dev/null llvm/lib/System/Interix/Path.cpp:1.1
*** /dev/null	Tue Aug 31 13:03:33 2004
--- llvm/lib/System/Interix/Path.cpp	Tue Aug 31 13:03:23 2004
***************
*** 0 ****
--- 1,50 ----
+ //===- Interix/Path.cpp - Interix Path Implementation -----------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Interix specific implementation of the Path class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Interix specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Path.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic Unix implementation
+ #include "../Unix/Path.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ bool 
+ Path::is_valid() const {
+   if (path.empty()) 
+     return false;
+   char pathname[MAXPATHLEN];
+   if (0 == realpath(path.c_str(), pathname))
+     if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
+       return false;
+   return true;
+ }
+ 
+ Path
+ Path::GetTemporaryDirectory() {
+   char pathname[MAXPATHLEN];
+   strcpy(pathname,"/tmp/llvm_XXXXXX");
+   if (0 == mkdtemp(pathname))
+     ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+   Path result;
+   result.set_directory(pathname);
+   assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+   return result;
+ }
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/Interix/Program.cpp
diff -c /dev/null llvm/lib/System/Interix/Program.cpp:1.1
*** /dev/null	Tue Aug 31 13:03:33 2004
--- llvm/lib/System/Interix/Program.cpp	Tue Aug 31 13:03:23 2004
***************
*** 0 ****
--- 1,22 ----
+ //===- Interix/Program.cpp - Interix Program Implementation --- -*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Interix specific implementation of the Program class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic Unix implementation
+ #include "../Unix/Program.cpp"
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Interix specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Program.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/Interix/Signals.cpp
diff -c /dev/null llvm/lib/System/Interix/Signals.cpp:1.1
*** /dev/null	Tue Aug 31 13:03:33 2004
--- llvm/lib/System/Interix/Signals.cpp	Tue Aug 31 13:03:23 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- Interix/Signals.cpp - Interix Signals Implementation -----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Interix specific implementation of the Signals class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/Signals.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Interix specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Signals.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/Interix/SysConfig.cpp
diff -c /dev/null llvm/lib/System/Interix/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 13:03:33 2004
--- llvm/lib/System/Interix/SysConfig.cpp	Tue Aug 31 13:03:23 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- Interix/SysConfig.cpp - Interix SysConfig Implementation -*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the Interix specific implementation of the Signals class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only Interix specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Signals.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 13:03:33 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 13:03:33 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200408311803.NAA21804@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.107 -> 1.108
---
Log message:

Add support for Interix and FreeBSD


---
Diffs of the changes:  (+2 -2)

Index: llvm/configure
diff -u llvm/configure:1.107 llvm/configure:1.108
--- llvm/configure:1.107	Tue Aug 31 09:20:36 2004
+++ llvm/configure	Tue Aug 31 13:03:22 2004
@@ -1911,12 +1911,12 @@
         *-*-freebsd*)
              OS=Linux
 
-             platform_type="Linux"
+             platform_type="FreeBSD"
              ;;
         *-*-interix*)
              OS=SunOS
 
-             platform_type="SunOS"
+             platform_type="Interix"
              ;;
 	*-*-linux*)
              OS=Linux





From reid at x10sys.com  Tue Aug 31 13:03:33 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 13:03:33 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200408311803.NAA21803@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.103 -> 1.104
---
Log message:

Add support for Interix and FreeBSD


---
Diffs of the changes:  (+2 -2)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.103 llvm/autoconf/configure.ac:1.104
--- llvm/autoconf/configure.ac:1.103	Tue Aug 31 09:20:36 2004
+++ llvm/autoconf/configure.ac	Tue Aug 31 13:03:23 2004
@@ -116,11 +116,11 @@
              ;;
         *-*-freebsd*)
              AC_SUBST(OS,[Linux])
-             platform_type="Linux"
+             platform_type="FreeBSD"
              ;;
         *-*-interix*)
              AC_SUBST(OS,[SunOS])
-             platform_type="SunOS"
+             platform_type="Interix"
              ;;
 	*-*-linux*)
              AC_SUBST(OS,[Linux])





From reid at x10sys.com  Tue Aug 31 13:09:45 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 13:09:45 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/Path.cpp Program.cpp
	Signals.cpp SysConfig.cpp 
Message-ID: <200408311809.NAA21863@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/FreeBSD:

Path.cpp added (r1.1)
Program.cpp added (r1.1)
Signals.cpp added (r1.1)
SysConfig.cpp added (r1.1)
---
Log message:

Add support for FreeBSD


---
Diffs of the changes:  (+126 -0)

Index: llvm/lib/System/FreeBSD/Path.cpp
diff -c /dev/null llvm/lib/System/FreeBSD/Path.cpp:1.1
*** /dev/null	Tue Aug 31 13:09:45 2004
--- llvm/lib/System/FreeBSD/Path.cpp	Tue Aug 31 13:09:35 2004
***************
*** 0 ****
--- 1,50 ----
+ //===- FreeBSD/Path.cpp - FreeBSD Path Implementation -----------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the FreeBSD specific implementation of the Path class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only FreeBSD specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Path.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic Unix implementation
+ #include "../Unix/Path.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ bool 
+ Path::is_valid() const {
+   if (path.empty()) 
+     return false;
+   char pathname[MAXPATHLEN];
+   if (0 == realpath(path.c_str(), pathname))
+     if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR)
+       return false;
+   return true;
+ }
+ 
+ Path
+ Path::GetTemporaryDirectory() {
+   char pathname[MAXPATHLEN];
+   strcpy(pathname,"/tmp/llvm_XXXXXX");
+   if (0 == mkdtemp(pathname))
+     ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+   Path result;
+   result.set_directory(pathname);
+   assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+   return result;
+ }
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/FreeBSD/Program.cpp
diff -c /dev/null llvm/lib/System/FreeBSD/Program.cpp:1.1
*** /dev/null	Tue Aug 31 13:09:45 2004
--- llvm/lib/System/FreeBSD/Program.cpp	Tue Aug 31 13:09:35 2004
***************
*** 0 ****
--- 1,22 ----
+ //===- FreeBSD/Program.cpp - FreeBSD Program Implementation --- -*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the FreeBSD specific implementation of the Program class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic Unix implementation
+ #include "../Unix/Program.cpp"
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only FreeBSD specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Program.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/FreeBSD/Signals.cpp
diff -c /dev/null llvm/lib/System/FreeBSD/Signals.cpp:1.1
*** /dev/null	Tue Aug 31 13:09:45 2004
--- llvm/lib/System/FreeBSD/Signals.cpp	Tue Aug 31 13:09:35 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- FreeBSD/Signals.cpp - FreeBSD Signals Implementation -----*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the FreeBSD specific implementation of the Signals class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/Signals.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only FreeBSD specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Signals.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab


Index: llvm/lib/System/FreeBSD/SysConfig.cpp
diff -c /dev/null llvm/lib/System/FreeBSD/SysConfig.cpp:1.1
*** /dev/null	Tue Aug 31 13:09:45 2004
--- llvm/lib/System/FreeBSD/SysConfig.cpp	Tue Aug 31 13:09:35 2004
***************
*** 0 ****
--- 1,27 ----
+ //===- FreeBSD/SysConfig.cpp - FreeBSD SysConfig Implementation -*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file provides the FreeBSD specific implementation of the Signals class.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ // Include the generic unix implementation
+ #include "../Unix/SysConfig.cpp"
+ 
+ namespace llvm {
+ using namespace sys;
+ 
+ //===----------------------------------------------------------------------===//
+ //=== WARNING: Implementation here must contain only FreeBSD specific code 
+ //===          and must not be generic UNIX code (see ../Unix/Signals.cpp)
+ //===----------------------------------------------------------------------===//
+ 
+ }
+ 
+ // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab





From reid at x10sys.com  Tue Aug 31 13:14:02 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 13:14:02 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/System/SysConfig.h 
Message-ID: <200408311814.NAA21896@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/System:

SysConfig.h added (r1.1)
---
Log message:

Initial commit for platform independent system configuration support.


---
Diffs of the changes:  (+30 -0)

Index: llvm/include/llvm/System/SysConfig.h
diff -c /dev/null llvm/include/llvm/System/SysConfig.h:1.1
*** /dev/null	Tue Aug 31 13:14:02 2004
--- llvm/include/llvm/System/SysConfig.h	Tue Aug 31 13:13:52 2004
***************
*** 0 ****
--- 1,30 ----
+ //===- llvm/System/SysConfig.h - System Configuration  ----------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Reid Spencer and is distributed under the 
+ // University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file declares the SysConfig utilities for platform independent system
+ // configuration (both globally and at the process level).
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef LLVM_SYSTEM_SYSCONFIG_H
+ #define LLVM_SYSTEM_SYSCONFIG_H
+ 
+ namespace llvm {
+ namespace sys {
+ 
+   /// This function makes the necessary calls to the operating system to prevent
+   /// core files or any other kind of large memory dumps that can occur when a
+   /// program fails.
+   /// @brief Prevent core file generation.
+   void PreventCoreFiles();
+ 
+ } // End sys namespace
+ } // End llvm namespace
+ 
+ #endif





From reid at x10sys.com  Tue Aug 31 23:41:39 2004
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 31 Aug 2004 23:41:39 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/CommandLine.cpp 
Message-ID: <200409010441.XAA19733@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

CommandLine.cpp updated: 1.48 -> 1.49
---
Log message:

Make CommandLine prefix error output with the name of the program.


---
Diffs of the changes:  (+20 -13)

Index: llvm/lib/Support/CommandLine.cpp
diff -u llvm/lib/Support/CommandLine.cpp:1.48 llvm/lib/Support/CommandLine.cpp:1.49
--- llvm/lib/Support/CommandLine.cpp:1.48	Fri Aug 13 14:47:30 2004
+++ llvm/lib/Support/CommandLine.cpp	Tue Aug 31 23:41:28 2004
@@ -29,6 +29,10 @@
 
 using namespace cl;
 
+// Globals for name and overview of program
+static const char *ProgramName = "<unknown>";
+static const char *ProgramOverview = 0;
+
 //===----------------------------------------------------------------------===//
 // Basic, shared command line option processing machinery...
 //
@@ -57,8 +61,8 @@
 
 static void AddArgument(const char *ArgName, Option *Opt) {
   if (getOption(ArgName)) {
-    std::cerr << "CommandLine Error: Argument '" << ArgName
-              << "' defined more than once!\n";
+    std::cerr << ProgramName << ": CommandLine Error: Argument '" 
+              << ArgName << "' defined more than once!\n";
   } else {
     // Add argument to the argument map!
     getOpts()[ArgName] = Opt;
@@ -83,9 +87,6 @@
   }
 }
 
-static const char *ProgramName = 0;
-static const char *ProgramOverview = 0;
-
 static inline bool ProvideOption(Option *Handler, const char *ArgName,
                                  const char *Value, int argc, char **argv,
                                  int &i) {
@@ -105,9 +106,14 @@
       return Handler->error(" does not allow a value! '" + 
                             std::string(Value) + "' specified.");
     break;
-  case ValueOptional: break;
-  default: std::cerr << "Bad ValueMask flag! CommandLine usage error:" 
-                     << Handler->getValueExpectedFlag() << "\n"; abort();
+  case ValueOptional: 
+    break;
+  default: 
+    std::cerr << ProgramName 
+              << ": Bad ValueMask flag! CommandLine usage error:" 
+              << Handler->getValueExpectedFlag() << "\n"; 
+    abort();
+    break;
   }
 
   // Run the handler now!
@@ -432,8 +438,8 @@
     }
 
     if (Handler == 0) {
-      std::cerr << "Unknown command line argument '" << argv[i] << "'.  Try: '"
-                << argv[0] << " --help'\n";
+      std::cerr << ProgramName << ": Unknown command line argument '" << argv[i]
+                << "'.  Try: '" << argv[0] << " --help'\n";
       ErrorParsing = true;
       continue;
     }
@@ -469,7 +475,8 @@
 
   // Check and handle positional arguments now...
   if (NumPositionalRequired > PositionalVals.size()) {
-    std::cerr << "Not enough positional command line arguments specified!\n"
+    std::cerr << ProgramName 
+              << ": Not enough positional command line arguments specified!\n"
               << "Must specify at least " << NumPositionalRequired
               << " positional arguments: See: " << argv[0] << " --help\n";
     ErrorParsing = true;
@@ -575,8 +582,8 @@
   if (ArgName[0] == 0)
     std::cerr << HelpStr;  // Be nice for positional arguments
   else
-    std::cerr << "-" << ArgName;
-  std::cerr << " option" << Message << "\n";
+    std::cerr << ProgramName << ": for the -" << ArgName;
+  std::cerr << " option: " << Message << "\n";
   return true;
 }
 





From llvm at cs.uiuc.edu  Wed Sep  1 00:04:21 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 00:04:21 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/
Message-ID: <200409010504.AAA19940@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config:

---
Log message:

Directory /var/cvs/llvm/llvm/include/llvm/Config added to the repository


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Wed Sep  1 00:04:21 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 00:04:21 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/sys/
Message-ID: <200409010504.AAA19943@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config/sys:

---
Log message:

Directory /var/cvs/llvm/llvm/include/llvm/Config/sys added to the repository


---
Diffs of the changes:  (+0 -0)




From criswell at cs.uiuc.edu  Wed Sep  1 10:05:48 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 10:05:48 -0500
Subject: [llvm-commits] CVS: llvm-test/LICENSE.TXT 
Message-ID: <200409011505.KAA22582@choi.cs.uiuc.edu>



Changes in directory llvm-test:

LICENSE.TXT added (r1.1)
---
Log message:

Initial license file, needed because this is a separate CVS module now.


---
Diffs of the changes:  (+103 -0)

Index: llvm-test/LICENSE.TXT
diff -c /dev/null llvm-test/LICENSE.TXT:1.1
*** /dev/null	Wed Sep  1 10:05:46 2004
--- llvm-test/LICENSE.TXT	Wed Sep  1 10:05:36 2004
***************
*** 0 ****
--- 1,103 ----
+ ==============================================================================
+ LLVM Release License
+ ==============================================================================
+ University of Illinois/NCSA
+ Open Source License
+ 
+ Copyright (c) 2003, 2004 University of Illinois at Urbana-Champaign.
+ All rights reserved.
+ 
+ Developed by:
+ 
+     LLVM Team
+ 
+     University of Illinois at Urbana-Champaign
+ 
+     http://llvm.cs.uiuc.edu
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal with
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ 
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimers.
+ 
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimers in the
+       documentation and/or other materials provided with the distribution.
+ 
+     * Neither the names of the LLVM Team, University of Illinois at
+       Urbana-Champaign, nor the names of its contributors may be used to
+       endorse or promote products derived from this Software without specific
+       prior written permission.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+ SOFTWARE.
+ 
+ ==============================================================================
+ Copyrights and Licenses for Third Party Software Distributed with LLVM:
+ ==============================================================================
+ The LLVM software contains code written by third parties.  Such software will
+ have its own individual LICENSE.TXT file in the directory in which it appears.
+ This file will describe the copyrights, license, and restrictions which apply
+ to that code.
+ 
+ The disclaimer of warranty in the University of Illinois Open Source License
+ applies to all code in the LLVM Distribution, and nothing in any of the
+ other licenses gives permission to use the names of the LLVM Team or the
+ University of Illinois to endorse or promote products derived from this
+ Software.
+ 
+ The following pieces of software have additional or alternate copyrights,
+ licenses, and/or restrictions:
+ 
+ Program             Directory
+ -------             ---------
+ System Library      llvm/lib/System
+ Compiler Driver     llvm/tools/llvmc
+ PowerPC Backend     llvm/lib/Target/PowerPC
+ Autoconf:           llvm/autoconf
+                     llvm/projects/ModuleMaker/autoconf
+                     llvm/projects/sample/autoconf
+ Burg:               llvm/utils/Burg
+                     llvm-test/MultiSource/Applications/Burg
+ Aha:                llvm-test/MultiSource/Applications/aha
+ SGEFA:              llvm-test/MultiSource/Applications/sgefa
+ SIOD:               llvm-test/MultiSource/Applications/siod
+ Spiff:              llvm-test/MultiSource/Applications/spiff
+ D:                  llvm-test/MultiSource/Applications/d
+ Lambda:             llvm-test/MultiSource/Applications/lambda-0.1.3
+ hbd:                llvm-test/MultiSource/Applications/hbd
+ treecc:             llvm-test/MultiSource/Applications/treecc
+ kimwitu++:          llvm-test/MultiSource/Applications/kimwitu++
+ obsequi:            llvm-test/MultiSource/Applications/obsequi
+ Fhourstones:        llvm-test/MultiSource/Benchmarks/Fhourstones
+ McCat:              llvm-test/MultiSource/Benchmarks/McCat
+ Olden:              llvm-test/MultiSource/Benchmarks/Olden
+ OptimizerEval:      llvm-test/MultiSource/Benchmarks/OptimizerEval
+ Ptrdist:            llvm-test/MultiSource/Benchmarks/Ptrdist
+ LLUBenchmark:       llvm-test/MultiSource/Benchmarks/llubenchmark
+ SIM:                llvm-test/MultiSource/Benchmarks/sim
+ cfrac:              llvm-test/MultiSource/Benchmarks/MallocBench/cfrac
+ espresso:           llvm-test/MultiSource/Benchmarks/MallocBench/espresso
+ gs:                 llvm-test/MultiSource/Benchmarks/MallocBench/gs
+ p2c:                llvm-test/MultiSource/Benchmarks/MallocBench/p2c
+ gawk:               llvm-test/MultiSource/Benchmarks/MallocBench/gawk
+ make:               llvm-test/MultiSource/Benchmarks/MallocBench/make
+ perl:               llvm-test/MultiSource/Benchmarks/MallocBench/perl
+ Dhrystone:          llvm-test/SingleSource/Benchmarks/Dhrystone
+ SingleSource Tests: llvm-test/SingleSource/Benchmarks/Misc
+                     llvm-test/SingleSource/CustomChecked
+                     llvm-test/SingleSource/Gizmos
+ GNU Libc:           llvm/runtime/GCCLibraries/libc
+ Zlib Library:       llvm/runtime/zlib
+ PNG Library:        llvm/runtime/libpng
+ 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/autoconf/
Message-ID: <200409011434.JAA06130@choi.cs.uiuc.edu>



Changes in directory llvm-test/autoconf:

---
Log message:

Directory /home/vadve/shared/PublicCVS/llvm-test/autoconf added to the repository


---
Diffs of the changes:  (+0 -0)




From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] CVS: llvm-test/External/SPEC/CFP2000/Makefile 
Message-ID: <200409011434.JAA06057@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CFP2000:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/SPEC/CFP2000/Makefile
diff -u llvm-test/External/SPEC/CFP2000/Makefile:1.5 llvm-test/External/SPEC/CFP2000/Makefile:1.6
--- llvm-test/External/SPEC/CFP2000/Makefile:1.5	Sat Oct  4 19:28:50 2003
+++ llvm-test/External/SPEC/CFP2000/Makefile	Wed Sep  1 09:33:19 2004
@@ -5,4 +5,4 @@
 	183.equake \
 	188.ammp
 
-include ${LEVEL}/test/Programs/Makefile.programs
+include ${LEVEL}/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/McCat/Makefile
Message-ID: <200409011434.JAA06065@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/Makefile:1.4 llvm-test/MultiSource/Benchmarks/McCat/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/McCat/Makefile:1.4	Thu Dec 18 10:42:06 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,7 +1,7 @@
 # MultiSource/McCat Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../../..
+LEVEL = ../../..
 PARALLEL_DIRS  := 01-qbsort 04-bisect 08-main 12-IOtest 17-bintr 03-testtrie 05-eks 09-vor 15-trie 18-imp
 
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile
Message-ID: <200409011434.JAA06171@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/tsp:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile:1.6 llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile:1.7
--- llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile:1.6	Wed Nov 12 15:39:38 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/tsp/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = tsp
 CPPFLAGS = -DTORONTO
@@ -9,5 +9,5 @@
 RUN_OPTIONS = 1024000
 endif
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile
Message-ID: <200409011434.JAA06122@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile
diff -u llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile:1.1 llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile:1.2
--- llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile:1.1	Wed Feb 25 21:32:33 2004
+++ llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile	Wed Sep  1 09:33:27 2004
@@ -1,7 +1,7 @@
 # Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
 LIBS = -lstdc++
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile
Message-ID: <200409011434.JAA06063@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/03-testtrie:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.4 llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile:1.4	Fri Sep 12 11:02:01 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/03-testtrie/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = testtrie
 LDFLAGS = -lm
 RUN_OPTIONS += testtrie.in2
 #STDIN_FILENAME = benchmark.in3
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:16 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:16 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile
Message-ID: <200409011434.JAA06052@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/lambda-0.1.3:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile
diff -u llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile:1.4 llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile:1.5
--- llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile:1.4	Mon Feb  9 11:26:26 2004
+++ llvm-test/MultiSource/Applications/lambda-0.1.3/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = lambda
 LDFLAGS += -lstdc++
 LIBS += -lstdc++





From criswell at cs.uiuc.edu  Wed Sep  1 09:33:59 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:33:59 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile
Message-ID: <200409011433.JAA06041@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CFP2000/188.ammp:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/SPEC/CFP2000/188.ammp/Makefile
diff -u llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.3 llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.4
--- llvm-test/External/SPEC/CFP2000/188.ammp/Makefile:1.3	Fri Feb 27 13:59:39 2004
+++ llvm-test/External/SPEC/CFP2000/188.ammp/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 RUN_OPTIONS     = 
 STDIN_FILENAME  = ammp.in
 STDOUT_FILENAME = ammp.out





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile
Message-ID: <200409011434.JAA06137@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/analyzer:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile:1.1	Sat Oct 11 16:18:46 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/analyzer/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = analyzer
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/sim/Makefile 
Message-ID: <200409011434.JAA06220@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/sim:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/sim/Makefile
diff -u llvm-test/MultiSource/Benchmarks/sim/Makefile:1.4 llvm-test/MultiSource/Benchmarks/sim/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/sim/Makefile:1.4	Fri Sep 12 11:02:43 2003
+++ llvm-test/MultiSource/Benchmarks/sim/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 
 PROG     = sim
 CPPFLAGS = -DUNIX





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile
Message-ID: <200409011434.JAA06082@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/12-IOtest:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.3 llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile:1.3	Fri Sep 12 11:02:15 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/12-IOtest/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,6 +1,6 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = iotest
 #LDFLAGS = -lm
 #RUN_OPTIONS += trie.in1
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:35:27 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:35:27 -0500
Subject: [llvm-commits] CVS: llvm-test/configure 
Message-ID: <200409011435.JAA06240@choi.cs.uiuc.edu>



Changes in directory llvm-test:

configure added (r1.1)
---
Log message:

Added configuration script for LLVM test suite project.


---
Diffs of the changes:  (+2252 -0)

Index: llvm-test/configure
diff -c /dev/null llvm-test/configure:1.1
*** /dev/null	Wed Sep  1 09:35:26 2004
--- llvm-test/configure	Wed Sep  1 09:35:16 2004
***************
*** 0 ****
--- 1,2252 ----
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.57 for [ModuleMaker] [x.xx].
+ #
+ # Report bugs to <bugs at yourdomain>.
+ #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+ 
+ # Work around bugs in pre-3.0 UWIN ksh.
+ $as_unset ENV MAIL MAILPATH
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+ for as_var in \
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+   LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+     $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
+ 
+ # Name of the executable.
+ as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
+ 
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
+ 
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+    { (exit 1); exit 1; }; }
+   fi
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+ 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
+   else
+     as_ln_s='ln -s'
+   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+ else
+   as_mkdir_p=false
+ fi
+ 
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+ $as_unset CDPATH
+ 
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+ exec 6>&1
+ 
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
+ ac_config_libobj_dir=.
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Maximum number of lines to put in a shell here document.
+ # This variable seems obsolete.  It should probably be removed, and
+ # only ac_max_sed_lines should be used.
+ : ${ac_max_here_lines=38}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='[ModuleMaker]'
+ PACKAGE_TARNAME='--modulemaker--'
+ PACKAGE_VERSION='[x.xx]'
+ PACKAGE_STRING='[ModuleMaker] [x.xx]'
+ PACKAGE_BUGREPORT='bugs at yourdomain'
+ 
+ ac_unique_file=""Makefile.common.in""
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+ exec_prefix=NONE
+ no_create=
+ no_recursion=
+ prefix=NONE
+ program_prefix=NONE
+ program_suffix=NONE
+ program_transform_name=s,x,x,
+ silent=
+ site=
+ srcdir=
+ verbose=
+ x_includes=NONE
+ x_libraries=NONE
+ 
+ # Installation directory options.
+ # These are left unexpanded so users can "make install exec_prefix=/foo"
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
+ 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'
+ 
+ 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
+ 
+   ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ 
+   # 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_alias ;;
+   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+     build_alias=$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 ;;
+ 
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+     ac_prev=datadir ;;
+   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     eval "enable_$ac_feature=no" ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) 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 | -h)
+     ac_init_help=long ;;
+   -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+     ac_init_help=recursive ;;
+   -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+     ac_init_help=short ;;
+ 
+   -host | --host | --hos | --ho)
+     ac_prev=host_alias ;;
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$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 | -n)
+     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_alias ;;
+   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+     target_alias=$ac_optarg ;;
+ 
+   -v | -verbose | --verbose | --verbos | --verbo | --verb)
+     verbose=yes ;;
+ 
+   -version | --version | --versio | --versi | --vers | -V)
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) ac_optarg=yes ;;
+     esac
+     eval "with_$ac_package='$ac_optarg'" ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     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 "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+     eval "$ac_envvar='$ac_optarg'"
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+   esac
+ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+   { echo "$as_me: error: missing argument to $ac_option" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ # Be sure to have absolute paths.
+ for ac_var in exec_prefix prefix
+ do
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+               localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* ) ;;
+     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+ # used to hold the argument of --host etc.
+ # FIXME: To remove some day.
+ build=$build_alias
+ host=$host_alias
+ target=$target_alias
+ 
+ # FIXME: To remove some day.
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+     echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+ fi
+ 
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+ 
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
+ # 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_confdir=`(dirname "$0") 2>/dev/null ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$0" : 'X\(//\)[^/]' \| \
+          X"$0" : 'X\(//\)$' \| \
+          X"$0" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+    { (exit 1); exit 1; }; }
+   else
+     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
+   fi
+ fi
+ (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+    { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+ ac_cv_env_build_alias_set=${build_alias+set}
+ ac_cv_env_build_alias_value=$build_alias
+ ac_env_host_alias_set=${host_alias+set}
+ ac_env_host_alias_value=$host_alias
+ ac_cv_env_host_alias_set=${host_alias+set}
+ ac_cv_env_host_alias_value=$host_alias
+ ac_env_target_alias_set=${target_alias+set}
+ ac_env_target_alias_value=$target_alias
+ ac_cv_env_target_alias_set=${target_alias+set}
+ ac_cv_env_target_alias_value=$target_alias
+ 
+ #
+ # Report the --help message.
+ #
+ if test "$ac_init_help" = "long"; then
+   # 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 <<_ACEOF
+ \`configure' configures [ModuleMaker] [x.xx] to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+ VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+ Configuration:
+   -h, --help              display this help and exit
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+   -q, --quiet, --silent   do not print \`checking...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+ _ACEOF
+ 
+   cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+ an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+ for instance \`--prefix=\$HOME'.
+ 
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+   --infodir=DIR          info documentation [PREFIX/info]
+   --mandir=DIR           man documentation [PREFIX/man]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+ _ACEOF
+ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+      short | recursive ) echo "Configuration of [ModuleMaker] [x.xx]:";;
+    esac
+   cat <<\_ACEOF
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-llvmsrc          Location of LLVM Source Code
+   --with-llvmobj          Location of LLVM Object Code
+ 
+ Report bugs to <bugs at yourdomain>.
+ _ACEOF
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+     test -d $ac_dir || continue
+     ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+     if test -f $ac_srcdir/configure.gnu; then
+       echo
+       $SHELL $ac_srcdir/configure.gnu  --help=recursive
+     elif test -f $ac_srcdir/configure; then
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+            test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+     cd $ac_popdir
+   done
+ fi
+ 
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ [ModuleMaker] configure [x.xx]
+ generated by GNU Autoconf 2.57
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit 0
+ fi
+ exec 5>config.log
+ cat >&5 <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by [ModuleMaker] $as_me [x.xx], which was
+ generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+ ## Platform. ##
+ ## --------- ##
+ 
+ hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+ 
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+ hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
+ 
+ } >&5
+ 
+ cat >&5 <<_ACEOF
+ 
+ 
+ ## ----------- ##
+ ## Core tests. ##
+ ## ----------- ##
+ 
+ _ACEOF
+ 
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
+ # Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
+ # Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+ ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+   for ac_arg
+   do
+     case $ac_arg in
+     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+     2)
+       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+         ac_must_keep_next=false # Got value, back to normal.
+       else
+         case $ac_arg in
+           *=* | --config-cache | -C | -disable-* | --disable-* \
+           | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+           | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+           | -with-* | --with-* | -without-* | --without-* | --x)
+             case "$ac_configure_args0 " in
+               "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+             esac
+             ;;
+           -* ) ac_must_keep_next=true ;;
+         esac
+       fi
+       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       # Get rid of the leading space.
+       ac_sep=" "
+       ;;
+     esac
+   done
+ done
+ $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+ # WARNING: Be sure not to use single quotes in there, as some shells,
+ # such as our DU 5.0 friend, will then `close' the trap.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
+ 
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+ ## ---------------- ##
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ {
+   (set) 2>&1 |
+     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       sed -n \
+         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       ;;
+     *)
+       sed -n \
+         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ }
+     echo
+ 
+     cat <<\_ASBOX
+ ## ----------------- ##
+ ## Output variables. ##
+ ## ----------------- ##
+ _ASBOX
+     echo
+     for ac_var in $ac_subst_vars
+     do
+       eval ac_val=$`echo $ac_var`
+       echo "$ac_var='"'"'$ac_val'"'"'"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+ ## ------------- ##
+ ## Output files. ##
+ ## ------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+ 	eval ac_val=$`echo $ac_var`
+         echo "$ac_var='"'"'$ac_val'"'"'"
+       done | sort
+       echo
+     fi
+ 
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+ ## confdefs.h. ##
+ ## ----------- ##
+ _ASBOX
+       echo
+       sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core core.* *.core &&
+   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # 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
+ 
+ # Predefined preprocessor variables.
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # 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 "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+ done
+ 
+ if test -r "$cache_file"; then
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+       *)                      . ./$cache_file;;
+     esac
+   fi
+ else
+   { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+ for ac_var in `(set) 2>&1 |
+                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+         { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+         { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+         { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+         ac_cache_corrupted=:
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+     esac
+   fi
+ done
+ if $ac_cache_corrupted; then
+   { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ ac_aux_dir=
+ for ac_dir in autoconf $srcdir/autoconf; do
+   if test -f $ac_dir/install-sh; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+   elif test -f $ac_dir/install.sh; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+   elif test -f $ac_dir/shtool; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+ 
+ 
+ 
+ 
+           ac_config_commands="$ac_config_commands Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands Makefile.tests"
+ 
+ 
+           ac_config_commands="$ac_config_commands Makefile.programs"
+ 
+ 
+           ac_config_commands="$ac_config_commands SingleSource/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands SingleSource/Makefile.singlesrc"
+ 
+ 
+           ac_config_commands="$ac_config_commands MultiSource/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands MultiSource/Makefile.multisrc"
+ 
+ 
+           ac_config_commands="$ac_config_commands External/Makefile"
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ # Check whether --with-llvmsrc or --without-llvmsrc was given.
+ if test "${with_llvmsrc+set}" = set; then
+   withval="$with_llvmsrc"
+   LLVM_SRC=$withval
+ 
+ else
+   LLVM_SRC=`cd ${srcdir}/../..; pwd`
+ 
+ fi;
+ 
+ 
+ # Check whether --with-llvmobj or --without-llvmobj was given.
+ if test "${with_llvmobj+set}" = set; then
+   withval="$with_llvmobj"
+   LLVM_OBJ=$withval
+ 
+ else
+   LLVM_OBJ=`cd ../..; pwd`
+ 
+ fi;
+ 
+           ac_config_files="$ac_config_files Makefile.common"
+ cat >confcache <<\_ACEOF
+ # 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, see configure's option --config-cache.
+ # It is not useful on other systems.  If it contains results you don't
+ # want to keep, you may remove or edit it.
+ #
+ # config.status only pays attention to the cache file if you give it
+ # the --recheck option to rerun configure.
+ #
+ # `ac_cv_env_foo' variables (set or unset) will be overridden when
+ # loading this file, other *unset* `ac_cv_foo' will be assigned the
+ # following values.
+ 
+ _ACEOF
+ 
+ # 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 \
+         "s/'/'\\\\''/g;
+     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       ;;
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+       sed -n \
+         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ } |
+   sed '
+      t clear
+      : clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
+ if diff $cache_file confcache >/dev/null 2>&1; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
+   else
+     echo "not updating unwritable cache $cache_file"
+   fi
+ fi
+ rm -f confcache
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+   ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+ s/^\([^=]*=[ 	]*\):*/\1/;
+ s/:*$//;
+ s/^[^=]*=[ 	]*$//;
+ }'
+ fi
+ 
+ # Transform confdefs.h into DEFS.
+ # Protect against shell expansion while executing Makefile rules.
+ # Protect against Makefile macro expansion.
+ #
+ # If the first sed substitution is executed (which looks for macros that
+ # take arguments), then we branch to the quote section.  Otherwise,
+ # look for a macro that doesn't take arguments.
+ cat >confdef2opt.sed <<\_ACEOF
+ t clear
+ : clear
+ s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+ t quote
+ s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+ t quote
+ d
+ : quote
+ s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+ s,\[,\\&,g
+ s,\],\\&,g
+ s,\$,$$,g
+ p
+ _ACEOF
+ # We use echo to avoid assuming a particular line-breaking character.
+ # The extra dot is to prevent the shell from consuming trailing
+ # line-breaks from the sub-command output.  A line-break within
+ # single-quotes doesn't work because, if this script is created in a
+ # platform that uses two characters for line-breaks (e.g., DOS), tr
+ # would break.
+ ac_LF_and_DOT=`echo; echo .`
+ DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+ rm -f confdef2opt.sed
+ 
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_i=`echo "$ac_i" |
+          sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+   # 2. Add them.
+   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+ { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in config.log if it exists.
+ 
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+ 
+ # Work around bugs in pre-3.0 UWIN ksh.
+ $as_unset ENV MAIL MAILPATH
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+ for as_var in \
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+   LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+     $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
+ 
+ # Name of the executable.
+ as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
+ 
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
+ 
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+ 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
+   else
+     as_ln_s='ln -s'
+   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+ else
+   as_mkdir_p=false
+ fi
+ 
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+ $as_unset CDPATH
+ 
+ exec 6>&1
+ 
+ # Open the log real soon, to keep \$[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.  Logging --version etc. is OK.
+ exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+ } >&5
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by [ModuleMaker] $as_me [x.xx], which was
+ generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+ _CSEOF
+ echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+ echo >&5
+ _ACEOF
+ 
+ # Files that config.status was made for.
+ if test -n "$ac_config_files"; then
+   echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_headers"; then
+   echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_links"; then
+   echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_commands"; then
+   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+ fi
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+   --file=FILE[:TEMPLATE]
+                    instantiate the configuration file FILE
+ 
+ Configuration files:
+ $config_files
+ 
+ Configuration commands:
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ [ModuleMaker] config.status [x.xx]
+ configured by $0, generated by GNU Autoconf 2.57,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ srcdir=$srcdir
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ # If no file are specified by the user, then we need to provide default
+ # value.  By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+   --*=*)
+     ac_option=`expr "x$1" : 'x\([^=]*\)='`
+     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+   -*)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+   *) # This is not an option, so the user has probably given explicit
+      # arguments.
+      ac_option=$1
+      ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+     { { echo "$as_me:$LINENO: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; };;
+   --help | --hel | -h )
+     echo "$ac_cs_usage"; exit 0 ;;
+   --debug | --d* | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ 
+   *) ac_config_targets="$ac_config_targets $1" ;;
+ 
+   esac
+   shift
+ done
+ 
+ ac_configure_extra_args=
+ 
+ if $ac_cs_silent; then
+   exec 6>/dev/null
+   ac_configure_extra_args="$ac_configure_extra_args --silent"
+ fi
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+   echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+   exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS section.
+ #
+ 
+ ${srcdir}/autoconf/mkinstalldirs `dirname Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname Makefile.tests`
+ ${srcdir}/autoconf/mkinstalldirs `dirname Makefile.programs`
+ ${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname SingleSource/Makefile.singlesrc`
+ ${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname MultiSource/Makefile.multisrc`
+ ${srcdir}/autoconf/mkinstalldirs `dirname External/Makefile`
+ 
+ _ACEOF
+ 
+ 
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_config_target in $ac_config_targets
+ do
+   case "$ac_config_target" in
+   # Handling of arguments.
+   "Makefile.common" ) CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
+   "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
+   "Makefile.tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.tests" ;;
+   "Makefile.programs" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.programs" ;;
+   "SingleSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile" ;;
+   "SingleSource/Makefile.singlesrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS SingleSource/Makefile.singlesrc" ;;
+   "MultiSource/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile" ;;
+   "MultiSource/Makefile.multisrc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS MultiSource/Makefile.multisrc" ;;
+   "External/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS External/Makefile" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+ # bizarre bug on SunOS 4.1.3.
+ if $ac_need_defaults; then
+   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+ # simply because there is no reason to put it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+ 
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+   tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ 
+ #
+ # CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+ if test -n "\$CONFIG_FILES"; then
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+ s, at SHELL@,$SHELL,;t t
+ s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+ s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+ s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+ s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+ s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+ s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s, at exec_prefix@,$exec_prefix,;t t
+ s, at prefix@,$prefix,;t t
+ s, at program_transform_name@,$program_transform_name,;t t
+ s, at bindir@,$bindir,;t t
+ s, at sbindir@,$sbindir,;t t
+ s, at libexecdir@,$libexecdir,;t t
+ s, at datadir@,$datadir,;t t
+ s, at sysconfdir@,$sysconfdir,;t t
+ s, at sharedstatedir@,$sharedstatedir,;t t
+ s, at localstatedir@,$localstatedir,;t t
+ s, at libdir@,$libdir,;t t
+ s, at includedir@,$includedir,;t t
+ s, at oldincludedir@,$oldincludedir,;t t
+ s, at infodir@,$infodir,;t t
+ s, at mandir@,$mandir,;t t
+ s, at build_alias@,$build_alias,;t t
+ s, at host_alias@,$host_alias,;t t
+ s, at target_alias@,$target_alias,;t t
+ s, at DEFS@,$DEFS,;t t
+ s, at ECHO_C@,$ECHO_C,;t t
+ s, at ECHO_N@,$ECHO_N,;t t
+ s, at ECHO_T@,$ECHO_T,;t t
+ s, at LIBS@,$LIBS,;t t
+ s, at LLVM_SRC@,$LLVM_SRC,;t t
+ s, at LLVM_OBJ@,$LLVM_OBJ,;t t
+ s, at LIBOBJS@,$LIBOBJS,;t t
+ s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+ _ACEOF
+ 
+   cat >>$CONFIG_STATUS <<\_ACEOF
+   # 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_lines=48
+   ac_sed_frag=1 # Number of current file.
+   ac_beg=1 # First line for current file.
+   ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
+     else
+       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+     fi
+     if test ! -s $tmp/subs.frag; then
+       ac_more_lines=false
+     else
+       # The purpose of the label and of the branching condition is to
+       # speed up the sed processing (if there are no `@' at all, there
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+       if test -z "$ac_sed_cmds"; then
+   	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       else
+   	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+       fi
+       ac_sed_frag=`expr $ac_sed_frag + 1`
+       ac_beg=$ac_end
+       ac_end=`expr $ac_end + $ac_max_sed_lines`
+     fi
+   done
+   if test -z "$ac_sed_cmds"; then
+     ac_sed_cmds=cat
+   fi
+ fi # test -n "$CONFIG_FILES"
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case $ac_file in
+   - | *:- | *:-:* ) # input from stdin
+         cat >$tmp/stdin
+         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_file" : 'X\(//\)[^/]' \| \
+          X"$ac_file" : 'X\(//\)$' \| \
+          X"$ac_file" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   { if $as_mkdir_p; then
+     mkdir -p "$ac_dir"
+   else
+     as_dir="$ac_dir"
+     as_dirs=
+     while test ! -d "$as_dir"; do
+       as_dirs="$as_dir $as_dirs"
+       as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$as_dir" : 'X\(//\)[^/]' \| \
+          X"$as_dir" : 'X\(//\)$' \| \
+          X"$as_dir" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+     done
+     test ! -n "$as_dirs" || mkdir $as_dirs
+   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+ 
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+   if test x"$ac_file" = x-; then
+     configure_input=
+   else
+     configure_input="$ac_file.  "
+   fi
+   configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                      sed 's,.*/,,'` by configure."
+ 
+   # First look for the input files in the build tree, otherwise in the
+   # src tree.
+   ac_file_inputs=`IFS=:
+     for f in $ac_file_in; do
+       case $f in
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+       *) # Relative
+          if test -f "$f"; then
+            # Build tree
+            echo $f
+          elif test -f "$srcdir/$f"; then
+            # Source tree
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ s, at configure_input@,$configure_input,;t t
+ s, at srcdir@,$ac_srcdir,;t t
+ s, at abs_srcdir@,$ac_abs_srcdir,;t t
+ s, at top_srcdir@,$ac_top_srcdir,;t t
+ s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+ s, at builddir@,$ac_builddir,;t t
+ s, at abs_builddir@,$ac_abs_builddir,;t t
+ s, at top_builddir@,$ac_top_builddir,;t t
+ s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+ " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+   rm -f $tmp/stdin
+   if test x"$ac_file" != x-; then
+     mv $tmp/out $ac_file
+   else
+     cat $tmp/out
+     rm -f $tmp/out
+   fi
+ 
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_dest" : 'X\(//\)[^/]' \| \
+          X"$ac_dest" : 'X\(//\)$' \| \
+          X"$ac_dest" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+     Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile Makefile ;;
+     Makefile.tests ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.tests Makefile.tests ;;
+     Makefile.programs ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/Makefile.programs Makefile.programs ;;
+     SingleSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile SingleSource/Makefile ;;
+     SingleSource/Makefile.singlesrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/SingleSource/Makefile.singlesrc SingleSource/Makefile.singlesrc ;;
+     MultiSource/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile MultiSource/Makefile ;;
+     MultiSource/Makefile.multisrc ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/MultiSource/Makefile.multisrc MultiSource/Makefile.multisrc ;;
+     External/Makefile ) ${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/External/Makefile External/Makefile ;;
+   esac
+ done
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+ # Unfortunately, on DOS this fails, as config.log is still kept open
+ # by configure, so config.status won't be able to write to it; its
+ # output is simply discarded.  So we exec the FD to /dev/null,
+ # effectively closing config.log, so it can be properly (re)opened and
+ # appended to by config.status.  When coming back to configure, we
+ # need to make the FD available again.
+ if test "$no_create" != yes; then
+   ac_cs_success=:
+   ac_config_status_args=
+   test "$silent" = yes &&
+     ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
+   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
+ 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/Benchmarks/Shootout/Makefile
Message-ID: <200409011434.JAA06136@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks/Shootout:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Shootout/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Shootout/Makefile:1.5 llvm-test/SingleSource/Benchmarks/Shootout/Makefile:1.6
--- llvm-test/SingleSource/Benchmarks/Shootout/Makefile:1.5	Tue Jun  8 12:21:42 2004
+++ llvm-test/SingleSource/Benchmarks/Shootout/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 LDFLAGS += -lm
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/siod/Makefile
Message-ID: <200409011434.JAA06061@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/siod:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -2)

Index: llvm-test/MultiSource/Applications/siod/Makefile
diff -u llvm-test/MultiSource/Applications/siod/Makefile:1.5 llvm-test/MultiSource/Applications/siod/Makefile:1.6
--- llvm-test/MultiSource/Applications/siod/Makefile:1.5	Wed Jun  2 18:06:37 2004
+++ llvm-test/MultiSource/Applications/siod/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,5 +1,4 @@
-
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG     = siod
 CPPFLAGS = -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix
 LDFLAGS  = -lm $(TOOLLINKOPTS)





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile
Message-ID: <200409011434.JAA06135@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/cfrac:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile:1.1	Thu Feb 19 15:46:32 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/cfrac/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = cfrac
 CPPFLAGS += -DNOMEMOPT
 LIBS += -lm





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile
Message-ID: <200409011434.JAA06141@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile
diff -u llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile:1.2 llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile:1.3
--- llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile:1.2	Sun Mar  7 21:37:35 2004
+++ llvm-test/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile	Wed Sep  1 09:33:27 2004
@@ -1,6 +1,6 @@
 # Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile
Message-ID: <200409011434.JAA06161@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/make:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile:1.2 llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile:1.3
--- llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile:1.2	Tue Feb 17 13:23:11 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/make/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = make
 CPPFLAGS += -DHAVE_SIGLIST -DNO_LDAV -DNOMEMOPT
 Source=commands.c job.c dir.c file.c load.c misc.c main.c read.c \





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile
Message-ID: <200409011434.JAA06123@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist/anagram:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.6 llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.7
--- llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile:1.6	Fri Sep 12 11:02:36 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/anagram/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,13 +1,13 @@
-LEVEL=../../../../../..
+LEVEL=../../../..
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 PROG = anagram
 #OBJS = anagram.o
 RUN_OPTIONS = words 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/input.OUT
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
  
 #test:
 #	$(SIM) ./anagram words < input.in > FOO





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/Regression/C++/EH/Makefile
Message-ID: <200409011434.JAA06225@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Regression/C++/EH:

Makefile updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Regression/C++/EH/Makefile
diff -u llvm-test/SingleSource/Regression/C++/EH/Makefile:1.7 llvm-test/SingleSource/Regression/C++/EH/Makefile:1.8
--- llvm-test/SingleSource/Regression/C++/EH/Makefile:1.7	Fri Feb 13 00:09:36 2004
+++ llvm-test/SingleSource/Regression/C++/EH/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 CFLAGS += -std=c99
 LIBS = -lstdc++
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/CustomChecked/Makefile 
Message-ID: <200409011434.JAA06223@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/CustomChecked:

Makefile updated: 1.11 -> 1.12
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/CustomChecked/Makefile
diff -u llvm-test/SingleSource/CustomChecked/Makefile:1.11 llvm-test/SingleSource/CustomChecked/Makefile:1.12
--- llvm-test/SingleSource/CustomChecked/Makefile:1.11	Mon Feb  9 11:25:36 2004
+++ llvm-test/SingleSource/CustomChecked/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,10 +1,10 @@
 # This directory contains testcases that use the TestRunner script to check to 
 # see if they succeed.
 
-LEVEL = ../../../..
+LEVEL = ../..
 DISABLE_DIFFS = 1
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 LIBS += -lstdc++
 LDFLAGS += -lm





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/health/Makefile
Message-ID: <200409011434.JAA06162@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/health:

Makefile updated: 1.14 -> 1.15
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/health/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/health/Makefile:1.14 llvm-test/MultiSource/Benchmarks/Olden/health/Makefile:1.15
--- llvm-test/MultiSource/Benchmarks/Olden/health/Makefile:1.14	Tue Apr 13 13:29:19 2004
+++ llvm-test/MultiSource/Benchmarks/Olden/health/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = health
 CPPFLAGS = -DTORONTO
@@ -11,5 +11,5 @@
 else
 RUN_OPTIONS = 9 20 1
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Makefile
	Makefile.multisrc 
Message-ID: <200409011434.JAA06132@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource:

Makefile updated: 1.4 -> 1.5
Makefile.multisrc updated: 1.42 -> 1.43
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Makefile
diff -u llvm-test/MultiSource/Makefile:1.4 llvm-test/MultiSource/Makefile:1.5
--- llvm-test/MultiSource/Makefile:1.4	Tue Dec  2 11:10:45 2003
+++ llvm-test/MultiSource/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,5 +1,5 @@
 # MultiSource Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../..
+LEVEL = ..
 PARALLEL_DIRS  := Applications Benchmarks
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs


Index: llvm-test/MultiSource/Makefile.multisrc
diff -u llvm-test/MultiSource/Makefile.multisrc:1.42 llvm-test/MultiSource/Makefile.multisrc:1.43
--- llvm-test/MultiSource/Makefile.multisrc:1.42	Tue May  4 16:39:22 2004
+++ llvm-test/MultiSource/Makefile.multisrc	Wed Sep  1 09:33:20 2004
@@ -17,7 +17,7 @@
 # FIXME: LIBS SHOULD BE SPECIFIED
 LIBS += -lm
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs
 
 # Figure out what object files we want to build...
 LObjs    := $(sort $(addsuffix .rbc, $(notdir $(basename $(Source)))))





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] CVS: llvm-test/External/Makefile Makefile.external 
Message-ID: <200409011434.JAA06045@choi.cs.uiuc.edu>



Changes in directory llvm-test/External:

Makefile updated: 1.9 -> 1.10
Makefile.external updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/External/Makefile
diff -u llvm-test/External/Makefile:1.9 llvm-test/External/Makefile:1.10
--- llvm-test/External/Makefile:1.9	Thu Aug 12 20:55:41 2004
+++ llvm-test/External/Makefile	Wed Sep  1 09:33:19 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../..
+LEVEL = ..
 
 #
 # Include the configuration so that we know whether or not to include SPEC


Index: llvm-test/External/Makefile.external
diff -u llvm-test/External/Makefile.external:1.1 llvm-test/External/Makefile.external:1.2
--- llvm-test/External/Makefile.external:1.1	Thu May 29 15:24:10 2003
+++ llvm-test/External/Makefile.external	Wed Sep  1 09:33:19 2004
@@ -6,5 +6,5 @@
 #
 ##===----------------------------------------------------------------------===##
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs
 .PRECIOUS: Output/%.linked.rll





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile
Message-ID: <200409011434.JAA06154@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/08-main:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile:1.5 llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile:1.6
--- llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile:1.5	Fri Sep 12 11:02:13 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/08-main/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,6 +1,6 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = main
 LDFLAGS = -lm
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/Makefile
Message-ID: <200409011434.JAA06071@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/Makefile:1.2 llvm-test/MultiSource/Benchmarks/FreeBench/Makefile:1.3
--- llvm-test/MultiSource/Benchmarks/FreeBench/Makefile:1.2	Thu Dec 18 10:42:06 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/Makefile	Wed Sep  1 09:33:21 2004
@@ -1,6 +1,6 @@
 # MultiSource/Olden Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../../..
+LEVEL = ../../..
 PARALLEL_DIRS  := distray mason pcompress2 analyzer fourinarow neural pifft
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile
Message-ID: <200409011434.JAA06140@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile:1.1	Sat Oct 11 16:18:47 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = fourinarow
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile
Message-ID: <200409011434.JAA06129@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist/ft:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.6 llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.7
--- llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile:1.6	Fri Sep 12 11:02:38 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/ft/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,5 +1,5 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = ft
 RUN_OPTIONS +=  1500 100000
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile
Message-ID: <200409011434.JAA06054@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CFP2000/177.mesa:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/SPEC/CFP2000/177.mesa/Makefile
diff -u llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.4 llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.5
--- llvm-test/External/SPEC/CFP2000/177.mesa/Makefile:1.4	Tue Apr 13 16:00:52 2004
+++ llvm-test/External/SPEC/CFP2000/177.mesa/Makefile	Wed Sep  1 09:33:19 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 FP_ABSTOLERANCE := 4
 
 ifdef LARGE_PROBLEM_SIZE





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/External/SPEC/CFP2000/179.art/Makefile
Message-ID: <200409011434.JAA06056@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CFP2000/179.art:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/SPEC/CFP2000/179.art/Makefile
diff -u llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.2 llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.3
--- llvm-test/External/SPEC/CFP2000/179.art/Makefile:1.2	Wed Feb 25 18:01:21 2004
+++ llvm-test/External/SPEC/CFP2000/179.art/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS     = -scanfile c756hel.in -trainfile1 a10.img -stride 2 -startx 134 -starty 220 -endx 184 -endy 240 -objects 3
 else





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile
Message-ID: <200409011434.JAA06084@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/09-vor:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.5 llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.6
--- llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile:1.5	Fri Sep 12 11:02:14 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/09-vor/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,10 +1,10 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 PROG = vor
 STDIN_FILENAME = $(BUILD_SRC_DIR)/vor.in3
 LDFLAGS = -lm
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/Makefile Makefile.programs
	Makefile.tests 
Message-ID: <200409011434.JAA06182@choi.cs.uiuc.edu>



Changes in directory llvm-test:

Makefile updated: 1.22 -> 1.23
Makefile.programs updated: 1.134 -> 1.135
Makefile.tests updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.


---
Diffs of the changes:  (+23 -32)

Index: llvm-test/Makefile
diff -u llvm-test/Makefile:1.22 llvm-test/Makefile:1.23
--- llvm-test/Makefile:1.22	Tue Dec  2 09:40:28 2003
+++ llvm-test/Makefile	Wed Sep  1 09:33:16 2004
@@ -1,12 +1,27 @@
-##===- test/Programs/Makefile ------------------------------*- Makefile -*-===##
-#
-# This recursively traverses the programs, building them as necessary.  This
-# makefile also implements 'make report TEST=<x>'.
+##===- projects/ModuleMaker/Makefile -----------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
 #
+# This file was developed by the LLVM research group and is distributed under
+# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
 ##===----------------------------------------------------------------------===##
+#
+# This is a sample Makefile for a project that uses LLVM.
+#
+
+#
+# Indicates our relative path to the top of the project's root directory.
+#
+LEVEL = .
 
-LEVEL = ../..
+#
+# Directories that needs to be built.
+#
 PARALLEL_DIRS = SingleSource MultiSource External
 
-include ${LEVEL}/test/Programs/Makefile.programs
+#
+# Include the Master Makefile that knows how to build all.
+#
+include $(LEVEL)/Makefile.common
 


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.134 llvm-test/Makefile.programs:1.135
--- llvm-test/Makefile.programs:1.134	Tue Aug 17 14:36:21 2004
+++ llvm-test/Makefile.programs	Wed Sep  1 09:33:16 2004
@@ -40,13 +40,13 @@
 # we do not automatically compute dependencies
 INCLUDES := $(ExtraHeaders) $(wildcard $(SourceDir)/*.h)
 
-include $(LEVEL)/test/Programs/Makefile.tests
+include $(LEVEL)/Makefile.tests
 
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
 .PRECIOUS: Output/%.linked.bc 
 
-PROGDIR = $(LLVM_SRC_ROOT)/test/Programs
+PROGDIR = $(BUILD_SRC_ROOT)
 
 #
 # Scripts in the Programs directory...
@@ -604,11 +604,3 @@
 
 clean::
 	rm -f report.*.raw.out report.*.txt report.*.html report.*.tex
-
-# If the Makefile in the source tree has been updated, copy it over into the
-# build tree.
-Makefile :: $(BUILD_SRC_DIR)/Makefile
-	@${ECHO} "===== Updating Makefile from source dir: `dirname $<` ====="
-	$(MKDIR) $(@D)
-	cp -f $< $@
-


Index: llvm-test/Makefile.tests
diff -u llvm-test/Makefile.tests:1.2 llvm-test/Makefile.tests:1.3
--- llvm-test/Makefile.tests:1.2	Tue Aug  3 10:48:21 2004
+++ llvm-test/Makefile.tests	Wed Sep  1 09:33:16 2004
@@ -34,22 +34,6 @@
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-# Find the location of the platform specific LLVM GCC libraries
-LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
-
-# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
-LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib \
-                         -L$(LLVMGCCDIR)/bytecode-libs
-LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
-LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
-LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
-LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
-LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Regression/C++/Makefile 
Message-ID: <200409011434.JAA06224@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Regression/C++:

Makefile updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Regression/C++/Makefile
diff -u llvm-test/SingleSource/Regression/C++/Makefile:1.7 llvm-test/SingleSource/Regression/C++/Makefile:1.8
--- llvm-test/SingleSource/Regression/C++/Makefile:1.7	Tue Sep 30 14:39:02 2003
+++ llvm-test/SingleSource/Regression/C++/Makefile	Wed Sep  1 09:33:26 2004
@@ -4,8 +4,8 @@
 # These tests are C++ source files that are input to GCC and compiled to .ll
 # files. After that, the files are assembled and executed by the LLVM backends.
 #
-LEVEL = ../../../../..
+LEVEL = ../../..
 DIRS=EH
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 CFLAGS += -std=c99
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p
Message-ID: <200409011434.JAA06081@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT:

mf.p updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p:1.1	Mon Feb 16 17:43:31 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p	Wed Sep  1 09:33:24 2004
@@ -393,7 +393,7 @@
 procedure sendascii(asc: integer);external;
 
 {------------------------------}
-{ $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p,v 1.1 2004/02/16 23:43:31 criswell Exp $ }
+{ $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p,v 1.2 2004/09/01 14:33:24 criswell Exp $ }
 
 { declarations for external C assist routines for MetaFont }
 
@@ -447,7 +447,7 @@
 function takefraction(q: integer; f: fraction): integer;
     external;
 
-{ $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p,v 1.1 2004/02/16 23:43:31 criswell Exp $ }
+{ $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/p2c/INPUT/mf.p,v 1.2 2004/09/01 14:33:24 criswell Exp $ }
 
 { External procedures for UNIX MetaFont VIRMF for display graphics }
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Makefile 
Message-ID: <200409011434.JAA06164@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/UnitTests/Makefile
diff -u llvm-test/SingleSource/UnitTests/Makefile:1.3 llvm-test/SingleSource/UnitTests/Makefile:1.4
--- llvm-test/SingleSource/UnitTests/Makefile:1.3	Thu Sep 11 14:06:59 2003
+++ llvm-test/SingleSource/UnitTests/Makefile	Wed Sep  1 09:33:27 2004
@@ -1,6 +1,6 @@
 # Programs/SingleSource/UnitTests/Makefile
 
 DIRS = SetjmpLongjmp
-LEVEL = ../../../..
-include ../Makefile.singlesrc
+LEVEL = ../..
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/Benchmarks/Stanford/Makefile
Message-ID: <200409011434.JAA06184@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks/Stanford:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Stanford/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Stanford/Makefile:1.4 llvm-test/SingleSource/Benchmarks/Stanford/Makefile:1.5
--- llvm-test/SingleSource/Benchmarks/Stanford/Makefile:1.4	Mon Jul 19 20:07:50 2004
+++ llvm-test/SingleSource/Benchmarks/Stanford/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,5 +1,5 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 LDFLAGS += -lm
 FP_TOLERANCE = 0.001
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile
Message-ID: <200409011434.JAA06222@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/em3d:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile:1.6 llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile:1.7
--- llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile:1.6	Fri Sep 12 11:02:25 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/em3d/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG       = em3d
 CPPFLAGS   = -DTORONTO
@@ -8,5 +8,5 @@
 RUN_OPTIONS = 1024 1000 125
 endif
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile
Message-ID: <200409011434.JAA06148@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Fhourstones:

Makefile updated: 1.8 -> 1.9
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile:1.8 llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile:1.9
--- llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile:1.8	Fri Sep 12 11:01:53 2003
+++ llvm-test/MultiSource/Benchmarks/Fhourstones/Makefile	Wed Sep  1 09:33:21 2004
@@ -1,9 +1,9 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 
 PROG     = fhourstones
 CPPFLAGS = -DUNIX -DTRANSIZE=1050011 -DPROBES=8 -DREPORTPLY=8
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 # Specify which file provides the contents of stdin for the test run 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/input





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile
Message-ID: <200409011434.JAA06221@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks/Shootout-C++:

Makefile updated: 1.10 -> 1.11
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile:1.10 llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile:1.11
--- llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile:1.10	Sun Aug  1 00:02:39 2004
+++ llvm-test/SingleSource/Benchmarks/Shootout-C++/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 CXXFLAGS += -Wno-deprecated
 CPPFLAGS += -Wno-deprecated
 LDFLAGS += -lm
@@ -6,4 +6,4 @@
 REQUIRES_EH_SUPPORT=1
 FP_TOLERANCE = 0.00000001
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h
	INTERN.h Makefile arg.h array.c array.h cmd.h cons.c dolist.c
	dump.c form.c form.h handy.h hash.c hash.h regcomp.h regexp.h
	spat.h stab.h usersub.c util.h 
Message-ID: <200409011434.JAA06201@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/perl:

EXTERN.h updated: 1.1 -> 1.2
INTERN.h updated: 1.1 -> 1.2
Makefile updated: 1.1 -> 1.2
arg.h updated: 1.1 -> 1.2
array.c updated: 1.1 -> 1.2
array.h updated: 1.1 -> 1.2
cmd.h updated: 1.1 -> 1.2
cons.c updated: 1.1 -> 1.2
dolist.c updated: 1.1 -> 1.2
dump.c updated: 1.1 -> 1.2
form.c updated: 1.1 -> 1.2
form.h updated: 1.1 -> 1.2
handy.h updated: 1.2 -> 1.3
hash.c updated: 1.1 -> 1.2
hash.h updated: 1.1 -> 1.2
regcomp.h updated: 1.1 -> 1.2
regexp.h updated: 1.1 -> 1.2
spat.h updated: 1.1 -> 1.2
stab.h updated: 1.1 -> 1.2
usersub.c updated: 1.1 -> 1.2
util.h updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+78 -21)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/EXTERN.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: EXTERN.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/INTERN.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: INTERN.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/Makefile:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/Makefile:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = perl
 REQUIRES_EH_SUPPORT = 1
 CPPFLAGS += -DHAS_STRERROR -DHAS_MKDIR -DHAS_RMDIR -U_POSIX_SOURCE -D__USE_MISC


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/arg.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: arg.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: array.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/array.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: array.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/cmd.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: cmd.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c:1.1	Tue Feb 17 16:21:15 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c,v 1.1 2004/02/17 22:21:15 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/cons.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: cons.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:15  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/dolist.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: dolist.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/dump.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: dump.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: form.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/form.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: form.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h:1.2 llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h:1.3
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h:1.2	Mon Apr  5 11:35:52 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h,v 1.2 2004/04/05 16:35:52 lattner Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/handy.h,v 1.3 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: handy.h,v $
+ * Revision 1.3  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.2  2004/04/05 16:35:52  lattner
  * Finally, fix the last perl bug that prevented it from working with LLVM:
  *   No, memcpy is NOT allowed when the src & dest overlap!


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: hash.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/hash.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: hash.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h	Wed Sep  1 09:33:24 2004
@@ -1,6 +1,9 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/regcomp.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  * $Log: regcomp.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h	Wed Sep  1 09:33:24 2004
@@ -5,9 +5,12 @@
  * not the System V one.
  */
 
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/regexp.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  * $Log: regexp.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/spat.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: spat.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h:1.1	Tue Feb 17 16:21:16 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h,v 1.1 2004/02/17 22:21:16 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/stab.h,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,9 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log: stab.h,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:16  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c:1.1	Tue Feb 17 16:21:17 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c	Wed Sep  1 09:33:24 2004
@@ -1,10 +1,13 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c,v 1.1 2004/02/17 22:21:17 criswell Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/usersub.c,v 1.2 2004/09/01 14:33:24 criswell Exp $
  *
  *  This file contains stubs for routines that the user may define to
  *  set up glue routines for C libraries or to decrypt encrypted scripts
  *  for execution.
  *
  * $Log: usersub.c,v $
+ * Revision 1.2  2004/09/01 14:33:24  criswell
+ * Migrating test suite out of the source tree.
+ *
  * Revision 1.1  2004/02/17 22:21:17  criswell
  * Initial commit of the perl Malloc Benchmark.  I've cheated a little by
  * generating the yacc output files and committing them directly, but it was


Index: llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h:1.3 llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h:1.4
--- llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h:1.3	Thu Jul 22 11:31:17 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h,v 1.3 2004/07/22 16:31:17 lattner Exp $
+/* $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/MallocBench/perl/util.h,v 1.4 2004/09/01 14:33:24 criswell Exp $
  *
  *    Copyright (c) 1989, Larry Wall
  *





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Regression/C/Makefile 
Message-ID: <200409011434.JAA06078@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Regression/C:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Regression/C/Makefile
diff -u llvm-test/SingleSource/Regression/C/Makefile:1.1 llvm-test/SingleSource/Regression/C/Makefile:1.2
--- llvm-test/SingleSource/Regression/C/Makefile:1.1	Fri Sep 26 14:50:49 2003
+++ llvm-test/SingleSource/Regression/C/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,3 +1,3 @@
-LEVEL = ../../../../..
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+LEVEL = ../../..
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile
Message-ID: <200409011434.JAA06077@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/bisort:

Makefile updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile:1.7 llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile:1.8
--- llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile:1.7	Thu Nov 13 11:53:25 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/bisort/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = bisort
 CPPFLAGS = -DTORONTO
@@ -9,5 +9,5 @@
 else
 RUN_OPTIONS = 700000
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:24 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:24 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile
Message-ID: <200409011434.JAA06062@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks/Dhrystone:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile:1.1 llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile:1.2
--- llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile:1.1	Thu Sep 11 12:58:23 2003
+++ llvm-test/SingleSource/Benchmarks/Dhrystone/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 LDFLAGS += -lm
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile
Message-ID: <200409011434.JAA06051@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/17-bintr:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.5 llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.6
--- llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile:1.5	Fri Sep 12 11:02:18 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/17-bintr/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,10 +1,10 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 PROG = bintr
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/bnchmrk.in1
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile
Message-ID: <200409011434.JAA06174@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/mst:

Makefile updated: 1.13 -> 1.14
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile:1.13 llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile:1.14
--- llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile:1.13	Wed Nov 12 15:33:41 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/mst/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG       = mst
 CPPFLAGS   = -DTORONTO
@@ -9,5 +9,5 @@
 RUN_OPTIONS = 500
 endif
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile
Message-ID: <200409011434.JAA06080@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/18-imp:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.3 llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile:1.3	Fri Sep 12 11:02:19 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/18-imp/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = imp
 RUN_OPTIONS += sg01.imp
 LDFLAGS := -lm
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/External/SPEC/CFP2000/183.equake/Makefile
Message-ID: <200409011434.JAA06046@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CFP2000/183.equake:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/SPEC/CFP2000/183.equake/Makefile
diff -u llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.2 llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.3
--- llvm-test/External/SPEC/CFP2000/183.equake/Makefile:1.2	Wed Feb 25 18:01:21 2004
+++ llvm-test/External/SPEC/CFP2000/183.equake/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 RUN_OPTIONS     = 
 STDIN_FILENAME  = inp.in
 STDOUT_FILENAME = inp.out





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Regression/Makefile 
Message-ID: <200409011434.JAA06142@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Regression:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Regression/Makefile
diff -u llvm-test/SingleSource/Regression/Makefile:1.1 llvm-test/SingleSource/Regression/Makefile:1.2
--- llvm-test/SingleSource/Regression/Makefile:1.1	Fri Sep 26 14:49:53 2003
+++ llvm-test/SingleSource/Regression/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../..
 DIRS=C++ C
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile
Message-ID: <200409011434.JAA06139@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile:1.1	Sat Oct 11 16:18:47 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = pcompress2
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/External/Povray/Makefile 
Message-ID: <200409011434.JAA06074@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/Povray:

Makefile updated: 1.8 -> 1.9
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/External/Povray/Makefile
diff -u llvm-test/External/Povray/Makefile:1.8 llvm-test/External/Povray/Makefile:1.9
--- llvm-test/External/Povray/Makefile:1.8	Fri Feb 27 12:18:17 2004
+++ llvm-test/External/Povray/Makefile	Wed Sep  1 09:33:19 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../..
 
 include $(LEVEL)/Makefile.config
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile
Message-ID: <200409011434.JAA06120@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/05-eks:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.4 llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile:1.4	Fri Sep 12 11:02:11 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/05-eks/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = eks
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 #STDIN_FILENAME = bnchmrk.in1
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile
Message-ID: <200409011434.JAA06183@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/gawk:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile:1.1 llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile:1.1	Mon Feb 23 11:05:56 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/gawk/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 RUN_OPTIONS = -f $(SourceDir)/INPUT/adj.awk type=l linelen=70 indent=5 $(SourceDir)/INPUT/words-large.awk
 PROG = gawk
 LIBS += -lm





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Makefile
	Makefile.singlesrc 
Message-ID: <200409011434.JAA06090@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource:

Makefile updated: 1.11 -> 1.12
Makefile.singlesrc updated: 1.25 -> 1.26
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Makefile
diff -u llvm-test/SingleSource/Makefile:1.11 llvm-test/SingleSource/Makefile:1.12
--- llvm-test/SingleSource/Makefile:1.11	Sun Feb 29 21:48:19 2004
+++ llvm-test/SingleSource/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../..
+LEVEL = ..
 PARALLEL_DIRS  = UnitTests Regression Benchmarks CustomChecked
 LDFLAGS += -lm
 


Index: llvm-test/SingleSource/Makefile.singlesrc
diff -u llvm-test/SingleSource/Makefile.singlesrc:1.25 llvm-test/SingleSource/Makefile.singlesrc:1.26
--- llvm-test/SingleSource/Makefile.singlesrc:1.25	Sun Apr 11 11:30:45 2004
+++ llvm-test/SingleSource/Makefile.singlesrc	Wed Sep  1 09:33:26 2004
@@ -18,7 +18,7 @@
 
 PROGRAMS_TO_TEST = $(patsubst $(SourceDir)%,%,$(basename $(Source)))
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs
 .PRECIOUS: Output/%.linked.rll
 
 ifndef USE_PRECOMPILED_BYTECODE





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile
Message-ID: <200409011434.JAA06094@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/llubenchmark:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile
diff -u llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile:1.3 llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile:1.3	Tue Mar  2 22:48:42 2004
+++ llvm-test/MultiSource/Benchmarks/llubenchmark/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 
 PROG     = llu
 CPPFLAGS =





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile
Message-ID: <200409011434.JAA06070@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/espresso:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile:1.2 llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile:1.3
--- llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile:1.2	Tue Feb 17 13:23:05 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/espresso/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = espresso
 CPPFLAGS += -DNOMEMOPT
 RUN_OPTIONS = -t $(BUILD_SRC_DIR)/INPUT/mlp4.espresso





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile
Message-ID: <200409011434.JAA06124@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist/ks:

Makefile updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.7 llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.8
--- llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile:1.7	Fri Sep 12 11:02:39 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/ks/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = ks
 #OBJS = KS-1.o KS-2.o
 RUN_OPTIONS += KL-4.in
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/Makefile 
Message-ID: <200409011434.JAA06055@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -3)

Index: llvm-test/MultiSource/Benchmarks/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Makefile:1.4 llvm-test/MultiSource/Benchmarks/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/Makefile:1.4	Fri Feb 20 12:11:43 2004
+++ llvm-test/MultiSource/Benchmarks/Makefile	Wed Sep  1 09:33:21 2004
@@ -1,9 +1,8 @@
 # MultiSource/Benchmarks Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../..
-include $(LEVEL)/Makefile.config
+LEVEL = ../..
 
 PARALLEL_DIRS := Fhourstones McCat Olden OptimizerEval Ptrdist llubenchmark sim FreeBench MallocBench
 
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/treecc/Makefile
Message-ID: <200409011434.JAA06053@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/treecc:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/treecc/Makefile
diff -u llvm-test/MultiSource/Applications/treecc/Makefile:1.2 llvm-test/MultiSource/Applications/treecc/Makefile:1.3
--- llvm-test/MultiSource/Applications/treecc/Makefile:1.2	Tue Apr  6 13:08:00 2004
+++ llvm-test/MultiSource/Applications/treecc/Makefile	Wed Sep  1 09:33:21 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = treecc
 #LDFLAGS += -lstdc++
 #LIBS += -lstdc++





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile
Message-ID: <200409011434.JAA06118@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/perimeter:

Makefile updated: 1.10 -> 1.11
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.10 llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.11
--- llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile:1.10	Fri Sep 12 11:02:28 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/perimeter/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = perimeter
 CPPFLAGS = -DTORONTO
@@ -9,5 +9,5 @@
 RUN_OPTIONS = 4
 endif
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile
Message-ID: <200409011434.JAA06066@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/04-bisect:

Makefile updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.7 llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.8
--- llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile:1.7	Sat Apr 17 18:11:29 2004
+++ llvm-test/MultiSource/Benchmarks/McCat/04-bisect/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,12 +1,12 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = bisect
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 
 FP_TOLERANCE := 0.001
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/bisect_test.in
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/Olden/Makefile
Message-ID: <200409011434.JAA06083@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/Makefile:1.4 llvm-test/MultiSource/Benchmarks/Olden/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/Olden/Makefile:1.4	Thu Dec 18 10:42:06 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,7 +1,7 @@
 # MultiSource/Olden Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../../..
+LEVEL = ../../..
 PARALLEL_DIRS  := bh em3d mst power tsp bisort health perimeter treeadd voronoi
 
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Benchmarks/Makefile 
Message-ID: <200409011434.JAA06143@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Makefile:1.2 llvm-test/SingleSource/Benchmarks/Makefile:1.3
--- llvm-test/SingleSource/Benchmarks/Makefile:1.2	Mon Dec  8 14:28:57 2003
+++ llvm-test/SingleSource/Benchmarks/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,5 +1,5 @@
-LEVEL = ../../../..
+LEVEL = ../..
 PARALLEL_DIRS=Dhrystone Shootout Shootout-C++ Stanford Misc
 LDFLAGS += -lm
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile
Message-ID: <200409011434.JAA06086@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/voronoi:

Makefile updated: 1.14 -> 1.15
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.14 llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.15
--- llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile:1.14	Tue Apr 13 13:35:20 2004
+++ llvm-test/MultiSource/Benchmarks/Olden/voronoi/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = voronoi
 INCLUDES = defines.h
@@ -9,5 +9,5 @@
 RUN_OPTIONS = 1000000 20 32 7
 endif
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile
Message-ID: <200409011434.JAA06126@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/treeadd:

Makefile updated: 1.9 -> 1.10
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.9 llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.10
--- llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile:1.9	Fri Sep 12 11:02:31 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/treeadd/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,8 +1,8 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG       = treeadd
 CPPFLAGS   = -DTORONTO
 LDFLAGS    = 
 RUN_OPTIONS = 22
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:24 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:24 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/kimwitu++/Makefile
Message-ID: <200409011434.JAA06060@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/kimwitu++:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/kimwitu++/Makefile
diff -u llvm-test/MultiSource/Applications/kimwitu++/Makefile:1.2 llvm-test/MultiSource/Applications/kimwitu++/Makefile:1.3
--- llvm-test/MultiSource/Applications/kimwitu++/Makefile:1.2	Tue Apr  6 16:59:56 2004
+++ llvm-test/MultiSource/Applications/kimwitu++/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = kc
 CPPFLAGS=-I$(BUILD_SRC_DIR) -DYYDEBUG=1
 LDFLAGS = -lstdc++





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile
Message-ID: <200409011434.JAA06087@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/gs:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile:1.2 llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile:1.3
--- llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile:1.2	Wed Feb 18 14:08:38 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/gs/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = gs
 LIBS += -lm
 LDFLAGS += -lm





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile scan.c 
Message-ID: <200409011434.JAA06151@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist/bc:

Makefile updated: 1.5 -> 1.6
scan.c updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+4 -4)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.5 llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.6
--- llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile:1.5	Fri Sep 12 11:02:37 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/bc/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,10 +1,10 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
-include $(LEVEL)/Makefile.config
+#include $(LLVM_OBJ_ROOT)/Makefile.config
 
 PROG = bc
 OBJS = scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o
 STDIN_FILENAME = $(BUILD_SRC_DIR)/primes.b
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 


Index: llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c:1.1 llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c:1.2
--- llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c:1.1	Fri Feb 14 13:14:11 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c	Wed Sep  1 09:33:25 2004
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c,v 1.1 2003/02/14 19:14:11 lattner Exp $
+ * $Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Benchmarks/Ptrdist/bc/scan.c,v 1.2 2004/09/01 14:33:25 criswell Exp $
  */
 
 #define FLEX_SCANNER





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:16 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:16 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile
Message-ID: <200409011434.JAA06067@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench/p2c:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile:1.2 llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile:1.3
--- llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile:1.2	Tue Feb 17 13:23:11 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/p2c/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = p2c
 CPPFLAGS += -DNOMEMOPT
 RUN_OPTIONS = -v





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile
Message-ID: <200409011434.JAA06216@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile:1.4 llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile:1.4	Thu Dec 18 10:42:06 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,7 +1,7 @@
 # MultiSource/Ptrdist Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../../..
+LEVEL = ../../..
 PARALLEL_DIRS  := anagram bc ft ks yacr2
 
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec
	Makefile.spec2000 Makefile.spec95 
Message-ID: <200409011434.JAA06109@choi.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC:

Makefile updated: 1.11 -> 1.12
Makefile.spec updated: 1.34 -> 1.35
Makefile.spec2000 updated: 1.2 -> 1.3
Makefile.spec95 updated: 1.7 -> 1.8
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+5 -5)

Index: llvm-test/External/SPEC/Makefile
diff -u llvm-test/External/SPEC/Makefile:1.11 llvm-test/External/SPEC/Makefile:1.12
--- llvm-test/External/SPEC/Makefile:1.11	Sat Jul 31 11:31:13 2004
+++ llvm-test/External/SPEC/Makefile	Wed Sep  1 09:33:19 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../..
 PARALLEL_DIRS := CFP2000 CINT2000 CINT95
 include ${LEVEL}/Makefile.config
 
@@ -14,4 +14,4 @@
 PARALLEL_DIRS := $(filter-out CINT95/, $(PARALLEL_DIRS))
 endif
 
-include ${LEVEL}/test/Programs/Makefile.programs
+include ${LEVEL}/Makefile.programs


Index: llvm-test/External/SPEC/Makefile.spec
diff -u llvm-test/External/SPEC/Makefile.spec:1.34 llvm-test/External/SPEC/Makefile.spec:1.35
--- llvm-test/External/SPEC/Makefile.spec:1.34	Sat Jul 24 02:54:37 2004
+++ llvm-test/External/SPEC/Makefile.spec	Wed Sep  1 09:33:19 2004
@@ -37,7 +37,7 @@
 PROGRAMS_HAVE_CUSTOM_RUN_RULES := 1
 SourceDir := $(SPEC_BENCH_DIR)/src/
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 
 # Do not pass -Wall to compile commands...
 LCCFLAGS  := -O3


Index: llvm-test/External/SPEC/Makefile.spec2000
diff -u llvm-test/External/SPEC/Makefile.spec2000:1.2 llvm-test/External/SPEC/Makefile.spec2000:1.3
--- llvm-test/External/SPEC/Makefile.spec2000:1.2	Fri Feb 27 13:59:39 2004
+++ llvm-test/External/SPEC/Makefile.spec2000	Wed Sep  1 09:33:19 2004
@@ -19,4 +19,4 @@
 endif
 endif
 
-include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec
+include $(LEVEL)/External/SPEC/Makefile.spec


Index: llvm-test/External/SPEC/Makefile.spec95
diff -u llvm-test/External/SPEC/Makefile.spec95:1.7 llvm-test/External/SPEC/Makefile.spec95:1.8
--- llvm-test/External/SPEC/Makefile.spec95:1.7	Sun Feb 29 18:30:25 2004
+++ llvm-test/External/SPEC/Makefile.spec95	Wed Sep  1 09:33:19 2004
@@ -19,4 +19,4 @@
 endif
 endif
 
-include $(LEVEL)/test/Programs/External/SPEC/Makefile.spec
+include $(LEVEL)/External/SPEC/Makefile.spec





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile
Message-ID: <200409011434.JAA06064@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/OptimizerEval:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile
diff -u llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile:1.3 llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile:1.3	Fri Sep 12 11:02:34 2003
+++ llvm-test/MultiSource/Benchmarks/OptimizerEval/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG       = optimizer-eval
 CPPFLAGS   = 
 LDFLAGS    = -lm





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile
Message-ID: <200409011434.JAA06068@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/01-qbsort:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.5 llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.6
--- llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile:1.5	Fri Sep 12 11:02:00 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/01-qbsort/Makefile	Wed Sep  1 09:33:24 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = qbsort
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/benchmark.in3
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/d/Makefile 
Message-ID: <200409011434.JAA06073@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/d:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/d/Makefile
diff -u llvm-test/MultiSource/Applications/d/Makefile:1.2 llvm-test/MultiSource/Applications/d/Makefile:1.3
--- llvm-test/MultiSource/Applications/d/Makefile:1.2	Wed Feb  4 17:07:03 2004
+++ llvm-test/MultiSource/Applications/d/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = make_dparser
 Sources=make_dparser.c write_ctables.c gram.c lex.c lr.c arg.c parse.c scan.c symtab.c util.c grammar.g.c
 CPPFLAGS =  -DD_BUILD_VERSION=5725





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/spiff/Makefile
	command.c comment.c compare.c exact.c float.c floatrep.c
	line.c miller.c misc.c output.c parse.c spiff.c strings.c
	token.c tol.c visual.c 
Message-ID: <200409011434.JAA06219@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/spiff:

Makefile updated: 1.1 -> 1.2
command.c updated: 1.1 -> 1.2
comment.c updated: 1.1 -> 1.2
compare.c updated: 1.1 -> 1.2
exact.c updated: 1.1 -> 1.2
float.c updated: 1.1 -> 1.2
floatrep.c updated: 1.1 -> 1.2
line.c updated: 1.1 -> 1.2
miller.c updated: 1.1 -> 1.2
misc.c updated: 1.1 -> 1.2
output.c updated: 1.1 -> 1.2
parse.c updated: 1.1 -> 1.2
spiff.c updated: 1.1 -> 1.2
strings.c updated: 1.1 -> 1.2
token.c updated: 1.1 -> 1.2
tol.c updated: 1.1 -> 1.2
visual.c updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+17 -17)

Index: llvm-test/MultiSource/Applications/spiff/Makefile
diff -u llvm-test/MultiSource/Applications/spiff/Makefile:1.1 llvm-test/MultiSource/Applications/spiff/Makefile:1.2
--- llvm-test/MultiSource/Applications/spiff/Makefile:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG     = spiff
 CPPFLAGS = 
 CFLAGS   = 


Index: llvm-test/MultiSource/Applications/spiff/command.c
diff -u llvm-test/MultiSource/Applications/spiff/command.c:1.1 llvm-test/MultiSource/Applications/spiff/command.c:1.2
--- llvm-test/MultiSource/Applications/spiff/command.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/command.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/command.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/command.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 


Index: llvm-test/MultiSource/Applications/spiff/comment.c
diff -u llvm-test/MultiSource/Applications/spiff/comment.c:1.1 llvm-test/MultiSource/Applications/spiff/comment.c:1.2
--- llvm-test/MultiSource/Applications/spiff/comment.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/comment.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/comment.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/comment.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 


Index: llvm-test/MultiSource/Applications/spiff/compare.c
diff -u llvm-test/MultiSource/Applications/spiff/compare.c:1.1 llvm-test/MultiSource/Applications/spiff/compare.c:1.2
--- llvm-test/MultiSource/Applications/spiff/compare.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/compare.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/compare.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/compare.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/exact.c
diff -u llvm-test/MultiSource/Applications/spiff/exact.c:1.1 llvm-test/MultiSource/Applications/spiff/exact.c:1.2
--- llvm-test/MultiSource/Applications/spiff/exact.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/exact.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/exact.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/exact.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/float.c
diff -u llvm-test/MultiSource/Applications/spiff/float.c:1.1 llvm-test/MultiSource/Applications/spiff/float.c:1.2
--- llvm-test/MultiSource/Applications/spiff/float.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/float.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/float.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/float.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include <ctype.h>


Index: llvm-test/MultiSource/Applications/spiff/floatrep.c
diff -u llvm-test/MultiSource/Applications/spiff/floatrep.c:1.1 llvm-test/MultiSource/Applications/spiff/floatrep.c:1.2
--- llvm-test/MultiSource/Applications/spiff/floatrep.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/floatrep.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/floatrep.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/floatrep.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/line.c
diff -u llvm-test/MultiSource/Applications/spiff/line.c:1.1 llvm-test/MultiSource/Applications/spiff/line.c:1.2
--- llvm-test/MultiSource/Applications/spiff/line.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/line.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/line.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/line.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include <stdio.h>


Index: llvm-test/MultiSource/Applications/spiff/miller.c
diff -u llvm-test/MultiSource/Applications/spiff/miller.c:1.1 llvm-test/MultiSource/Applications/spiff/miller.c:1.2
--- llvm-test/MultiSource/Applications/spiff/miller.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/miller.c	Wed Sep  1 09:33:20 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/miller.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/miller.c,v 1.2 2004/09/01 14:33:20 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/misc.c
diff -u llvm-test/MultiSource/Applications/spiff/misc.c:1.1 llvm-test/MultiSource/Applications/spiff/misc.c:1.2
--- llvm-test/MultiSource/Applications/spiff/misc.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/misc.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/misc.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/misc.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include <stdio.h>


Index: llvm-test/MultiSource/Applications/spiff/output.c
diff -u llvm-test/MultiSource/Applications/spiff/output.c:1.1 llvm-test/MultiSource/Applications/spiff/output.c:1.2
--- llvm-test/MultiSource/Applications/spiff/output.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/output.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/output.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/output.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include <stdio.h>


Index: llvm-test/MultiSource/Applications/spiff/parse.c
diff -u llvm-test/MultiSource/Applications/spiff/parse.c:1.1 llvm-test/MultiSource/Applications/spiff/parse.c:1.2
--- llvm-test/MultiSource/Applications/spiff/parse.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/parse.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/parse.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/parse.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/spiff.c
diff -u llvm-test/MultiSource/Applications/spiff/spiff.c:1.1 llvm-test/MultiSource/Applications/spiff/spiff.c:1.2
--- llvm-test/MultiSource/Applications/spiff/spiff.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/spiff.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/spiff.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/spiff.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 


Index: llvm-test/MultiSource/Applications/spiff/strings.c
diff -u llvm-test/MultiSource/Applications/spiff/strings.c:1.1 llvm-test/MultiSource/Applications/spiff/strings.c:1.2
--- llvm-test/MultiSource/Applications/spiff/strings.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/strings.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/strings.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/strings.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include <ctype.h>


Index: llvm-test/MultiSource/Applications/spiff/token.c
diff -u llvm-test/MultiSource/Applications/spiff/token.c:1.1 llvm-test/MultiSource/Applications/spiff/token.c:1.2
--- llvm-test/MultiSource/Applications/spiff/token.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/token.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/token.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/token.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/tol.c
diff -u llvm-test/MultiSource/Applications/spiff/tol.c:1.1 llvm-test/MultiSource/Applications/spiff/tol.c:1.2
--- llvm-test/MultiSource/Applications/spiff/tol.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/tol.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/tol.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/tol.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #include "misc.h"


Index: llvm-test/MultiSource/Applications/spiff/visual.c
diff -u llvm-test/MultiSource/Applications/spiff/visual.c:1.1 llvm-test/MultiSource/Applications/spiff/visual.c:1.2
--- llvm-test/MultiSource/Applications/spiff/visual.c:1.1	Tue Jun  1 15:35:58 2004
+++ llvm-test/MultiSource/Applications/spiff/visual.c	Wed Sep  1 09:33:21 2004
@@ -8,7 +8,7 @@
 
 
 #ifndef lint
-static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/visual.c,v 1.1 2004/06/01 20:35:58 gaeke Exp $";
+static char rcsid[]= "$Header: /home/vadve/shared/PublicCVS/llvm-test/MultiSource/Applications/spiff/visual.c,v 1.2 2004/09/01 14:33:21 criswell Exp $";
 #endif
 
 #ifdef MGR





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:26 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:26 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile
Message-ID: <200409011434.JAA06091@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.3 llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile:1.3	Fri Sep 12 11:02:41 2003
+++ llvm-test/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = yacr2
 CPPFLAGS = -DTODD
 RUN_OPTIONS += input2.in
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile
Message-ID: <200409011434.JAA06069@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/McCat/15-trie:

Makefile updated: 1.3 -> 1.4
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile
diff -u llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.3 llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.4
--- llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile:1.3	Fri Sep 12 11:02:17 2003
+++ llvm-test/MultiSource/Benchmarks/McCat/15-trie/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,7 +1,7 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 PROG = trie
 LDFLAGS = -lm
 RUN_OPTIONS += trie.in1
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/power/Makefile
Message-ID: <200409011434.JAA06179@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/power:

Makefile updated: 1.4 -> 1.5
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/power/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/power/Makefile:1.4 llvm-test/MultiSource/Benchmarks/Olden/power/Makefile:1.5
--- llvm-test/MultiSource/Benchmarks/Olden/power/Makefile:1.4	Wed Jun  2 16:30:07 2004
+++ llvm-test/MultiSource/Benchmarks/Olden/power/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,9 +1,9 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = power
 CPPFLAGS = -DTORONTO
 LDFLAGS  = -lm
 FP_TOLERANCE = 0.00001
 
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/Burg/Makefile
Message-ID: <200409011434.JAA06093@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/Burg:

Makefile updated: 1.11 -> 1.12
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Applications/Burg/Makefile
diff -u llvm-test/MultiSource/Applications/Burg/Makefile:1.11 llvm-test/MultiSource/Applications/Burg/Makefile:1.12
--- llvm-test/MultiSource/Applications/Burg/Makefile:1.11	Mon Jan 12 10:17:16 2004
+++ llvm-test/MultiSource/Applications/Burg/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 
-include $(LEVEL)/Makefile.config
+include $(LEVEL)/Makefile.common
 
 PROG     = burg
 CPPFLAGS = -DDEBUG
@@ -10,7 +10,7 @@
 
 STDIN_FILENAME = $(BUILD_SRC_DIR)/sample.gr
 
-include $(LEVEL)/Makefile.config
+include $(LLVM_OBJ_ROOT)/Makefile.config
 
 Source  := $(ExtraSource) $(wildcard $(BUILD_SRC_DIR)/*.c)
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/Makefile 
Message-ID: <200409011434.JAA06145@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications:

Makefile updated: 1.11 -> 1.12
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+3 -3)

Index: llvm-test/MultiSource/Applications/Makefile
diff -u llvm-test/MultiSource/Applications/Makefile:1.11 llvm-test/MultiSource/Applications/Makefile:1.12
--- llvm-test/MultiSource/Applications/Makefile:1.11	Thu Jul  1 09:05:51 2004
+++ llvm-test/MultiSource/Applications/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,12 +1,12 @@
 # MultiSource/Applications Makefile:  Build all subdirectories automatically
 
-LEVEL = ../../../..
+LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
+include $(LEVEL)/Makefile.common
 
 PARALLEL_DIRS  = Burg aha sgefa siod lambda-0.1.3 d spiff hbd treecc
 ifeq ($(OS),Linux)
 PARALLEL_DIRS += kimwitu++ obsequi
 endif
 
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:35:30 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:35:30 -0500
Subject: [llvm-commits] CVS: llvm-test/autoconf/LICENSE.TXT aclocal.m4
	config.guess config.sub configure.ac install-sh ltmain.sh
	mkinstalldirs 
Message-ID: <200409011435.JAA06259@choi.cs.uiuc.edu>



Changes in directory llvm-test/autoconf:

LICENSE.TXT added (r1.1)
aclocal.m4 added (r1.1)
config.guess added (r1.1)
config.sub added (r1.1)
configure.ac added (r1.1)
install-sh added (r1.1)
ltmain.sh added (r1.1)
mkinstalldirs added (r1.1)
---
Log message:

Added configuration script for LLVM test suite project.



---
Diffs of the changes:  (+15778 -0)

Index: llvm-test/autoconf/LICENSE.TXT
diff -c /dev/null llvm-test/autoconf/LICENSE.TXT:1.1
*** /dev/null	Wed Sep  1 09:35:29 2004
--- llvm-test/autoconf/LICENSE.TXT	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,24 ----
+ ------------------------------------------------------------------------------
+ Autoconf Files
+ ------------------------------------------------------------------------------
+ All autoconf files are licensed under the LLVM license with the following
+ additions:
+ 
+ llvm/autoconf/install-sh:
+ 	This script is licensed under the LLVM license, with the following
+ 	additional copyrights and restrictions:
+ 
+ 	Copyright 1991 by the Massachusetts Institute of Technology
+ 
+ 	Permission to use, copy, modify, distribute, and sell this software and its
+ 	documentation for any purpose is hereby granted without fee, provided that
+ 	the above copyright notice appear in all copies and that both that
+ 	copyright notice and this permission notice appear in supporting 
+ 	documentation, and that the name of M.I.T. not be used in advertising or
+ 	publicity pertaining to distribution of the software without specific,
+ 	written prior permission.  M.I.T. makes no representations about the
+ 	suitability of this software for any purpose.  It is provided "as is"
+ 	without express or implied warranty.
+ 
+ Please see the source files for additional copyrights.
+ 


Index: llvm-test/autoconf/aclocal.m4
diff -c /dev/null llvm-test/autoconf/aclocal.m4:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/aclocal.m4	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,6168 ----
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ ## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+ ## the Free Software Foundation; either version 2 of the License, or
+ ## (at your option) any later version.
+ ##
+ ## This program is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ ## General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##
+ ## As a special exception to the GNU General Public License, if you
+ ## distribute this file as part of a program that contains a
+ ## configuration script generated by Autoconf, you may include it under
+ ## the same distribution terms that you use for the rest of that program.
+ 
+ # serial 47 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+ # If this macro is not defined by Autoconf, define it here.
+ m4_ifdef([AC_PROVIDE_IFELSE],
+          [],
+          [m4_define([AC_PROVIDE_IFELSE],
+ 	         [m4_ifdef([AC_PROVIDE_$1],
+ 		           [$2], [$3])])])
+ 
+ 
+ # AC_PROG_LIBTOOL
+ # ---------------
+ AC_DEFUN([AC_PROG_LIBTOOL],
+ [AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+ dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+ dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+   AC_PROVIDE_IFELSE([AC_PROG_CXX],
+     [AC_LIBTOOL_CXX],
+     [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+   ])])
+ dnl And a similar setup for Fortran 77 support
+   AC_PROVIDE_IFELSE([AC_PROG_F77],
+     [AC_LIBTOOL_F77],
+     [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+ ])])
+ 
+ dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+ dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+   AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+     [AC_LIBTOOL_GCJ],
+     [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+       [AC_LIBTOOL_GCJ],
+       [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ 	[AC_LIBTOOL_GCJ],
+       [ifdef([AC_PROG_GCJ],
+ 	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+        ifdef([A][M_PROG_GCJ],
+ 	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+        ifdef([LT_AC_PROG_GCJ],
+ 	     [define([LT_AC_PROG_GCJ],
+ 		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+ ])])# AC_PROG_LIBTOOL
+ 
+ 
+ # _AC_PROG_LIBTOOL
+ # ----------------
+ AC_DEFUN([_AC_PROG_LIBTOOL],
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/mklib'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+ ])# _AC_PROG_LIBTOOL
+ 
+ 
+ # AC_LIBTOOL_SETUP
+ # ----------------
+ AC_DEFUN([AC_LIBTOOL_SETUP],
+ [AC_PREREQ(2.50)dnl
+ AC_REQUIRE([AC_ENABLE_SHARED])dnl
+ AC_REQUIRE([AC_ENABLE_STATIC])dnl
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_LD])dnl
+ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+ 
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+ 
+ AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ _LT_AC_PROG_ECHO_BACKSLASH
+ 
+ case $host_os in
+ aix3*)
+   # AIX sometimes has problems with the GCC collect2 program.  For some
+   # reason, if we set the COLLECT_NAMES environment variable, the problems
+   # vanish in a puff of smoke.
+   if test "X${COLLECT_NAMES+set}" != Xset; then
+     COLLECT_NAMES=
+     export COLLECT_NAMES
+   fi
+   ;;
+ esac
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed='sed -e s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+ [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+ 
+ # Sed substitution to delay expansion of an escaped shell variable in a
+ # double_quote_subst'ed string.
+ delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+ # Sed substitution to avoid accidental globbing in evaled expressions
+ no_glob_subst='s/\*/\\\*/g'
+ 
+ # Constants:
+ rm="rm -f"
+ 
+ # Global variables:
+ default_ofile=mklib
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except M$VC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+ ofile="$default_ofile"
+ with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+ AC_CHECK_TOOL(AR, ar, false)
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+ AC_CHECK_TOOL(STRIP, strip, :)
+ 
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ 
+ # Set sane defaults for various variables
+ test -z "$AR" && AR=ar
+ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$SED" && SED=sed
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+ test -z "$RANLIB" && RANLIB=:
+ test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+ old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+     old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+     ;;
+   *)
+     old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     AC_PATH_MAGIC
+   fi
+   ;;
+ esac
+ 
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+ 
+ AC_ARG_ENABLE([libtool-lock],
+     [AC_HELP_STRING([--disable-libtool-lock],
+ 	[avoid locking (might break parallel builds)])])
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ AC_ARG_WITH([pic],
+     [AC_HELP_STRING([--with-pic],
+ 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+     [pic_mode="$withval"],
+     [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+ _LT_AC_TAGCONFIG
+ ])# AC_LIBTOOL_SETUP
+ 
+ 
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+ # for the system default hardcoded library path. In most cases,
+ # this is /usr/lib:/lib, but when the MPI compilers are used
+ # the location of the communication and MPI libs are included too.
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+ [AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`; fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+ 
+ # _LT_AC_SHELL_INIT(ARG)
+ # ----------------------
+ AC_DEFUN([_LT_AC_SHELL_INIT],
+ [ifdef([AC_DIVERSION_NOTICE],
+ 	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ 	 [AC_DIVERT_PUSH(NOTICE)])
+ $1
+ AC_DIVERT_POP
+ ])# _LT_AC_SHELL_INIT
+ 
+ 
+ # _LT_AC_PROG_ECHO_BACKSLASH
+ # --------------------------
+ # Add some code to the start of the generated configure script which
+ # will find an echo command which doesn't interpret backslashes.
+ AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+ [_LT_AC_SHELL_INIT([
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ case X$ECHO in
+ X*--fallback-echo)
+   # Remove one level of quotation (which was required for Make).
+   ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+   ;;
+ esac
+ 
+ echo=${ECHO-echo}
+ if test "X[$]1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X[$]1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+   # Yippee, $echo works!
+   :
+ else
+   # Restart under the correct shell.
+   exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
+ 
+ if test "X[$]1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+   cat <<EOF
+ [$]*
+ EOF
+   exit 0
+ fi
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+     if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+        echo_test_string="`eval $cmd`" &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+     fi
+   done
+ fi
+ 
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+    echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+    test "X$echo_testing_string" = "X$echo_test_string"; then
+   :
+ else
+   # The Solaris, AIX, and Digital Unix default echo programs unquote
+   # backslashes.  This makes it impossible to quote backslashes using
+   #   echo "$something" | sed 's/\\/\\\\/g'
+   #
+   # So, first we look for a working echo in the user's PATH.
+ 
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for dir in $PATH /usr/ucb; do
+     IFS="$lt_save_ifs"
+     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+        test "X$echo_testing_string" = "X$echo_test_string"; then
+       echo="$dir/echo"
+       break
+     fi
+   done
+   IFS="$lt_save_ifs"
+ 
+   if test "X$echo" = Xecho; then
+     # We didn't find a better echo, so look for alternatives.
+     if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+        test "X$echo_testing_string" = "X$echo_test_string"; then
+       # This shell has a builtin print -r that does the trick.
+       echo='print -r'
+     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+ 	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+       # If we have ksh, try running configure again with it.
+       ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+       export ORIGINAL_CONFIG_SHELL
+       CONFIG_SHELL=/bin/ksh
+       export CONFIG_SHELL
+       exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+     else
+       # Try using printf.
+       echo='printf %s\n'
+       if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ 	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ 	 test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	# Cool, printf works
+ 	:
+       elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = 'X\t' &&
+ 	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ 	export CONFIG_SHELL
+ 	SHELL="$CONFIG_SHELL"
+ 	export SHELL
+ 	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+       elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = 'X\t' &&
+ 	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+       else
+ 	# maybe with a smaller string...
+ 	prev=:
+ 
+ 	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ 	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ 	  then
+ 	    break
+ 	  fi
+ 	  prev="$cmd"
+ 	done
+ 
+ 	if test "$prev" != 'sed 50q "[$]0"'; then
+ 	  echo_test_string=`eval $prev`
+ 	  export echo_test_string
+ 	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ 	else
+ 	  # Oops.  We lost completely, so just stick with echo.
+ 	  echo=echo
+ 	fi
+       fi
+     fi
+   fi
+ fi
+ fi
+ 
+ # Copy echo and quote the copy suitably for passing to libtool from
+ # the Makefile, instead of quoting the original, which is used later.
+ ECHO=$echo
+ if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+    ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+ fi
+ 
+ AC_SUBST(ECHO)
+ ])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
+ 
+ # _LT_AC_LOCK
+ # -----------
+ AC_DEFUN([_LT_AC_LOCK],
+ [AC_ARG_ENABLE([libtool-lock],
+     [AC_HELP_STRING([--disable-libtool-lock],
+ 	[avoid locking (might break parallel builds)])])
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case `/usr/bin/file conftest.$ac_objext` in
+     *ELF-32*)
+       HPUX_IA64_MODE="32"
+       ;;
+     *ELF-64*)
+       HPUX_IA64_MODE="64"
+       ;;
+     esac
+   fi
+   rm -rf conftest*
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+     case `/usr/bin/file conftest.$ac_objext` in
+     *32-bit*)
+       LD="${LD-ld} -melf32bsmip"
+       ;;
+     *N32*)
+       LD="${LD-ld} -melf32bmipn32"
+       ;;
+     *64-bit*)
+       LD="${LD-ld} -melf64bmip"
+       ;;
+     esac
+    else
+     case `/usr/bin/file conftest.$ac_objext` in
+     *32-bit*)
+       LD="${LD-ld} -32"
+       ;;
+     *N32*)
+       LD="${LD-ld} -n32"
+       ;;
+     *64-bit*)
+       LD="${LD-ld} -64"
+       ;;
+     esac
+    fi
+   fi
+   rm -rf conftest*
+   ;;
+ 
+ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+         ppc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+     *64-bit*)
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+     esac
+   fi
+   rm -rf conftest*
+   ;;
+ 
+ *-*-sco3.2v5*)
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+     [AC_LANG_PUSH(C)
+      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+      AC_LANG_POP])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+   ;;
+   ])
+ esac
+ 
+ need_locks="$enable_libtool_lock"
+ 
+ ])# _LT_AC_LOCK
+ 
+ 
+ # AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+ #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+ # ----------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+ [AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&AS_MESSAGE_LOG_FD
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test ! -s conftest.err; then
+        $2=yes
+      fi
+    fi
+    $rm conftest*
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+     ifelse([$5], , :, [$5])
+ else
+     ifelse([$6], , :, [$6])
+ fi
+ ])# AC_LIBTOOL_COMPILER_OPTION
+ 
+ 
+ # AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+ #                          [ACTION-SUCCESS], [ACTION-FAILURE])
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+ [AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+      else
+        $2=yes
+      fi
+    fi
+    $rm conftest*
+    LDFLAGS="$save_LDFLAGS"
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+     ifelse([$4], , :, [$4])
+ else
+     ifelse([$5], , :, [$5])
+ fi
+ ])# AC_LIBTOOL_LINKER_OPTION
+ 
+ 
+ # AC_LIBTOOL_SYS_MAX_CMD_LEN
+ # --------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+ [# find the maximum length of command line arguments
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+   testring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+     # On DJGPP, this test can blow up pretty badly due to problems in libc
+     # (any single argument exceeding 2000 bytes causes a buffer overrun
+     # during glob expansion).  Even if it were fixed, the result of this
+     # check would be larger than it should be.
+     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+     ;;
+ 
+   gnu*)
+     # Under GNU Hurd, this test is not required because there is
+     # no limit to the length of command line arguments.
+     # Libtool will interpret -1 as no limit whatsoever
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+   cygwin* | mingw*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+     # you end up with a "frozen" computer, even though with patience
+     # the test eventually succeeds (with a max line length of 256k).
+     # Instead, let's just punt: use the minimum linelength reported by
+     # all of the supported platforms: 8192 (on NT/2K/XP).
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+     while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+ 	       = "XX$testring") >/dev/null 2>&1 &&
+ 	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+       testring=$testring$testring
+     done
+     testring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+     ;;
+   esac
+ ])
+ if test -n $lt_cv_sys_max_cmd_len ; then
+   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+ else
+   AC_MSG_RESULT(none)
+ fi
+ ])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+ # --------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+ 
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+ # ------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+   [$4]
+ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+ [#line __oline__ "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+ 
+ #include <stdio.h>
+ 
+ #ifdef RTLD_GLOBAL
+ #  define LT_DLGLOBAL		RTLD_GLOBAL
+ #else
+ #  ifdef DL_GLOBAL
+ #    define LT_DLGLOBAL		DL_GLOBAL
+ #  else
+ #    define LT_DLGLOBAL		0
+ #  endif
+ #endif
+ 
+ /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+    find out it does not work in some platform. */
+ #ifndef LT_DLLAZY_OR_NOW
+ #  ifdef RTLD_LAZY
+ #    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+ #  else
+ #    ifdef DL_LAZY
+ #      define LT_DLLAZY_OR_NOW		DL_LAZY
+ #    else
+ #      ifdef RTLD_NOW
+ #        define LT_DLLAZY_OR_NOW	RTLD_NOW
+ #      else
+ #        ifdef DL_NOW
+ #          define LT_DLLAZY_OR_NOW	DL_NOW
+ #        else
+ #          define LT_DLLAZY_OR_NOW	0
+ #        endif
+ #      endif
+ #    endif
+ #  endif
+ #endif
+ 
+ #ifdef __cplusplus
+ extern "C" void exit (int);
+ #endif
+ 
+ void fnord() { int i=42;}
+ int main ()
+ {
+   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+   int status = $lt_dlunknown;
+ 
+   if (self)
+     {
+       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
+ 
+     exit (status);
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+     (./conftest; exit; ) 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+       x$lt_dlneed_uscore) $2 ;;
+       x$lt_unknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+     $3
+   fi
+ fi
+ rm -fr conftest*
+ ])# _LT_AC_TRY_DLOPEN_SELF
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+ # -------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+   enable_dlopen=unknown
+   enable_dlopen_self=unknown
+   enable_dlopen_self_static=unknown
+ else
+   lt_cv_dlopen=no
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+   beos*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+   mingw* | pw32*)
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+    ;;
+ 
+   cygwin*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+    ;;
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+     AC_CHECK_LIB([dl], [dlopen],
+ 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+     lt_cv_dlopen="dyld"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+     
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+ 	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+ 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+ 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+ 		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ 	      ])
+ 	    ])
+ 	  ])
+ 	])
+       ])
+     ;;
+   esac
+ 
+   if test "x$lt_cv_dlopen" != xno; then
+     enable_dlopen=yes
+   else
+     enable_dlopen=no
+   fi
+ 
+   case $lt_cv_dlopen in
+   dlopen)
+     save_CPPFLAGS="$CPPFLAGS"
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+     eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+     AC_CACHE_CHECK([whether a program can dlopen itself],
+ 	  lt_cv_dlopen_self, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+ 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+       LDFLAGS="$LDFLAGS $link_static_flag"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+ 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+       ])
+     fi
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+     LDFLAGS="$save_LDFLAGS"
+     LIBS="$save_LIBS"
+     ;;
+   esac
+ 
+   case $lt_cv_dlopen_self in
+   yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+   *) enable_dlopen_self=unknown ;;
+   esac
+ 
+   case $lt_cv_dlopen_self_static in
+   yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+   *) enable_dlopen_self_static=unknown ;;
+   esac
+ fi
+ ])# AC_LIBTOOL_DLOPEN_SELF
+ 
+ 
+ # AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+ [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+    $rm -r conftest 2>/dev/null
+    mkdir conftest
+    cd conftest
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+    # that will create temporary files in the current directory regardless of
+    # the output directory.  Thus, making CWD read-only will cause this test
+    # to fail, enabling locking or at least warning the user not to do parallel
+    # builds.
+    chmod -w .
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&AS_MESSAGE_LOG_FD
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test ! -s out/conftest.err; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+    chmod u+w .
+    $rm conftest* out/*
+    rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ ])
+ ])# AC_LIBTOOL_PROG_CC_C_O
+ 
+ 
+ # AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+ # -----------------------------------------
+ # Check to see if we can do hard links to lock some files if needed
+ AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+ [AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+ hard_links="nottested"
+ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+   AC_MSG_CHECKING([if we can lock with hard links])
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   AC_MSG_RESULT([$hard_links])
+   if test "$hard_links" = no; then
+     AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+     need_locks=warn
+   fi
+ else
+   need_locks=no
+ fi
+ ])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+ 
+ # AC_LIBTOOL_OBJDIR
+ # -----------------
+ AC_DEFUN([AC_LIBTOOL_OBJDIR],
+ [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+ [rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+ if test -d .libs; then
+   lt_cv_objdir=.libs
+ else
+   # MS-DOS does not allow filenames that begin with a dot.
+   lt_cv_objdir=_libs
+ fi
+ rmdir .libs 2>/dev/null])
+ objdir=$lt_cv_objdir
+ ])# AC_LIBTOOL_OBJDIR
+ 
+ 
+ # AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+ # ----------------------------------------------
+ # Check hardcoding attributes.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+    test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+      # If the only mechanism to avoid hardcoding is shlibpath_var, we
+      # have to relink, otherwise we might link with an installed library
+      # when we should be linking with a yet-to-be-installed one
+      ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+      test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+     # Linking always hardcodes the temporary library directory.
+     _LT_AC_TAGVAR(hardcode_action, $1)=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+     _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+   fi
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
+   _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+ fi
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+ if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+   # Fast installation is not supported
+   enable_fast_install=no
+ elif test "$shlibpath_overrides_runpath" = yes ||
+      test "$enable_shared" = no; then
+   # Fast installation is not necessary
+   enable_fast_install=needless
+ fi
+ ])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+ 
+ 
+ # AC_LIBTOOL_SYS_LIB_STRIP
+ # ------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+ [striplib=
+ old_striplib=
+ AC_MSG_CHECKING([whether stripping libraries is possible])
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   AC_MSG_RESULT([yes])
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+ fi
+        ;;
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+   esac  
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+ 
+ # AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+ [AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+ shrext=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+ finish_eval=
+ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ if test "$GCC" = yes; then
+   sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+   if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+     sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+     sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+ need_version=unknown
+ 
+ case $host_os in
+ aix3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+   # AIX 3 has no versioning support, so we append a major version to the name.
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+ aix4* | aix5*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
+     library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+     shlibpath_var=LD_LIBRARY_PATH
+   else
+     # With GCC up to 2.95.x, collect2 would create an import file
+     # for dependence libraries.  The import file would start with
+     # the line `#! .'.  This would cause the generated library to
+     # depend on `.', always an invalid library.  This was fixed in
+     # development snapshots of GCC prior to 3.0.
+     case $host_os in
+       aix4 | aix4.[[01]] | aix4.[[01]].*)
+       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ 	   echo ' yes '
+ 	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+       fi
+       ;;
+     esac
+     # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+     # soname into executable. Probably we can add versioning support to
+     # collect2, so additional links can be useful in future.
+     if test "$aix_use_runtimelinking" = yes; then
+       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
+       library_names_spec='${libname}${release}.a $libname.a'
+       soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+     shlibpath_var=LIBPATH
+   fi
+   ;;
+ 
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+   ;;
+ 
+ beos*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+ bsdi4*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+   # the default ld.so.conf also contains /usr/contrib/lib and
+   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+   # libtool to hard-code these into programs
+   ;;
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+   shrext=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+   yes,cygwin* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+       $install_prog $dir/$dlname \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+     shlibpath_overrides_runpath=yes
+ 
+     case $host_os in
+     cygwin*)
+       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+       ;;
+     mingw*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+       if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+         # It is most probably a Windows format PATH printed by
+         # mingw gcc, but we are running on Cygwin. Gcc prints its search
+         # path with ; separators, and with drive letters. We can handle the
+         # drive letters (cygwin fileutils understands them), so leave them,
+         # especially as we might pass files found there to a mingw objdump,
+         # which wouldn't understand a cygwinified path. Ahh.
+         sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+       else
+         sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+ 
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
+   dynamic_linker='Win32 ld.exe'
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+ 
+ darwin* | rhapsody*)
+   dynamic_linker="$host_os dyld"
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+   # FIXME: Relying on posixy $() will cause problems for
+   #        cross-compilation, but unfortunately the echo tests do not
+   #        yet detect zsh echo's removal of \ escapes.
+   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+   sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+   fi
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+ dgux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+ freebsd*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+       need_version=no
+       need_lib_prefix=no
+       ;;
+     freebsd-*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+   *) # from 3.2 on
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+   esac
+   ;;
+ 
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+     shrext='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     if test "X$HPUX_IA64_MODE" = X32; then
+       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+     else
+       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+      shrext='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+     shrext='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+     *)
+ 	if test "$lt_cv_prog_gnu_ld" = yes; then
+ 		version_type=linux
+ 	else
+ 		version_type=irix
+ 	fi ;;
+   esac
+   need_lib_prefix=no
+   need_version=no
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+   case $host_os in
+   irix5* | nonstopux*)
+     libsuff= shlibsuff=
+     ;;
+   *)
+     case $LD in # libtool.m4 will add one of these switches to LD
+     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+       libsuff= shlibsuff= libmagic=32-bit;;
+     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+       libsuff=32 shlibsuff=N32 libmagic=N32;;
+     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+       libsuff=64 shlibsuff=64 libmagic=64-bit;;
+     *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+     ;;
+   esac
+   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+   hardcode_into_libs=yes
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+ linux*oldld* | linux*aout* | linux*coff*)
+   dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   ;;
+ 
+ newsos6)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ nto-qnx)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     case $host_os in
+       openbsd2.[[89]] | openbsd2.[[89]].*)
+ 	shlibpath_overrides_runpath=no
+ 	;;
+       *)
+ 	shlibpath_overrides_runpath=yes
+ 	;;
+       esac
+   else
+     shlibpath_overrides_runpath=yes
+   fi
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
+   shrext=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   version_type=osf
+   need_lib_prefix=no
+   need_version=no
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+ sco3.2v5*)
+   version_type=osf
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   # ldd complains unless libraries are executable
+   postinstall_cmds='chmod +x $lib'
+   ;;
+ 
+ sunos4*)
+   version_type=sunos
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   if test "$with_gnu_ld" = yes; then
+     need_lib_prefix=no
+   fi
+   need_version=yes
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+       export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+       need_lib_prefix=no
+       ;;
+     motorola)
+       need_lib_prefix=no
+       need_version=no
+       shlibpath_overrides_runpath=no
+       sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+       ;;
+   esac
+   ;;
+ 
+ sysv4*MP*)
+   if test -d /usr/nec ;then
+     version_type=linux
+     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+     soname_spec='$libname${shared_ext}.$major'
+     shlibpath_var=LD_LIBRARY_PATH
+   fi
+   ;;
+ 
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ *)
+   dynamic_linker=no
+   ;;
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+ [AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+ 
+ if test -f "$ltmain" && test -n "$tagnames"; then
+   if test ! -f "${ofile}"; then
+     AC_MSG_WARN([output file `$ofile' does not exist])
+   fi
+ 
+   if test -z "$LTCC"; then
+     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+     if test -z "$LTCC"; then
+       AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+     else
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+   available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+ 
+   lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+   for tagname in $tagnames; do
+     IFS="$lt_save_ifs"
+     # Check whether tagname contains only valid characters
+     case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+     "") ;;
+     *)  AC_MSG_ERROR([invalid tag name: $tagname])
+ 	;;
+     esac
+ 
+     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+     then
+       AC_MSG_ERROR([tag name \"$tagname\" already exists])
+     fi
+ 
+     # Update the list of available tags.
+     if test -n "$tagname"; then
+       echo appending configuration tag \"$tagname\" to $ofile
+ 
+       case $tagname in
+       CXX)
+ 	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       F77)
+ 	if test -n "$F77" && test "X$F77" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_F77_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       GCJ)
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_GCJ_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       RC)
+ 	AC_LIBTOOL_LANG_RC_CONFIG
+ 	;;
+ 
+       *)
+ 	AC_MSG_ERROR([Unsupported tag name: $tagname])
+ 	;;
+       esac
+ 
+       # Append the new tag name to the list of available tags.
+       if test -n "$tagname" ; then
+       available_tags="$available_tags $tagname"
+     fi
+     fi
+   done
+   IFS="$lt_save_ifs"
+ 
+   # Now substitute the updated list of available tags.
+   if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+     mv "${ofile}T" "$ofile"
+     chmod +x "$ofile"
+   else
+     rm -f "${ofile}T"
+     AC_MSG_ERROR([unable to update list of available tagged configurations.])
+   fi
+ fi
+ ])# _LT_AC_TAGCONFIG
+ 
+ 
+ # AC_LIBTOOL_DLOPEN
+ # -----------------
+ # enable checks for dlopen support
+ AC_DEFUN([AC_LIBTOOL_DLOPEN],
+  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_DLOPEN
+ 
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+ # declare package support for building win32 dll's
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+ 
+ 
+ # AC_ENABLE_SHARED([DEFAULT])
+ # ---------------------------
+ # implement the --enable-shared flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_SHARED],
+ [define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([shared],
+     [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+ 	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+     *)
+       enable_shared=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_shared=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+ ])# AC_ENABLE_SHARED
+ 
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+ #- set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+ ])# AC_DISABLE_SHARED
+ 
+ 
+ # AC_ENABLE_STATIC([DEFAULT])
+ # ---------------------------
+ # implement the --enable-static flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_STATIC],
+ [define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([static],
+     [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+ 	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+     *)
+      enable_static=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_static=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+ ])# AC_ENABLE_STATIC
+ 
+ 
+ # AC_DISABLE_STATIC
+ # -----------------
+ # set the default static flag to --disable-static
+ AC_DEFUN([AC_DISABLE_STATIC],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_STATIC(no)
+ ])# AC_DISABLE_STATIC
+ 
+ 
+ # AC_ENABLE_FAST_INSTALL([DEFAULT])
+ # ---------------------------------
+ # implement the --enable-fast-install flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+ [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([fast-install],
+     [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+     [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+     *)
+       enable_fast_install=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_fast_install=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+ ])# AC_ENABLE_FAST_INSTALL
+ 
+ 
+ # AC_DISABLE_FAST_INSTALL
+ # -----------------------
+ # set the default to --disable-fast-install
+ AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)
+ ])# AC_DISABLE_FAST_INSTALL
+ 
+ 
+ # AC_LIBTOOL_PICMODE([MODE])
+ # --------------------------
+ # implement the --with-pic flag
+ # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+ AC_DEFUN([AC_LIBTOOL_PICMODE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ pic_mode=ifelse($#,1,$1,default)
+ ])# AC_LIBTOOL_PICMODE
+ 
+ 
+ # AC_PROG_EGREP
+ # -------------
+ # This is predefined starting with Autoconf 2.54, so this conditional
+ # definition can be removed once we require Autoconf 2.54 or later.
+ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+ [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+    [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+     then ac_cv_prog_egrep='grep -E'
+     else ac_cv_prog_egrep='egrep'
+     fi])
+  EGREP=$ac_cv_prog_egrep
+  AC_SUBST([EGREP])
+ ])])
+ 
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+ # find a file program which can recognise shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ [case $MAGIC_CMD in
+ [[\\/*] |  ?:[\\/]*])
+   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
+ *)
+   lt_save_MAGIC_CMD="$MAGIC_CMD"
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ dnl $ac_dummy forces splitting on constant user-supplied paths.
+ dnl POSIX.2 word splitting is done only on the output of word expansions,
+ dnl not every word.  This closes a longstanding sh security hole.
+   ac_dummy="ifelse([$2], , $PATH, [$2])"
+   for ac_dir in $ac_dummy; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$1; then
+       lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+ 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+ 	    :
+ 	  else
+ 	    cat <<EOF 1>&2
+ 
+ *** Warning: the command libtool uses to detect shared libraries,
+ *** $file_magic_cmd, produces output that libtool cannot recognize.
+ *** The result is that libtool may fail to recognize shared libraries
+ *** as such.  This will affect the creation of libtool libraries that
+ *** depend on shared libraries, but programs linked with such libtool
+ *** libraries will work regardless of this problem.  Nevertheless, you
+ *** may want to report the problem to your system manager and/or to
+ *** bug-libtool at gnu.org
+ 
+ EOF
+ 	  fi ;;
+ 	esac
+       fi
+       break
+     fi
+   done
+   IFS="$lt_save_ifs"
+   MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
+ esac])
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+   AC_MSG_RESULT($MAGIC_CMD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+ ])# AC_PATH_TOOL_PREFIX
+ 
+ 
+ # AC_PATH_MAGIC
+ # -------------
+ # find a file program which can recognise a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+     AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+   else
+     MAGIC_CMD=:
+   fi
+ fi
+ ])# AC_PATH_MAGIC
+ 
+ 
+ # AC_PROG_LD
+ # ----------
+ # find the path to the GNU or non-GNU linker
+ AC_DEFUN([AC_PROG_LD],
+ [AC_ARG_WITH([gnu-ld],
+     [AC_HELP_STRING([--with-gnu-ld],
+ 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+     [test "$withval" = no || with_gnu_ld=yes],
+     [with_gnu_ld=no])
+ AC_REQUIRE([LT_AC_PROG_SED])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by $CC])
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+   *)
+     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+   esac
+   case $ac_prog in
+     # Accept absolute paths.
+     [[\\/]]* | ?:[[\\/]]*)
+       re_direlt='/[[^/]][[^/]]*/\.\./'
+       # Canonicalize the path of ld
+       ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+   "")
+     # If it fails, then pretend we aren't using GCC.
+     ac_prog=ld
+     ;;
+   *)
+     # If it is relative, then search for the first ld in PATH.
+     with_gnu_ld=unknown
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+   AC_MSG_CHECKING([for GNU ld])
+ else
+   AC_MSG_CHECKING([for non-GNU ld])
+ fi
+ AC_CACHE_VAL(lt_cv_path_LD,
+ [if test -z "$LD"; then
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+ 	test "$with_gnu_ld" != no && break
+ 	;;
+       *)
+ 	test "$with_gnu_ld" != yes && break
+ 	;;
+       esac
+     fi
+   done
+   IFS="$lt_save_ifs"
+ else
+   lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+   AC_MSG_RESULT($LD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_PROG_LD_GNU
+ ])# AC_PROG_LD
+ 
+ 
+ # AC_PROG_LD_GNU
+ # --------------
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+ *)
+   lt_cv_prog_gnu_ld=no
+   ;;
+ esac])
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ ])# AC_PROG_LD_GNU
+ 
+ 
+ # AC_PROG_LD_RELOAD_FLAG
+ # ----------------------
+ # find reload flag for linker
+ #   -- PORTME Some linkers may need a different reload flag.
+ AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+ [AC_CACHE_CHECK([for $LD option to reload object files],
+   lt_cv_ld_reload_flag,
+   [lt_cv_ld_reload_flag='-r'])
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+ # AC_DEPLIBS_CHECK_METHOD
+ # -----------------------
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+ [AC_CACHE_CHECK([how to recognise dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+ lt_cv_deplibs_check_method='unknown'
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+ # `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+ # which responds to the $file_magic_cmd with a given extended regex.
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+ aix4* | aix5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ beos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ bsdi4*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin* | mingw* | pw32*)
+   # win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='win32_libid'
+   ;;
+ 
+ darwin* | rhapsody*)
+   # this will be overwritten by pass_all, but leave it in just in case
+   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   case "$host_os" in
+   rhapsody* | darwin1.[[012]])
+     lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+     ;;
+   *) # Darwin 1.3 on
+     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+     ;;
+   esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ freebsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+     esac
+   else
+     lt_cv_deplibs_check_method=pass_all
+   fi
+   ;;
+ 
+ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case "$host_cpu" in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+   hppa*64*)
+     [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+     lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+   irix5* | nonstopux*)
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+     ;;
+   *)
+     case $LD in
+     *-32|*"-32 ") libmagic=32-bit;;
+     *-n32|*"-n32 ") libmagic=N32;;
+     *-64|*"-64 ") libmagic=64-bit;;
+     *) libmagic=never-match;;
+     esac
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+     ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+   case $host_cpu in
+   alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   fi
+   ;;
+ 
+ newos6*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+ nto-qnx)
+   lt_cv_deplibs_check_method=unknown
+   ;;
+ 
+ openbsd*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+   else
+     lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+     ;;
+   ncr)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
+   sequent)
+     lt_cv_file_magic_cmd='/bin/file'
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+     ;;
+   sni)
+     lt_cv_file_magic_cmd='/bin/file'
+     lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+     lt_cv_file_magic_test_file=/lib/libc.so
+     ;;
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
+   esac
+   ;;
+ 
+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+ ])
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ ])# AC_DEPLIBS_CHECK_METHOD
+ 
+ 
+ # AC_PROG_NM
+ # ----------
+ # find the path to a BSD-compatible name lister
+ AC_DEFUN([AC_PROG_NM],
+ [AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+ [if test -n "$NM"; then
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+     if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+       */dev/null* | *'Invalid file or object type'*)
+ 	lt_cv_path_NM="$tmp_nm -B"
+ 	break
+         ;;
+       *)
+ 	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ 	*/dev/null*)
+ 	  lt_cv_path_NM="$tmp_nm -p"
+ 	  break
+ 	  ;;
+ 	*)
+ 	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ 	  continue # so that we can try to find one that supports BSD flags
+ 	  ;;
+ 	esac
+       esac
+     fi
+   done
+   IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+ ])# AC_PROG_NM
+ 
+ 
+ # AC_CHECK_LIBM
+ # -------------
+ # check for math library
+ AC_DEFUN([AC_CHECK_LIBM],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+ *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+   ;;
+ *)
+   AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
+ esac
+ ])# AC_CHECK_LIBM
+ 
+ 
+ # AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+ # --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+ # and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+ # DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+ # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+ # '${top_srcdir}/' (note the single quotes!).  If your package is not
+ # flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+   esac
+   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
+ ])# AC_LIBLTDL_CONVENIENCE
+ 
+ 
+ # AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+ # --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+ # and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+ # DIRECTORY is not provided and an installed libltdl is not found, it is
+ # assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+ # and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+ # quotes!).  If your package is not flat and you're not using automake,
+ # define top_builddir and top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   AC_CHECK_LIB(ltdl, lt_dlinit,
+   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+   [if test x"$enable_ltdl_install" = xno; then
+      AC_MSG_WARN([libltdl not installed, but installation disabled])
+    else
+      enable_ltdl_install=yes
+    fi
+   ])
+   if test x"$enable_ltdl_install" = x"yes"; then
+     ac_configure_args="$ac_configure_args --enable-ltdl-install"
+     LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+     LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   else
+     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+     LIBLTDL="-lltdl"
+     LTDLINCL=
+   fi
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
+ ])# AC_LIBLTDL_INSTALLABLE
+ 
+ 
+ # AC_LIBTOOL_CXX
+ # --------------
+ # enable support for C++ libraries
+ AC_DEFUN([AC_LIBTOOL_CXX],
+ [AC_REQUIRE([_LT_AC_LANG_CXX])
+ ])# AC_LIBTOOL_CXX
+ 
+ 
+ # _LT_AC_LANG_CXX
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_CXX
+ 
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+ # enable support for Fortran 77 libraries
+ AC_DEFUN([AC_LIBTOOL_F77],
+ [AC_REQUIRE([_LT_AC_LANG_F77])
+ ])# AC_LIBTOOL_F77
+ 
+ 
+ # _LT_AC_LANG_F77
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_F77],
+ [AC_REQUIRE([AC_PROG_F77])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_F77
+ 
+ 
+ # AC_LIBTOOL_GCJ
+ # --------------
+ # enable support for GCJ libraries
+ AC_DEFUN([AC_LIBTOOL_GCJ],
+ [AC_REQUIRE([_LT_AC_LANG_GCJ])
+ ])# AC_LIBTOOL_GCJ
+ 
+ 
+ # _LT_AC_LANG_GCJ
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_GCJ],
+ [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+   [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+     [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+       [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+ 	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+ 	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_GCJ
+ 
+ 
+ # AC_LIBTOOL_RC
+ # --------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
+ ])# AC_LIBTOOL_RC
+ 
+ 
+ # AC_LIBTOOL_LANG_C_CONFIG
+ # ------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+ AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+ [lt_save_CC="$CC"
+ AC_LANG_PUSH(C)
+ 
+ # Source file extension for C test sources.
+ ac_ext=c
+ 
+ # Object file extension for compiled C test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(){return(0);}\n'
+ 
+ _LT_AC_SYS_COMPILER
+ 
+ #
+ # Check for any special shared library compilation flags.
+ #
+ _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+ if test "$GCC" = no; then
+   case $host_os in
+   sco3.2v5*)
+     _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+     ;;
+   esac
+ fi
+ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+   if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+   else
+     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+   fi
+ fi
+ 
+ 
+ #
+ # Check to make sure the static flag actually works.
+ #
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+   _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+   $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+   [],
+   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ 
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ # Report which librarie types wil actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case "$host_os" in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+     archive_cmds="$archive_cmds~\$RANLIB \$lib"
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+ 
+ aix4*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+   ;;
+   darwin* | rhapsody*)
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case "$host_os" in
+     rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+       test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+       ;;
+     esac
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+     #	       `"' quotes if we put them in here... so don't!
+ 		output_verbose_link_cmd='echo'
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+     _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ 		  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ 		  _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+     fi
+     ;;  
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_C_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_CXX_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+ # Dependencies to place before and after the object being linked:
+ _LT_AC_TAGVAR(predep_objects, $1)=
+ _LT_AC_TAGVAR(postdep_objects, $1)=
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cc
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+   unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+   unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test "$GXX" = yes; then
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+ 
+ if test "$GXX" = yes; then
+   # Set up default GNU C++ configuration
+ 
+   AC_PROG_LD
+ 
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+     #     investigate it a little bit more. (MM)
+     wlarc='${wl}'
+ 
+     # ancient GNU ld didn't support --whole-archive et. al.
+     if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+ 	grep 'no-whole-archive' > /dev/null; then
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+     else
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     with_gnu_ld=no
+     wlarc=
+ 
+     # A generic and very simple default shared library creation
+     # command for GNU C++ for the case where it uses the native
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+   # what "hidden" libraries, object files and flags are used when
+   # linking a shared library.
+   output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ else
+   GXX=no
+   with_gnu_ld=no
+   wlarc=
+ fi
+ 
+ # PORTME: fill in a description of your system's C++ link characteristics
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ case $host_os in
+   aix3*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   aix4* | aix5*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+       aix_use_runtimelinking=no
+ 
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+ 	    aix_use_runtimelinking=yes
+ 	    break
+ 	    ;;
+ 	  esac
+ 	done
+       esac
+ 
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+ 
+     # When large executables or shared objects are built, AIX ld can
+     # have problems creating the table of contents.  If linking a library
+     # or program results in "error TOC overflow" add -mminimal-toc to
+     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+     # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+     _LT_AC_TAGVAR(archive_cmds, $1)=''
+     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+       case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+ 	if test -f "$collect2name" && \
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ 	  # It fails to find uninstalled libraries when the uninstalled
+ 	  # path is not listed in the libpath.  Setting hardcode_minus_L
+ 	  # to unsupported forces relinking
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	fi
+       esac
+       shared_flag='-shared'
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+ 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ 	# chokes on -Wl,-G. The following line is correct:
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag='${wl}-G'
+ 	else
+ 	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+     # It seems that -bexpall does not export symbols beginning with
+     # underscore (_), so it is better to generate a list of symbols to export.
+     _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	# Warning - without using the other run time loading flags,
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ 	# -bexpall does not export symbols beginning with underscore (_)
+ 	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	# This is similar to how AIX traditionally builds it's shared libraries.
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
+   chorus*)
+     case $cc_basename in
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+ 
+   cygwin* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+     _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ 	cp $export_symbols $output_objdir/$soname.def;
+       else
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+       $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
+ 
+   darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case "$host_os" in
+     rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+       test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+       ;;
+     esac
+     	lt_int_apple_cc_single_mod=no
+     	output_verbose_link_cmd='echo'
+     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+     	  lt_int_apple_cc_single_mod=yes
+     	fi
+     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+     	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     	else
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+ 
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       fi
+         _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    fi 
+     ;;
+ 
+   dgux*)
+     case $cc_basename in
+       ec++)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       ghcx)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   freebsd[12]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+   freebsd*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+     ;;
+   gnu*)
+     ;;
+   hpux9*)
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+     _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 				# but as the default
+ 				# location of the library.
+ 
+     case $cc_basename in
+     CC)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     aCC)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+       case "$host_cpu" in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+         ;;
+       ia64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+     case "$host_cpu" in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+     ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 					      # but as the default
+ 					      # location of the library.
+       ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 					      # but as the default
+ 					      # location of the library.
+       ;;
+     esac
+ 
+     case $cc_basename in
+       CC)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       aCC)
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+ 	    case "$host_cpu" in
+ 	    ia64*|hppa*64*)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   irix5* | irix6*)
+     case $cc_basename in
+       CC)
+ 	# SGI C++
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+ 	# necessary to make sure instantiated templates are included
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ 	;;
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 	  else
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 	;;
+     esac
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+   linux*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+       icpc)
+ 	# Intel C++
+ 	with_gnu_ld=yes
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+       cxx)
+ 	# Compaq C++
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+     esac
+     ;;
+   lynxos*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   m88k*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   mvs*)
+     case $cc_basename in
+       cxx)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   netbsd*)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+     fi
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
+   osf3*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+       RCC)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       cxx)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	  # Commands to make compiler produce verbose output that lists
+ 	  # what "hidden" libraries, object files and flags are used when
+ 	  # linking a shared library.
+ 	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+       RCC)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       cxx)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+ 	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	  # Commands to make compiler produce verbose output that lists
+ 	  # what "hidden" libraries, object files and flags are used when
+ 	  # linking a shared library.
+ 	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   psos*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   sco*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case $cc_basename in
+       CC)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   sunos4*)
+     case $cc_basename in
+       CC)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       lcc)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   solaris*)
+     case $cc_basename in
+       CC)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+ 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+ 	    # linker.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+ 	# necessary to make sure instantiated templates are included
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+       gcx)
+ 	# Green Hills C++ Compiler
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ 	;;
+       *)
+ 	# GNU C++ compiler with Solaris linker
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+ 	    # linking a shared library.
+ 	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+ 	    # linking a shared library.
+ 	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ 	fi
+ 	;;
+     esac
+     ;;
+   sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+   tandem*)
+     case $cc_basename in
+       NCC)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   vxworks*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   *)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+ esac
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ _LT_AC_TAGVAR(GCC, $1)="$GXX"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_POSTDEP_PREDEP($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ldcxx=$with_gnu_ld
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+ # ------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+ AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library.  It's possible we should let each
+ dnl tag define a new lt_????_link_test_code variable,
+ dnl but it's only used here...
+ ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+ int a;
+ void foo (void) { a = 0; }
+ EOF
+ ],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+ public:
+   Foo (void) { a = 0; }
+ private:
+   int a;
+ };
+ EOF
+ ],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+       subroutine foo
+       implicit none
+       integer*4 a
+       a=0
+       return
+       end
+ EOF
+ ],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+ public class foo {
+   private int a;
+   public void bar (void) {
+     a = 0;
+   }
+ };
+ EOF
+ ])
+ dnl Parse the compiler output and extract the necessary
+ dnl objects, libraries and library flags.
+ if AC_TRY_EVAL(ac_compile); then
+   # Parse the compiler output and extract the necessary
+   # objects, libraries and library flags.
+ 
+   # Sentinel used to keep track of whether or not we are before
+   # the conftest object file.
+   pre_test_object_deps_done=no
+ 
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+   output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+ 
+     -L* | -R* | -l*)
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test $p = "-L" \
+ 	  || test $p = "-R"; then
+ 	 prev=$p
+ 	 continue
+        else
+ 	 prev=
+        fi
+ 
+        if test "$pre_test_object_deps_done" = no; then
+ 	 case $p in
+ 	 -L* | -R*)
+ 	   # Internal compiler library paths should come after those
+ 	   # provided the user.  The postdeps already come after the
+ 	   # user supplied libs so there is no need to process them.
+ 	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ 	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ 	   else
+ 	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ 	   fi
+ 	   ;;
+ 	 # The "-l" case would never come before the object being
+ 	 # linked, so don't bother handling this case.
+ 	 esac
+        else
+ 	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+ 	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+ 	 else
+ 	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+ 	 fi
+        fi
+        ;;
+ 
+     *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+ 	 pre_test_object_deps_done=yes
+ 	 continue
+        fi
+ 
+        if test "$pre_test_object_deps_done" = no; then
+ 	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+ 	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+ 	 else
+ 	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+ 	 fi
+        else
+ 	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+ 	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+ 	 else
+ 	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+ 	 fi
+        fi
+        ;;
+ 
+     *) ;; # Ignore the rest.
+ 
+     esac
+   done
+ 
+   # Clean up.
+   rm -f a.out a.exe
+ else
+   echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+ 
+ $rm -f confest.$objext
+ 
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+ # ------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+ AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+ [AC_REQUIRE([AC_PROG_F77])
+ AC_LANG_PUSH(Fortran 77)
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+ # Source file extension for f77 test sources.
+ ac_ext=f
+ 
+ # Object file extension for compiled f77 test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="      program t\n      end\n"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case "$host_os" in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+     archive_cmds="$archive_cmds~\$RANLIB \$lib"
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+ aix4*)
+   test "$enable_shared" = yes && enable_static=no
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_F77_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_GCJ_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+ AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+ [AC_LANG_SAVE
+ 
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+ # Object file extension for compiled Java test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_RESTORE
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+ AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+ [AC_LANG_SAVE
+ 
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+ # Object file extension for compiled RC test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_RESTORE
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_RC_CONFIG
+ 
+ 
+ # AC_LIBTOOL_CONFIG([TAGNAME])
+ # ----------------------------
+ # If TAGNAME is not passed, then create an initial libtool script
+ # with a default configuration from the untagged config vars.  Otherwise
+ # add code to config.status for appending the configuration named by
+ # TAGNAME from the matching tagged config vars.
+ AC_DEFUN([AC_LIBTOOL_CONFIG],
+ [# The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+ # with your package, and you will get complaints that there are
+ # no rules to generate ltmain.sh.
+ if test -f "$ltmain"; then
+   # See if we are running on zsh, and set the options which allow our commands through
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+   fi  
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+   for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+     deplibs_check_method reload_flag reload_cmds need_locks \
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+     old_postinstall_cmds old_postuninstall_cmds \
+     _LT_AC_TAGVAR(compiler, $1) \
+     _LT_AC_TAGVAR(CC, $1) \
+     _LT_AC_TAGVAR(LD, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+     _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+     _LT_AC_TAGVAR(old_archive_cmds, $1) \
+     _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+     _LT_AC_TAGVAR(predep_objects, $1) \
+     _LT_AC_TAGVAR(postdep_objects, $1) \
+     _LT_AC_TAGVAR(predeps, $1) \
+     _LT_AC_TAGVAR(postdeps, $1) \
+     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+     _LT_AC_TAGVAR(archive_cmds, $1) \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(postinstall_cmds, $1) \
+     _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+     _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+     _LT_AC_TAGVAR(no_undefined_flag, $1) \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+     _LT_AC_TAGVAR(hardcode_automatic, $1) \
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+     case $var in
+     _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+     postinstall_cmds | postuninstall_cmds | \
+     old_postinstall_cmds | old_postuninstall_cmds | \
+     sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+       # Double-quote double-evaled strings.
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+     *)
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+       ;;
+     esac
+   done
+ 
+   case $lt_echo in
+   *'\[$]0 --fallback-echo"')
+     lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+     ;;
+   esac
+ 
+ ifelse([$1], [],
+   [cfgfile="${ofile}T"
+   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+   $rm -f "$cfgfile"
+   AC_MSG_NOTICE([creating $ofile])],
+   [cfgfile="$ofile"])
+ 
+   cat <<__EOF__ >> "$cfgfile"
+ ifelse([$1], [],
+ [#! $SHELL
+ 
+ # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # A sed program that does not truncate output.
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="$SED -e s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+ 
+ # ### BEGIN LIBTOOL CONFIG],
+ [# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ 
+ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+ # Shell to use when invoking shell scripts.
+ SHELL=$lt_SHELL
+ 
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+ 
+ # Whether or not to build static libraries.
+ build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+ build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+ 
+ # Whether or not to disallow shared libs when runtime libs are static
+ allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ 
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+ 
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+ 
+ # The archiver.
+ AR=$lt_AR
+ AR_FLAGS=$lt_AR_FLAGS
+ 
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+ # Is the compiler the GNU C compiler?
+ with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ 
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+ 
+ # The linker used to build libraries.
+ LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+ 
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+ 
+ # A BSD-compatible nm program.
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+ STRIP=$STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+ 
+ # Used on cygwin: DLL creation program.
+ DLLTOOL="$DLLTOOL"
+ 
+ # Used on cygwin: object dumper.
+ OBJDUMP="$OBJDUMP"
+ 
+ # Used on cygwin: assembler.
+ AS="$AS"
+ 
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+ 
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+ reload_cmds=$lt_reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+ wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ 
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+ shrext='$shrext'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+ pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ pic_mode=$pic_mode
+ 
+ # What is the maximum length of a command?
+ max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+ # Must we lock files when doing compilation ?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+ need_lib_prefix=$need_lib_prefix
+ 
+ # Do we need a version for libraries?
+ need_version=$need_version
+ 
+ # Whether dlopen is supported.
+ dlopen_support=$enable_dlopen
+ 
+ # Whether dlopen of programs is supported.
+ dlopen_self=$enable_dlopen_self
+ 
+ # Whether dlopen of statically linked programs is supported.
+ dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ 
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ 
+ # Compiler flag to allow reflexive dlopens.
+ export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ 
+ # Compiler flag to generate shared objects directly from archives.
+ whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ 
+ # Compiler flag to generate thread-safe objects.
+ thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ 
+ # Library versioning type.
+ version_type=$version_type
+ 
+ # Format of library name prefix.
+ libname_spec=$lt_libname_spec
+ 
+ # List of archive names.  First name is the real one, the rest are links.
+ # The last name is the one that the linker finds with -lNAME.
+ library_names_spec=$lt_library_names_spec
+ 
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+ 
+ # Commands used to build and install an old-style archive.
+ RANLIB=$lt_RANLIB
+ old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+ # Create an old-style archive from a shared archive.
+ old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ 
+ # Create a temporary old-style archive to link instead of a shared archive.
+ old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ 
+ # Commands used to build and install a shared archive.
+ archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+ archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+ postinstall_cmds=$lt_postinstall_cmds
+ postuninstall_cmds=$lt_postuninstall_cmds
+ 
+ # Commands used to build a loadable module (assumed same as above if empty)
+ module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+ module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+ 
+ # Commands to strip libraries.
+ old_striplib=$lt_old_striplib
+ striplib=$lt_striplib
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+ predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+ 
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+ postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ 
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ 
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+ 
+ # Command to use when deplibs_check_method == file_magic.
+ file_magic_cmd=$lt_file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+ allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ 
+ # Flag that forces no undefined symbols.
+ no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+ 
+ # Same as above, but a single script fragment to be evaled but not shown.
+ finish_eval=$lt_finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+ # Transform the output of nm in a proper C declaration
+ global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+ # Transform the output of nm in a C name address pair
+ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+ 
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+ 
+ # Is shlibpath searched before the hard-coded library search path?
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+ # How to hardcode a shared library path into an executable.
+ hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+ 
+ # Whether we should hardcode library paths into libraries.
+ hardcode_into_libs=$hardcode_into_libs
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+ hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+ hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+ 
+ # Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+ # resulting binary.
+ hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+ 
+ # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+ # resulting binary.
+ hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+ 
+ # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+ # the resulting binary.
+ hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+ 
+ # Set to yes if building a shared library automatically hardcodes DIR into the library
+ # and all subsequent libraries and executables linked against it.
+ hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+ 
+ # Variables whose values should be saved in libtool wrapper scripts and
+ # restored at relink time.
+ variables_saved_for_relink="$variables_saved_for_relink"
+ 
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ 
+ # Compile-time system search path for libraries
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+ fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+ 
+ # The commands to list exported symbols.
+ export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+ 
+ # The commands to extract the exported symbol list from a shared archive.
+ extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+ # Symbols that should not be listed in the preloaded symbols.
+ exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+ 
+ # Symbols that must always be exported.
+ include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+ 
+ ifelse([$1],[],
+ [# ### END LIBTOOL CONFIG],
+ [# ### END LIBTOOL TAG CONFIG: $tagname])
+ 
+ __EOF__
+ 
+ ifelse([$1],[], [
+   case $host_os in
+   aix3*)
+     cat <<\EOF >> "$cfgfile"
+ 
+ # AIX sometimes has problems with the GCC collect2 program.  For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+   COLLECT_NAMES=
+   export COLLECT_NAMES
+ fi
+ EOF
+     ;;
+   esac
+ 
+   # We use sed instead of cat because bash on DJGPP gets confused if
+   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+   # text mode, it properly converts lines to CR/LF.  This bash problem
+   # is reportedly fixed, but why not run on old versions too?
+   sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+ 
+   mv -f "$cfgfile" "$ofile" || \
+     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+   chmod +x "$ofile"
+ ])
+ else
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+   test -f Makefile && make "$ltmain"
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+ 
+ # AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+ # -------------------------------------------
+ AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+ [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ 
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ 
+ if test "$GCC" = yes; then
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+   AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+     lt_cv_prog_compiler_rtti_exceptions,
+     [-fno-rtti -fno-exceptions], [],
+     [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+ fi
+ ])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+ 
+ 
+ # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+ [
+ # These are sane defaults that work on at least a few old systems.
+ # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+ 
+ # Character class describing NM global symbol codes.
+ symcode='[[BCDEGRST]]'
+ 
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+ # Transform the above into a raw symbol and a C symbol.
+ symxfrm='\1 \2\3 \3'
+ 
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+ # Transform an extracted symbol line into symbol name and symbol address
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+ 
+ # Define system-specific variables.
+ case $host_os in
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+ cygwin* | mingw* | pw32*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+   if test "$host_cpu" = ia64; then
+     symcode='[[ABCDEGRST]]'
+   fi
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris* | sysv5*)
+   symcode='[[BDT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+   ;;
+ esac
+ 
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+ case $build_os in
+ mingw*)
+   opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+   ;;
+ esac
+ 
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+   symcode='[[ABCDGISTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
+   # Write the raw and C identifiers.
+   lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+ 
+   rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ char nm_test_var;
+ void nm_test_func(){}
+ #ifdef __cplusplus
+ }
+ #endif
+ int main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
+ 
+   if AC_TRY_EVAL(ac_compile); then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+     if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+ 	mv -f "$nlist"T "$nlist"
+       else
+ 	rm -f "$nlist"T
+       fi
+ 
+       # Make sure that we snagged all the symbols we need.
+       if grep ' nm_test_var$' "$nlist" >/dev/null; then
+ 	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+ 	  cat <<EOF > conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+ EOF
+ 	  # Now generate the symbol file.
+ 	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+ 
+ 	  cat <<EOF >> conftest.$ac_ext
+ #if defined (__STDC__) && __STDC__
+ # define lt_ptr_t void *
+ #else
+ # define lt_ptr_t char *
+ # define const
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
+ const struct {
+   const char *name;
+   lt_ptr_t address;
+ }
+ lt_preloaded_symbols[[]] =
+ {
+ EOF
+ 	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+ 	  cat <<\EOF >> conftest.$ac_ext
+   {0, (lt_ptr_t) 0}
+ };
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ EOF
+ 	  # Now try linking the two files.
+ 	  mv conftest.$ac_objext conftstm.$ac_objext
+ 	  lt_save_LIBS="$LIBS"
+ 	  lt_save_CFLAGS="$CFLAGS"
+ 	  LIBS="conftstm.$ac_objext"
+ 	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ 	    pipe_works=yes
+ 	  fi
+ 	  LIBS="$lt_save_LIBS"
+ 	  CFLAGS="$lt_save_CFLAGS"
+ 	else
+ 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ 	fi
+       else
+ 	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+       fi
+     else
+       echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+     fi
+   else
+     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+     cat conftest.$ac_ext >&5
+   fi
+   rm -f conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+     break
+   else
+     lt_cv_sys_global_symbol_pipe=
+   fi
+ done
+ ])
+ if test -z "$lt_cv_sys_global_symbol_pipe"; then
+   lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+   AC_MSG_RESULT(failed)
+ else
+   AC_MSG_RESULT(ok)
+ fi
+ ]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ 
+ 
+ # AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+ # ---------------------------------------
+ AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+ [_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+ 
+ AC_MSG_CHECKING([for $compiler option to produce PIC])
+  ifelse([$1],[CXX],[
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+     case $host_os in
+     aix*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+     beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+     *djgpp*)
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       fi
+       ;;
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	;;
+       esac
+       ;;
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+   else
+     case $host_os in
+       aix4* | aix5*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+ 	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	else
+ 	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ 	fi
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+ 	cxch68)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
+       dgux*)
+ 	case $cc_basename in
+ 	  ec++)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+ 	  ghcx)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       freebsd*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+ 	  aCC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    case "$host_cpu" in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+ 	    *)
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	      ;;
+ 	    esac
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       linux*)
+ 	case $cc_basename in
+ 	  KCC)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  icpc)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 	    ;; 
+ 	  cxx)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       lynxos*)
+ 	;;
+       m88k*)
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+ 	  cxx)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       netbsd*)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+ 	  KCC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+ 	  RCC)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  cxx)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       psos*)
+ 	;;
+       sco*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+ 	  gcx)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+ 	  lcc)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+ 	  NCC)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       unixware*)
+ 	;;
+       vxworks*)
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ 	;;
+     esac
+   fi
+ ],
+ [
+   if test "$GCC" = yes; then
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+     case $host_os in
+       aix*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+ 
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+     beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       enable_shared=no
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       fi
+       ;;
+ 
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	;;
+       esac
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+   else
+     # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+     aix*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	;;
+       esac
+       # Is there a better lt_prog_compiler_static that works with the bundled CC?
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC (with -KPIC) is the default.
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     newsos6)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     linux*)
+       case $CC in
+       icc|ecc)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
+       ccc)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
+       esac
+       ;;
+ 
+     osf3* | osf4* | osf5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # All OSF/1 code is PIC.
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     sco3.2v5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+       ;;
+ 
+     solaris*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sunos4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec ;then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+ 
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+     esac
+   fi
+ ])
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+     _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+      "" | " "*) ;;
+      *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+      esac],
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+ case "$host_os" in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     ;;
+   *)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
+ ])
+ 
+ 
+ # AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+ [AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+   aix4* | aix5*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+     else
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+     fi
+     ;;
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
+ ],[
+   runpath_var=
+   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+   _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_AC_TAGVAR(archive_cmds, $1)=
+   _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+   _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+   _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+   _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+   _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+   _LT_AC_TAGVAR(hardcode_direct, $1)=no
+   _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+   _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+   _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+   # included in the symbol list
+   _LT_AC_TAGVAR(include_expsyms, $1)=
+   # exclude_expsyms can be an extended regexp of symbols to exclude
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+   _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+     # When not using gcc, we currently assume that we are using
+     # Microsoft Visual C++.
+     if test "$GCC" != yes; then
+       with_gnu_ld=no
+     fi
+     ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+   esac
+ 
+   _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+   if test "$with_gnu_ld" = yes; then
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+ 
+ *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support.  If you
+ *** really care for shared libraries, you may want to modify your PATH
+ *** so that a non-GNU linker is found, and then restart.
+ 
+ EOF
+       fi
+       ;;
+ 
+     amigaos*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 
+       # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+       # that the semantics of dynamic libraries on AmigaOS, at least up
+       # to version 4, is to share data among multiple programs linked
+       # with the same dynamic library.  Since this doesn't match the
+       # behavior of shared libraries on other platforms, we can't use
+       # them.
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     beos*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+     cygwin* | mingw* | pw32*)
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname.def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+ 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+     netbsd*)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+     solaris* | sysv5*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+ 
+ *** Warning: The releases 2.8.* of the GNU linker cannot reliably
+ *** create shared libraries on Solaris systems.  Therefore, libtool
+ *** is disabling shared libraries support.  We urge you to upgrade GNU
+ *** binutils to release 2.9.1 or newer.  Another option is to modify
+ *** your PATH or compiler configuration so that the native linker is
+ *** used, and then restart.
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+     if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+       runpath_var=LD_RUN_PATH
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+   	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+       fi
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+     case $host_os in
+     aix3*)
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       if test "$GCC" = yes && test -z "$link_static_flag"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+       fi
+       ;;
+ 
+     aix4* | aix5*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+ 	aix_use_runtimelinking=no
+ 	exp_sym_flag='-Bexport'
+ 	no_entry_flag=""
+       else
+ 	# If we're using GNU nm, then we don't want the "-C" option.
+ 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ 	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
+ 	aix_use_runtimelinking=no
+ 
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+ 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+   	    break
+   	  fi
+ 	  done
+ 	esac
+ 
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+ 
+       # When large executables or shared objects are built, AIX ld can
+       # have problems creating the table of contents.  If linking a library
+       # or program results in "error TOC overflow" add -mminimal-toc to
+       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+       _LT_AC_TAGVAR(archive_cmds, $1)=''
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+ 	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+ 	  if test -f "$collect2name" && \
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+   	  # It fails to find uninstalled libraries when the uninstalled
+   	  # path is not listed in the libpath.  Setting hardcode_minus_L
+   	  # to unsupported forces relinking
+   	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+   	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+ 	    shared_flag='${wl}-G'
+ 	  else
+ 	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+       # It seems that -bexpall does not export symbols beginning with
+       # underscore (_), so it is better to generate a list of symbols to export.
+       _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       if test "$aix_use_runtimelinking" = yes; then
+ 	# Warning - without using the other runtime loading flags (-brtl),
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+        _LT_AC_SYS_LIBPATH_AIX
+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+ 	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	  # Warning - without using the other run time loading flags,
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ 	  # -bexpall does not export symbols beginning with underscore (_)
+ 	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	  # This is similar to how AIX traditionally builds it's shared libraries.
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+ 
+     amigaos*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       # see comment about different semantics on the GNU ld section
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     bsdi4*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+     cygwin* | mingw* | pw32*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+     if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       case "$host_os" in
+       rhapsody* | darwin1.[[012]])
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+ 	;;
+       *) # Darwin 1.3 on
+ 	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ 	;;
+       esac
+       # FIXME: Relying on posixy $() will cause problems for
+       #        cross-compilation, but unfortunately the echo tests do not
+       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+       #	       `"' quotes if we put them in here... so don't!
+     	lt_int_apple_cc_single_mod=no
+     	output_verbose_link_cmd='echo'
+     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+     	  lt_int_apple_cc_single_mod=yes
+     	fi
+     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+     	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     	else
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         else
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         fi
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+     fi  
+       ;;
+ 
+     dgux*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     freebsd1*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+     # support.  Future versions do this automatically, but an explicit c++rt0.o
+     # does not break anything, and helps significantly (at the cost of a little
+     # extra space).
+     freebsd2.2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+     freebsd2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+     hpux10* | hpux11*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+ 	case "$host_cpu" in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+ 	ia64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 
+ 	  # hardcode_minus_L: Not really in the search PATH,
+ 	  # but as the default location of the library.
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+ 	  # hardcode_minus_L: Not really in the search PATH,
+ 	  # but as the default location of the library.
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  ;;
+ 	esac
+       fi
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+     netbsd*)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     newsos6)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     openbsd*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+        case $host_os in
+ 	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ 	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+ 	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+       fi
+       ;;
+ 
+     os2*)
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+     sco3.2v5*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       ;;
+ 
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+     sunos4*)
+       if test "x$host_vendor" = xsequent; then
+ 	# Use $CC to link under sequent, because it throws in some extra .o
+ 	# files that make .init and .fini sections work.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv4)
+       case $host_vendor in
+ 	sni)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+ 	;;
+ 	siemens)
+ 	  ## LD is ld it makes a PLAMLIB
+ 	  ## CC just makes a GrossModule.
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+         ;;
+ 	motorola)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+ 	;;
+       esac
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv4.3*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	runpath_var=LD_RUN_PATH
+ 	hardcode_runpath_var=yes
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+       fi
+       ;;
+ 
+     sysv4.2uw2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       hardcode_runpath_var=yes
+       runpath_var=LD_RUN_PATH
+       ;;
+ 
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv5*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       # $CC -shared without GNU ld will not create a library from C++
+       # object files and a static libstdc++, better avoid it by now
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       runpath_var='LD_RUN_PATH'
+       ;;
+ 
+     uts4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     esac
+   fi
+ ])
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+ 
+ #
+ # Do we need to explicitly link libc?
+ #
+ case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+ x|xyes)
+   # Assume -lc should be added
+   _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 
+   if test "$enable_shared" = yes && test "$GCC" = yes; then
+     case $_LT_AC_TAGVAR(archive_cmds, $1) in
+     *'~'*)
+       # FIXME: we may have to deal with multi-command sequences.
+       ;;
+     '$CC '*)
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+         output_objdir=.
+         libname=conftest
+         lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+         if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+         then
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+         else
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+         fi
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+       AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ ])# AC_LIBTOOL_PROG_LD_SHLIBS
+ 
+ 
+ # _LT_AC_FILE_LTDLL_C
+ # -------------------
+ # Be careful that the start marker always follows a newline.
+ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+ # /* ltdll.c starts here */
+ # #define WIN32_LEAN_AND_MEAN
+ # #include <windows.h>
+ # #undef WIN32_LEAN_AND_MEAN
+ # #include <stdio.h>
+ #
+ # #ifndef __CYGWIN__
+ # #  ifdef __CYGWIN32__
+ # #    define __CYGWIN__ __CYGWIN32__
+ # #  endif
+ # #endif
+ #
+ # #ifdef __cplusplus
+ # extern "C" {
+ # #endif
+ # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+ # #ifdef __cplusplus
+ # }
+ # #endif
+ #
+ # #ifdef __CYGWIN__
+ # #include <cygwin/cygwin_dll.h>
+ # DECLARE_CYGWIN_DLL( DllMain );
+ # #endif
+ # HINSTANCE __hDllInstance_base;
+ #
+ # BOOL APIENTRY
+ # DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+ # {
+ #   __hDllInstance_base = hInst;
+ #   return TRUE;
+ # }
+ # /* ltdll.c ends here */
+ ])# _LT_AC_FILE_LTDLL_C
+ 
+ 
+ # _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+ # ---------------------------------
+ AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+ 
+ 
+ # old names
+ AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+ AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+ AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+ AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+ AC_DEFUN([LT_AC_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj, no)
+   test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+   AC_SUBST(GCJFLAGS)
+ ])
+ 
+ AC_DEFUN([LT_AC_PROG_RC],
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+ 
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+ #  macro and use it instead.                               #
+ ############################################################
+ # LT_AC_PROG_SED
+ # --------------
+ # Check for a fully-functional sed program, that truncates
+ # as few characters as possible.  Prefer GNU sed if found.
+ AC_DEFUN([LT_AC_PROG_SED],
+ [AC_MSG_CHECKING([for a sed that does not truncate output])
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+ # Then use that list of sed's as ones to test for truncation.
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+   test ! -f $lt_ac_sed && break
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+   # Check for GNU sed and select it if it is found.
+   if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+     lt_cv_path_SED=$lt_ac_sed
+     break
+   fi
+   while true; do
+     cat conftest.in conftest.in >conftest.tmp
+     mv conftest.tmp conftest.in
+     cp conftest.in conftest.nl
+     echo >>conftest.nl
+     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+     cmp -s conftest.out conftest.nl || break
+     # 10000 chars as input seems more than enough
+     test $lt_ac_count -gt 10 && break
+     lt_ac_count=`expr $lt_ac_count + 1`
+     if test $lt_ac_count -gt $lt_ac_max; then
+       lt_ac_max=$lt_ac_count
+       lt_cv_path_SED=$lt_ac_sed
+     fi
+   done
+ done
+ SED=$lt_cv_path_SED
+ ])
+ AC_MSG_RESULT([$SED])
+ ])
+ #############################################################################
+ # Additional Macros
+ #############################################################################
+ 
+ #
+ # Check for C++ namespace support.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ AC_DEFUN([AC_CXX_NAMESPACES],
+ [AC_CACHE_CHECK(whether the compiler implements namespaces,
+ ac_cv_cxx_namespaces,
+ [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
+                 [using namespace Outer::Inner; return i;],
+  ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
+  AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_namespaces" = yes; then
+   AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
+ fi
+ ])
+ 
+ #
+ # Check for hash_map extension.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_EXT_HASH_MAP],
+ [AC_CACHE_CHECK(whether the compiler has ext/hash_map,
+ ac_cv_cxx_have_ext_hash_map,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_map>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[hash_map<int, int> t; return 0;],
+   ac_cv_cxx_have_ext_hash_map=std, ac_cv_cxx_have_ext_hash_map=no)
+   AC_TRY_COMPILE([#include <ext/hash_map>
+ #ifdef HAVE_NAMESPACES
+ using namespace __gnu_cxx;
+ #endif],[hash_map<int, int> t; return 0;],
+   ac_cv_cxx_have_ext_hash_map=gnu, ac_cv_cxx_have_ext_hash_map=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_ext_hash_map" = std; then
+    AC_DEFINE(HAVE_STD_EXT_HASH_MAP,,[define if the compiler has ext/hash_map])
+ fi
+ if test "$ac_cv_cxx_have_ext_hash_map" = gnu; then
+    AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,,[define if the compiler has ext/hash_map])
+ fi
+ ])
+ 
+ #
+ # Check for hash_set extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_EXT_HASH_SET],
+ [AC_CACHE_CHECK(whether the compiler has ext/hash_set,
+ ac_cv_cxx_have_ext_hash_set,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_set>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[hash_set<int> t; return 0;],
+   ac_cv_cxx_have_ext_hash_set=std, ac_cv_cxx_have_ext_hash_set=no)
+   AC_TRY_COMPILE([#include <ext/hash_set>
+ #ifdef HAVE_NAMESPACES
+ using namespace __gnu_cxx;
+ #endif],[hash_set<int> t; return 0;],
+   ac_cv_cxx_have_ext_hash_set=gnu, ac_cv_cxx_have_ext_hash_set=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_ext_hash_set" = std; then
+    AC_DEFINE(HAVE_STD_EXT_HASH_SET,,[define if the compiler has ext/hash_set in std])
+ fi
+ if test "$ac_cv_cxx_have_ext_hash_set" = gnu; then
+    AC_DEFINE(HAVE_GNU_EXT_HASH_SET,,[define if the compiler has ext/hash_set in __gnu_cc])
+ fi
+ ])
+ 
+ #
+ # Check for standard iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_STD_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has the standard iterator,
+ ac_cv_cxx_have_std_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[iterator<int,int,int> t; return 0;],
+   ac_cv_cxx_have_std_iterator=yes, ac_cv_cxx_have_std_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_std_iterator" = yes; then
+    AC_DEFINE(HAVE_STD_ITERATOR,,[define if the compiler has STL iterators])
+ fi
+ ])
+ 
+ #
+ # Check for bidirectional iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_BI_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has the bidirectional iterator,
+ ac_cv_cxx_have_bi_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[bidirectional_iterator<int,int> t; return 0;],
+   ac_cv_cxx_have_bi_iterator=yes, ac_cv_cxx_have_bi_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_bi_iterator" = yes; then
+    AC_DEFINE(HAVE_BI_ITERATOR,,[define if the compiler has bidirectional iterator])
+ fi
+ ])
+ 
+ #
+ # Check for forward iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_FWD_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has forward iterators,
+ ac_cv_cxx_have_fwd_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[forward_iterator<int,int> t; return 0;],
+   ac_cv_cxx_have_fwd_iterator=yes, ac_cv_cxx_have_fwd_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_fwd_iterator" = yes; then
+    AC_DEFINE(HAVE_FWD_ITERATOR,,[define if the compiler has STL iterators])
+ fi
+ ])
+ 
+ #
+ # Check for slist extension.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_EXT_SLIST],
+ [AC_CACHE_CHECK(whether the compiler has ext/slist,
+ ac_cv_cxx_have_ext_slist,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/slist>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[slist<int> s; return 0;],
+   ac_cv_cxx_have_ext_slist=std, ac_cv_cxx_have_ext_slist=no)
+   AC_TRY_COMPILE([#include <ext/slist>
+ #ifdef HAVE_NAMESPACES
+ using namespace __gnu_cxx;
+ #endif],[slist<int> s; return 0;],
+   ac_cv_cxx_have_ext_slist=gnu, ac_cv_cxx_have_ext_slist=no)
+ 
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_ext_slist" = std; then
+    AC_DEFINE(HAVE_EXT_SLIST,std,[define if the compiler has ext/slist])
+ fi
+ if test "$ac_cv_cxx_have_ext_slist" = gnu; then
+    AC_DEFINE(HAVE_EXT_SLIST,gnu,[define if the compiler has ext/slist])
+ fi
+ ])
+ 
+ #
+ # Check for FLEX.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ AC_DEFUN([AC_PROG_FLEX],
+ [AC_CACHE_CHECK(,
+ ac_cv_has_flex,
+ [AC_PROG_LEX()
+ ])
+ if test "$LEX" != "flex"; then
+   AC_MSG_ERROR([flex not found but required])
+ fi
+ ])
+ 
+ #
+ # Check for Bison.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ AC_DEFUN([AC_PROG_BISON],
+ [AC_CACHE_CHECK(,
+ ac_cv_has_bison,
+ [AC_PROG_YACC()
+ ])
+ if test "$YACC" != "bison -y"; then
+   AC_MSG_ERROR([bison not found but required])
+ else
+   AC_SUBST(YACC,[bison],[location of bison])
+ fi
+ ])
+ 
+ #
+ # Check for GNU Make.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/check_gnu_make.html
+ #
+ AC_DEFUN(
+         [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+                 _cv_gnu_make_command='' ;
+ dnl Search all the common names for GNU make
+                 for a in "$MAKE" make gmake gnumake ; do
+                         if test -z "$a" ; then continue ; fi ;
+                         if  ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
+                                 _cv_gnu_make_command=$a ;
+                                 break;
+                         fi
+                 done ;
+         ) ;
+ dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
+         if test  "x$_cv_gnu_make_command" != "x"  ; then
+                 ifGNUmake='' ;
+         else
+                 ifGNUmake='#' ;
+                 AC_MSG_RESULT("Not found");
+         fi
+         AC_SUBST(ifGNUmake)
+ ] )
+ 
+ #
+ # Check for the ability to mmap a file.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_FUNC_MMAP_FILE],
+ [AC_CACHE_CHECK(for mmap of files,
+ ac_cv_func_mmap_file,
+ [AC_LANG_SAVE
+   AC_LANG_C
+   AC_TRY_RUN([
+ #ifdef HAVE_SYS_MMAN_H
+ #include <sys/mman.h>
+ #endif
+ 
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ 
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+ 
+   int fd;
+   int main () {
+   fd = creat ("foo",0777); fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); unlink ("foo"); return (fd != MAP_FAILED);}],
+   ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_func_mmap_file" = yes; then
+    AC_DEFINE(HAVE_MMAP_FILE)
+    AC_SUBST(MMAP_FILE,[yes])
+ fi
+ ])
+ 
+ #
+ # Check for anonymous mmap macros.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_HEADER_MMAP_ANONYMOUS],
+ [AC_CACHE_CHECK(for MAP_ANONYMOUS vs. MAP_ANON,
+ ac_cv_header_mmap_anon,
+ [AC_LANG_SAVE
+   AC_LANG_C
+   AC_TRY_COMPILE([#include <sys/mman.h>
+   #include <unistd.h>
+   #include <fcntl.h>],
+   [mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0);],
+   ac_cv_header_mmap_anon=yes, ac_cv_header_mmap_anon=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_header_mmap_anon" = yes; then
+    AC_DEFINE(HAVE_MMAP_ANONYMOUS)
+ fi
+ ])
+ 
+ #
+ # Configure a Makefile without clobbering it if it exists and is not out of
+ # date.  This is modified from:
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_CONFIG_MAKEFILE],
+ [AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`)
+ ])
+ 
+ 


Index: llvm-test/autoconf/config.guess
diff -c /dev/null llvm-test/autoconf/config.guess:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/config.guess	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,1388 ----
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+ timestamp='2003-02-22'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Originally written by Per Bothner <per at bothner.com>.
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+ # don't specify an explicit build system type.
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+ Operation modes:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches at gnu.org>."
+ 
+ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+        echo "$timestamp" ; exit 0 ;;
+     --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+        echo "$me: invalid option $1$help" >&2
+        exit 1 ;;
+     * )
+        break ;;
+   esac
+ done
+ 
+ if test $# != 0; then
+   echo "$me: too many arguments$help" >&2
+   exit 1
+ fi
+ 
+ trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+ # temporary files to be created and, as you can see below, it is a
+ # headache to deal with in a portable fashion.
+ 
+ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+ # use `HOST_CC' if defined, but it is deprecated.
+ 
+ # Portable tmp directory creation inspired by the Autoconf team.
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+  ,,)    echo "int x;" > $dummy.c ;
+ 	for c in cc gcc c89 c99 ; do
+ 	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+ 	if test x"$CC_FOR_BUILD" = x ; then
+ 	  CC_FOR_BUILD=no_compiler_found ;
+ 	fi
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+ esac ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi at noc.rutgers.edu 1994-08-24)
+ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+ 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+ 	# compatibility and a consistent mechanism for selecting the
+ 	# object file format.
+ 	#
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+ 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+ 	# to ELF recently, or will in the future.
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep __ELF__ >/dev/null
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+ 		    os=netbsd
+ 		else
+ 		    os=netbsdelf
+ 		fi
+ 		;;
+ 	    *)
+ 	        os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+ 	# Debian GNU/NetBSD machines have a different userland, and
+ 	# thus, need a distinct triplet. However, they do not need
+ 	# kernel version information, so it can be replaced with a
+ 	# suitable tag, in the style of linux-gnu.
+ 	case "${UNAME_VERSION}" in
+ 	    Debian*)
+ 		release='-gnu'
+ 		;;
+ 	    *)
+ 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     arc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     macppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme88k:OpenBSD:*:*)
+ 	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvmeppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     pmax:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sgi:OpenBSD:*:*)
+ 	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     wgrisc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 	fi
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+ 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+ 	# covers most systems running today.  This code pipes the CPU
+ 	# types through head -n 1, so we only detect the type of CPU 0.
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+ 	    "EV4 (21064)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "EV4.5 (21064)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "LCA4 (21066/21068)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "EV5 (21164)")
+ 		UNAME_MACHINE="alphaev5" ;;
+ 	    "EV5.6 (21164A)")
+ 		UNAME_MACHINE="alphaev56" ;;
+ 	    "EV5.6 (21164PC)")
+ 		UNAME_MACHINE="alphapca56" ;;
+ 	    "EV5.7 (21164PC)")
+ 		UNAME_MACHINE="alphapca57" ;;
+ 	    "EV6 (21264)")
+ 		UNAME_MACHINE="alphaev6" ;;
+ 	    "EV6.7 (21264A)")
+ 		UNAME_MACHINE="alphaev67" ;;
+ 	    "EV6.8CB (21264C)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.8AL (21264B)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.8CX (21264D)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.9A (21264/EV69A)")
+ 		UNAME_MACHINE="alphaev69" ;;
+ 	    "EV7 (21364)")
+ 		UNAME_MACHINE="alphaev7" ;;
+ 	    "EV7.9 (21364A)")
+ 		UNAME_MACHINE="alphaev79" ;;
+ 	esac
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	exit 0 ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+ 	exit 0 ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+ 	exit 0;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+ 	exit 0 ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+ 	exit 0 ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ 		echo pyramid-pyramid-sysv3
+ 	else
+ 		echo pyramid-pyramid-bsd
+ 	fi
+ 	exit 0 ;;
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
+     DRS?6000:UNIX_SV:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+ 	esac ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     i86pc:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+ 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+ 		UNAME_RELEASE=`uname -v`
+ 		;;
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+ 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ 	exit 0 ;;
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+ 		echo m68k-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	    sun4)
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+ 	exit 0 ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+         exit 0 ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+         echo m68k-milan-mint${UNAME_RELEASE}
+         exit 0 ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+         echo m68k-hades-mint${UNAME_RELEASE}
+         exit 0 ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
+     RISC*:ULTRIX:*:*)
+ 	echo mips-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+ #endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+ 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_SVR4)
+ 	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ 	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ 	#endif
+ 	#endif
+ 	  exit (-1);
+ 	}
+ EOF
+ 	$CC_FOR_BUILD -o $dummy $dummy.c \
+ 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ 	  && exit 0
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+ 	exit 0 ;;
+     Motorola:*:4.3:PL8-*)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+     m88k:CX/UX:7*:*)
+ 	echo m88k-harris-cxux7
+ 	exit 0 ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+ 	exit 0 ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+ 	exit 0 ;;
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+ 	    then
+ 		echo m88k-dg-dgux${UNAME_RELEASE}
+ 	    else
+ 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ 	    fi
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+  	exit 0 ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit 0 ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+ 	exit 0 ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ 	echo m88k-tektronix-sysv3
+ 	exit 0 ;;
+     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ 	echo m68k-tektronix-bsd
+ 	exit 0 ;;
+     *:IRIX*:*:*)
+ 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ 	exit 0 ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+     i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
+     ia64:AIX:*:*)
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
+ 		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+ 			{
+ 			if (!__power_pc())
+ 				exit(1);
+ 			puts("powerpc-ibm-aix3.2.5");
+ 			exit(0);
+ 			}
+ EOF
+ 		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+     *:AIX:*:[45])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+ 	exit 0 ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+ 	exit 0 ;;
+     DPX/2?00:B.O.S.:*:*)
+ 	echo m68k-bull-sysv3
+ 	exit 0 ;;
+     9000/[34]??:4.3bsd:1.*:*)
+ 	echo m68k-hp-bsd
+ 	exit 0 ;;
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+     9000/[34678]??:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                     case "${sc_cpu_version}" in
+                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                       532)                      # CPU_PA_RISC2_0
+                         case "${sc_kernel_bits}" in
+                           32) HP_ARCH="hppa2.0n" ;;
+                           64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                         esac ;;
+                     esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+ 		    sed 's/^              //' << EOF >$dummy.c
+ 
+               #define _HPUX_SOURCE
+               #include <stdlib.h>
+               #include <unistd.h>
+ 
+               int main ()
+               {
+               #if defined(_SC_KERNEL_BITS)
+                   long bits = sysconf(_SC_KERNEL_BITS);
+               #endif
+                   long cpu  = sysconf (_SC_CPU_VERSION);
+ 
+                   switch (cpu)
+               	{
+               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+               	case CPU_PA_RISC2_0:
+               #if defined(_SC_KERNEL_BITS)
+               	    switch (bits)
+               		{
+               		case 64: puts ("hppa2.0w"); break;
+               		case 32: puts ("hppa2.0n"); break;
+               		default: puts ("hppa2.0"); break;
+               		} break;
+               #else  /* !defined(_SC_KERNEL_BITS) */
+               	    puts ("hppa2.0"); break;
+               #endif
+               	default: puts ("hppa1.0"); break;
+               	}
+                   exit (0);
+               }
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+ 	    # avoid double evaluation of $set_cc_for_build
+ 	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+ 		HP_ARCH="hppa64"
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     ia64:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ia64-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+ 	{
+ 	  long cpu = sysconf (_SC_CPU_VERSION);
+ 	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ 	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+ 	     results, however.  */
+ 	  if (CPU_IS_PA_RISC (cpu))
+ 	    {
+ 	      switch (cpu)
+ 		{
+ 		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ 		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ 		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ 		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+ 		}
+ 	    }
+ 	  else if (CPU_IS_HP_MC68K (cpu))
+ 	    puts ("m68k-hitachi-hiuxwe2");
+ 	  else puts ("unknown-hitachi-hiuxwe2");
+ 	  exit (0);
+ 	}
+ EOF
+ 	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 	echo hppa1.1-hp-bsd
+ 	exit 0 ;;
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+ 	exit 0 ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+ 	exit 0 ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+         exit 0 ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+         exit 0 ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+         exit 0 ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+         exit 0 ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+         exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     *:UNICOS/mp:*:*)
+ 	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+ 	exit 0 ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+ 	# Determine whether the default compiler uses glibc.
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <features.h>
+ 	#if __GLIBC__ >= 2
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+     x86:Interix*:3*)
+ 	echo i586-pc-interix3
+ 	exit 0 ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+ 	echo i586-pc-interix
+ 	exit 0 ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit 0 ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     mips:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+ 	#undef mips
+ 	#undef mipsel
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ 	CPU=mipsel
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+ 	#undef mips64
+ 	#undef mips64el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ 	CPU=mips64el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips64
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     ppc:Linux:*:*)
+ 	echo powerpc-unknown-linux-gnu
+ 	exit 0 ;;
+     ppc64:Linux:*:*)
+ 	echo powerpc64-unknown-linux-gnu
+ 	exit 0 ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+ 	  EV56)  UNAME_MACHINE=alphaev56 ;;
+ 	  PCA56) UNAME_MACHINE=alphapca56 ;;
+ 	  PCA57) UNAME_MACHINE=alphapca56 ;;
+ 	  EV6)   UNAME_MACHINE=alphaev6 ;;
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit 0 ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ 	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit 0 ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+ 	echo hppa64-unknown-linux-gnu
+ 	exit 0 ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit 0 ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit 0 ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+ 	# Set LC_ALL=C to ensure ld outputs messages in English.
+ 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ 			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+ 				    s/.*supported targets: *//
+ 				    s/ .*//
+ 				    p'`
+         case "$ld_supported_targets" in
+ 	  elf32-i386)
+ 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+ 	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit 0 ;;
+ 	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0 ;;
+ 	  "")
+ 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit 0 ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <features.h>
+ 	#ifdef __ELF__
+ 	# ifdef __GLIBC__
+ 	#  if __GLIBC__ >= 2
+ 	LIBC=gnu
+ 	#  else
+ 	LIBC=gnulibc1
+ 	#  endif
+ 	# else
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+ 	#ifdef __INTEL_COMPILER
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit 0 ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+ 	exit 0 ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ 	exit 0 ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+     i*86:*:5:[78]*)
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit 0 ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
+ 		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+         exit 0 ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit 0 ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+ 	exit 0 ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+ 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+ 	exit 0 ;;
+     mini*:CTIX:SYS*5:*)
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+ 	echo m68k-convergent-sysv
+ 	exit 0 ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ 	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 		echo ${UNAME_MACHINE}-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes at openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+ 	exit 0 ;;
+     *:*:*:FTX*)
+ 	# From seanf at swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
+     *:VOS:*:*)
+ 	# From Paul.Green at stratus.com.
+ 	echo hppa1.1-stratus-vos
+ 	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit 0 ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+ 	exit 0 ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit 0 ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:*)
+ 	case `uname -p` in
+ 	    *86) UNAME_PROCESSOR=i686 ;;
+ 	    powerpc) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+ 	exit 0 ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+ 	exit 0 ;;
+     DS/*:UNIX_System_V:*:*)
+ 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+ 	# operating systems.
+ 	if test "$cputype" = "386"; then
+ 	    UNAME_MACHINE=i386
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+ 	exit 0 ;;
+     *:TENEX:*:*)
+ 	echo pdp10-unknown-tenex
+ 	exit 0 ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+ 	exit 0 ;;
+     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ 	echo pdp10-xkl-tops20
+ 	exit 0 ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+ 	exit 0 ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+ #endif
+ main ()
+ {
+ #if defined (sony)
+ #if defined (MIPSEB)
+   /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+      I don't know....  */
+   printf ("mips-sony-bsd\n"); exit (0);
+ #else
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+           "4"
+ #else
+ 	  ""
+ #endif
+          ); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+   printf ("arm-acorn-riscix"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+   printf ("m68k-hp-bsd\n"); exit (0);
+ #endif
+ 
+ #if defined (NeXT)
+ #if !defined (__ARCHITECTURE__)
+ #define __ARCHITECTURE__ "m68k"
+ #endif
+   int version;
+   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+   if (version < 4)
+     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+   else
+     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+   exit (0);
+ #endif
+ 
+ #if defined (MULTIMAX) || defined (n16)
+ #if defined (UMAXV)
+   printf ("ns32k-encore-sysv\n"); exit (0);
+ #else
+ #if defined (CMU)
+   printf ("ns32k-encore-mach\n"); exit (0);
+ #else
+   printf ("ns32k-encore-bsd\n"); exit (0);
+ #endif
+ #endif
+ #endif
+ 
+ #if defined (__386BSD__)
+   printf ("i386-pc-bsd\n"); exit (0);
+ #endif
+ 
+ #if defined (sequent)
+ #if defined (i386)
+   printf ("i386-sequent-dynix\n"); exit (0);
+ #endif
+ #if defined (ns32000)
+   printf ("ns32k-sequent-dynix\n"); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (_SEQUENT_)
+     struct utsname un;
+ 
+     uname(&un);
+ 
+     if (strncmp(un.version, "V2", 2) == 0) {
+ 	printf ("i386-sequent-ptx2\n"); exit (0);
+     }
+     if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ 	printf ("i386-sequent-ptx1\n"); exit (0);
+     }
+     printf ("i386-sequent-ptx\n"); exit (0);
+ 
+ #endif
+ 
+ #if defined (vax)
+ # if !defined (ultrix)
+ #  include <sys/param.h>
+ #  if defined (BSD)
+ #   if BSD == 43
+       printf ("vax-dec-bsd4.3\n"); exit (0);
+ #   else
+ #    if BSD == 199006
+       printf ("vax-dec-bsd4.3reno\n"); exit (0);
+ #    else
+       printf ("vax-dec-bsd\n"); exit (0);
+ #    endif
+ #   endif
+ #  else
+     printf ("vax-dec-bsd\n"); exit (0);
+ #  endif
+ # else
+     printf ("vax-dec-ultrix\n"); exit (0);
+ # endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+   printf ("i860-alliant-bsd\n"); exit (0);
+ #endif
+ 
+   exit (1);
+ }
+ EOF
+ 
+ $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+ 
+ # Apollos put the system type in the environment.
+ 
+ test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+ if [ -x /usr/convex/getsysinfo ]
+ then
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+ 	exit 0 ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+ 	exit 0 ;;
+     c34*)
+ 	echo c34-convex-bsd
+ 	exit 0 ;;
+     c38*)
+ 	echo c38-convex-bsd
+ 	exit 0 ;;
+     c4*)
+ 	echo c4-convex-bsd
+ 	exit 0 ;;
+     esac
+ fi
+ 
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
+ This script, last modified $timestamp, has failed to recognize
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+     ftp://ftp.gnu.org/pub/gnu/config/
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+ pertinent to <config-patches at gnu.org> in order to provide the needed
+ information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+ 
+ hostinfo               = `(hostinfo) 2>/dev/null`
+ /bin/universe          = `(/bin/universe) 2>/dev/null`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+ /bin/arch              = `(/bin/arch) 2>/dev/null`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+ UNAME_MACHINE = ${UNAME_MACHINE}
+ UNAME_RELEASE = ${UNAME_RELEASE}
+ UNAME_SYSTEM  = ${UNAME_SYSTEM}
+ UNAME_VERSION = ${UNAME_VERSION}
+ EOF
+ 
+ exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:


Index: llvm-test/autoconf/config.sub
diff -c /dev/null llvm-test/autoconf/config.sub:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/config.sub	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,1489 ----
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+ timestamp='2003-02-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+ #
+ # This file is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+ # Each package is responsible for reporting which valid configurations
+ # it does not support.  The user should be able to distinguish
+ # a failure to support a valid configuration from a meaningless
+ # configuration.
+ 
+ # The goal of this file is to map all the various variations of a given
+ # machine specification into a single specification in the form:
+ #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # or in some cases, the newer four-part form:
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION] CPU-MFR-OPSYS
+        $0 [OPTION] ALIAS
+ 
+ Canonicalize a configuration name.
+ 
+ Operation modes:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches at gnu.org>."
+ 
+ version="\
+ GNU config.sub ($timestamp)
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+        echo "$timestamp" ; exit 0 ;;
+     --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+        echo "$me: invalid option $1$help"
+        exit 1 ;;
+ 
+     *local*)
+        # First pass through any local machine types.
+        echo $1
+        exit 0;;
+ 
+     * )
+        break ;;
+   esac
+ done
+ 
+ case $# in
+  0) echo "$me: missing argument$help" >&2
+     exit 1;;
+  1) ;;
+  *) echo "$me: too many arguments$help" >&2
+     exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+   nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+     then os=`echo $1 | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+ 
+ ### Let's recognize common machines as not being operating systems so
+ ### that things like config.sub decstation-3100 work.  We also
+ ### recognize some manufacturers as not being operating systems, so we
+ ### can provide default operating systems below.
+ case $os in
+ 	-sun*os*)
+ 		# Prevent following clause from handling this invalid input.
+ 		;;
+ 	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ 	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ 	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ 	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-scout)
+ 		;;
+ 	-wrs)
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
+ 	-chorusos*)
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+  	-chorusrdb)
+  		os=-chorusrdb
+ 		basic_machine=$1
+  		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+ 		os=-sco3.2v4
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2.[4-9]*)
+ 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2v[4-9]*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-udk*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-isc)
+ 		os=-isc2.2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-clix*)
+ 		basic_machine=clipper-intergraph
+ 		;;
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-windowsnt*)
+ 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ 		;;
+ 	-psos*)
+ 		os=-psos
+ 		;;
+ 	-mint | -mint[0-9]*)
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+ esac
+ 
+ # Decode aliases for certain CPU-COMPANY combinations.
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ 	| clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k \
+ 	| m32r | m68000 | m68k | m88k | mcore \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+ 	| mips64vr | mips64vrel \
+ 	| mips64orion | mips64orionel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| msp430 \
+ 	| ns16k | ns32k \
+ 	| openrisc | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+ 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ 	| strongarm \
+ 	| tahoe | thumb | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xscale | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+ 	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* \
+ 	| bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* \
+ 	| m32r-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+ 	| mips64vr-* | mips64vrel-* \
+ 	| mips64orion-* | mips64orionel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| msp430-* \
+ 	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+ 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ 	| xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+ 		basic_machine=i386-unknown
+ 		os=-bsd
+ 		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ 		basic_machine=m68000-att
+ 		;;
+ 	3b*)
+ 		basic_machine=we32k-att
+ 		;;
+ 	a29khif)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+ 		;;
+ 	alliant | fx80)
+ 		basic_machine=fx80-alliant
+ 		;;
+ 	altos | altos3068)
+ 		basic_machine=m68k-altos
+ 		;;
+ 	am29k)
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+ 		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+ 		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+ 		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+ 		basic_machine=m68k-apollo
+ 		os=-sysv
+ 		;;
+ 	apollo68bsd)
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+ 		;;
+ 	balance)
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c2)
+ 		basic_machine=c2-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c32)
+ 		basic_machine=c32-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c34)
+ 		basic_machine=c34-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c38)
+ 		basic_machine=c38-convex
+ 		os=-bsd
+ 		;;
+ 	cray | j90)
+ 		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+ 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ 		basic_machine=mips-dec
+ 		;;
+ 	decsystem10* | dec10*)
+ 		basic_machine=pdp10-dec
+ 		os=-tops10
+ 		;;
+ 	decsystem20* | dec20*)
+ 		basic_machine=pdp10-dec
+ 		os=-tops20
+ 		;;
+ 	delta | 3300 | motorola-3300 | motorola-delta \
+ 	      | 3300-motorola | delta-motorola)
+ 		basic_machine=m68k-motorola
+ 		;;
+ 	delta88)
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+ 		;;
+ 	dpx2* | dpx2*-bull)
+ 		basic_machine=m68k-bull
+ 		os=-sysv3
+ 		;;
+ 	ebmon29k)
+ 		basic_machine=a29k-amd
+ 		os=-ebmon
+ 		;;
+ 	elxsi)
+ 		basic_machine=elxsi-elxsi
+ 		os=-bsd
+ 		;;
+ 	encore | umax | mmax)
+ 		basic_machine=ns32k-encore
+ 		;;
+ 	es1800 | OSE68k | ose68k | ose | OSE)
+ 		basic_machine=m68k-ericsson
+ 		os=-ose
+ 		;;
+ 	fx2800)
+ 		basic_machine=i860-alliant
+ 		;;
+ 	genix)
+ 		basic_machine=ns32k-ns
+ 		;;
+ 	gmicro)
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
+ 	go32)
+ 		basic_machine=i386-pc
+ 		os=-go32
+ 		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+ 		;;
+ 	h8300hms)
+ 		basic_machine=h8300-hitachi
+ 		os=-hms
+ 		;;
+ 	h8300xray)
+ 		basic_machine=h8300-hitachi
+ 		os=-xray
+ 		;;
+ 	h8500hms)
+ 		basic_machine=h8500-hitachi
+ 		os=-hms
+ 		;;
+ 	harris)
+ 		basic_machine=m88k-harris
+ 		os=-sysv3
+ 		;;
+ 	hp300-*)
+ 		basic_machine=m68k-hp
+ 		;;
+ 	hp300bsd)
+ 		basic_machine=m68k-hp
+ 		os=-bsd
+ 		;;
+ 	hp300hpux)
+ 		basic_machine=m68k-hp
+ 		os=-hpux
+ 		;;
+ 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hp9k2[0-9][0-9] | hp9k31[0-9])
+ 		basic_machine=m68000-hp
+ 		;;
+ 	hp9k3[2-9][0-9])
+ 		basic_machine=m68k-hp
+ 		;;
+ 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k78[0-9] | hp78[0-9])
+ 		# FIXME: really hppa2.0-hp
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ 		# FIXME: really hppa2.0-hp
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][13679] | hp8[0-9][13679])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+ 		;;
+ 	hppro)
+ 		basic_machine=hppa1.1-hp
+ 		os=-proelf
+ 		;;
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+ 	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+ 	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+ 	i386-vsta | vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+ 		    -irix*)
+ 			;;
+ 		    *)
+ 			os=-irix4
+ 			;;
+ 		esac
+ 		;;
+ 	isi68 | isi)
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+ 		;;
+ 	merlin)
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+ 	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+ 	mmix*)
+ 		basic_machine=mmix-knuth
+ 		os=-mmixware
+ 		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	morphos)
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+ 		;;
+ 	netbsd386)
+ 		basic_machine=i386-unknown
+ 		os=-netbsd
+ 		;;
+ 	netwinder)
+ 		basic_machine=armv4l-rebel
+ 		os=-linux
+ 		;;
+ 	news | news700 | news800 | news900)
+ 		basic_machine=m68k-sony
+ 		os=-newsos
+ 		;;
+ 	news1000)
+ 		basic_machine=m68030-sony
+ 		os=-newsos
+ 		;;
+ 	news-3600 | risc-news)
+ 		basic_machine=mips-sony
+ 		os=-newsos
+ 		;;
+ 	necv70)
+ 		basic_machine=v70-nec
+ 		os=-sysv
+ 		;;
+ 	next | m*-next )
+ 		basic_machine=m68k-next
+ 		case $os in
+ 		    -nextstep* )
+ 			;;
+ 		    -ns2*)
+ 		      os=-nextstep2
+ 			;;
+ 		    *)
+ 		      os=-nextstep3
+ 			;;
+ 		esac
+ 		;;
+ 	nh3000)
+ 		basic_machine=m68k-harris
+ 		os=-cxux
+ 		;;
+ 	nh[45]000)
+ 		basic_machine=m88k-harris
+ 		os=-cxux
+ 		;;
+ 	nindy960)
+ 		basic_machine=i960-intel
+ 		os=-nindy
+ 		;;
+ 	mon960)
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
+ 	nonstopux)
+ 		basic_machine=mips-compaq
+ 		os=-nonstopux
+ 		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
+ 	nv1)
+ 		basic_machine=nv1-cray
+ 		os=-unicosmp
+ 		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+ 	or32 | or32-*)
+ 		basic_machine=or32-unknown
+ 		os=-coff
+ 		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+ 		;;
+ 	os68k)
+ 		basic_machine=m68k-none
+ 		os=-os68k
+ 		;;
+ 	pa-hitachi)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+ 		;;
+ 	paragon)
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+ 	pbb)
+ 		basic_machine=m68k-tti
+ 		;;
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+ 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 		;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+ 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+ 		;;
+ 	ppc64le-* | powerpc64little-*)
+ 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
+ 	s390 | s390-*)
+ 		basic_machine=s390-ibm
+ 		;;
+ 	s390x | s390x-*)
+ 		basic_machine=s390x-ibm
+ 		;;
+ 	sa29200)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	sb1)
+ 		basic_machine=mipsisa64sb1-unknown
+ 		;;
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+ 	sh)
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
+ 	sparclite-wrs | simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
+ 	sps7)
+ 		basic_machine=m68k-bull
+ 		os=-sysv2
+ 		;;
+ 	spur)
+ 		basic_machine=spur-unknown
+ 		;;
+ 	st2000)
+ 		basic_machine=m68k-tandem
+ 		;;
+ 	stratus)
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+ 	sun2os3)
+ 		basic_machine=m68000-sun
+ 		os=-sunos3
+ 		;;
+ 	sun2os4)
+ 		basic_machine=m68000-sun
+ 		os=-sunos4
+ 		;;
+ 	sun3os3)
+ 		basic_machine=m68k-sun
+ 		os=-sunos3
+ 		;;
+ 	sun3os4)
+ 		basic_machine=m68k-sun
+ 		os=-sunos4
+ 		;;
+ 	sun4os3)
+ 		basic_machine=sparc-sun
+ 		os=-sunos3
+ 		;;
+ 	sun4os4)
+ 		basic_machine=sparc-sun
+ 		os=-sunos4
+ 		;;
+ 	sun4sol2)
+ 		basic_machine=sparc-sun
+ 		os=-solaris2
+ 		;;
+ 	sun3 | sun3-*)
+ 		basic_machine=m68k-sun
+ 		;;
+ 	sun4)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
+ 	sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
+ 	t3e)
+ 		basic_machine=alphaev5-cray
+ 		os=-unicos
+ 		;;
+ 	t90)
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+         tic4x | c4x*)
+ 		basic_machine=tic4x-unknown
+ 		os=-coff
+ 		;;
+ 	tic54x | c54x*)
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
+ 	tic55x | c55x*)
+ 		basic_machine=tic55x-unknown
+ 		os=-coff
+ 		;;
+ 	tic6x | c6x*)
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
+ 	toad1)
+ 		basic_machine=pdp10-xkl
+ 		os=-tops20
+ 		;;
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	ultra3)
+ 		basic_machine=a29k-nyu
+ 		os=-sym1
+ 		;;
+ 	v810 | necv810)
+ 		basic_machine=v810-nec
+ 		os=-none
+ 		;;
+ 	vaxv)
+ 		basic_machine=vax-dec
+ 		os=-sysv
+ 		;;
+ 	vms)
+ 		basic_machine=vax-dec
+ 		os=-vms
+ 		;;
+ 	vpp*|vx|vx-*)
+ 		basic_machine=f301-fujitsu
+ 		;;
+ 	vxworks960)
+ 		basic_machine=i960-wrs
+ 		os=-vxworks
+ 		;;
+ 	vxworks68)
+ 		basic_machine=m68k-wrs
+ 		os=-vxworks
+ 		;;
+ 	vxworks29k)
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
+ 	w65*)
+ 		basic_machine=w65-wdc
+ 		os=-none
+ 		;;
+ 	w89k-*)
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+ 	z8k-*-coff)
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+ 		;;
+ 
+ # Here we handle the default manufacturer of certain CPU types.  It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ 	w89k)
+ 		basic_machine=hppa1.1-winbond
+ 		;;
+ 	op50n)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	op60c)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	romp)
+ 		basic_machine=romp-ibm
+ 		;;
+ 	rs6000)
+ 		basic_machine=rs6000-ibm
+ 		;;
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
+ 	pdp10)
+ 		# there are many clones, so DEC is not a safe bet
+ 		basic_machine=pdp10-unknown
+ 		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+ 	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+ 	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+ 	orion)
+ 		basic_machine=orion-highlevel
+ 		;;
+ 	orion105)
+ 		basic_machine=clipper-highlevel
+ 		;;
+ 	mac | mpw | mac-mpw)
+ 		basic_machine=m68k-apple
+ 		;;
+ 	pmac | pmac-mpw)
+ 		basic_machine=powerpc-apple
+ 		;;
+ 	*-unknown)
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+ 
+ # Here we canonicalize certain aliases for manufacturers.
+ case $basic_machine in
+ 	*-digital*)
+ 		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ 		;;
+ 	*-commodore*)
+ 		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ 		;;
+ 	*)
+ 		;;
+ esac
+ 
+ # Decode manufacturer-specific aliases for certain operating systems.
+ 
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+ 	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+ 	# First accept the basic system types.
+ 	# The portable systems comes first.
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+ 		case $basic_machine in
+ 		    x86-* | i*86-*)
+ 			;;
+ 		    *)
+ 			os=-nto$os
+ 			;;
+ 		esac
+ 		;;
+ 	-nto-qnx*)
+ 		;;
+ 	-nto*)
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux*)
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+ 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+ 	-osf*)
+ 		os=-osf
+ 		;;
+ 	-utek*)
+ 		os=-bsd
+ 		;;
+ 	-dynix*)
+ 		os=-bsd
+ 		;;
+ 	-acis*)
+ 		os=-aos
+ 		;;
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
+ 	-ctix* | -uts*)
+ 		os=-sysv
+ 		;;
+ 	-nova*)
+ 		os=-rtmk-nova
+ 		;;
+ 	-ns2 )
+ 		os=-nextstep2
+ 		;;
+ 	-nsk*)
+ 		os=-nsk
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+ 		;;
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+ 	-svr4)
+ 		os=-sysv4
+ 		;;
+ 	-svr3)
+ 		os=-sysv3
+ 		;;
+ 	-sysvr4)
+ 		os=-sysv4
+ 		;;
+ 	# This must come after -sysvr4.
+ 	-sysv*)
+ 		;;
+ 	-ose*)
+ 		os=-ose
+ 		;;
+ 	-es1800*)
+ 		os=-ose
+ 		;;
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+ 	-aros*)
+ 		os=-aros
+ 		;;
+ 	-kaos*)
+ 		os=-kaos
+ 		;;
+ 	-none)
+ 		;;
+ 	*)
+ 		# Get rid of the `-' at the beginning of $os.
+ 		os=`echo $os | sed 's/[^-]*-//'`
+ 		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+ else
+ 
+ # Here we handle the default operating systems that come with various machines.
+ # The value should be what the vendor currently ships out the door with their
+ # machine or put another way, the most popular os provided with the machine.
+ 
+ # Note that if you're going to try to match "-MANUFACTURER" here (say,
+ # "-sun"), then you have to tell the case statement up towards the top
+ # that MANUFACTURER isn't an operating system.  Otherwise, code above
+ # will signal an error saying that MANUFACTURER isn't an operating
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+ 	arm*-rebel)
+ 		os=-linux
+ 		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
+ 	pdp11-*)
+ 		os=-none
+ 		;;
+ 	*-dec | vax-*)
+ 		os=-ultrix4.2
+ 		;;
+ 	m68*-apollo)
+ 		os=-domain
+ 		;;
+ 	i386-sun)
+ 		os=-sunos4.0.2
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+ 		# This also exists in the configure program, but was not the
+ 		# default.
+ 		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+ 	mips*-*)
+ 		os=-elf
+ 		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+ 	*-wec)
+ 		os=-proelf
+ 		;;
+ 	*-winbond)
+ 		os=-proelf
+ 		;;
+ 	*-oki)
+ 		os=-proelf
+ 		;;
+ 	*-hp)
+ 		os=-hpux
+ 		;;
+ 	*-hitachi)
+ 		os=-hiux
+ 		;;
+ 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ 		os=-sysv
+ 		;;
+ 	*-cbm)
+ 		os=-amigaos
+ 		;;
+ 	*-dg)
+ 		os=-dgux
+ 		;;
+ 	*-dolphin)
+ 		os=-sysv3
+ 		;;
+ 	m68k-ccur)
+ 		os=-rtu
+ 		;;
+ 	m88k-omron*)
+ 		os=-luna
+ 		;;
+ 	*-next )
+ 		os=-nextstep
+ 		;;
+ 	*-sequent)
+ 		os=-ptx
+ 		;;
+ 	*-crds)
+ 		os=-unos
+ 		;;
+ 	*-ns)
+ 		os=-genix
+ 		;;
+ 	i370-*)
+ 		os=-mvs
+ 		;;
+ 	*-next)
+ 		os=-nextstep3
+ 		;;
+ 	*-gould)
+ 		os=-sysv
+ 		;;
+ 	*-highlevel)
+ 		os=-bsd
+ 		;;
+ 	*-encore)
+ 		os=-bsd
+ 		;;
+ 	*-sgi)
+ 		os=-irix
+ 		;;
+ 	*-siemens)
+ 		os=-sysv4
+ 		;;
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+ 	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+ 		os=-coff
+ 		;;
+ 	*-*bug)
+ 		os=-coff
+ 		;;
+ 	*-apple)
+ 		os=-macos
+ 		;;
+ 	*-atari*)
+ 		os=-mint
+ 		;;
+ 	*)
+ 		os=-none
+ 		;;
+ esac
+ fi
+ 
+ # Here we handle the case where we know the os, and the CPU type, but not the
+ # manufacturer.  We pick the logical manufacturer.
+ vendor=unknown
+ case $basic_machine in
+ 	*-unknown)
+ 		case $os in
+ 			-riscix*)
+ 				vendor=acorn
+ 				;;
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+ 			-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+ 				vendor=be
+ 				;;
+ 			-hpux*)
+ 				vendor=hp
+ 				;;
+ 			-mpeix*)
+ 				vendor=hp
+ 				;;
+ 			-hiux*)
+ 				vendor=hitachi
+ 				;;
+ 			-unos*)
+ 				vendor=crds
+ 				;;
+ 			-dgux*)
+ 				vendor=dg
+ 				;;
+ 			-luna*)
+ 				vendor=omron
+ 				;;
+ 			-genix*)
+ 				vendor=ns
+ 				;;
+ 			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
+ 			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+ 				vendor=apple
+ 				;;
+ 			-hms*)
+ 				vendor=hitachi
+ 				;;
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+ 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
+ exit 0
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:


Index: llvm-test/autoconf/configure.ac
diff -c /dev/null llvm-test/autoconf/configure.ac:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/configure.ac	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,67 ----
+ dnl **************************************************************************
+ dnl * Initialize
+ dnl **************************************************************************
+ AC_INIT([[[ModuleMaker]]],[[[x.xx]]],[bugs at yourdomain])
+ 
+ dnl Place all of the extra autoconf files into the config subdirectory
+ AC_CONFIG_AUX_DIR([autoconf])
+ 
+ dnl Configure a header file
+ 
+ dnl Configure Makefiles
+ dnl List every Makefile that exists within your source tree
+ 
+ AC_CONFIG_MAKEFILE(Makefile)
+ AC_CONFIG_MAKEFILE(Makefile.tests)
+ AC_CONFIG_MAKEFILE(Makefile.programs)
+ AC_CONFIG_MAKEFILE(SingleSource/Makefile)
+ AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc)
+ AC_CONFIG_MAKEFILE(MultiSource/Makefile)
+ AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc)
+ AC_CONFIG_MAKEFILE(External/Makefile)
+ 
+ dnl **************************************************************************
+ dnl * Determine which system we are building on
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Check for programs.
+ dnl **************************************************************************
+ 
+ dnl Verify that the source directory is valid
+ AC_CONFIG_SRCDIR(["Makefile.common.in"])
+ 
+ dnl **************************************************************************
+ dnl * Check for libraries.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for header files.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for typedefs, structures, and compiler characteristics.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for library functions.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Enable various compile-time options
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Set the location of various third-party software packages
+ dnl **************************************************************************
+ 
+ dnl Location of LLVM source code
+ AC_ARG_WITH(llvmsrc,AC_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[`cd ${srcdir}/../..; pwd`]))
+ 
+ dnl Location of LLVM object code
+ AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`]))
+ 
+ dnl **************************************************************************
+ dnl * Create the output files
+ dnl **************************************************************************
+ AC_OUTPUT(Makefile.common)


Index: llvm-test/autoconf/install-sh
diff -c /dev/null llvm-test/autoconf/install-sh:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/install-sh	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,251 ----
+ #!/bin/sh
+ #
+ # install - install a program, script, or datafile
+ # This comes from X11R5 (mit/util/scripts/install.sh).
+ #
+ # Copyright 1991 by the Massachusetts Institute of Technology
+ #
+ # Permission to use, copy, modify, distribute, and sell this software and its
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+ # documentation, and that the name of M.I.T. not be used in advertising or
+ # publicity pertaining to distribution of the software without specific,
+ # written prior permission.  M.I.T. makes no representations about the
+ # suitability of this software for any purpose.  It is provided "as is"
+ # without express or implied warranty.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+ 
+ 
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+ 
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+ chmodprog="${CHMODPROG-chmod}"
+ chownprog="${CHOWNPROG-chown}"
+ chgrpprog="${CHGRPPROG-chgrp}"
+ stripprog="${STRIPPROG-strip}"
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+ transformbasename=""
+ transform_arg=""
+ instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+ chowncmd=""
+ chgrpcmd=""
+ stripcmd=""
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+ src=""
+ dst=""
+ dir_arg=""
+ 
+ while [ x"$1" != x ]; do
+     case $1 in
+ 	-c) instcmd="$cpprog"
+ 	    shift
+ 	    continue;;
+ 
+ 	-d) dir_arg=true
+ 	    shift
+ 	    continue;;
+ 
+ 	-m) chmodcmd="$chmodprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-o) chowncmd="$chownprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-g) chgrpcmd="$chgrpprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-s) stripcmd="$stripprog"
+ 	    shift
+ 	    continue;;
+ 
+ 	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ 	    shift
+ 	    continue;;
+ 
+ 	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ 	    shift
+ 	    continue;;
+ 
+ 	*)  if [ x"$src" = x ]
+ 	    then
+ 		src=$1
+ 	    else
+ 		# this colon is to work around a 386BSD /bin/sh bug
+ 		:
+ 		dst=$1
+ 	    fi
+ 	    shift
+ 	    continue;;
+     esac
+ done
+ 
+ if [ x"$src" = x ]
+ then
+ 	echo "install:	no input file specified"
+ 	exit 1
+ else
+ 	:
+ fi
+ 
+ if [ x"$dir_arg" != x ]; then
+ 	dst=$src
+ 	src=""
+ 	
+ 	if [ -d $dst ]; then
+ 		instcmd=:
+ 		chmodcmd=""
+ 	else
+ 		instcmd=$mkdirprog
+ 	fi
+ else
+ 
+ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad 
+ # if $src (and thus $dsttmp) contains '*'.
+ 
+ 	if [ -f $src -o -d $src ]
+ 	then
+ 		:
+ 	else
+ 		echo "install:  $src does not exist"
+ 		exit 1
+ 	fi
+ 	
+ 	if [ x"$dst" = x ]
+ 	then
+ 		echo "install:	no destination specified"
+ 		exit 1
+ 	else
+ 		:
+ 	fi
+ 
+ # If destination is a directory, append the input filename; if your system
+ # does not like double slashes in filenames, you may need to add some logic
+ 
+ 	if [ -d $dst ]
+ 	then
+ 		dst="$dst"/`basename $src`
+ 	else
+ 		:
+ 	fi
+ fi
+ 
+ ## this sed command emulates the dirname command
+ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ 
+ # Make sure that the destination directory exists.
+ #  this part is taken from Noah Friedman's mkinstalldirs script
+ 
+ # Skip lots of stat calls in the usual case.
+ if [ ! -d "$dstdir" ]; then
+ defaultIFS='
+ 	'
+ IFS="${IFS-${defaultIFS}}"
+ 
+ oIFS="${IFS}"
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS="${oIFS}"
+ 
+ pathcomp=''
+ 
+ while [ $# -ne 0 ] ; do
+ 	pathcomp="${pathcomp}${1}"
+ 	shift
+ 
+ 	if [ ! -d "${pathcomp}" ] ;
+         then
+ 		$mkdirprog "${pathcomp}"
+ 	else
+ 		:
+ 	fi
+ 
+ 	pathcomp="${pathcomp}/"
+ done
+ fi
+ 
+ if [ x"$dir_arg" != x ]
+ then
+ 	$doit $instcmd $dst &&
+ 
+ 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+ 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+ 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+ 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+ else
+ 
+ # If we're going to rename the final executable, determine the name now.
+ 
+ 	if [ x"$transformarg" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		dstfile=`basename $dst $transformbasename | 
+ 			sed $transformarg`$transformbasename
+ 	fi
+ 
+ # don't allow the sed command to completely eliminate the filename
+ 
+ 	if [ x"$dstfile" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		:
+ 	fi
+ 
+ # Make a temp file name in the proper directory.
+ 
+ 	dsttmp=$dstdir/#inst.$$#
+ 
+ # Move or copy the file name to the temp name
+ 
+ 	$doit $instcmd $src $dsttmp &&
+ 
+ 	trap "rm -f ${dsttmp}" 0 &&
+ 
+ # and set any options; do chmod last to preserve setuid bits
+ 
+ # If any of these fail, we abort the whole thing.  If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $instcmd $src $dsttmp" command.
+ 
+ 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+ 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+ 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+ 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+ 
+ # Now rename the file to the real destination.
+ 
+ 	$doit $rmcmd -f $dstdir/$dstfile &&
+ 	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+ 
+ fi &&
+ 
+ 
+ exit 0


Index: llvm-test/autoconf/ltmain.sh
diff -c /dev/null llvm-test/autoconf/ltmain.sh:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/ltmain.sh	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,6290 ----
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X$1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+   # Yippee, $echo works!
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+   exec $SHELL "$0" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+   cat <<EOF
+ $*
+ EOF
+   exit 0
+ fi
+ 
+ # The name of this program.
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+ modename="$progname"
+ 
+ # Constants.
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+ VERSION=1.5
+ TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
+ 
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+ mkdir="mkdir"
+ mv="mv -f"
+ rm="rm -f"
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+ case `echo A|od -x` in
+  *[Cc]1*) # EBCDIC based system
+   SP2NL="tr '\100' '\n'"
+   NL2SP="tr '\r\n' '\100\100'"
+   ;;
+  *) # Assume ASCII based system
+   SP2NL="tr '\040' '\012'"
+   NL2SP="tr '\015\012' '\040\040'"
+   ;;
+ esac
+ 
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+ if test "${LC_ALL+set}" = set; then
+   save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+ fi
+ if test "${LANG+set}" = set; then
+   save_LANG="$LANG"; LANG=C; export LANG
+ fi
+ 
+ # Make sure IFS has a sensible default
+ : ${IFS=" 	"}
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+   exit 1
+ fi
+ 
+ # Global variables.
+ mode=$default_mode
+ nonopt=
+ prev=
+ prevopt=
+ run=
+ show="$echo"
+ show_help=
+ execute_dlfiles=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+ win32_libid () {
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+   *ar\ archive\ import\ library*) # definitely import
+     win32_libid_type="x86 archive import"
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+       grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+ 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+       if test "X$win32_nmres" = "Ximport" ; then
+         win32_libid_type="x86 archive import"
+       else
+         win32_libid_type="x86 archive static"
+       fi
+     fi
+     ;;
+   *DLL*) 
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+     case $win32_fileres in
+     *MS\ Windows\ PE\ Intel*)
+       win32_libid_type="x86 DLL"
+       ;;
+     esac
+     ;;
+   esac
+   $echo $win32_libid_type
+ }
+ 
+ # End of Shell function definitions
+ #####################################
+ 
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+   arg="$1"
+   shift
+ 
+   case $arg in
+   -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+   *) optarg= ;;
+   esac
+ 
+   # If the previous option needs an argument, assign it.
+   if test -n "$prev"; then
+     case $prev in
+     execute_dlfiles)
+       execute_dlfiles="$execute_dlfiles $arg"
+       ;;
+     tag)
+       tagname="$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+ 	exit 1
+ 	;;
+       esac
+ 
+       case $tagname in
+       CC)
+ 	# Don't test for the "default" C tag, as we know, it's there, but
+ 	# not specially marked.
+ 	;;
+       *)
+ 	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+ 	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+ 	;;
+       esac
+       ;;
+     *)
+       eval "$prev=\$arg"
+       ;;
+     esac
+ 
+     prev=
+     prevopt=
+     continue
+   fi
+ 
+   # Have we seen a non-optional argument yet?
+   case $arg in
+   --help)
+     show_help=yes
+     ;;
+ 
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+     exit 0
+     ;;
+ 
+   --config)
+     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+     done
+     exit 0
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
+     ;;
+ 
+   --dry-run | -n)
+     run=:
+     ;;
+ 
+   --features)
+     $echo "host: $host"
+     if test "$build_libtool_libs" = yes; then
+       $echo "enable shared libraries"
+     else
+       $echo "disable shared libraries"
+     fi
+     if test "$build_old_libs" = yes; then
+       $echo "enable static libraries"
+     else
+       $echo "disable static libraries"
+     fi
+     exit 0
+     ;;
+ 
+   --finish) mode="finish" ;;
+ 
+   --mode) prevopt="--mode" prev=mode ;;
+   --mode=*) mode="$optarg" ;;
+ 
+   --preserve-dup-deps) duplicate_deps="yes" ;;
+ 
+   --quiet | --silent)
+     show=:
+     ;;
+ 
+   --tag) prevopt="--tag" prev=tag ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
+     ;;
+ 
+   -dlopen)
+     prevopt="-dlopen"
+     prev=execute_dlfiles
+     ;;
+ 
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+     exit 1
+     ;;
+ 
+   *)
+     nonopt="$arg"
+     break
+     ;;
+   esac
+ done
+ 
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+   exit 1
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+ exec_cmd=
+ 
+ if test -z "$show_help"; then
+ 
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+     $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+       for arg
+       do
+ 	case $arg in
+ 	-c)
+ 	   mode=compile
+ 	   break
+ 	   ;;
+ 	esac
+       done
+       ;;
+     *db | *dbx | *strace | *truss)
+       mode=execute
+       ;;
+     *install*|cp|mv)
+       mode=install
+       ;;
+     *rm)
+       mode=uninstall
+       ;;
+     *)
+       # If we have no mode, but dlfiles were specified, then do execute mode.
+       test -n "$execute_dlfiles" && mode=execute
+ 
+       # Just use the default operation mode.
+       if test -z "$mode"; then
+ 	if test -n "$nonopt"; then
+ 	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+ 	else
+ 	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+ 	fi
+       fi
+       ;;
+     esac
+   fi
+ 
+   # Only execute mode is allowed to have -dlopen flags.
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+     exit 1
+   fi
+ 
+   # Change the help message to a mode-specific one.
+   generic_help="$help"
+   help="Try \`$modename --help --mode=$mode' for more information."
+ 
+   # These modes are in order of execution frequency so that they run quickly.
+   case $mode in
+   # libtool compile mode
+   compile)
+     modename="$modename: compile"
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+     suppress_output=
+     arg_mode=normal
+     libobj=
+ 
+     for arg
+     do
+       case "$arg_mode" in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+ 	arg_mode=normal
+ 	;;
+ 
+       target )
+ 	libobj="$arg"
+ 	arg_mode=normal
+ 	continue
+ 	;;
+ 
+       normal )
+ 	# Accept any command-line options.
+ 	case $arg in
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+ 	-static)
+ 	  build_old_libs=yes
+ 	  continue
+ 	  ;;
+ 
+ 	-prefer-pic)
+ 	  pic_mode=yes
+ 	  continue
+ 	  ;;
+ 
+ 	-prefer-non-pic)
+ 	  pic_mode=no
+ 	  continue
+ 	  ;;
+ 
+ 	-Xcompiler)
+ 	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+ 	  continue      #  The current "srcfile" will either be retained or
+ 	  ;;            #  replaced later.  I would guess that would be a bug.
+ 
+ 	-Wc,*)
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+ 	    # Many Bourne shells cannot handle close brackets correctly
+ 	    # in scan sets, so we specify it separately.
+ 	    case $arg in
+ 	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	      arg="\"$arg\""
+ 	      ;;
+ 	    esac
+ 	    lastarg="$lastarg $arg"
+ 	  done
+ 	  IFS="$save_ifs"
+ 	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ 
+ 	  # Add the arguments to base_compile.
+ 	  base_compile="$base_compile $lastarg"
+ 	  continue
+ 	  ;;
+ 
+ 	* )
+ 	  # Accept the current argument as the source file.
+ 	  # The previous "srcfile" becomes the current argument.
+ 	  #
+ 	  lastarg="$srcfile"
+ 	  srcfile="$arg"
+ 	  ;;
+ 	esac  #  case $arg
+ 	;;
+       esac    #  case $arg_mode
+ 
+       # Aesthetically quote the previous argument.
+       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+ 
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+       # in scan sets, so we specify it separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+       esac
+ 
+       base_compile="$base_compile $lastarg"
+     done # for arg
+ 
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+       exit 1
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+       exit 1
+       ;;
+     *)
+       # Get the name of the library object.
+       [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+       ;;
+     esac
+ 
+     # Recognize several different file suffixes.
+     # If the user specifies -o file.o, it is replaced with file.lo
+     xform='[cCFSifmso]'
+     case $libobj in
+     *.ada) xform=ada ;;
+     *.adb) xform=adb ;;
+     *.ads) xform=ads ;;
+     *.asm) xform=asm ;;
+     *.c++) xform=c++ ;;
+     *.cc) xform=cc ;;
+     *.ii) xform=ii ;;
+     *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+     *.f90) xform=f90 ;;
+     *.for) xform=for ;;
+     *.java) xform=java ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+ 
+     case $libobj in
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+       exit 1
+       ;;
+     esac
+ 
+     # Infer tagged configuration to use if any are available and
+     # if one wasn't chosen via the "--tag" command line option.
+     # Only attempt this if the compiler in the base compile
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+       # Blanks in the command may have been stripped by the calling shell,
+       # but not from the CC environment variable when configure was run.
+       " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+       # Blanks at the start of $base_compile will cause this to fail
+       # if we don't check for them as well.
+       *)
+ 	for z in $available_tags; do
+ 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    case "$base_compile " in
+ 	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+ 	      # The compiler in the base compile command matches
+ 	      # the one in the tagged configuration.
+ 	      # Assume this is the tagged configuration we want.
+ 	      tagname=$z
+ 	      break
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	done
+ 	# If $tagname still isn't set, then no tagged configuration
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+ 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+ 	  exit 1
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+ 	fi
+ 	;;
+       esac
+     fi
+ 
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+       xdir=
+     else
+       xdir=$xdir/
+     fi
+     lobj=${xdir}$objdir/$objname
+ 
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+       removelist="$obj $lobj $libobj ${libobj}T"
+     else
+       removelist="$lobj $libobj ${libobj}T"
+     fi
+ 
+     $run $rm $removelist
+     trap "$run $rm $removelist; exit 1" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+     cygwin* | mingw* | pw32* | os2*)
+       pic_mode=default
+       ;;
+     esac
+     if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+ 
+     # Calculate the filename of the output object if compiler does
+     # not support -o with -c
+     if test "$compiler_c_o" = no; then
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+       trap "$run $rm $removelist; exit 1" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+       lockfile=
+     fi
+ 
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+       until $run ln "$0" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+     elif test "$need_locks" = warn; then
+       if test -f "$lockfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+       $echo $srcfile > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+     # Create a libtool object file (analogous to a ".la" file),
+     # but don't create it if we're doing a dry run.
+     test -z "$run" && cat > ${libobj}T <<EOF
+ # $libobj - a libtool object file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+ 
+ # Name of the PIC object.
+ EOF
+ 
+     # Only build a PIC object if we are building libtool libraries.
+     if test "$build_libtool_libs" = yes; then
+       # Without this assignment, base_compile gets emptied.
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+ 	command="$base_compile $srcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+ 	status=$?
+ 	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ 	  exit $status
+ 	fi
+       fi
+ 
+       if test -z "$output_obj"; then
+ 	# Place PIC objects in $objdir
+ 	command="$command -o $lobj"
+       fi
+ 
+       $run $rm "$lobj" "$output_obj"
+ 
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+ 	exit 1
+       fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ but it should contain:
+ $srcfile
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+ 	$show "$mv $output_obj $lobj"
+ 	if $run $mv $output_obj $lobj; then :
+ 	else
+ 	  error=$?
+ 	  $run $rm $removelist
+ 	  exit $error
+ 	fi
+       fi
+ 
+       # Append the name of the PIC object to the libtool object file.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ pic_object='$objdir/$objname'
+ 
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+       suppress_output=' >/dev/null 2>&1'
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ pic_object=none
+ 
+ EOF
+     fi
+ 
+     # Only build a position-dependent object if we build old libraries.
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       else
+ 	command="$base_compile $srcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+       fi
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+       command="$command$suppress_output"
+       $run $rm "$obj" "$output_obj"
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ but it should contain:
+ $srcfile
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       # Just move the object if needed
+       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ 	$show "$mv $output_obj $obj"
+ 	if $run $mv $output_obj $obj; then :
+ 	else
+ 	  error=$?
+ 	  $run $rm $removelist
+ 	  exit $error
+ 	fi
+       fi
+ 
+       # Append the name of the non-PIC object the libtool object file.
+       # Only append if the libtool object file exists.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ # Name of the non-PIC object.
+ non_pic_object='$objname'
+ 
+ EOF
+     else
+       # Append the name of the non-PIC object the libtool object file.
+       # Only append if the libtool object file exists.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ # Name of the non-PIC object.
+ non_pic_object=none
+ 
+ EOF
+     fi
+ 
+     $run $mv "${libobj}T" "${libobj}"
+ 
+     # Unlock the critical section if it was locked
+     if test "$need_locks" != no; then
+       $run $rm "$lockfile"
+     fi
+ 
+     exit 0
+     ;;
+ 
+   # libtool link mode
+   link | relink)
+     modename="$modename: link"
+     case $host in
+     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+       # It is impossible to link a dll without this setting, and
+       # we shouldn't force the makefile maintainer to figure out
+       # which system we are compiling for in order to pass an extra
+       # flag for every libtool invocation.
+       # allow_undefined=no
+ 
+       # FIXME: Unfortunately, there are problems with the above when trying
+       # to make a dll which has undefined symbols, in which case not
+       # even a static library is built.  For now, we need to specify
+       # -no-undefined on the libtool link line when we can be certain
+       # that all symbols are satisfied, otherwise we get a static library.
+       allow_undefined=yes
+       ;;
+     *)
+       allow_undefined=yes
+       ;;
+     esac
+     libtool_args="$nonopt"
+     base_compile="$nonopt"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+     compile_rpath=
+     finalize_rpath=
+     compile_shlibpath=
+     finalize_shlibpath=
+     convenience=
+     old_convenience=
+     deplibs=
+     old_deplibs=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
+     inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+     dlprefiles=
+     dlself=no
+     export_dynamic=no
+     export_symbols=
+     export_symbols_regex=
+     generated=
+     libobjs=
+     ltlibs=
+     module=no
+     no_install=no
+     objs=
+     non_pic_objects=
+     prefer_static_libs=no
+     preload=no
+     prev=
+     prevarg=
+     release=
+     rpath=
+     xrpath=
+     perm_rpath=
+     temp_rpath=
+     thread_safe=no
+     vinfo=
+     vinfo_number=no
+ 
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+       case $arg in
+       -all-static | -static)
+ 	if test "X$arg" = "X-all-static"; then
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+     done
+ 
+     # See if our shared archives depend on static archives.
+     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+       base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+ 	;;
+       *) qarg=$arg ;;
+       esac
+       libtool_args="$libtool_args $qarg"
+ 
+       # If the previous option needs an argument, assign it.
+       if test -n "$prev"; then
+ 	case $prev in
+ 	output)
+ 	  compile_command="$compile_command @OUTPUT@"
+ 	  finalize_command="$finalize_command @OUTPUT@"
+ 	  ;;
+ 	esac
+ 
+ 	case $prev in
+ 	dlfiles|dlprefiles)
+ 	  if test "$preload" = no; then
+ 	    # Add the symbol object into the linking commands.
+ 	    compile_command="$compile_command @SYMFILE@"
+ 	    finalize_command="$finalize_command @SYMFILE@"
+ 	    preload=yes
+ 	  fi
+ 	  case $arg in
+ 	  *.la | *.lo) ;;  # We handle these cases below.
+ 	  force)
+ 	    if test "$dlself" = no; then
+ 	      dlself=needless
+ 	      export_dynamic=yes
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  self)
+ 	    if test "$prev" = dlprefiles; then
+ 	      dlself=yes
+ 	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ 	      dlself=yes
+ 	    else
+ 	      dlself=needless
+ 	      export_dynamic=yes
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  *)
+ 	    if test "$prev" = dlfiles; then
+ 	      dlfiles="$dlfiles $arg"
+ 	    else
+ 	      dlprefiles="$dlprefiles $arg"
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	expsyms)
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+ 	    exit 1
+ 	  fi
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	expsyms_regex)
+ 	  export_symbols_regex="$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	inst_prefix)
+ 	  inst_prefix_dir="$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+ 	    moreargs=
+ 	    for fil in `cat $save_arg`
+ 	    do
+ #	      moreargs="$moreargs $fil"
+ 	      arg=$fil
+ 	      # A libtool-controlled object.
+ 
+ 	      # Check to see that this really is a libtool object.
+ 	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 		pic_object=
+ 		non_pic_object=
+ 
+ 		# Read the .lo file
+ 		# If there is no directory component, then add one.
+ 		case $arg in
+ 		*/* | *\\*) . $arg ;;
+ 		*) . ./$arg ;;
+ 		esac
+ 
+ 		if test -z "$pic_object" || \
+ 		   test -z "$non_pic_object" ||
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ 		  exit 1
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+ 		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 		if test "X$xdir" = "X$arg"; then
+ 		  xdir=
+ 		else
+ 		  xdir="$xdir/"
+ 		fi
+ 
+ 		if test "$pic_object" != none; then
+ 		  # Prepend the subdirectory the object is found in.
+ 		  pic_object="$xdir$pic_object"
+ 
+ 		  if test "$prev" = dlfiles; then
+ 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ 		      dlfiles="$dlfiles $pic_object"
+ 		      prev=
+ 		      continue
+ 		    else
+ 		      # If libtool objects are unsupported, then we need to preload.
+ 		      prev=dlprefiles
+ 		    fi
+ 		  fi
+ 
+ 		  # CHECK ME:  I think I busted this.  -Ossama
+ 		  if test "$prev" = dlprefiles; then
+ 		    # Preload the old-style object.
+ 		    dlprefiles="$dlprefiles $pic_object"
+ 		    prev=
+ 		  fi
+ 
+ 		  # A PIC object.
+ 		  libobjs="$libobjs $pic_object"
+ 		  arg="$pic_object"
+ 		fi
+ 
+ 		# Non-PIC object.
+ 		if test "$non_pic_object" != none; then
+ 		  # Prepend the subdirectory the object is found in.
+ 		  non_pic_object="$xdir$non_pic_object"
+ 
+ 		  # A standard non-PIC object
+ 		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
+ 		fi
+ 	      else
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ 		  exit 1
+ 		else
+ 		  # Dry-run case.
+ 
+ 		  # Extract subdirectory from the argument.
+ 		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 		  if test "X$xdir" = "X$arg"; then
+ 		    xdir=
+ 		  else
+ 		    xdir="$xdir/"
+ 		  fi
+ 
+ 		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ 		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ 		  libobjs="$libobjs $pic_object"
+ 		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      fi
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+ 	    exit 1
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	rpath | xrpath)
+ 	  # We need an absolute path.
+ 	  case $arg in
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+ 	    exit 1
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+ 	    case "$rpath " in
+ 	    *" $arg "*) ;;
+ 	    *) rpath="$rpath $arg" ;;
+ 	    esac
+ 	  else
+ 	    case "$xrpath " in
+ 	    *" $arg "*) ;;
+ 	    *) xrpath="$xrpath $arg" ;;
+ 	    esac
+ 	  fi
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	xcompiler)
+ 	  compiler_flags="$compiler_flags $qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $qarg"
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+ 	xlinker)
+ 	  linker_flags="$linker_flags $qarg"
+ 	  compiler_flags="$compiler_flags $wl$qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $wl$qarg"
+ 	  finalize_command="$finalize_command $wl$qarg"
+ 	  continue
+ 	  ;;
+ 	xcclinker)
+ 	  linker_flags="$linker_flags $qarg"
+ 	  compiler_flags="$compiler_flags $qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $qarg"
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+ 	*)
+ 	  eval "$prev=\"\$arg\""
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	esac
+       fi # test -n "$prev"
+ 
+       prevarg="$arg"
+ 
+       case $arg in
+       -all-static)
+ 	if test -n "$link_static_flag"; then
+ 	  compile_command="$compile_command $link_static_flag"
+ 	  finalize_command="$finalize_command $link_static_flag"
+ 	fi
+ 	continue
+ 	;;
+ 
+       -allow-undefined)
+ 	# FIXME: remove this flag sometime in the future.
+ 	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+ 	continue
+ 	;;
+ 
+       -avoid-version)
+ 	avoid_version=yes
+ 	continue
+ 	;;
+ 
+       -dlopen)
+ 	prev=dlfiles
+ 	continue
+ 	;;
+ 
+       -dlpreopen)
+ 	prev=dlprefiles
+ 	continue
+ 	;;
+ 
+       -export-dynamic)
+ 	export_dynamic=yes
+ 	continue
+ 	;;
+ 
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+ 	  exit 1
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+ 	else
+ 	  prev=expsyms_regex
+ 	fi
+ 	continue
+ 	;;
+ 
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+ 	;;
+ 
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+ 	case $with_gcc/$host in
+ 	no/*-*-irix* | /*-*-irix*)
+ 	  compile_command="$compile_command $arg"
+ 	  finalize_command="$finalize_command $arg"
+ 	  ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -L*)
+ 	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ 	# We need an absolute path.
+ 	case $dir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+ 	esac
+ 	case "$deplibs " in
+ 	*" -L$dir "*) ;;
+ 	*)
+ 	  deplibs="$deplibs -L$dir"
+ 	  lib_search_path="$lib_search_path $dir"
+ 	  ;;
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
+ 	  ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+ 	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+ 	  *-*-mingw* | *-*-os2*)
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    continue
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+ 	 *-*-openbsd* | *-*-freebsd*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+ 	 esac
+ 	fi
+ 	deplibs="$deplibs $arg"
+ 	continue
+ 	;;
+ 
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+       # gcc -m* arguments should be passed to the linker via $compiler_flags
+       # in order to pass architecture information to the linker
+       # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+       # but this is not reliable with gcc because gcc may use -mfoo to
+       # select a different linker, different libraries, etc, while
+       # -Wl,-mfoo simply passes -mfoo to the linker.
+       -m*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+         if test "$with_gcc" = "yes" ; then
+           compiler_flags="$compiler_flags $arg"
+         fi
+         continue
+         ;;
+ 
+       -shrext)
+ 	prev=shrext
+ 	continue
+ 	;;
+ 
+       -no-fast-install)
+ 	fast_install=no
+ 	continue
+ 	;;
+ 
+       -no-install)
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+ 	  # in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+ 	  ;;
+ 	*) no_install=yes ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -no-undefined)
+ 	allow_undefined=no
+ 	continue
+ 	;;
+ 
+       -objectlist)
+ 	prev=objectlist
+ 	continue
+ 	;;
+ 
+       -o) prev=output ;;
+ 
+       -release)
+ 	prev=release
+ 	continue
+ 	;;
+ 
+       -rpath)
+ 	prev=rpath
+ 	continue
+ 	;;
+ 
+       -R)
+ 	prev=xrpath
+ 	continue
+ 	;;
+ 
+       -R*)
+ 	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ 	# We need an absolute path.
+ 	case $dir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+ 	*" $dir "*) ;;
+ 	*) xrpath="$xrpath $dir" ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -static)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+ 	# would be equivalent was wrong.  It would break on at least
+ 	# Digital Unix and AIX.
+ 	continue
+ 	;;
+ 
+       -thread-safe)
+ 	thread_safe=yes
+ 	continue
+ 	;;
+ 
+       -version-info)
+ 	prev=vinfo
+ 	continue
+ 	;;
+       -version-number)
+ 	prev=vinfo
+ 	vinfo_number=yes
+ 	continue
+ 	;;
+ 
+       -Wc,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ 	arg=
+ 	save_ifs="$IFS"; IFS=','
+ 	for flag in $args; do
+ 	  IFS="$save_ifs"
+ 	  case $flag in
+ 	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	    flag="\"$flag\""
+ 	    ;;
+ 	  esac
+ 	  arg="$arg $wl$flag"
+ 	  compiler_flags="$compiler_flags $flag"
+ 	done
+ 	IFS="$save_ifs"
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+ 	save_ifs="$IFS"; IFS=','
+ 	for flag in $args; do
+ 	  IFS="$save_ifs"
+ 	  case $flag in
+ 	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	    flag="\"$flag\""
+ 	    ;;
+ 	  esac
+ 	  arg="$arg $wl$flag"
+ 	  compiler_flags="$compiler_flags $wl$flag"
+ 	  linker_flags="$linker_flags $flag"
+ 	done
+ 	IFS="$save_ifs"
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
+       -Xcompiler)
+ 	prev=xcompiler
+ 	continue
+ 	;;
+ 
+       -Xlinker)
+ 	prev=xlinker
+ 	continue
+ 	;;
+ 
+       -XCClinker)
+ 	prev=xcclinker
+ 	continue
+ 	;;
+ 
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+ 	;;
+ 
+       *.$objext)
+ 	# A standard object.
+ 	objs="$objs $arg"
+ 	;;
+ 
+       *.lo)
+ 	# A libtool-controlled object.
+ 
+ 	# Check to see that this really is a libtool object.
+ 	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  pic_object=
+ 	  non_pic_object=
+ 
+ 	  # Read the .lo file
+ 	  # If there is no directory component, then add one.
+ 	  case $arg in
+ 	  */* | *\\*) . $arg ;;
+ 	  *) . ./$arg ;;
+ 	  esac
+ 
+ 	  if test -z "$pic_object" || \
+ 	     test -z "$non_pic_object" ||
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+ 	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 	  if test "X$xdir" = "X$arg"; then
+ 	    xdir=
+  	  else
+ 	    xdir="$xdir/"
+ 	  fi
+ 
+ 	  if test "$pic_object" != none; then
+ 	    # Prepend the subdirectory the object is found in.
+ 	    pic_object="$xdir$pic_object"
+ 
+ 	    if test "$prev" = dlfiles; then
+ 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ 		dlfiles="$dlfiles $pic_object"
+ 		prev=
+ 		continue
+ 	      else
+ 		# If libtool objects are unsupported, then we need to preload.
+ 		prev=dlprefiles
+ 	      fi
+ 	    fi
+ 
+ 	    # CHECK ME:  I think I busted this.  -Ossama
+ 	    if test "$prev" = dlprefiles; then
+ 	      # Preload the old-style object.
+ 	      dlprefiles="$dlprefiles $pic_object"
+ 	      prev=
+ 	    fi
+ 
+ 	    # A PIC object.
+ 	    libobjs="$libobjs $pic_object"
+ 	    arg="$pic_object"
+ 	  fi
+ 
+ 	  # Non-PIC object.
+ 	  if test "$non_pic_object" != none; then
+ 	    # Prepend the subdirectory the object is found in.
+ 	    non_pic_object="$xdir$non_pic_object"
+ 
+ 	    # A standard non-PIC object
+ 	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
+ 	  fi
+ 	else
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ 	    exit 1
+ 	  else
+ 	    # Dry-run case.
+ 
+ 	    # Extract subdirectory from the argument.
+ 	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 	    if test "X$xdir" = "X$arg"; then
+ 	      xdir=
+ 	    else
+ 	      xdir="$xdir/"
+ 	    fi
+ 
+ 	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ 	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ 	    libobjs="$libobjs $pic_object"
+ 	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *.$libext)
+ 	# An archive.
+ 	deplibs="$deplibs $arg"
+ 	old_deplibs="$old_deplibs $arg"
+ 	continue
+ 	;;
+ 
+       *.la)
+ 	# A libtool-controlled library.
+ 
+ 	if test "$prev" = dlfiles; then
+ 	  # This library was specified with -dlopen.
+ 	  dlfiles="$dlfiles $arg"
+ 	  prev=
+ 	elif test "$prev" = dlprefiles; then
+ 	  # The library was specified with -dlpreopen.
+ 	  dlprefiles="$dlprefiles $arg"
+ 	  prev=
+ 	else
+ 	  deplibs="$deplibs $arg"
+ 	fi
+ 	continue
+ 	;;
+ 
+       # Some other compiler argument.
+       *)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+ 	;;
+       esac # arg
+ 
+       # Now actually substitute the argument into the commands.
+       if test -n "$arg"; then
+ 	compile_command="$compile_command $arg"
+ 	finalize_command="$finalize_command $arg"
+       fi
+     done # argument parsing loop
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Infer tagged configuration to use if any are available and
+     # if one wasn't chosen via the "--tag" command line option.
+     # Only attempt this if the compiler in the base link
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+       # Blanks in the command may have been stripped by the calling shell,
+       # but not from the CC environment variable when configure was run.
+       "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+       # Blanks at the start of $base_compile will cause this to fail
+       # if we don't check for them as well.
+       *)
+ 	for z in $available_tags; do
+ 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    case $base_compile in
+ 	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+ 	      # The compiler in $compile_command matches
+ 	      # the one in the tagged configuration.
+ 	      # Assume this is the tagged configuration we want.
+ 	      tagname=$z
+ 	      break
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	done
+ 	# If $tagname still isn't set, then no tagged configuration
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+ 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+ 	  exit 1
+ #       else
+ #         $echo "$modename: using $tagname tagged configuration"
+ 	fi
+ 	;;
+       esac
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+       eval arg=\"$export_dynamic_flag_spec\"
+       compile_command="$compile_command $arg"
+       finalize_command="$finalize_command $arg"
+     fi
+ 
+     oldlibs=
+     # calculate the name of the file, without its directory
+     outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+     libobjs_save="$libobjs"
+ 
+     if test -n "$shlibpath_var"; then
+       # get the directories listed in $shlibpath_var
+       eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+     else
+       shlib_search_path=
+     fi
+     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+     output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$output_objdir" = "X$output"; then
+       output_objdir="$objdir"
+     else
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+       if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+ 
+     # Determine the type of output
+     case $output in
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+     *.la) linkmode=lib ;;
+     *) linkmode=prog ;; # Anything else should be a program.
+     esac
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+       # don't eliminate duplcations in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+       duplicate_compiler_generated_deps=$duplicate_deps
+       ;;
+     esac
+     specialdeplibs=
+ 
+     libs=
+     # Find all interdependent deplibs by searching for libraries
+     # that are linked more than once (e.g. -la -lb -la)
+     for deplib in $deplibs; do
+       if test "X$duplicate_deps" = "Xyes" ; then
+ 	case "$libs " in
+ 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	esac
+       fi
+       libs="$libs $deplib"
+     done
+ 
+     if test "$linkmode" = lib; then
+       libs="$predeps $libs $compiler_lib_search_path $postdeps"
+ 
+       # Compute libraries that are listed more than once in $predeps
+       # $postdeps and mark them as special (i.e., whose duplicates are
+       # not to be eliminated).
+       pre_post_deps=
+       if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+ 	for pre_post_dep in $predeps $postdeps; do
+ 	  case "$pre_post_deps " in
+ 	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ 	  esac
+ 	  pre_post_deps="$pre_post_deps $pre_post_dep"
+ 	done
+       fi
+       pre_post_deps=
+     fi
+ 
+     deplibs=
+     newdependency_libs=
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+     notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+ 	for file in $dlfiles $dlprefiles; do
+ 	  case $file in
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+ 	    exit 1
+ 	    ;;
+ 	  esac
+ 	done
+ 	;;
+     prog)
+ 	compile_deplibs=
+ 	finalize_deplibs=
+ 	alldeplibs=no
+ 	newdlfiles=
+ 	newdlprefiles=
+ 	passes="conv scan dlopen dlpreopen link"
+ 	;;
+     *)  passes="conv"
+ 	;;
+     esac
+     for pass in $passes; do
+       if test "$linkmode,$pass" = "lib,link" ||
+ 	 test "$linkmode,$pass" = "prog,scan"; then
+ 	libs="$deplibs"
+ 	deplibs=
+       fi
+       if test "$linkmode" = prog; then
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+ 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+ 	# Collect dlpreopened libraries
+ 	save_deplibs="$deplibs"
+ 	deplibs=
+       fi
+       for deplib in $libs; do
+ 	lib=
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 	    # Search the libtool library
+ 	    lib="$searchdir/lib${name}.la"
+ 	    if test -f "$lib"; then
+ 	      found=yes
+ 	      break
+ 	    fi
+ 	  done
+ 	  if test "$found" != yes; then
+ 	    # deplib doesn't seem to be a libtool library
+ 	    if test "$linkmode,$pass" = "prog,link"; then
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+ 	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  else # deplib is a libtool library
+ 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ 	    # We need to do some special things here, and not later.
+ 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 	      case " $predeps $postdeps " in
+ 	      *" $deplib "*)
+ 		if (${SED} -e '2q' $lib |
+                     grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 		  library_names=
+ 		  old_library=
+ 		  case $lib in
+ 		  */* | *\\*) . $lib ;;
+ 		  *) . ./$lib ;;
+ 		  esac
+ 		  for l in $old_library $library_names; do
+ 		    ll="$l"
+ 		  done
+ 		  if test "X$ll" = "X$old_library" ; then # only static version available
+ 		    found=no
+ 		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ 		    test "X$ladir" = "X$lib" && ladir="."
+ 		    lib=$ladir/$old_library
+ 		    if test "$linkmode,$pass" = "prog,link"; then
+ 		      compile_deplibs="$deplib $compile_deplibs"
+ 		      finalize_deplibs="$deplib $finalize_deplibs"
+ 		    else
+ 		      deplibs="$deplib $deplibs"
+ 		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 		    fi
+ 		    continue
+ 		  fi
+ 		fi
+ 	        ;;
+ 	      *) ;;
+ 	      esac
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+ 	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+ 	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    ;;
+ 	  esac # linkmode
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+ 	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+ 	    *" $dir "*) ;;
+ 	    *) xrpath="$xrpath $dir" ;;
+ 	    esac
+ 	  fi
+ 	  deplibs="$deplib $deplibs"
+ 	  continue
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+ 	    if test "$deplibs_check_method" != pass_all; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+ 	      $echo "*** you link to this library.  But I can only do this if you have a"
+ 	      $echo "*** shared version of the library, which you do not appear to have"
+ 	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+ 	      $echo "*** that it is just a static archive that I should not used here."
+ 	    else
+ 	      $echo
+ 	      $echo "*** Warning: Linking the shared library $output against the"
+ 	      $echo "*** static library $deplib is not portable!"
+ 	      deplibs="$deplib $deplibs"
+ 	    fi
+ 	    continue
+ 	    ;;
+ 	  prog)
+ 	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
+ 	    continue
+ 	    ;;
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	  elif test "$linkmode" = prog; then
+ 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	      # If there is no dlopen support or we're linking statically,
+ 	      # we need to preload.
+ 	      newdlprefiles="$newdlprefiles $deplib"
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      newdlfiles="$newdlfiles $deplib"
+ 	    fi
+ 	  fi
+ 	  continue
+ 	  ;;
+ 	%DEPLIBS%)
+ 	  alldeplibs=yes
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$ladir" = "X$lib" && ladir="."
+ 
+ 	dlname=
+ 	dlopen=
+ 	dlpreopen=
+ 	libdir=
+ 	library_names=
+ 	old_library=
+ 	# If the library was installed with an old release of libtool,
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
+ 
+ 	# Read the .la file
+ 	case $lib in
+ 	*/* | *\\*) . $lib ;;
+ 	*) . ./$lib ;;
+ 	esac
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ 	      exit 1
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+ 	        case "$tmp_libs " in
+ 	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	        esac
+               fi
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+     
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+ 	  linklib="$l"
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+ 	    # bomb out in the load deplibs phase.
+ 	    dlprefiles="$dlprefiles $lib $dependency_libs"
+ 	  else
+ 	    newdlfiles="$newdlfiles $lib"
+ 	  fi
+ 	  continue
+ 	fi # $pass = dlopen
+ 
+ 	# We need an absolute path.
+ 	case $ladir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ 	*)
+ 	  abs_ladir=`cd "$ladir" && pwd`
+ 	  if test -z "$abs_ladir"; then
+ 	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+ 	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ 	    abs_ladir="$ladir"
+ 	  fi
+ 	  ;;
+ 	esac
+ 	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 
+ 	# Find the relevant object directory and library name.
+ 	if test "X$installed" = Xyes; then
+ 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ 	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+ 	    dir="$ladir"
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
+ 	else
+ 	  dir="$ladir/$objdir"
+ 	  absdir="$abs_ladir/$objdir"
+ 	  # Remove this search path later
+ 	  notinst_path="$notinst_path $abs_ladir"
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+ 	  if test -n "$old_library"; then
+ 	    newdlprefiles="$newdlprefiles $dir/$old_library"
+ 	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+ 	  elif test -n "$dlname"; then
+ 	    newdlprefiles="$newdlprefiles $dir/$dlname"
+ 	  else
+ 	    newdlprefiles="$newdlprefiles $dir/$linklib"
+ 	  fi
+ 	fi # $pass = dlpreopen
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+ 	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+ 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ 	  else
+ 	    deplibs="$lib $deplibs" # used for prog,scan pass
+ 	  fi
+ 	  continue
+ 	fi
+ 
+     
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+ 	  linkalldeplibs=no
+ 	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+ 	     test "$build_libtool_libs" = no; then
+ 	    linkalldeplibs=yes
+ 	  fi
+ 
+ 	  tmp_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+ 	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+ 	      # or/and link against static libraries
+ 	      newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    if test "X$duplicate_deps" = "Xyes" ; then
+ 	      case "$tmp_libs " in
+ 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	      esac
+ 	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done # for deplib
+ 	  continue
+ 	fi # $linkmode = prog...
+ 
+ 	if test "$linkmode,$pass" = "prog,link"; then
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+ 	    if test -n "$shlibpath_var"; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+ 	      *) temp_rpath="$temp_rpath $dir" ;;
+ 	      esac
+ 	    fi
+ 
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $absdir "*) ;;
+ 	    *)
+ 	      case "$compile_rpath " in
+ 	      *" $absdir "*) ;;
+ 	      *) compile_rpath="$compile_rpath $absdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $libdir "*) ;;
+ 	    *)
+ 	      case "$finalize_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) finalize_rpath="$finalize_rpath $libdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+ 		 test -n "$library_names"; }; }; then
+ 	    # We only need to search for static libraries
+ 	    continue
+ 	  fi
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
+ 	if test -n "$library_names" &&
+ 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+ 	
+       # Warn about portability, can't link against -module's on some systems (darwin)
+       if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+ 	    $echo "*** $linklib is not portable!"    
+       fi	  
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $absdir "*) ;;
+ 	    *)
+ 	      case "$compile_rpath " in
+ 	      *" $absdir "*) ;;
+ 	      *) compile_rpath="$compile_rpath $absdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $libdir "*) ;;
+ 	    *)
+ 	      case "$finalize_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) finalize_rpath="$finalize_rpath $libdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  fi
+ 
+ 	  if test -n "$old_archive_from_expsyms_cmds"; then
+ 	    # figure out the soname
+ 	    set dummy $library_names
+ 	    realname="$2"
+ 	    shift; shift
+ 	    libname=`eval \\$echo \"$libname_spec\"`
+ 	    # use dlname if we got it. it's perfectly good, no?
+ 	    if test -n "$dlname"; then
+ 	      soname="$dlname"
+ 	    elif test -n "$soname_spec"; then
+ 	      # bleh windows
+ 	      case $host in
+ 	      *cygwin* | mingw*)
+ 		major=`expr $current - $age`
+ 		versuffix="-$major"
+ 		;;
+ 	      esac
+ 	      eval soname=\"$soname_spec\"
+ 	    else
+ 	      soname="$realname"
+ 	    fi
+ 
+ 	    # Make a new name for the extract_expsyms_cmds to use
+ 	    soroot="$soname"
+ 	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+ 	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ 
+ 	    # If the library has no export list, then create one now
+ 	    if test -f "$output_objdir/$soname-def"; then :
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      eval cmds=\"$extract_expsyms_cmds\"
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 
+ 	    # Create $newlib
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      eval cmds=\"$old_archive_from_expsyms_cmds\"
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+ 	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+ 	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+ 	    lib_linked=yes
+ 	    case $hardcode_action in
+ 	    immediate | unsupported)
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
+ 		case $host in
+ 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+ 		    # if the lib is a module then we can not link against it, someone
+ 		    # is ignoring the new warnings I added
+ 		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+ 		        $echo "** And there doesn't seem to be a static archive available"
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+ 		      fi 
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+ 		case $host in
+ 		*-*-sunos*) add_shlibpath="$dir" ;;
+ 		esac
+ 		add_dir="-L$dir"
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = no; then
+ 		add_shlibpath="$dir"
+ 		add="-l$name"
+ 	      else
+ 		lib_linked=no
+ 	      fi
+ 	      ;;
+ 	    relink)
+ 	      if test "$hardcode_direct" = yes; then
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+ 		  case "$libdir" in
+ 		    [\\/]*)
+ 		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		      ;;
+ 		  esac
+ 		fi
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = yes; then
+ 		add_shlibpath="$dir"
+ 		add="-l$name"
+ 	      else
+ 		lib_linked=no
+ 	      fi
+ 	      ;;
+ 	    *) lib_linked=no ;;
+ 	    esac
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+ 	      exit 1
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+ 	      case :$compile_shlibpath: in
+ 	      *":$add_shlibpath:"*) ;;
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+ 	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	      if test "$hardcode_direct" != yes && \
+ 		 test "$hardcode_minus_L" != yes && \
+ 		 test "$hardcode_shlibpath_var" = yes; then
+ 		case :$finalize_shlibpath: in
+ 		*":$libdir:"*) ;;
+ 		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ 		esac
+ 	      fi
+ 	    fi
+ 	  fi
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+ 	      *":$libdir:"*) ;;
+ 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+ 	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+ 	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		  [\\/]*)
+ 		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		    ;;
+ 		esac
+ 	      fi
+ 	      add="-l$name"
+ 	    fi
+ 
+ 	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+ 	elif test "$linkmode" = prog; then
+ 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+ 	  # is not unsupported.  This is valid on all known static and
+ 	  # shared platforms.
+ 	  if test "$hardcode_direct" != unsupported; then
+ 	    test -n "$old_library" && linklib="$old_library"
+ 	    compile_deplibs="$dir/$linklib $compile_deplibs"
+ 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ 	  else
+ 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+ 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ 	  fi
+ 	elif test "$build_libtool_libs" = yes; then
+ 	  # Not a shared library
+ 	  if test "$deplibs_check_method" != pass_all; then
+ 	    # We're trying link a shared library against a static one
+ 	    # but the system doesn't support it.
+ 
+ 	    # Just print a warning and add the library to dependency_libs so
+ 	    # that the program can be linked against the static library.
+ 	    $echo
+ 	    $echo "*** Warning: This system can not link to static lib archive $lib."
+ 	    $echo "*** I have the capability to make that library automatically link in when"
+ 	    $echo "*** you link to this library.  But I can only do this if you have a"
+ 	    $echo "*** shared version of the library, which you do not appear to have."
+ 	    if test "$module" = yes; then
+ 	      $echo "*** But as you try to build a module library, libtool will still create "
+ 	      $echo "*** a static module, that should work as long as the dlopening application"
+ 	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ 	      if test -z "$global_symbol_pipe"; then
+ 		$echo
+ 		$echo "*** However, this would only work if libtool was able to extract symbol"
+ 		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ 		$echo "*** not find such a program.  So, this module is probably useless."
+ 		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	      fi
+ 	      if test "$build_old_libs" = no; then
+ 		build_libtool_libs=module
+ 		build_old_libs=yes
+ 	      else
+ 		build_libtool_libs=no
+ 	      fi
+ 	    fi
+ 	  else
+ 	    convenience="$convenience $dir/$old_library"
+ 	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+ 	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+ 	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+ 	      case $libdir in
+ 	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+ 		   case " $xrpath " in
+ 		   *" $temp_xrpath "*) ;;
+ 		   *) xrpath="$xrpath $temp_xrpath";;
+ 		   esac;;
+ 	      *) temp_deplibs="$temp_deplibs $libdir";;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+ 	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+ 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ 	  # ... and its dependency_libs
+ 	  tmp_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    if test "X$duplicate_deps" = "Xyes" ; then
+ 	      case "$tmp_libs " in
+ 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	      esac
+ 	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+ 	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+ 	      -L*) path="$deplib" ;;
+ 	      *.la)
+ 		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+ 		test "X$dir" = "X$deplib" && dir="."
+ 		# We need an absolute path.
+ 		case $dir in
+ 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ 		*)
+ 		  absdir=`cd "$dir" && pwd`
+ 		  if test -z "$absdir"; then
+ 		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ 		    absdir="$dir"
+ 		  fi
+ 		  ;;
+ 		esac
+ 		if grep "^installed=no" $deplib > /dev/null; then
+ 		  path="$absdir/$objdir"
+ 		else
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		    exit 1
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+ 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+ 		  # we do not want to link against static libs, but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+ 		      depdepl=$tmp
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+ 		   fi
+ 		    newlib_search_path="$newlib_search_path $path"
+ 		    path=""
+ 		  fi
+ 		  ;;
+ 		*)
+ 		path="-L$path"
+ 		;;
+ 		esac 
+ 		
+ 		;;
+ 		  -l*)
+ 		case $host in
+ 		*-*-darwin*)
+ 		 # Again, we only want to link against shared libraries
+ 		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+ 		 for tmp in $newlib_search_path ; do
+ 		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+ 		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+ 		       break
+ 		     fi  
+          done
+          path=""
+ 		  ;;
+ 		*) continue ;;
+ 		esac  		  
+ 		;;
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+ 	      *" $depdepl "*) ;;
+ 	      *) deplibs="$deplibs $depdepl" ;;
+ 	      esac	      
+ 	      case " $deplibs " in
+ 	      *" $path "*) ;;
+ 	      *) deplibs="$deplibs $path" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+       dependency_libs="$newdependency_libs"
+       if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+       if test "$pass" != dlopen; then
+ 	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+ 	    case "$lib_search_path " in
+ 	    *" $dir "*) ;;
+ 	    *) lib_search_path="$lib_search_path $dir" ;;
+ 	    esac
+ 	  done
+ 	  newlib_search_path=
+ 	fi
+ 
+ 	if test "$linkmode,$pass" != "prog,link"; then
+ 	  vars="deplibs"
+ 	else
+ 	  vars="compile_deplibs finalize_deplibs"
+ 	fi
+ 	for var in $vars dependency_libs; do
+ 	  # Add libraries to $var in reverse order
+ 	  eval tmp_libs=\"\$$var\"
+ 	  new_libs=
+ 	  for deplib in $tmp_libs; do
+ 	    # FIXME: Pedantically, this is the right thing to do, so
+ 	    #        that some nasty dependency loop isn't accidentally
+ 	    #        broken:
+ 	    #new_libs="$deplib $new_libs"
+ 	    # Pragmatically, this seems to cause very few problems in
+ 	    # practice:
+ 	    case $deplib in
+ 	    -L*) new_libs="$deplib $new_libs" ;;
+ 	    -R*) ;;
+ 	    *)
+ 	      # And here is the reason: when a library appears more
+ 	      # than once as an explicit dependence of a library, or
+ 	      # is implicitly linked in more than once by the
+ 	      # compiler, it is considered special, and multiple
+ 	      # occurrences thereof are not removed.  Compare this
+ 	      # with having the same library being listed as a
+ 	      # dependency of multiple other libraries: in this case,
+ 	      # we know (pedantically, we assume) the library does not
+ 	      # need to be listed more than once, so we keep only the
+ 	      # last copy.  This is not always right, but it is rare
+ 	      # enough that we require users that really mean to play
+ 	      # such unportable linking tricks to link the library
+ 	      # using -Wl,-lname, so that libtool does not consider it
+ 	      # for duplicate removal.
+ 	      case " $specialdeplibs " in
+ 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ 	      *)
+ 		case " $new_libs " in
+ 		*" $deplib "*) ;;
+ 		*) new_libs="$deplib $new_libs" ;;
+ 		esac
+ 		;;
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  done
+ 	  tmp_libs=
+ 	  for deplib in $new_libs; do
+ 	    case $deplib in
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+ 	      *) tmp_libs="$tmp_libs $deplib" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
+ 	    esac
+ 	  done
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+       # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+ 	*" $i "*)
+ 	  i=""
+ 	  ;;
+ 	esac
+ 	if test -n "$i" ; then
+ 	  tmp_libs="$tmp_libs $i"
+ 	fi
+       done
+       dependency_libs=$tmp_libs
+     done # for pass
+     if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+ 
+     case $linkmode in
+     oldlib)
+       if test -n "$deplibs"; then
+ 	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$rpath"; then
+ 	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$xrpath"; then
+ 	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+       fi
+ 
+       # Now set the variables for building old libraries.
+       build_libtool_libs=no
+       oldlibs="$output"
+       objs="$objs$old_deplibs"
+       ;;
+ 
+     lib)
+       # Make sure we only generate libraries of the form `libNAME.la'.
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 	eval shared_ext=\"$shrext\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ 	  eval shared_ext=\"$shrext\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ 	fi
+ 	;;
+       esac
+ 
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+ 	  exit 1
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+ 	  $echo "*** objects $objs is not portable!"
+ 	  libobjs="$libobjs $objs"
+ 	fi
+       fi
+ 
+       if test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+       fi
+ 
+       set dummy $rpath
+       if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+ 
+       oldlibs=
+       if test -z "$rpath"; then
+ 	if test "$build_libtool_libs" = yes; then
+ 	  # Building a libtool convenience library.
+ 	  # Some compilers have problems with a `.al' extension so
+ 	  # convenience libraries should have the same extension an
+ 	  # archive normally would.
+ 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ 	  build_libtool_libs=convenience
+ 	  build_old_libs=yes
+ 	fi
+ 
+ 	if test -n "$vinfo"; then
+ 	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ 	fi
+ 
+ 	if test -n "$release"; then
+ 	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ 	fi
+       else
+ 
+ 	# Parse the version information argument.
+ 	save_ifs="$IFS"; IFS=':'
+ 	set dummy $vinfo 0 0 0
+ 	IFS="$save_ifs"
+ 
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+ 	
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+ 	  number_minor="$3"
+ 	  number_revision="$4"
+ 	  #
+ 	  # There are really only two kinds -- those that
+ 	  # use the current revision as the major version
+ 	  # and those that subtract age and use age as
+ 	  # a minor version.  But, then there is irix
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+ 	  darwin|linux|osf|windows)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor - 1`
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+ 	  current="$2"
+ 	  revision="$3"
+ 	  age="$4"
+ 	  ;;
+ 	esac
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Calculate the version variables.
+ 	major=
+ 	versuffix=
+ 	verstring=
+ 	case $version_type in
+ 	none) ;;
+ 
+ 	darwin)
+ 	  # Like Linux, but with the current version available in
+ 	  # verstring for coding it into the library header
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+ 	  major=".$current"
+ 	  versuffix=".$current.$revision";
+ 	  ;;
+ 
+ 	freebsd-elf)
+ 	  major=".$current"
+ 	  versuffix=".$current";
+ 	  ;;
+ 
+ 	irix | nonstopux)
+ 	  major=`expr $current - $age + 1`
+ 
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+ 	  esac
+ 	  verstring="$verstring_prefix$major.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+ 	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring_prefix$major.$iface:$verstring"
+ 	  done
+ 
+ 	  # Before this point, $major must not contain `.'.
+ 	  major=.$major
+ 	  versuffix="$major.$revision"
+ 	  ;;
+ 
+ 	linux)
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	osf)
+ 	  major=.`expr $current - $age`
+ 	  versuffix=".$current.$age.$revision"
+ 	  verstring="$current.$age.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+ 	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+ 	  done
+ 
+ 	  # Make executables depend on our current version.
+ 	  verstring="$verstring:${current}.0"
+ 	  ;;
+ 
+ 	sunos)
+ 	  major=".$current"
+ 	  versuffix=".$current.$revision"
+ 	  ;;
+ 
+ 	windows)
+ 	  # Use '-' rather than '.', since we only want one
+ 	  # extension on DOS 8.3 filesystems.
+ 	  major=`expr $current - $age`
+ 	  versuffix="-$major"
+ 	  ;;
+ 
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	# Clear the version info if we defaulted, and they specified a release.
+ 	if test -z "$vinfo" && test -n "$release"; then
+ 	  major=
+ 	  case $version_type in
+ 	  darwin)
+ 	    # we can't check for "0.0" in archive_cmds due to quoting
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+ 	  esac
+ 	  if test "$need_version" = no; then
+ 	    versuffix=
+ 	  else
+ 	    versuffix=".0.0"
+ 	  fi
+ 	fi
+ 
+ 	# Remove version info from name if versioning should be avoided
+ 	if test "$avoid_version" = yes && test "$need_version" = no; then
+ 	  major=
+ 	  versuffix=
+ 	  verstring=""
+ 	fi
+ 
+ 	# Check to see if the archive will have undefined symbols.
+ 	if test "$allow_undefined" = yes; then
+ 	  if test "$allow_undefined_flag" = unsupported; then
+ 	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ 	    build_libtool_libs=no
+ 	    build_old_libs=yes
+ 	  fi
+ 	else
+ 	  # Don't allow undefined symbols.
+ 	  allow_undefined_flag="$no_undefined_flag"
+ 	fi
+       fi
+ 
+       if test "$mode" != relink; then
+ 	# Remove our outputs, but don't remove object files since they
+ 	# may have been created when compiling PIC objects.
+ 	removelist=
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+ 	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+ 	  esac
+ 	done
+ 	if test -n "$removelist"; then
+ 	  $show "${rm}r $removelist"
+ 	  $run ${rm}r $removelist
+ 	fi
+       fi
+ 
+       # Now set the variables for building old libraries.
+       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ 
+ 	# Transform .lo files to .o files.
+ 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+       fi
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+ 	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+ 	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ 	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+       done
+ 
+       if test -n "$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+ 	temp_xrpath=
+ 	for libdir in $xrpath; do
+ 	  temp_xrpath="$temp_xrpath -R$libdir"
+ 	  case "$finalize_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+ 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+ 
+       # Make sure dlfiles contains only unique files that won't be dlpreopened
+       old_dlfiles="$dlfiles"
+       dlfiles=
+       for lib in $old_dlfiles; do
+ 	case " $dlprefiles $dlfiles " in
+ 	*" $lib "*) ;;
+ 	*) dlfiles="$dlfiles $lib" ;;
+ 	esac
+       done
+ 
+       # Make sure dlprefiles contains only unique files
+       old_dlprefiles="$dlprefiles"
+       dlprefiles=
+       for lib in $old_dlprefiles; do
+ 	case "$dlprefiles " in
+ 	*" $lib "*) ;;
+ 	*) dlprefiles="$dlprefiles $lib" ;;
+ 	esac
+       done
+ 
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+ 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+ 	  esac
+ 	fi
+ 
+ 	# Transform deplibs into only deplibs that can be linked in shared.
+ 	name_save=$name
+ 	libname_save=$libname
+ 	release_save=$release
+ 	versuffix_save=$versuffix
+ 	major_save=$major
+ 	# I'm not sure if I'm treating the release correctly.  I think
+ 	# release should show up in the -l (ie -lgmp5) so we don't want to
+ 	# add it in twice.  Is that correct?
+ 	release=""
+ 	versuffix=""
+ 	major=""
+ 	newdeplibs=
+ 	droppeddeps=no
+ 	case $deplibs_check_method in
+ 	pass_all)
+ 	  # Don't check for shared/static.  Everything works.
+ 	  # This might be a little naive.  We might want to check
+ 	  # whether the library exists or not.  But this is on
+ 	  # osf3 & osf4 and I'm not really sure... Just
+ 	  # implementing what was already the behavior.
+ 	  newdeplibs=$deplibs
+ 	  ;;
+ 	test_compile)
+ 	  # This code stresses the "libraries are programs" paradigm to its
+ 	  # limits. Maybe even breaks it.  We compile a program, linking it
+ 	  # against the deplibs as a proxy for the library.  Then we can check
+ 	  # whether they linked in statically or dynamically with ldd.
+ 	  $rm conftest.c
+ 	  cat > conftest.c <<EOF
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+ 	  $LTCC -o conftest conftest.c $deplibs
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		  case " $predeps $postdeps " in
+ 		  *" $i "*)
+ 		    newdeplibs="$newdeplibs $i"
+ 		    i=""
+ 		    ;;
+ 		  esac
+ 	        fi
+ 		if test -n "$i" ; then
+ 		  libname=`eval \\$echo \"$libname_spec\"`
+ 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ 		  set dummy $deplib_matches
+ 		  deplib_match=$2
+ 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ 		    newdeplibs="$newdeplibs $i"
+ 		  else
+ 		    droppeddeps=yes
+ 		    $echo
+ 		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+ 		    $echo "*** I have the capability to make that library automatically link in when"
+ 		    $echo "*** you link to this library.  But I can only do this if you have a"
+ 		    $echo "*** shared version of the library, which I believe you do not have"
+ 		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+ 		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ 		  fi
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  else
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+ 		$LTCC -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+ 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		    case " $predeps $postdeps " in
+ 		    *" $i "*)
+ 		      newdeplibs="$newdeplibs $i"
+ 		      i=""
+ 		      ;;
+ 		    esac
+ 		  fi
+ 		  if test -n "$i" ; then
+ 		    libname=`eval \\$echo \"$libname_spec\"`
+ 		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ 		    set dummy $deplib_matches
+ 		    deplib_match=$2
+ 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ 		      newdeplibs="$newdeplibs $i"
+ 		    else
+ 		      droppeddeps=yes
+ 		      $echo
+ 		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+ 		      $echo "*** I have the capability to make that library automatically link in when"
+ 		      $echo "*** you link to this library.  But I can only do this if you have a"
+ 		      $echo "*** shared version of the library, which you do not appear to have"
+ 		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+ 		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ 		    fi
+ 		  fi
+ 		else
+ 		  droppeddeps=yes
+ 		  $echo
+ 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+ 		  $echo "***  make it link in!  You will probably need to install it or some"
+ 		  $echo "*** library that it depends on before this library will be fully"
+ 		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  fi
+ 	  ;;
+ 	file_magic*)
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		case " $predeps $postdeps " in
+ 		*" $a_deplib "*)
+ 		  newdeplibs="$newdeplibs $a_deplib"
+ 		  a_deplib=""
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		libname=`eval \\$echo \"$libname_spec\"`
+ 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ 		  for potent_lib in $potential_libs; do
+ 		      # Follow soft links.
+ 		      if ls -lLd "$potent_lib" 2>/dev/null \
+ 			 | grep " -> " >/dev/null; then
+ 			continue
+ 		      fi
+ 		      # The statement above tries to avoid entering an
+ 		      # endless loop below, in case of cyclic links.
+ 		      # We might still enter an endless loop, since a link
+ 		      # loop can be closed while we follow links,
+ 		      # but so what?
+ 		      potlib="$potent_lib"
+ 		      while test -h "$potlib" 2>/dev/null; do
+ 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ 			case $potliblink in
+ 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | ${SED} 10q \
+ 			 | $EGREP "$file_magic_regex" > /dev/null; then
+ 			newdeplibs="$newdeplibs $a_deplib"
+ 			a_deplib=""
+ 			break 2
+ 		      fi
+ 		  done
+ 		done
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		$echo
+ 		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+ 		$echo "*** I have the capability to make that library automatically link in when"
+ 		$echo "*** you link to this library.  But I can only do this if you have a"
+ 		$echo "*** shared version of the library, which you do not appear to have"
+ 		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+ 		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ 		else
+ 		  $echo "*** with $libname and none of the candidates passed a file format test"
+ 		  $echo "*** using a file magic. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+ 	      newdeplibs="$newdeplibs $a_deplib"
+ 	    fi
+ 	  done # Gone through all deplibs.
+ 	  ;;
+ 	match_pattern*)
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		case " $predeps $postdeps " in
+ 		*" $a_deplib "*)
+ 		  newdeplibs="$newdeplibs $a_deplib"
+ 		  a_deplib=""
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		libname=`eval \\$echo \"$libname_spec\"`
+ 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ 		  for potent_lib in $potential_libs; do
+ 		    potlib="$potent_lib" # see symlink-check above in file_magic test
+ 		    if eval $echo \"$potent_lib\" 2>/dev/null \
+ 		        | ${SED} 10q \
+ 		        | $EGREP "$match_pattern_regex" > /dev/null; then
+ 		      newdeplibs="$newdeplibs $a_deplib"
+ 		      a_deplib=""
+ 		      break 2
+ 		    fi
+ 		  done
+ 		done
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		$echo
+ 		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+ 		$echo "*** I have the capability to make that library automatically link in when"
+ 		$echo "*** you link to this library.  But I can only do this if you have a"
+ 		$echo "*** shared version of the library, which you do not appear to have"
+ 		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+ 		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ 		else
+ 		  $echo "*** with $libname and none of the candidates passed a file format test"
+ 		  $echo "*** using a regex pattern. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+ 	      newdeplibs="$newdeplibs $a_deplib"
+ 	    fi
+ 	  done # Gone through all deplibs.
+ 	  ;;
+ 	none | unknown | *)
+ 	  newdeplibs=""
+ 	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+ 	    -e 's/ -[LR][^ ]*//g'`
+ 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 	    for i in $predeps $postdeps ; do
+ 	      # can't use Xsed below, because $i might contain '/'
+ 	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+ 	    done
+ 	  fi
+ 	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+ 	    | grep . >/dev/null; then
+ 	    $echo
+ 	    if test "X$deplibs_check_method" = "Xnone"; then
+ 	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ 	    else
+ 	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+ 	    fi
+ 	    $echo "*** All declared inter-library dependencies are being dropped."
+ 	    droppeddeps=yes
+ 	  fi
+ 	  ;;
+ 	esac
+ 	versuffix=$versuffix_save
+ 	major=$major_save
+ 	release=$release_save
+ 	libname=$libname_save
+ 	name=$name_save
+ 
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+ 	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+ 	if test "$droppeddeps" = yes; then
+ 	  if test "$module" = yes; then
+ 	    $echo
+ 	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+ 	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+ 	    $echo "*** a static module, that should work as long as the dlopening"
+ 	    $echo "*** application is linked with the -dlopen flag."
+ 	    if test -z "$global_symbol_pipe"; then
+ 	      $echo
+ 	      $echo "*** However, this would only work if libtool was able to extract symbol"
+ 	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ 	      $echo "*** not find such a program.  So, this module is probably useless."
+ 	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	    fi
+ 	    if test "$build_old_libs" = no; then
+ 	      oldlibs="$output_objdir/$libname.$libext"
+ 	      build_libtool_libs=module
+ 	      build_old_libs=yes
+ 	    else
+ 	      build_libtool_libs=no
+ 	    fi
+ 	  else
+ 	    $echo "*** The inter-library dependencies that have been dropped here will be"
+ 	    $echo "*** automatically added whenever a program is linked with this library"
+ 	    $echo "*** or is declared to -dlopen it."
+ 
+ 	    if test "$allow_undefined" = no; then
+ 	      $echo
+ 	      $echo "*** Since this library must not contain undefined symbols,"
+ 	      $echo "*** because either the platform does not support them or"
+ 	      $echo "*** it was explicitly requested with -no-undefined,"
+ 	      $echo "*** libtool will only create a static version of it."
+ 	      if test "$build_old_libs" = no; then
+ 		oldlibs="$output_objdir/$libname.$libext"
+ 		build_libtool_libs=module
+ 		build_old_libs=yes
+ 	      else
+ 		build_libtool_libs=no
+ 	      fi
+ 	    fi
+ 	  fi
+ 	fi
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+ 
+       # All the library-specific variables (install_libdir is set above).
+       library_names=
+       old_library=
+       dlname=
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+ 	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+ 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+ 		if test -z "$hardcode_libdirs"; then
+ 		  hardcode_libdirs="$libdir"
+ 		else
+ 		  # Just accumulate the unique libdirs.
+ 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		    ;;
+ 		  *)
+ 		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		    ;;
+ 		  esac
+ 		fi
+ 	      else
+ 		eval flag=\"$hardcode_libdir_flag_spec\"
+ 		dep_rpath="$dep_rpath $flag"
+ 	      fi
+ 	    elif test -n "$runpath_var"; then
+ 	      case "$perm_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) perm_rpath="$perm_rpath $libdir" ;;
+ 	      esac
+ 	    fi
+ 	  done
+ 	  # Substitute the hardcoded libdirs into the rpath.
+ 	  if test -n "$hardcode_libdir_separator" &&
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ 	    else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+ 	  fi
+ 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ 	    # We should set the runpath_var.
+ 	    rpath=
+ 	    for dir in $perm_rpath; do
+ 	      rpath="$rpath$dir:"
+ 	    done
+ 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ 	  fi
+ 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ 	fi
+ 
+ 	shlibpath="$finalize_shlibpath"
+ 	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ 	if test -n "$shlibpath"; then
+ 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+ 	eval shared_ext=\"$shrext\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+ 	shift; shift
+ 
+ 	if test -n "$soname_spec"; then
+ 	  eval soname=\"$soname_spec\"
+ 	else
+ 	  soname="$realname"
+ 	fi
+ 	if test -z "$dlname"; then
+ 	  dlname=$soname
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+ 	done
+ 
+ 	# Use standard objects if they are pic
+ 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 
+ 	# Prepare the list of exported symbols
+ 	if test -z "$export_symbols"; then
+ 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+ 	    eval cmds=\"$export_symbols_cmds\"
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+ 	        $run eval "$cmd" || exit $?
+ 	        skipped_export=false
+ 	      else
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+ 	    if test -n "$export_symbols_regex"; then
+ 	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+ 	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ 	    fi
+ 	  fi
+ 	fi
+ 
+ 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ 	fi
+ 
+ 	tmp_deplibs=
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+ 		*) 
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+ 	deplibs="$tmp_deplibs" 
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+ 	    save_libobjs=$libobjs
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+ 	    $show "${rm}r $gentop"
+ 	    $run ${rm}r "$gentop"
+ 	    $show "$mkdir $gentop"
+ 	    $run $mkdir "$gentop"
+ 	    status=$?
+ 	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	      exit $status
+ 	    fi
+ 	    generated="$generated $gentop"
+ 
+ 	    for xlib in $convenience; do
+ 	      # Extract the objects.
+ 	      case $xlib in
+ 	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	      *) xabs=`pwd`"/$xlib" ;;
+ 	      esac
+ 	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	      xdir="$gentop/$xlib"
+ 
+ 	      $show "${rm}r $xdir"
+ 	      $run ${rm}r "$xdir"
+ 	      $show "$mkdir $xdir"
+ 	      $run $mkdir "$xdir"
+ 	      status=$?
+ 	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 		exit $status
+ 	      fi
+ 	      # We will extract separately just the conflicting names and we will no
+ 	      # longer touch any unique names. It is faster to leave these extract
+ 	      # automatically by $AR in one run.
+ 	      $show "(cd $xdir && $AR x $xabs)"
+ 	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 		:
+ 	      else
+ 		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 		do
+ 		  i=1
+ 		  while test "$i" -le "$count"
+ 		  do
+ 		   # Put our $i before any first dot (extension)
+ 		   # Never overwrite any file
+ 		   name_to="$name"
+ 		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 		   do
+ 		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 		   done
+ 		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 		   i=`expr $i + 1`
+ 		  done
+ 		done
+ 	      fi
+ 
+ 	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ 	    done
+ 	  fi
+ 	fi
+ 
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+ 	fi
+ 
+ 	# Make a backup of the uninstalled library when relinking
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ 	    eval cmds=\"$module_expsym_cmds\"
+ 	  else
+ 	    eval cmds=\"$module_cmds\"
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ 	  eval cmds=\"$archive_expsym_cmds\"
+ 	else
+ 	  eval cmds=\"$archive_cmds\"
+ 	  fi
+ 	fi
+ 
+ 	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+ 	  # The command line is too long to link in one step, link piecewise.
+ 	  $echo "creating reloadable object files..."
+ 
+ 	  # Save the value of $output and $libobjs because we want to
+ 	  # use them later.  If we have whole_archive_flag_spec, we
+ 	  # want to use save_libobjs as it was before
+ 	  # whole_archive_flag_spec was expanded, because we can't
+ 	  # assume the linker understands whole_archive_flag_spec.
+ 	  # This may have to be revisited, in case too many
+ 	  # convenience libraries get linked in and end up exceeding
+ 	  # the spec.
+ 	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+ 	  test_cmds=
+ 	  concat_cmds=
+ 	  objlist=
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+ 	  output=$output_objdir/$save_output-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+ 	       { len=`expr "X$test_cmds" : ".*"` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+ 	      # The command $test_cmds is almost too long, add a
+ 	      # command to the queue.
+ 	      if test "$k" -eq 1 ; then
+ 		# The first file doesn't have a previous command to add.
+ 		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	      else
+ 		# All subsequent reloadable object files will link in
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+ 	      last_robj=$output_objdir/$save_output-${k}.$objext
+ 	      k=`expr $k + 1`
+ 	      output=$output_objdir/$save_output-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+ 	  done
+ 	  # Handle the remaining objects by creating one last
+ 	  # reloadable object file.  All subsequent reloadable object
+ 	  # files will link in the last one created.
+ 	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ 
+ 	  if ${skipped_export-false}; then
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+ 	    libobjs=$output
+ 	    # Append the command to create the export file.
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+ 	  # Set up a command to remove the reloadale object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+ 	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+ 
+ 	  # Loop through the commands generated above and execute them.
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $concat_cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+ 	  IFS="$save_ifs"
+ 
+ 	  libobjs=$output
+ 	  # Restore the value of output.
+ 	  output=$save_output
+ 
+ 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  fi
+ 	  # Expand the library linking commands again to reset the
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ 	    eval cmds=\"$archive_expsym_cmds\"
+ 	  else
+ 	    eval cmds=\"$archive_cmds\"
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+ 	  eval cmds=\"\$cmds~$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ 	  exit 0
+ 	fi
+ 
+ 	# Create links to the real library.
+ 	for linkname in $linknames; do
+ 	  if test "$realname" != "$linkname"; then
+ 	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+ 	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ 	  fi
+ 	done
+ 
+ 	# If -module or -export-dynamic was specified, set the dlname.
+ 	if test "$module" = yes || test "$export_dynamic" = yes; then
+ 	  # On all known operating systems, these are identical.
+ 	  dlname="$soname"
+ 	fi
+       fi
+       ;;
+ 
+     obj)
+       if test -n "$deplibs"; then
+ 	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$rpath"; then
+ 	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$xrpath"; then
+ 	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+       fi
+ 
+       case $output in
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+ 	  exit 1
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ 	;;
+       *)
+ 	libobj=
+ 	obj="$output"
+ 	;;
+       esac
+ 
+       # Delete the old objects.
+       $run $rm $obj $libobj
+ 
+       # Objects from convenience libraries.  This assumes
+       # single-version convenience libraries.  Whenever we create
+       # different ones for PIC/non-PIC, this we'll have to duplicate
+       # the extraction.
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+       # -Wl from whole_archive_flag_spec
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r "$gentop"
+ 	  $show "$mkdir $gentop"
+ 	  $run $mkdir "$gentop"
+ 	  status=$?
+ 	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	    exit $status
+ 	  fi
+ 	  generated="$generated $gentop"
+ 
+ 	  for xlib in $convenience; do
+ 	    # Extract the objects.
+ 	    case $xlib in
+ 	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	    *) xabs=`pwd`"/$xlib" ;;
+ 	    esac
+ 	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	    xdir="$gentop/$xlib"
+ 
+ 	    $show "${rm}r $xdir"
+ 	    $run ${rm}r "$xdir"
+ 	    $show "$mkdir $xdir"
+ 	    $run $mkdir "$xdir"
+ 	    status=$?
+ 	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	      exit $status
+ 	    fi
+ 	    # We will extract separately just the conflicting names and we will no
+ 	    # longer touch any unique names. It is faster to leave these extract
+ 	    # automatically by $AR in one run.
+ 	    $show "(cd $xdir && $AR x $xabs)"
+ 	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 	      :
+ 	    else
+ 	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 	      do
+ 		i=1
+ 		while test "$i" -le "$count"
+ 		do
+ 		 # Put our $i before any first dot (extension)
+ 		 # Never overwrite any file
+ 		 name_to="$name"
+ 		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 		 do
+ 		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 		 done
+ 		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 		 i=`expr $i + 1`
+ 		done
+ 	      done
+ 	    fi
+ 
+ 	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ 	  done
+ 	fi
+       fi
+ 
+       # Create the old-style object.
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+       eval cmds=\"$reload_cmds\"
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+ 
+       # Exit if we aren't doing a library object file.
+       if test -z "$libobj"; then
+ 	if test -n "$gentop"; then
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+ 	exit 0
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+ 	if test -n "$gentop"; then
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+ 	# Create an invalid libtool object if no PIC, so that we don't
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+ 	exit 0
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+ 	eval cmds=\"$reload_cmds\"
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+ 	IFS="$save_ifs"
+       fi
+ 
+       if test -n "$gentop"; then
+ 	$show "${rm}r $gentop"
+ 	$run ${rm}r $gentop
+       fi
+ 
+       exit 0
+       ;;
+ 
+     prog)
+       case $host in
+ 	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+       esac
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+       fi
+ 
+       if test "$preload" = yes; then
+ 	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+ 	   test "$dlopen_self_static" = unknown; then
+ 	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+ 	fi
+       fi
+ 
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+ 	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+       *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+         ;;
+       esac
+ 
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+       if test -n "$rpath$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+ 	for libdir in $rpath $xrpath; do
+ 	  # This is the magic to use -rpath.
+ 	  case "$finalize_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+       fi
+ 
+       # Now hardcode the library paths
+       rpath=
+       hardcode_libdirs=
+       for libdir in $compile_rpath $finalize_rpath; do
+ 	if test -n "$hardcode_libdir_flag_spec"; then
+ 	  if test -n "$hardcode_libdir_separator"; then
+ 	    if test -z "$hardcode_libdirs"; then
+ 	      hardcode_libdirs="$libdir"
+ 	    else
+ 	      # Just accumulate the unique libdirs.
+ 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		;;
+ 	      *)
+ 		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		;;
+ 	      esac
+ 	    fi
+ 	  else
+ 	    eval flag=\"$hardcode_libdir_flag_spec\"
+ 	    rpath="$rpath $flag"
+ 	  fi
+ 	elif test -n "$runpath_var"; then
+ 	  case "$perm_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) perm_rpath="$perm_rpath $libdir" ;;
+ 	  esac
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
+ 	  ;;
+ 	esac
+       done
+       # Substitute the hardcoded libdirs into the rpath.
+       if test -n "$hardcode_libdir_separator" &&
+ 	 test -n "$hardcode_libdirs"; then
+ 	libdir="$hardcode_libdirs"
+ 	eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       compile_rpath="$rpath"
+ 
+       rpath=
+       hardcode_libdirs=
+       for libdir in $finalize_rpath; do
+ 	if test -n "$hardcode_libdir_flag_spec"; then
+ 	  if test -n "$hardcode_libdir_separator"; then
+ 	    if test -z "$hardcode_libdirs"; then
+ 	      hardcode_libdirs="$libdir"
+ 	    else
+ 	      # Just accumulate the unique libdirs.
+ 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		;;
+ 	      *)
+ 		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		;;
+ 	      esac
+ 	    fi
+ 	  else
+ 	    eval flag=\"$hardcode_libdir_flag_spec\"
+ 	    rpath="$rpath $flag"
+ 	  fi
+ 	elif test -n "$runpath_var"; then
+ 	  case "$finalize_perm_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ 	  esac
+ 	fi
+       done
+       # Substitute the hardcoded libdirs into the rpath.
+       if test -n "$hardcode_libdir_separator" &&
+ 	 test -n "$hardcode_libdirs"; then
+ 	libdir="$hardcode_libdirs"
+ 	eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       finalize_rpath="$rpath"
+ 
+       if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ 	# Transform all the library objects into standard objects.
+ 	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       fi
+ 
+       dlsyms=
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ 	  dlsyms="${outputname}S.c"
+ 	else
+ 	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ 	fi
+       fi
+ 
+       if test -n "$dlsyms"; then
+ 	case $dlsyms in
+ 	"") ;;
+ 	*.c)
+ 	  # Discover the nlist of each of the dlfiles.
+ 	  nlist="$output_objdir/${outputname}.nm"
+ 
+ 	  $show "$rm $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Parse the name list into a source file.
+ 	  $show "creating $output_objdir/$dlsyms"
+ 
+ 	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+ /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+ 
+ #ifdef __cplusplus
+ extern \"C\" {
+ #endif
+ 
+ /* Prevent the only kind of declaration conflicts we can make. */
+ #define lt_preloaded_symbols some_other_symbol
+ 
+ /* External symbol declarations for the compiler. */\
+ "
+ 
+ 	  if test "$dlself" = yes; then
+ 	    $show "generating symbol list for \`$output'"
+ 
+ 	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+ 
+ 	    # Add our own program objects to the symbol list.
+ 	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 	    for arg in $progfiles; do
+ 	      $show "extracting global C symbols from \`$arg'"
+ 	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	    done
+ 
+ 	    if test -n "$exclude_expsyms"; then
+ 	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+ 	    if test -n "$export_symbols_regex"; then
+ 	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+ 	      export_symbols="$output_objdir/$output.exp"
+ 	      $run $rm $export_symbols
+ 	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+ 	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+ 	  fi
+ 
+ 	  for arg in $dlprefiles; do
+ 	    $show "extracting global C symbols from \`$arg'"
+ 	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+ 	    $run eval '$echo ": $name " >> "$nlist"'
+ 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	  done
+ 
+ 	  if test -z "$run"; then
+ 	    # Make sure we have at least an empty file.
+ 	    test -f "$nlist" || : > "$nlist"
+ 
+ 	    if test -n "$exclude_expsyms"; then
+ 	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ 	      $mv "$nlist"T "$nlist"
+ 	    fi
+ 
+ 	    # Try sorting and uniquifying the output.
+ 	    if grep -v "^: " < "$nlist" |
+ 		if sort -k 3 </dev/null >/dev/null 2>&1; then
+ 		  sort -k 3
+ 		else
+ 		  sort +2
+ 		fi |
+ 		uniq > "$nlist"S; then
+ 	      :
+ 	    else
+ 	      grep -v "^: " < "$nlist" > "$nlist"S
+ 	    fi
+ 
+ 	    if test -f "$nlist"S; then
+ 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ 	    else
+ 	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ 	    fi
+ 
+ 	    $echo >> "$output_objdir/$dlsyms" "\
+ 
+ #undef lt_preloaded_symbols
+ 
+ #if defined (__STDC__) && __STDC__
+ # define lt_ptr void *
+ #else
+ # define lt_ptr char *
+ # define const
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
+ const struct {
+   const char *name;
+   lt_ptr address;
+ }
+ lt_preloaded_symbols[] =
+ {\
+ "
+ 
+ 	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+ 
+ 	    $echo >> "$output_objdir/$dlsyms" "\
+   {0, (lt_ptr) 0}
+ };
+ 
+ /* This works around a problem in FreeBSD linker */
+ #ifdef FREEBSD_WORKAROUND
+ static const void *lt_preloaded_setup() {
+   return lt_preloaded_symbols;
+ }
+ #endif
+ 
+ #ifdef __cplusplus
+ }
+ #endif\
+ "
+ 	  fi
+ 
+ 	  pic_flag_for_symtable=
+ 	  case $host in
+ 	  # compiling the symbol table file with pic_flag works around
+ 	  # a FreeBSD bug that causes programs to crash when -lm is
+ 	  # linked before any other PIC object.  But we must not use
+ 	  # pic_flag when linking with -static.  The problem exists in
+ 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ 	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ 	    esac;;
+ 	  *-*-hpux*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag";;
+ 	    esac
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+ 	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ 	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+ 	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ 	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+       else
+ 	# We keep going just in case the user didn't refer to
+ 	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+ 
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+ 	status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+ 	  $show "$rm $output_objdir/${outputname}S.${objext}"
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+ 	exit $status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+ 	# We should set the shlibpath_var
+ 	rpath=
+ 	for dir in $temp_rpath; do
+ 	  case $dir in
+ 	  [\\/]* | [A-Za-z]:[\\/]*)
+ 	    # Absolute path.
+ 	    rpath="$rpath$dir:"
+ 	    ;;
+ 	  *)
+ 	    # Relative path: add a thisdir entry.
+ 	    rpath="$rpath\$thisdir/$dir:"
+ 	    ;;
+ 	  esac
+ 	done
+ 	temp_rpath="$rpath"
+       fi
+ 
+       if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+       fi
+       if test -n "$finalize_shlibpath"; then
+ 	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+       fi
+ 
+       compile_var=
+       finalize_var=
+       if test -n "$runpath_var"; then
+ 	if test -n "$perm_rpath"; then
+ 	  # We should set the runpath_var.
+ 	  rpath=
+ 	  for dir in $perm_rpath; do
+ 	    rpath="$rpath$dir:"
+ 	  done
+ 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
+ 	if test -n "$finalize_perm_rpath"; then
+ 	  # We should set the runpath_var.
+ 	  rpath=
+ 	  for dir in $finalize_perm_rpath; do
+ 	    rpath="$rpath$dir:"
+ 	  done
+ 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
+       fi
+ 
+       if test "$no_install" = yes; then
+ 	# We don't need to create a wrapper script.
+ 	link_command="$compile_var$compile_command$compile_rpath"
+ 	# Replace the output file specification.
+ 	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	# Delete the old output file.
+ 	$run $rm $output
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+ 	exit 0
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+ 	# Fast installation is not supported
+ 	link_command="$compile_var$compile_command$compile_rpath"
+ 	relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 
+ 	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+ 	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+       else
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+ 	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+ 	  fi
+ 	else
+ 	  link_command="$compile_var$compile_command$compile_rpath"
+ 	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 	fi
+       fi
+ 
+       # Replace the output file specification.
+       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ 
+       # Delete the old output files.
+       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 
+       $show "$link_command"
+       $run eval "$link_command" || exit $?
+ 
+       # Now create the wrapper script.
+       $show "creating $output"
+ 
+       # Quote the relink command for shipping.
+       if test -n "$relink_command"; then
+ 	# Preserve any variables that may affect compiler behavior
+ 	for var in $variables_saved_for_relink; do
+ 	  if eval test -z \"\${$var+set}\"; then
+ 	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ 	  elif eval var_value=\$$var; test -z "$var_value"; then
+ 	    relink_command="$var=; export $var; $relink_command"
+ 	  else
+ 	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	  fi
+ 	done
+ 	relink_command="(cd `pwd`; $relink_command)"
+ 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+       # Quote $echo for shipping.
+       if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+ 	case $0 in
+ 	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+ 	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+ 	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+       # Only actually do things if our run command is non-null.
+       if test -z "$run"; then
+ 	# win32 will think the script is a binary if it has
+ 	# a .exe suffix, so we strip it off here.
+ 	case $output in
+ 	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ 	esac
+ 	# test for cygwin because mv fails w/o .exe extensions
+ 	case $host in
+ 	  *cygwin*)
+ 	    exeext=.exe
+ 	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+ 	  *cygwin* | *mingw* )
+ 	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ 	    cwrapper=`$echo ${output}.exe`
+ 	    $rm $cwrappersource $cwrapper
+ 	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+ /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+    Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+    
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+    Currently, it simply execs the wrapper *script* "/bin/sh $output",
+    but could eventually absorb all of the scripts functionality and
+    exec $objdir/$outputname directly.
+ */
+ EOF
+ 	    cat >> $cwrappersource<<"EOF"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+ #elif defined(MAXPATHLEN)
+ # define LT_PATHMAX MAXPATHLEN
+ #else
+ # define LT_PATHMAX 1024
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+ #define DIR_SEPARATOR '/'
+ #endif
+ 
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+ #ifndef DIR_SEPARATOR_2 
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+ 
+ #ifndef DIR_SEPARATOR_2
+ # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+ #else /* DIR_SEPARATOR_2 */
+ # define IS_DIR_SEPARATOR(ch) \
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+ char * basename (const char *name);
+ char * fnqualify(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+ int
+ main (int argc, char *argv[])
+ {
+   char **newargz;
+   int i;
+   
+   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+ 
+ 	    cat >> $cwrappersource <<EOF
+   newargz[0] = "$SHELL";
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
+   newargz[1] = fnqualify(argv[0]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+   strendzap(newargz[1],".exe"); 
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
+ EOF
+ 
+ 	    cat >> $cwrappersource <<EOF
+   execv("$SHELL",newargz);
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
+ }
+ 
+ void *
+ xmalloc (size_t num)
+ {
+   void * p = (void *) malloc (num);
+   if (!p)
+     lt_fatal ("Memory exhausted");
+ 
+   return p;
+ }
+ 
+ char * 
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+ 
+ char *
+ basename (const char *name)
+ {
+   const char *base;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+   if (isalpha (name[0]) && name[1] == ':') 
+     name += 2;
+ #endif
+ 
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+   return (char *) base;
+ }
+ 
+ char * 
+ fnqualify(const char *path)
+ {
+   size_t size;
+   char *p;
+   char tmp[LT_PATHMAX + 1];
+ 
+   assert(path != NULL);
+ 
+   /* Is it qualified already? */
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   if (isalpha (path[0]) && path[1] == ':')
+     return xstrdup (path);
+ #endif
+   if (IS_DIR_SEPARATOR (path[0]))
+     return xstrdup (path);
+ 
+   /* prepend the current directory */
+   /* doesn't handle '~' */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+     lt_fatal ("getcwd failed");
+   size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+   p = XMALLOC(char, size);
+   sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+   return p;
+ }
+ 
+ char *
+ strendzap(char *str, const char *pat) 
+ {
+   size_t len, patlen;
+ 
+   assert(str != NULL);
+   assert(pat != NULL);
+ 
+   len = strlen(str);
+   patlen = strlen(pat);
+ 
+   if (patlen <= len)
+   {
+     str += len - patlen;
+     if (strcmp(str, pat) == 0)
+       *str = '\0';
+   }
+   return str;
+ }
+ 
+ static void
+ lt_error_core (int exit_status, const char * mode, 
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+   vfprintf (stderr, message, ap);
+   fprintf (stderr, ".\n");
+ 
+   if (exit_status >= 0)
+     exit (exit_status);
+ }
+ 
+ void
+ lt_fatal (const char *message, ...)
+ {
+   va_list ap;
+   va_start (ap, message);
+   lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+   va_end (ap);
+ }
+ EOF
+ 	  # we should really use a build-platform specific compiler
+ 	  # here, but OTOH, the wrappers (shell script and this C one)
+ 	  # are only useful if you want to execute the "real" binary.
+ 	  # Since the "real" binary is built for $host, then this
+ 	  # wrapper might as well be built for $host, too.
+ 	  $run $LTCC -s -o $cwrapper $cwrappersource
+ 	  ;;
+ 	esac
+ 	$rm $output
+ 	trap "$rm $output; exit 1" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+ 
+ # $output - temporary wrapper script for $objdir/$outputname
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # The $output program cannot be directly executed until all the libtool
+ # libraries that it depends on are installed.
+ #
+ # This wrapper script should never be moved out of the build directory.
+ # If it is, it will not operate correctly.
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+ 
+ relink_command=\"$relink_command\"
+ 
+ # This environment variable determines our operation mode.
+ if test \"\$libtool_install_magic\" = \"$magic\"; then
+   # install mode needs the following variable:
+   notinst_deplibs='$notinst_deplibs'
+ else
+   # When we are sourced in execute mode, \$file and \$echo are already set.
+   if test \"\$libtool_execute_magic\" != \"$magic\"; then
+     echo=\"$qecho\"
+     file=\"\$0\"
+     # Make sure echo works.
+     if test \"X\$1\" = X--no-reexec; then
+       # Discard the --no-reexec flag, and continue.
+       shift
+     elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+       # Yippee, \$echo works!
+       :
+     else
+       # Restart under the correct shell, and then maybe \$echo will work.
+       exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+     fi
+   fi\
+ "
+ 	$echo >> $output "\
+ 
+   # Find the directory that this script lives in.
+   thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+   # Follow symbolic links until we get to the real thisdir.
+   file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+   while test -n \"\$file\"; do
+     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+     # If there was a directory component, then change thisdir.
+     if test \"x\$destdir\" != \"x\$file\"; then
+       case \"\$destdir\" in
+       [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+       *) thisdir=\"\$thisdir/\$destdir\" ;;
+       esac
+     fi
+ 
+     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+   done
+ 
+   # Try to get the absolute directory name.
+   absdir=\`cd \"\$thisdir\" && pwd\`
+   test -n \"\$absdir\" && thisdir=\"\$absdir\"
+ "
+ 
+ 	if test "$fast_install" = yes; then
+ 	  $echo >> $output "\
+   program=lt-'$outputname'$exeext
+   progdir=\"\$thisdir/$objdir\"
+ 
+   if test ! -f \"\$progdir/\$program\" || \\
+      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+     file=\"\$\$-\$program\"
+ 
+     if test ! -d \"\$progdir\"; then
+       $mkdir \"\$progdir\"
+     else
+       $rm \"\$progdir/\$file\"
+     fi"
+ 
+ 	  $echo >> $output "\
+ 
+     # relink executable if necessary
+     if test -n \"\$relink_command\"; then
+       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+ 	exit 1
+       fi
+     fi
+ 
+     $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+     { $rm \"\$progdir/\$program\";
+       $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+     $rm \"\$progdir/\$file\"
+   fi"
+ 	else
+ 	  $echo >> $output "\
+   program='$outputname'
+   progdir=\"\$thisdir/$objdir\"
+ "
+ 	fi
+ 
+ 	$echo >> $output "\
+ 
+   if test -f \"\$progdir/\$program\"; then"
+ 
+ 	# Export our shlibpath_var if we have one.
+ 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ 	  $echo >> $output "\
+     # Add our own library path to $shlibpath_var
+     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ 
+     # Some systems cannot cope with colon-terminated $shlibpath_var
+     # The second colon is a workaround for a bug in BeOS R4 sed
+     $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ 
+     export $shlibpath_var
+ "
+ 	fi
+ 
+ 	# fixup the dll searchpath if we need to.
+ 	if test -n "$dllsearchpath"; then
+ 	  $echo >> $output "\
+     # Add the dll search path components to the executable PATH
+     PATH=$dllsearchpath:\$PATH
+ "
+ 	fi
+ 
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+       exec \$progdir\\\\\$program \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+ 	  $echo >> $output "\
+       exec \$progdir/\$program \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+       exit 1
+     fi
+   else
+     # The program doesn't exist.
+     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+     exit 1
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+       exit 0
+       ;;
+     esac
+ 
+     # See if we need to build an old-fashioned archive.
+     for oldlib in $oldlibs; do
+ 
+       if test "$build_libtool_libs" = convenience; then
+ 	oldobjs="$libobjs_save"
+ 	addlibs="$convenience"
+ 	build_libtool_libs=no
+       else
+ 	if test "$build_libtool_libs" = module; then
+ 	  oldobjs="$libobjs_save"
+ 	  build_libtool_libs=no
+ 	else
+ 	  oldobjs="$old_deplibs $non_pic_objects"
+ 	fi
+ 	addlibs="$old_convenience"
+       fi
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+ 	$show "${rm}r $gentop"
+ 	$run ${rm}r "$gentop"
+ 	$show "$mkdir $gentop"
+ 	$run $mkdir "$gentop"
+ 	status=$?
+ 	if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	  exit $status
+ 	fi
+ 	generated="$generated $gentop"
+ 
+ 	# Add in members from convenience archives.
+ 	for xlib in $addlibs; do
+ 	  # Extract the objects.
+ 	  case $xlib in
+ 	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	  *) xabs=`pwd`"/$xlib" ;;
+ 	  esac
+ 	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	  xdir="$gentop/$xlib"
+ 
+ 	  $show "${rm}r $xdir"
+ 	  $run ${rm}r "$xdir"
+ 	  $show "$mkdir $xdir"
+ 	  $run $mkdir "$xdir"
+ 	  status=$?
+ 	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	    exit $status
+ 	  fi
+ 	  # We will extract separately just the conflicting names and we will no
+ 	  # longer touch any unique names. It is faster to leave these extract
+ 	  # automatically by $AR in one run.
+ 	  $show "(cd $xdir && $AR x $xabs)"
+ 	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 	    :
+ 	  else
+ 	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 	    do
+ 	      i=1
+ 	      while test "$i" -le "$count"
+ 	      do
+ 	       # Put our $i before any first dot (extension)
+ 	       # Never overwrite any file
+ 	       name_to="$name"
+ 	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 	       do
+ 		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 	       done
+ 	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 	       i=`expr $i + 1`
+ 	      done
+ 	    done
+ 	  fi
+ 
+ 	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ 	done
+       fi
+ 
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ 	eval cmds=\"$old_archive_from_new_cmds\"
+       else
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+ 	  save_RANLIB=$RANLIB
+ 	  RANLIB=:
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+ 	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+ 	  # encoded into archives.  This makes 'ar r' malfunction in
+ 	  # this piecewise linking case whenever conflicting object
+ 	  # names appear in distinct ar calls; check, warn and compensate.
+ 	    if (for obj in $save_oldobjs
+ 	    do
+ 	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+ 	    done | sort | sort -uc >/dev/null 2>&1); then
+ 	    :
+ 	  else
+ 	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+ 	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+ 	    AR_FLAGS=cq
+ 	  fi
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+ 	  done  
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+ 	    if len=`expr "X$test_cmds" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+ 	      # the above command should be used before it gets too long
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+ 	      fi  
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+ 	    fi
+ 	  done
+ 	  RANLIB=$save_RANLIB
+ 	  oldobjs=$objlist
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+ 	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+     done
+ 
+     if test -n "$generated"; then
+       $show "${rm}r$generated"
+       $run ${rm}r$generated
+     fi
+ 
+     # Now create the libtool archive.
+     case $output in
+     *.la)
+       old_library=
+       test "$build_old_libs" = yes && old_library="$libname.$libext"
+       $show "creating $output"
+ 
+       # Preserve any variables that may affect compiler behavior
+       for var in $variables_saved_for_relink; do
+ 	if eval test -z \"\${$var+set}\"; then
+ 	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ 	elif eval var_value=\$$var; test -z "$var_value"; then
+ 	  relink_command="$var=; export $var; $relink_command"
+ 	else
+ 	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ 	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	fi
+       done
+       # Quote the link command for shipping.
+       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+ 	  if test "$installed" = yes; then
+ 	    if test -z "$install_libdir"; then
+ 	      break
+ 	    fi
+ 	    output="$output_objdir/$outputname"i
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+ 	      *.la)
+ 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+ 	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+ 	    newdlfiles=
+ 	    for lib in $dlfiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+ 	    dlfiles="$newdlfiles"
+ 	    newdlprefiles=
+ 	    for lib in $dlprefiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+ 	  tdlname=$dlname
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+ 
+ # The name that we can dlopen(3).
+ dlname='$tdlname'
+ 
+ # Names of this library.
+ library_names='$library_names'
+ 
+ # The name of the static archive.
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+ dependency_libs='$dependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
+ age=$age
+ revision=$revision
+ 
+ # Is this an already installed library?
+ installed=$installed
+ 
+ # Should we warn about portability when linking against -modules?
+ shouldnotlink=$module
+ 
+ # Files to dlopen/dlpreopen
+ dlopen='$dlfiles'
+ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+ 	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+ 	done
+       fi
+ 
+       # Do a symbolic link so that the libtool archive can be found in
+       # LD_LIBRARY_PATH before the program is installed.
+       $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+     exit 0
+     ;;
+ 
+   # libtool install mode
+   install)
+     modename="$modename: install"
+ 
+     # There may be an optional sh(1) argument at the beginning of
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+        $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+ 	arg="\"$arg\""
+ 	;;
+       esac
+       install_prog="$arg "
+       arg="$1"
+       shift
+     else
+       install_prog=
+       arg="$nonopt"
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+       arg="\"$arg\""
+       ;;
+     esac
+     install_prog="$install_prog$arg"
+ 
+     # We need to accept at least all the BSD install flags.
+     dest=
+     files=
+     opts=
+     prev=
+     install_type=
+     isdir=no
+     stripme=
+     for arg
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+ 	dest="$arg"
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+       -f) prev="-f" ;;
+       -g) prev="-g" ;;
+       -m) prev="-m" ;;
+       -o) prev="-o" ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+       -*) ;;
+ 
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+ 	  dest="$arg"
+ 	  continue
+ 	fi
+ 	;;
+       esac
+ 
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+ 	arg="\"$arg\""
+ 	;;
+       esac
+       install_prog="$install_prog $arg"
+     done
+ 
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     if test -z "$files"; then
+       if test -z "$dest"; then
+ 	$echo "$modename: no file or destination specified" 1>&2
+       else
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Strip any trailing slash from the destination.
+     dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+ 
+     # Check to see that the destination is a directory.
+     test -d "$dest" && isdir=yes
+     if test "$isdir" = yes; then
+       destdir="$dest"
+       destname=
+     else
+       destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+       test "X$destdir" = "X$dest" && destdir=.
+       destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+       fi
+     fi
+     case $destdir in
+     [\\/]* | [A-Za-z]:[\\/]*) ;;
+     *)
+       for file in $files; do
+ 	case $file in
+ 	*.lo) ;;
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+       done
+       ;;
+     esac
+ 
+     # This variable tells wrapper scripts just to set variables rather
+     # than running their programs.
+     libtool_install_magic="$magic"
+ 
+     staticlibs=
+     future_libdirs=
+     current_libdirs=
+     for file in $files; do
+ 
+       # Do each installation.
+       case $file in
+       *.$libext)
+ 	# Do the static libraries later.
+ 	staticlibs="$staticlibs $file"
+ 	;;
+ 
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	library_names=
+ 	old_library=
+ 	relink_command=
+ 	# If there is no directory component, then add one.
+ 	case $file in
+ 	*/* | *\\*) . $file ;;
+ 	*) . ./$file ;;
+ 	esac
+ 
+ 	# Add the libdir to current_libdirs if it is the destination.
+ 	if test "X$destdir" = "X$libdir"; then
+ 	  case "$current_libdirs " in
+ 	  *" $libdir "*) ;;
+ 	  *) current_libdirs="$current_libdirs $libdir" ;;
+ 	  esac
+ 	else
+ 	  # Note the libdir as a future libdir.
+ 	  case "$future_libdirs " in
+ 	  *" $libdir "*) ;;
+ 	  *) future_libdirs="$future_libdirs $libdir" ;;
+ 	  esac
+ 	fi
+ 
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+ 	test "X$dir" = "X$file/" && dir=
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
+ 	  # Determine the prefix the user has applied to our future dir.
+ 	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+ 	  # are installed to the same prefix.
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+ 	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ 	  else
+ 	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ 	    exit 1
+ 	  fi
+ 	fi
+ 
+ 	# See the names of the shared library.
+ 	set dummy $library_names
+ 	if test -n "$2"; then
+ 	  realname="$2"
+ 	  shift
+ 	  shift
+ 
+ 	  srcname="$realname"
+ 	  test -n "$relink_command" && srcname="$realname"T
+ 
+ 	  # Install the shared library and build the symlinks.
+ 	  $show "$install_prog $dir/$srcname $destdir/$realname"
+ 	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ 	  if test -n "$stripme" && test -n "$striplib"; then
+ 	    $show "$striplib $destdir/$realname"
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+ 		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ 		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+ 	  eval cmds=\"$postinstall_cmds\"
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ 	;;
+ 
+       *.lo)
+ 	# Install (i.e. copy) a libtool object.
+ 
+ 	# Figure out destination file name, if it wasn't already specified.
+ 	if test -n "$destname"; then
+ 	  destfile="$destdir/$destname"
+ 	else
+ 	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	  destfile="$destdir/$destfile"
+ 	fi
+ 
+ 	# Deduce the name of the destination old-style object file.
+ 	case $destfile in
+ 	*.lo)
+ 	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+ 	  ;;
+ 	*.$objext)
+ 	  staticdest="$destfile"
+ 	  destfile=
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	# Install the libtool object if requested.
+ 	if test -n "$destfile"; then
+ 	  $show "$install_prog $file $destfile"
+ 	  $run eval "$install_prog $file $destfile" || exit $?
+ 	fi
+ 
+ 	# Install the old object if enabled.
+ 	if test "$build_old_libs" = yes; then
+ 	  # Deduce the name of the old-style object file.
+ 	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+ 
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+ 	exit 0
+ 	;;
+ 
+       *)
+ 	# Figure out destination file name, if it wasn't already specified.
+ 	if test -n "$destname"; then
+ 	  destfile="$destdir/$destname"
+ 	else
+ 	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	  destfile="$destdir/$destfile"
+ 	fi
+ 
+ 	# If the file is missing, and there is a .exe on the end, strip it
+ 	# because it is most likely a libtool script we actually want to
+ 	# install
+ 	stripped_ext=""
+ 	case $file in
+ 	  *.exe)
+ 	    if test ! -f "$file"; then
+ 	      file=`$echo $file|${SED} 's,.exe$,,'`
+ 	      stripped_ext=".exe"
+ 	    fi
+ 	    ;;
+ 	esac
+ 
+ 	# Do a test to see if this is really a libtool program.
+ 	case $host in
+ 	*cygwin*|*mingw*)
+ 	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	*)
+ 	    wrapper=$file
+ 	    ;;
+ 	esac
+ 	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+ 	  # To insure that "foo" is sourced, and not "foo.exe",
+ 	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ 	  # which disallows the automatic-append-.exe behavior.
+ 	  case $build in
+ 	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ 	  *) wrapperdot=${wrapper} ;;
+ 	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . ${wrapperdot} ;;
+ 	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  finalize=yes
+ 	  for lib in $notinst_deplibs; do
+ 	    # Check to see that each library is installed.
+ 	    libdir=
+ 	    if test -f "$lib"; then
+ 	      # If there is no directory component, then add one.
+ 	      case $lib in
+ 	      */* | *\\*) . $lib ;;
+ 	      *) . ./$lib ;;
+ 	      esac
+ 	    fi
+ 	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ 	    if test -n "$libdir" && test ! -f "$libfile"; then
+ 	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ 	      finalize=no
+ 	    fi
+ 	  done
+ 
+ 	  relink_command=
+ 	  # To insure that "foo" is sourced, and not "foo.exe",
+ 	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ 	  # which disallows the automatic-append-.exe behavior.
+ 	  case $build in
+ 	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ 	  *) wrapperdot=${wrapper} ;;
+ 	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . ${wrapperdot} ;;
+ 	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  outputname=
+ 	  if test "$fast_install" = no && test -n "$relink_command"; then
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+ 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+ 	      else
+ 		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ 		${rm}r "$tmpdir"
+ 		continue
+ 	      fi
+ 	      file="$outputname"
+ 	    else
+ 	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+ 	    fi
+ 	  else
+ 	    # Install the binary that we compiled earlier.
+ 	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ 	  fi
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+ 	# one anyways
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+ 	  *.exe:*.exe)
+ 	    # this is ok
+ 	    ;;
+ 	  *.exe:*)
+ 	    destfile=$destfile.exe
+ 	    ;;
+ 	  *:*.exe)
+ 	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	esac
+ 	$show "$install_prog$stripme $file $destfile"
+ 	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+ 	test -n "$outputname" && ${rm}r "$tmpdir"
+ 	;;
+       esac
+     done
+ 
+     for file in $staticlibs; do
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 
+       # Set up the ranlib parameters.
+       oldlib="$destdir/$name"
+ 
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+       if test -n "$stripme" && test -n "$striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+       eval cmds=\"$old_postinstall_cmds\"
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+     done
+ 
+     if test -n "$future_libdirs"; then
+       $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+     fi
+ 
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+       exec_cmd='$SHELL $0 --finish$current_libdirs'
+     else
+       exit 0
+     fi
+     ;;
+ 
+   # libtool finish mode
+   finish)
+     modename="$modename: finish"
+     libdirs="$nonopt"
+     admincmds=
+ 
+     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+       for dir
+       do
+ 	libdirs="$libdirs $dir"
+       done
+ 
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+ 	  eval cmds=\"$finish_cmds\"
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+ 	if test -n "$finish_eval"; then
+ 	  # Do the single finish_eval.
+ 	  eval cmds=\"$finish_eval\"
+ 	  $run eval "$cmds" || admincmds="$admincmds
+        $cmds"
+ 	fi
+       done
+     fi
+ 
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+     $echo "----------------------------------------------------------------------"
+     $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+     done
+     $echo
+     $echo "If you ever happen to want to link against installed libraries"
+     $echo "in a given directory, LIBDIR, you must either use libtool, and"
+     $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+     $echo "flag during linking and do at least one of the following:"
+     if test -n "$shlibpath_var"; then
+       $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+       $echo "     during execution"
+     fi
+     if test -n "$runpath_var"; then
+       $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+       $echo "     during linking"
+     fi
+     if test -n "$hardcode_libdir_flag_spec"; then
+       libdir=LIBDIR
+       eval flag=\"$hardcode_libdir_flag_spec\"
+ 
+       $echo "   - use the \`$flag' linker flag"
+     fi
+     if test -n "$admincmds"; then
+       $echo "   - have your system administrator run these commands:$admincmds"
+     fi
+     if test -f /etc/ld.so.conf; then
+       $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+     fi
+     $echo
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+     $echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
+   # libtool execute mode
+   execute)
+     modename="$modename: execute"
+ 
+     # The first argument is the command name.
+     cmd="$nonopt"
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+       exit 1
+     fi
+ 
+     # Handle -dlopen flags immediately.
+     for file in $execute_dlfiles; do
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+       fi
+ 
+       dir=
+       case $file in
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Read the libtool library.
+ 	dlname=
+ 	library_names=
+ 
+ 	# If there is no directory component, then add one.
+ 	case $file in
+ 	*/* | *\\*) . $file ;;
+ 	*) . ./$file ;;
+ 	esac
+ 
+ 	# Skip this library if it cannot be dlopened.
+ 	if test -z "$dlname"; then
+ 	  # Warn if it was a shared library.
+ 	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+ 	  continue
+ 	fi
+ 
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$dir" = "X$file" && dir=.
+ 
+ 	if test -f "$dir/$objdir/$dlname"; then
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ 	  exit 1
+ 	fi
+ 	;;
+ 
+       *.lo)
+ 	# Just add the directory containing the .lo file.
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$dir" = "X$file" && dir=.
+ 	;;
+ 
+       *)
+ 	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+ 	continue
+ 	;;
+       esac
+ 
+       # Get the absolute pathname.
+       absdir=`cd "$dir" && pwd`
+       test -n "$absdir" && dir="$absdir"
+ 
+       # Now add the directory to shlibpath_var.
+       if eval "test -z \"\$$shlibpath_var\""; then
+ 	eval "$shlibpath_var=\"\$dir\""
+       else
+ 	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+       fi
+     done
+ 
+     # This variable tells wrapper scripts just to set shlibpath_var
+     # rather than running their programs.
+     libtool_execute_magic="$magic"
+ 
+     # Check if any of the arguments is a wrapper script.
+     args=
+     for file
+     do
+       case $file in
+       -*) ;;
+       *)
+ 	# Do a test to see if this is really a libtool program.
+ 	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . $file ;;
+ 	  *) . ./$file ;;
+ 	  esac
+ 
+ 	  # Transform arg to wrapped name.
+ 	  file="$progdir/$program"
+ 	fi
+ 	;;
+       esac
+       # Quote arguments (to preserve shell metacharacters).
+       file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+       args="$args \"$file\""
+     done
+ 
+     if test -z "$run"; then
+       if test -n "$shlibpath_var"; then
+ 	# Export the shlibpath_var.
+ 	eval "export $shlibpath_var"
+       fi
+ 
+       # Restore saved environment variables
+       if test "${save_LC_ALL+set}" = set; then
+ 	LC_ALL="$save_LC_ALL"; export LC_ALL
+       fi
+       if test "${save_LANG+set}" = set; then
+ 	LANG="$save_LANG"; export LANG
+       fi
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+     else
+       # Display what would be done.
+       if test -n "$shlibpath_var"; then
+ 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+       exit 0
+     fi
+     ;;
+ 
+   # libtool clean and uninstall mode
+   clean | uninstall)
+     modename="$modename: $mode"
+     rm="$nonopt"
+     files=
+     rmforce=
+     exit_status=0
+ 
+     # This variable tells wrapper scripts just to set variables rather
+     # than running their programs.
+     libtool_install_magic="$magic"
+ 
+     for arg
+     do
+       case $arg in
+       -f) rm="$rm $arg"; rmforce=yes ;;
+       -*) rm="$rm $arg" ;;
+       *) files="$files $arg" ;;
+       esac
+     done
+ 
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     rmdirs=
+ 
+     origobjdir="$objdir"
+     for file in $files; do
+       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+       if test "X$dir" = "X$file"; then
+ 	dir=.
+ 	objdir="$origobjdir"
+       else
+ 	objdir="$dir/$origobjdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+       test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+       if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+ 	esac
+       fi
+ 
+       # Don't error if the file doesn't exist and rm -f was used.
+       if (test -L "$file") >/dev/null 2>&1 \
+ 	|| (test -h "$file") >/dev/null 2>&1 \
+ 	|| test -f "$file"; then
+ 	:
+       elif test -d "$file"; then
+ 	exit_status=1
+ 	continue
+       elif test "$rmforce" = yes; then
+ 	continue
+       fi
+ 
+       rmfiles="$file"
+ 
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  . $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+ 	  for n in $library_names; do
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ 	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+ 	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+ 	      eval cmds=\"$postuninstall_cmds\"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+ 	      eval cmds=\"$old_postuninstall_cmds\"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *.lo)
+ 	# Possibly a libtool object, so verify it.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 
+ 	  # Read the .lo file
+ 	  . $dir/$name
+ 
+ 	  # Add PIC object to the list of files to remove.
+ 	  if test -n "$pic_object" \
+ 	     && test "$pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$pic_object"
+ 	  fi
+ 
+ 	  # Add non-PIC object to the list of files to remove.
+ 	  if test -n "$non_pic_object" \
+ 	     && test "$non_pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$non_pic_object"
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *)
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+ 	  *.exe) 
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+ 	    # add $file without .exe
+ 	    rmfiles="$rmfiles $file"
+ 	    ;;
+ 	  esac
+ 	  # Do a test to see if this is a libtool program.
+ 	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	    relink_command=
+ 	    . $dir/$noexename
+ 
+ 	    # note $name still contains .exe if it was in $file originally
+ 	    # as does the version of $file that was added into $rmfiles
+ 	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ 	    if test "$fast_install" = yes && test -n "$relink_command"; then
+ 	      rmfiles="$rmfiles $objdir/lt-$name"
+ 	    fi
+ 	    if test "X$noexename" != "X$name" ; then
+ 	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ 	    fi
+ 	  fi
+ 	fi
+ 	;;
+       esac
+       $show "$rm $rmfiles"
+       $run $rm $rmfiles || exit_status=1
+     done
+     objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+       if test -d "$dir"; then
+ 	$show "rmdir $dir"
+ 	$run rmdir $dir >/dev/null 2>&1
+       fi
+     done
+ 
+     exit $exit_status
+     ;;
+ 
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+     exit 1
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+     exit 1
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+   exit 1
+ fi
+ 
+ # We need to display help for each of the modes.
+ case $mode in
+ "") $echo \
+ "Usage: $modename [OPTION]... [MODE-ARG]...
+ 
+ Provide generalized library-building support services.
+ 
+     --config          show all configuration variables
+     --debug           enable verbose shell tracing
+ -n, --dry-run         display commands without modifying any files
+     --features        display basic configuration information and exit
+     --finish          same as \`--mode=finish'
+     --help            display this help message and exit
+     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+     --quiet           same as \`--silent'
+     --silent          don't print informational messages
+     --tag=TAG         use configuration variables from tag TAG
+     --version         print version information
+ 
+ MODE must be one of the following:
+ 
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+ 
+ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool at gnu.org>."
+   exit 0
+   ;;
+ 
+ clean)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+ 
+ Remove files from the build directory.
+ 
+ RM is the name of the program to use to delete files associated with each FILE
+ (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+ 
+ If FILE is a libtool library, object or program, all the files associated
+ with it are deleted. Otherwise, only FILE itself is deleted using RM."
+   ;;
+ 
+ compile)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+ 
+ Compile a source file into a libtool library object.
+ 
+ This mode accepts the following additional options:
+ 
+   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+   -prefer-pic       try to building PIC objects only
+   -prefer-non-pic   try to building non-PIC objects only
+   -static           always build a \`.o' file suitable for static linking
+ 
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+ 
+ The output file name is determined by removing the directory component from
+ SOURCEFILE, then substituting the C source code suffix \`.c' with the
+ library object suffix, \`.lo'."
+   ;;
+ 
+ execute)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+ 
+ Automatically set library path, then run a program.
+ 
+ This mode accepts the following additional options:
+ 
+   -dlopen FILE      add the directory containing FILE to the library path
+ 
+ This mode sets the library path environment variable according to \`-dlopen'
+ flags.
+ 
+ If any of the ARGS are libtool executable wrappers, then they are translated
+ into their corresponding uninstalled binary, and any of their required library
+ directories are added to the library path.
+ 
+ Then, COMMAND is executed, with ARGS as arguments."
+   ;;
+ 
+ finish)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+ 
+ Complete the installation of libtool libraries.
+ 
+ Each LIBDIR is a directory that contains libtool libraries.
+ 
+ The commands that this mode executes may require superuser privileges.  Use
+ the \`--dry-run' option if you just want to see what would be executed."
+   ;;
+ 
+ install)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+ 
+ Install executables or libraries.
+ 
+ INSTALL-COMMAND is the installation command.  The first component should be
+ either the \`install' or \`cp' program.
+ 
+ The rest of the components are interpreted as arguments to that command (only
+ BSD-compatible install options are recognized)."
+   ;;
+ 
+ link)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+ 
+ Link object files or libraries together to form another library, or to
+ create an executable program.
+ 
+ LINK-COMMAND is a command using the C compiler that you would use to create
+ a program from several object files.
+ 
+ The following components of LINK-COMMAND are treated specially:
+ 
+   -all-static       do not do any dynamic linking at all
+   -avoid-version    do not add a version suffix if possible
+   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+ 		    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+ 		    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+   -no-fast-install  disable the fast-install mode
+   -no-install       link a not-installable executable
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+   -static           do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+ 		    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+ Every other argument is treated as a filename.  Files ending in \`.la' are
+ treated as uninstalled libtool libraries, other files are standard or library
+ object files.
+ 
+ If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+ only library objects (\`.lo' files) may be specified, and \`-rpath' is
+ required, except when creating a convenience library.
+ 
+ If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+ using \`ar' and \`ranlib', or on Windows using \`lib'.
+ 
+ If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+ is created, otherwise an executable program is created."
+   ;;
+ 
+ uninstall)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+ 
+ Remove libraries from an installation directory.
+ 
+ RM is the name of the program to use to delete files associated with each FILE
+ (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+ 
+ If FILE is a libtool library, all the files associated with it are deleted.
+ Otherwise, only FILE itself is deleted using RM."
+   ;;
+ 
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+   exit 1
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+ exit 0
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+ # choices, we go for a static library, that is the most portable,
+ # since we can't tell whether shared libraries were disabled because
+ # the user asked for that or because the platform doesn't support
+ # them.  This is particularly important on AIX, because we don't
+ # support having both static and shared libraries enabled at the same
+ # time on that platform, so we default to a shared-only configuration.
+ # If a disable-shared tag is given, we'll fallback to a static-only
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+ build_libtool_libs=no
+ build_old_libs=yes
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
+ # mode:shell-script
+ # sh-indentation:2
+ # End:


Index: llvm-test/autoconf/mkinstalldirs
diff -c /dev/null llvm-test/autoconf/mkinstalldirs:1.1
*** /dev/null	Wed Sep  1 09:35:30 2004
--- llvm-test/autoconf/mkinstalldirs	Wed Sep  1 09:35:18 2004
***************
*** 0 ****
--- 1,101 ----
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+ # Author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+ # Public domain
+ 
+ # $Id: mkinstalldirs,v 1.1 2004/09/01 14:35:18 criswell Exp $
+ 
+ errstatus=0
+ dirmode=""
+ 
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+ 
+ # process command line arguments
+ while test $# -gt 0 ; do
+    case "${1}" in
+      -h | --help | --h* )			# -h for help
+ 	echo "${usage}" 1>&2; exit 0 ;;
+      -m )					# -m PERM arg
+ 	shift
+ 	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ 	dirmode="${1}"
+ 	shift ;;
+      -- ) shift; break ;;			# stop option processing
+      -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+      * )  break ;;				# first non-opt arg
+    esac
+ done
+ 
+ for file
+ do
+   if test -d "$file"; then
+     shift
+   else
+     break
+   fi
+ done
+ 
+ case $# in
+ 0) exit 0 ;;
+ esac
+ 
+ case $dirmode in
+ '')
+   if mkdir -p -- . 2>/dev/null; then
+     echo "mkdir -p -- $*"
+     exec mkdir -p -- "$@"
+   fi ;;
+ *)
+   if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+     echo "mkdir -m $dirmode -p -- $*"
+     exec mkdir -m "$dirmode" -p -- "$@"
+   fi ;;
+ esac
+ 
+ for file
+ do
+    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+    shift
+ 
+    pathcomp=
+    for d
+    do
+      pathcomp="$pathcomp$d"
+      case "$pathcomp" in
+        -* ) pathcomp=./$pathcomp ;;
+      esac
+ 
+      if test ! -d "$pathcomp"; then
+ 	echo "mkdir $pathcomp"
+ 
+ 	mkdir "$pathcomp" || lasterr=$?
+ 
+ 	if test ! -d "$pathcomp"; then
+ 	  errstatus=$lasterr
+ 	else
+ 	  if test ! -z "$dirmode"; then
+ 	     echo "chmod $dirmode $pathcomp"
+ 
+ 	     lasterr=""
+ 	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+ 
+ 	     if test ! -z "$lasterr"; then
+ 	       errstatus=$lasterr
+ 	     fi
+ 	  fi
+ 	fi
+      fi
+ 
+      pathcomp="$pathcomp/"
+    done
+ done
+ 
+ exit $errstatus
+ 
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 3
+ # End:
+ # mkinstalldirs ends here





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/obsequi/Makefile
Message-ID: <200409011434.JAA06138@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/obsequi:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/obsequi/Makefile
diff -u llvm-test/MultiSource/Applications/obsequi/Makefile:1.1 llvm-test/MultiSource/Applications/obsequi/Makefile:1.2
--- llvm-test/MultiSource/Applications/obsequi/Makefile:1.1	Tue May 11 14:34:12 2004
+++ llvm-test/MultiSource/Applications/obsequi/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = Obsequi
 CPPFLAGS += -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE -DHASHCODEBITS=23
 CPPFLAGS += -DTWO_STAGE_GENERATION





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/SingleSource/Benchmarks/Misc/Makefile
Message-ID: <200409011434.JAA06119@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/Benchmarks/Misc:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/Benchmarks/Misc/Makefile
diff -u llvm-test/SingleSource/Benchmarks/Misc/Makefile:1.2 llvm-test/SingleSource/Benchmarks/Misc/Makefile:1.3
--- llvm-test/SingleSource/Benchmarks/Misc/Makefile:1.2	Tue Apr 13 22:32:46 2004
+++ llvm-test/SingleSource/Benchmarks/Misc/Makefile	Wed Sep  1 09:33:26 2004
@@ -1,5 +1,5 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 LDFLAGS += -lm
 FP_TOLERANCE := 0.001
 
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+include $(LEVEL)/SingleSource/Makefile.singlesrc





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile
Message-ID: <200409011434.JAA06098@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/pifft:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile:1.1	Sat Oct 11 16:18:48 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/pifft/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = pifft
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Applications/sgefa/Makefile
Message-ID: <200409011434.JAA06075@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/sgefa:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/sgefa/Makefile
diff -u llvm-test/MultiSource/Applications/sgefa/Makefile:1.6 llvm-test/MultiSource/Applications/sgefa/Makefile:1.7
--- llvm-test/MultiSource/Applications/sgefa/Makefile:1.6	Sun Jun 27 19:39:14 2004
+++ llvm-test/MultiSource/Applications/sgefa/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG     = sgefa
 LDFLAGS  = -lm
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile
Message-ID: <200409011434.JAA06131@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/distray:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile:1.1	Sat Oct 11 16:18:47 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/distray/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = distray
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile
Message-ID: <200409011434.JAA06163@choi.cs.uiuc.edu>



Changes in directory llvm-test/SingleSource/UnitTests/SetjmpLongjmp:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile
diff -u llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.6 llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.7
--- llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile:1.6	Wed Feb 25 21:32:32 2004
+++ llvm-test/SingleSource/UnitTests/SetjmpLongjmp/Makefile	Wed Sep  1 09:33:27 2004
@@ -1,7 +1,7 @@
 # Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
 
 DIRS = C C++
-LEVEL = ../../../../..
-include $(LEVEL)/test/Programs/SingleSource/Makefile.singlesrc
+LEVEL = ../../..
+include $(LEVEL)/SingleSource/Makefile.singlesrc
 
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:14 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:14 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile
Message-ID: <200409011434.JAA06049@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/neural:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile:1.1	Sat Oct 11 16:18:47 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/neural/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = neural
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/aha/Makefile
Message-ID: <200409011434.JAA06125@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/aha:

Makefile updated: 1.5 -> 1.6
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/aha/Makefile
diff -u llvm-test/MultiSource/Applications/aha/Makefile:1.5 llvm-test/MultiSource/Applications/aha/Makefile:1.6
--- llvm-test/MultiSource/Applications/aha/Makefile:1.5	Fri Sep 12 11:02:46 2003
+++ llvm-test/MultiSource/Applications/aha/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = aha
 CPPFLAGS = 
 LDFLAGS =





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile
Message-ID: <200409011434.JAA06121@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/FreeBench/mason:

Makefile updated: 1.1 -> 1.2
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile
diff -u llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile:1.1 llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile:1.1	Sat Oct 11 16:18:47 2003
+++ llvm-test/MultiSource/Benchmarks/FreeBench/mason/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = mason
 CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = test.in
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/MallocBench/Makefile
Message-ID: <200409011434.JAA06085@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/MallocBench:

Makefile updated: 1.6 -> 1.7
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/MallocBench/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MallocBench/Makefile:1.6 llvm-test/MultiSource/Benchmarks/MallocBench/Makefile:1.7
--- llvm-test/MultiSource/Benchmarks/MallocBench/Makefile:1.6	Fri Feb 20 12:11:23 2004
+++ llvm-test/MultiSource/Benchmarks/MallocBench/Makefile	Wed Sep  1 09:33:23 2004
@@ -1,3 +1,3 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PARALLEL_DIRS  := cfrac espresso gs make perl
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] 
	CVS: llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile
Message-ID: <200409011434.JAA06079@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Benchmarks/Olden/bh:

Makefile updated: 1.11 -> 1.12
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+2 -2)

Index: llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile:1.11 llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile:1.12
--- llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile:1.11	Fri Nov 14 19:34:54 2003
+++ llvm-test/MultiSource/Benchmarks/Olden/bh/Makefile	Wed Sep  1 09:33:25 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../../..
+LEVEL = ../../../..
 
 PROG     = bh
 CPPFLAGS = -DTORONTO
@@ -6,5 +6,5 @@
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = 40000 30
 endif
-include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+include $(LEVEL)/MultiSource/Makefile.multisrc
 





From criswell at cs.uiuc.edu  Wed Sep  1 09:34:25 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed, 1 Sep 2004 09:34:25 -0500
Subject: [llvm-commits] CVS: llvm-test/MultiSource/Applications/hbd/Makefile
Message-ID: <200409011434.JAA06097@choi.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/hbd:

Makefile updated: 1.2 -> 1.3
---
Log message:

Migrating test suite out of the source tree.



---
Diffs of the changes:  (+1 -1)

Index: llvm-test/MultiSource/Applications/hbd/Makefile
diff -u llvm-test/MultiSource/Applications/hbd/Makefile:1.2 llvm-test/MultiSource/Applications/hbd/Makefile:1.3
--- llvm-test/MultiSource/Applications/hbd/Makefile:1.2	Mon Mar  8 10:46:22 2004
+++ llvm-test/MultiSource/Applications/hbd/Makefile	Wed Sep  1 09:33:20 2004
@@ -1,4 +1,4 @@
-LEVEL = ../../../../..
+LEVEL = ../../..
 PROG = hbd
 CPPFLAGS += -DHAVE_CONFIG_H
 LDFLAGS += -lstdc++





From gaeke at cs.uiuc.edu  Wed Sep  1 14:56:19 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed, 1 Sep 2004 14:56:19 -0500
Subject: [llvm-commits] CVS: llvm/test/Programs/External/Makefile.external 
Message-ID: <200409011956.OAA04961@zion.cs.uiuc.edu>



Changes in directory llvm/test/Programs/External:

Makefile.external updated: 1.1 -> 1.2
---
Log message:

Fix name of makefile in comment.


---
Diffs of the changes:  (+1 -1)

Index: llvm/test/Programs/External/Makefile.external
diff -u llvm/test/Programs/External/Makefile.external:1.1 llvm/test/Programs/External/Makefile.external:1.2
--- llvm/test/Programs/External/Makefile.external:1.1	Thu May 29 15:24:10 2003
+++ llvm/test/Programs/External/Makefile.external	Wed Sep  1 14:56:09 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/SingleSource/Makefile.external --------*- Makefile -*-===##
+##===- test/Programs/External/Makefile.external ------------*- Makefile -*-===##
 #
 # This makefile is used to build programs that are not directly in the LLVM
 # build system.  It relies on a set of external makefiles to build the program,





From reid at x10sys.com  Wed Sep  1 15:29:46 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 15:29:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/Path.cpp 
Message-ID: <200409012029.PAA19735@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Cygwin:

Path.cpp updated: 1.1 -> 1.2
---
Log message:

mkdtemp doesn't exist on Cygwin. Use tempnam & mkdir instead.


---
Diffs of the changes:  (+7 -5)

Index: llvm/lib/System/Cygwin/Path.cpp
diff -u llvm/lib/System/Cygwin/Path.cpp:1.1 llvm/lib/System/Cygwin/Path.cpp:1.2
--- llvm/lib/System/Cygwin/Path.cpp:1.1	Mon Aug 30 16:46:55 2004
+++ llvm/lib/System/Cygwin/Path.cpp	Wed Sep  1 15:29:35 2004
@@ -35,13 +35,15 @@
 
 Path
 Path::GetTemporaryDirectory() {
-  char pathname[MAXPATHLEN];
-  strcpy(pathname,"/tmp/llvm_XXXXXX");
-  if (0 == mkdtemp(pathname))
-    ThrowErrno(std::string(pathname) + ": Can't create temporary directory");
+  char* pathname = tempnam(0,"llvm_");
+  if (0 == pathname)
+    ThrowErrno(std::string("Can't create temporary directory name"));
   Path result;
   result.set_directory(pathname);
-  assert(result.is_valid() && "mkdtemp didn't create a valid pathname!");
+  free(pathname);
+  assert(result.is_valid() && "tempnam didn't create a valid pathname!");
+  if (0 != mkdir(result.c_str(), S_IRWXU))
+    ThrowErrno(result.get() + ": Can't create temporary directory");
   return result;
 }
 





From reid at x10sys.com  Wed Sep  1 15:36:25 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 15:36:25 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/ConfigLexer.h 
Message-ID: <200409012036.PAA20055@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

ConfigLexer.h updated: 1.7 -> 1.8
---
Log message:

Make sure <cassert> is included for platforms that don't include it via
other header files.


---
Diffs of the changes:  (+1 -0)

Index: llvm/tools/llvmc/ConfigLexer.h
diff -u llvm/tools/llvmc/ConfigLexer.h:1.7 llvm/tools/llvmc/ConfigLexer.h:1.8
--- llvm/tools/llvmc/ConfigLexer.h:1.7	Mon Aug 30 01:29:06 2004
+++ llvm/tools/llvmc/ConfigLexer.h	Wed Sep  1 15:36:15 2004
@@ -15,6 +15,7 @@
 
 #include <string>
 #include <istream>
+#include <cassert>
 
 namespace llvm {
 





From llvm at cs.uiuc.edu  Wed Sep  1 15:55:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 15:55:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Posix/
Message-ID: <200409012055.PAA25586@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix/Posix:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Unix/Posix added to the repository


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Wed Sep  1 15:55:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 15:55:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/BSD/
Message-ID: <200409012055.PAA25592@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix/BSD:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Unix/BSD added to the repository


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Wed Sep  1 15:55:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 15:55:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/SUS/
Message-ID: <200409012055.PAA25589@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix/SUS:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Unix/SUS added to the repository


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Wed Sep  1 15:55:04 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 15:55:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/SVID/
Message-ID: <200409012055.PAA25595@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix/SVID:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/System/Unix/SVID added to the repository


---
Diffs of the changes:  (+0 -0)




From alkis at cs.uiuc.edu  Wed Sep  1 17:35:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 17:35:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveVariables.cpp 
Message-ID: <200409012235.RAA27325@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveVariables.cpp updated: 1.42 -> 1.43
---
Log message:

Give a better assertion if we see a use before a def.


---
Diffs of the changes:  (+2 -0)

Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.42 llvm/lib/CodeGen/LiveVariables.cpp:1.43
--- llvm/lib/CodeGen/LiveVariables.cpp:1.42	Sat Aug 28 17:43:31 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed Sep  1 17:34:52 2004
@@ -82,6 +82,8 @@
 
 void LiveVariables::HandleVirtRegUse(VarInfo &VRInfo, MachineBasicBlock *MBB,
                                      MachineInstr *MI) {
+  assert(VRInfo.DefInst && "Register use before def!");
+
   // Check to see if this basic block is already a kill block...
   if (!VRInfo.Kills.empty() && VRInfo.Kills.back()->getParent() == MBB) {
     // Yes, this register is killed in this basic block already.  Increase the





From alkis at cs.uiuc.edu  Wed Sep  1 17:52:39 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 17:52:39 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp
	RegAllocIterativeScan.cpp 
Message-ID: <200409012252.RAA27646@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.90 -> 1.91
RegAllocIterativeScan.cpp updated: 1.14 -> 1.15
---
Log message:

Be a bit more efficient when processing the active and inactive
lists. Instead of scanning the vector backwards, scan it forward and
swap each element we want to erase. Then at the end erase all removed
intervals at once. This doesn't save much: 0.08s out of 4s when
compiling 176.gcc.


---
Diffs of the changes:  (+62 -52)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.90 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.91
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.90	Fri Aug 27 14:00:29 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Wed Sep  1 17:52:29 2004
@@ -231,63 +231,68 @@
 void RA::processActiveIntervals(IntervalPtrs::value_type cur)
 {
   DEBUG(std::cerr << "\tprocessing active intervals:\n");
-  for (IntervalPtrs::reverse_iterator
-         i = active_.rbegin(); i != active_.rend();) {
-    unsigned reg = (*i)->reg;
+  IntervalPtrs::iterator ii = active_.begin(), ie = active_.end();
+  while (ii != ie) {
+    LiveInterval* i = *ii;
+    unsigned reg = i->reg;
+
     // remove expired intervals
-    if ((*i)->expiredAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n");
+    if (i->expiredAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->delRegUse(reg);
-      // remove from active
-      i = IntervalPtrs::reverse_iterator(active_.erase(i.base()-1));
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     // move inactive intervals to inactive list
-    else if (!(*i)->liveAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " inactive\n");
+    else if (!i->liveAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " inactive\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->delRegUse(reg);
       // add to inactive
-      inactive_.push_back(*i);
-      // remove from active
-      i = IntervalPtrs::reverse_iterator(active_.erase(i.base()-1));
+      inactive_.push_back(i);
+      // swap with last element and move end iterator back one postion
+      std::iter_swap(ii, --ie);
     }
     else {
-      ++i;
+      ++ii;
     }
   }
+  active_.erase(ie, active_.end());
 }
 
 void RA::processInactiveIntervals(IntervalPtrs::value_type cur)
 {
   DEBUG(std::cerr << "\tprocessing inactive intervals:\n");
-  for (IntervalPtrs::reverse_iterator
-         i = inactive_.rbegin(); i != inactive_.rend();) {
-    unsigned reg = (*i)->reg;
+  IntervalPtrs::iterator ii = inactive_.begin(), ie = inactive_.end();
+  while (ii != ie) {
+    LiveInterval* i = *ii;
+    unsigned reg = i->reg;
 
     // remove expired intervals
-    if ((*i)->expiredAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n");
-      // remove from inactive
-      i = IntervalPtrs::reverse_iterator(inactive_.erase(i.base()-1));
+    if (i->expiredAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     // move re-activated intervals in active list
-    else if ((*i)->liveAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " active\n");
+    else if (i->liveAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " active\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->addRegUse(reg);
       // add to active
-      active_.push_back(*i);
-      // remove from inactive
-      i = IntervalPtrs::reverse_iterator(inactive_.erase(i.base()-1));
+      active_.push_back(i);
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     else {
-      ++i;
+      ++ii;
     }
   }
+  inactive_.erase(ie, inactive_.end());
 }
 
 void RA::updateSpillWeights(unsigned reg, SpillWeights::value_type weight)


Index: llvm/lib/CodeGen/RegAllocIterativeScan.cpp
diff -u llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.14 llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.15
--- llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.14	Fri Aug 27 14:00:29 2004
+++ llvm/lib/CodeGen/RegAllocIterativeScan.cpp	Wed Sep  1 17:52:29 2004
@@ -264,63 +264,68 @@
 void RA::processActiveIntervals(IntervalPtrs::value_type cur)
 {
   DEBUG(std::cerr << "\tprocessing active intervals:\n");
-  for (IntervalPtrs::reverse_iterator
-         i = active_.rbegin(); i != active_.rend();) {
-    unsigned reg = (*i)->reg;
+  IntervalPtrs::iterator ii = active_.begin(), ie = active_.end();
+  while (ii != ie) {
+    LiveInterval* i = *ii;
+    unsigned reg = i->reg;
+
     // remove expired intervals
-    if ((*i)->expiredAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n");
+    if (i->expiredAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->delRegUse(reg);
-      // remove from active
-      i = IntervalPtrs::reverse_iterator(active_.erase(i.base()-1));
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     // move inactive intervals to inactive list
-    else if (!(*i)->liveAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " inactive\n");
+    else if (!i->liveAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " inactive\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->delRegUse(reg);
       // add to inactive
-      inactive_.push_back(*i);
-      // remove from active
-      i = IntervalPtrs::reverse_iterator(active_.erase(i.base()-1));
+      inactive_.push_back(i);
+      // swap with last element and move end iterator back one postion
+      std::iter_swap(ii, --ie);
     }
     else {
-      ++i;
+      ++ii;
     }
   }
+  active_.erase(ie, active_.end());
 }
 
 void RA::processInactiveIntervals(IntervalPtrs::value_type cur)
 {
   DEBUG(std::cerr << "\tprocessing inactive intervals:\n");
-  for (IntervalPtrs::reverse_iterator
-         i = inactive_.rbegin(); i != inactive_.rend();) {
-    unsigned reg = (*i)->reg;
+  IntervalPtrs::iterator ii = inactive_.begin(), ie = inactive_.end();
+  while (ii != ie) {
+    LiveInterval* i = *ii;
+    unsigned reg = i->reg;
 
     // remove expired intervals
-    if ((*i)->expiredAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " expired\n");
-      // remove from inactive
-      i = IntervalPtrs::reverse_iterator(inactive_.erase(i.base()-1));
+    if (i->expiredAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     // move re-activated intervals in active list
-    else if ((*i)->liveAt(cur->start())) {
-      DEBUG(std::cerr << "\t\tinterval " << **i << " active\n");
+    else if (i->liveAt(cur->start())) {
+      DEBUG(std::cerr << "\t\tinterval " << *i << " active\n");
       if (MRegisterInfo::isVirtualRegister(reg))
         reg = vrm_->getPhys(reg);
       prt_->addRegUse(reg);
       // add to active
-      active_.push_back(*i);
-      // remove from inactive
-      i = IntervalPtrs::reverse_iterator(inactive_.erase(i.base()-1));
+      active_.push_back(i);
+      // swap with last element and move end iterator back one position
+      std::iter_swap(ii, --ie);
     }
     else {
-      ++i;
+      ++ii;
     }
   }
+  inactive_.erase(ie, inactive_.end());
 }
 
 void RA::updateSpillWeights(unsigned reg, SpillWeights::value_type weight)





From reid at x10sys.com  Wed Sep  1 17:55:50 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:50 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200409012255.RAA28062@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.108 -> 1.109
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+9 -9)

Index: llvm/configure
diff -u llvm/configure:1.108 llvm/configure:1.109
--- llvm/configure:1.108	Tue Aug 31 13:03:22 2004
+++ llvm/configure	Wed Sep  1 17:55:34 2004
@@ -1544,7 +1544,7 @@
 
 if test ${srcdir} != "."
 then
-	if test -f ${srcdir}/include/Config/config.h
+	if test -f ${srcdir}/include/llvm/Config/config.h
 	then
 		{ { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5
 echo "$as_me: error: Already configured in ${srcdir}" >&2;}
@@ -1566,10 +1566,10 @@
   fi
 done
 
-          ac_config_headers="$ac_config_headers include/Config/config.h"
+          ac_config_headers="$ac_config_headers include/llvm/Config/config.h"
 
 
-                                                            ac_config_files="$ac_config_files Makefile.config include/Support/DataTypes.h include/Support/ThreadSupport.h include/Support/hash_map include/Support/hash_set include/Support/iterator"
+                                                            ac_config_files="$ac_config_files Makefile.config include/llvm/Support/DataTypes.h include/llvm/Support/ThreadSupport.h include/llvm/ADT/hash_map include/llvm/ADT/hash_set include/llvm/ADT/iterator"
 
 
           ac_config_commands="$ac_config_commands Makefile"
@@ -24450,11 +24450,11 @@
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
-  "include/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/DataTypes.h" ;;
-  "include/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/ThreadSupport.h" ;;
-  "include/Support/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_map" ;;
-  "include/Support/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_set" ;;
-  "include/Support/iterator" ) CONFIG_FILES="$CONFIG_FILES include/Support/iterator" ;;
+  "include/llvm/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/DataTypes.h" ;;
+  "include/llvm/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/ThreadSupport.h" ;;
+  "include/llvm/ADT/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_map" ;;
+  "include/llvm/ADT/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_set" ;;
+  "include/llvm/ADT/iterator" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/iterator" ;;
   "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$platform_type" ;;
   "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
   "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
@@ -24507,7 +24507,7 @@
   "tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
   "utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Makefile" ;;
   "projects/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/Makefile" ;;
-  "include/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/Config/config.h" ;;
+  "include/llvm/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Config/config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
	SchedGraph.cpp SchedGraph.h SchedGraphCommon.cpp
	SchedPriorities.cpp SchedPriorities.h 
Message-ID: <200409012255.RAA28254@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/InstrSched:

InstrScheduling.cpp updated: 1.77 -> 1.78
SchedGraph.cpp updated: 1.66 -> 1.67
SchedGraph.h updated: 1.39 -> 1.40
SchedGraphCommon.cpp updated: 1.6 -> 1.7
SchedPriorities.cpp updated: 1.33 -> 1.34
SchedPriorities.h updated: 1.26 -> 1.27
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+7 -7)

Index: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
diff -u llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.77 llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.78
--- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.77	Wed Aug 18 15:04:21 2004
+++ llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "../../Target/SparcV9/MachineCodeForInstruction.h"
 #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h"
 #include "../../Target/SparcV9/SparcV9InstrInfo.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <iostream>
 


Index: llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
diff -u llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.66 llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.67
--- llvm/lib/CodeGen/InstrSched/SchedGraph.cpp:1.66	Wed Aug 18 15:04:23 2004
+++ llvm/lib/CodeGen/InstrSched/SchedGraph.cpp	Wed Sep  1 17:55:35 2004
@@ -22,7 +22,7 @@
 #include "../../Target/SparcV9/MachineCodeForInstruction.h"
 #include "../../Target/SparcV9/SparcV9RegInfo.h"
 #include "../../Target/SparcV9/SparcV9InstrInfo.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 namespace llvm {


Index: llvm/lib/CodeGen/InstrSched/SchedGraph.h
diff -u llvm/lib/CodeGen/InstrSched/SchedGraph.h:1.39 llvm/lib/CodeGen/InstrSched/SchedGraph.h:1.40
--- llvm/lib/CodeGen/InstrSched/SchedGraph.h:1.39	Wed Feb 11 19:34:05 2004
+++ llvm/lib/CodeGen/InstrSched/SchedGraph.h	Wed Sep  1 17:55:35 2004
@@ -22,8 +22,8 @@
 #include "llvm/CodeGen/SchedGraphCommon.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/hash_map"
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/GraphTraits.h"
 
 namespace llvm {
 


Index: llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
diff -u llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp:1.6 llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp:1.7
--- llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp:1.6	Sun Jul  4 07:19:56 2004
+++ llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp	Wed Sep  1 17:55:35 2004
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/SchedGraphCommon.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 namespace llvm {


Index: llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
diff -u llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp:1.33 llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp:1.34
--- llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp:1.33	Sun Jul  4 07:19:56 2004
+++ llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp	Wed Sep  1 17:55:35 2004
@@ -21,7 +21,7 @@
 #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/CFG.h"
-#include "Support/PostOrderIterator.h"
+#include "llvm/ADT/PostOrderIterator.h"
 #include <iostream>
 
 namespace llvm {


Index: llvm/lib/CodeGen/InstrSched/SchedPriorities.h
diff -u llvm/lib/CodeGen/InstrSched/SchedPriorities.h:1.26 llvm/lib/CodeGen/InstrSched/SchedPriorities.h:1.27
--- llvm/lib/CodeGen/InstrSched/SchedPriorities.h:1.26	Tue Nov 11 16:41:33 2003
+++ llvm/lib/CodeGen/InstrSched/SchedPriorities.h	Wed Sep  1 17:55:35 2004
@@ -23,7 +23,7 @@
 #include "SchedGraph.h"
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/Target/TargetSchedInfo.h"
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 #include <list>
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/runtime/libtrace/tracelib.c 
Message-ID: <200409012255.RAA28207@zion.cs.uiuc.edu>



Changes in directory llvm/runtime/libtrace:

tracelib.c updated: 1.10 -> 1.11
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/runtime/libtrace/tracelib.c
diff -u llvm/runtime/libtrace/tracelib.c:1.10 llvm/runtime/libtrace/tracelib.c:1.11
--- llvm/runtime/libtrace/tracelib.c:1.10	Wed Jul 30 07:49:25 2003
+++ llvm/runtime/libtrace/tracelib.c	Wed Sep  1 17:55:37 2004
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 /*===---------------------------------------------------------------------=====
  * HASH FUNCTIONS





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
	CompleteBottomUp.cpp DataStructure.cpp DataStructureOpt.cpp
	DataStructureStats.cpp DependenceGraph.h GraphChecker.cpp
	IPModRef.cpp IPModRef.h Local.cpp MemoryDepAnalysis.cpp
	MemoryDepAnalysis.h Parallelize.cpp PgmDependenceGraph.h
	Printer.cpp Steensgaard.cpp TopDownClosure.cpp 
Message-ID: <200409012255.RAA28568@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/DataStructure:

BottomUpClosure.cpp updated: 1.80 -> 1.81
CompleteBottomUp.cpp updated: 1.12 -> 1.13
DataStructure.cpp updated: 1.179 -> 1.180
DataStructureOpt.cpp updated: 1.6 -> 1.7
DataStructureStats.cpp updated: 1.13 -> 1.14
DependenceGraph.h updated: 1.1 -> 1.2
GraphChecker.cpp updated: 1.15 -> 1.16
IPModRef.cpp updated: 1.25 -> 1.26
IPModRef.h updated: 1.1 -> 1.2
Local.cpp updated: 1.110 -> 1.111
MemoryDepAnalysis.cpp updated: 1.17 -> 1.18
MemoryDepAnalysis.h updated: 1.2 -> 1.3
Parallelize.cpp updated: 1.16 -> 1.17
PgmDependenceGraph.h updated: 1.3 -> 1.4
Printer.cpp updated: 1.71 -> 1.72
Steensgaard.cpp updated: 1.41 -> 1.42
TopDownClosure.cpp updated: 1.68 -> 1.69
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+41 -41)

Index: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.80 llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.81
--- llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.80	Wed Jul  7 01:35:22 2004
+++ llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp	Wed Sep  1 17:55:35 2004
@@ -16,8 +16,8 @@
 
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Module.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 #include "DSCallSiteIterator.h"
 using namespace llvm;
 


Index: llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
diff -u llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.12 llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.13
--- llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.12	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp	Wed Sep  1 17:55:35 2004
@@ -16,10 +16,10 @@
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Module.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/Debug.h"
-#include "Support/SCCIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/SCCIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.179 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.180
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.179	Thu Jul 29 12:14:36 2004
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Wed Sep  1 17:55:35 2004
@@ -18,12 +18,12 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/Statistic.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.6 llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.7
--- llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp:1.6	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Constant.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.13 llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.14
--- llvm/lib/Analysis/DataStructure/DataStructureStats.cpp:1.13	Thu Jul 29 12:03:32 2004
+++ llvm/lib/Analysis/DataStructure/DataStructureStats.cpp	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 


Index: llvm/lib/Analysis/DataStructure/DependenceGraph.h
diff -u llvm/lib/Analysis/DataStructure/DependenceGraph.h:1.1 llvm/lib/Analysis/DataStructure/DependenceGraph.h:1.2
--- llvm/lib/Analysis/DataStructure/DependenceGraph.h:1.1	Sun Jun 27 19:32:33 2004
+++ llvm/lib/Analysis/DataStructure/DependenceGraph.h	Wed Sep  1 17:55:35 2004
@@ -24,7 +24,7 @@
 #ifndef LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 #define LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <cassert>
 #include <iosfwd>
 #include <utility>


Index: llvm/lib/Analysis/DataStructure/GraphChecker.cpp
diff -u llvm/lib/Analysis/DataStructure/GraphChecker.cpp:1.15 llvm/lib/Analysis/DataStructure/GraphChecker.cpp:1.16
--- llvm/lib/Analysis/DataStructure/GraphChecker.cpp:1.15	Thu Jul 15 19:04:13 2004
+++ llvm/lib/Analysis/DataStructure/GraphChecker.cpp	Wed Sep  1 17:55:35 2004
@@ -25,7 +25,7 @@
 
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Value.h"
 #include <iostream>
 #include <set>


Index: llvm/lib/Analysis/DataStructure/IPModRef.cpp
diff -u llvm/lib/Analysis/DataStructure/IPModRef.cpp:1.25 llvm/lib/Analysis/DataStructure/IPModRef.cpp:1.26
--- llvm/lib/Analysis/DataStructure/IPModRef.cpp:1.25	Thu Jul 29 12:03:32 2004
+++ llvm/lib/Analysis/DataStructure/IPModRef.cpp	Wed Sep  1 17:55:35 2004
@@ -16,9 +16,9 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <vector>
 
 namespace llvm {


Index: llvm/lib/Analysis/DataStructure/IPModRef.h
diff -u llvm/lib/Analysis/DataStructure/IPModRef.h:1.1 llvm/lib/Analysis/DataStructure/IPModRef.h:1.2
--- llvm/lib/Analysis/DataStructure/IPModRef.h:1.1	Sun Jun 27 19:41:23 2004
+++ llvm/lib/Analysis/DataStructure/IPModRef.h	Wed Sep  1 17:55:35 2004
@@ -47,8 +47,8 @@
 #define LLVM_ANALYSIS_IPMODREF_H
 
 #include "llvm/Pass.h"
-#include "Support/BitSetVector.h"
-#include "Support/hash_map"
+#include "llvm/ADT/BitSetVector.h"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/DataStructure/Local.cpp
diff -u llvm/lib/Analysis/DataStructure/Local.cpp:1.110 llvm/lib/Analysis/DataStructure/Local.cpp:1.111
--- llvm/lib/Analysis/DataStructure/Local.cpp:1.110	Mon Aug  2 15:16:21 2004
+++ llvm/lib/Analysis/DataStructure/Local.cpp	Wed Sep  1 17:55:35 2004
@@ -21,9 +21,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/Timer.h"
 
 // FIXME: This should eventually be a FunctionPass that is automatically
 // aggregated into a Pass.


Index: llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
diff -u llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp:1.17 llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp:1.18
--- llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp:1.17	Thu Jul 29 12:03:32 2004
+++ llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp	Wed Sep  1 17:55:35 2004
@@ -25,11 +25,11 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SCCIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_map"
-#include "Support/hash_set"
+#include "llvm/ADT/SCCIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h
diff -u llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h:1.2 llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h:1.3
--- llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h:1.2	Sun Jun 27 19:32:33 2004
+++ llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h	Wed Sep  1 17:55:35 2004
@@ -22,7 +22,7 @@
 
 #include "DependenceGraph.h"
 #include "llvm/Pass.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/DataStructure/Parallelize.cpp
diff -u llvm/lib/Analysis/DataStructure/Parallelize.cpp:1.16 llvm/lib/Analysis/DataStructure/Parallelize.cpp:1.17
--- llvm/lib/Analysis/DataStructure/Parallelize.cpp:1.16	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/Parallelize.cpp	Wed Sep  1 17:55:35 2004
@@ -46,10 +46,10 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_set"
-#include "Support/hash_map"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_set"
+#include "llvm/ADT/hash_map"
 #include <functional>
 #include <algorithm>
 using namespace llvm;


Index: llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h
diff -u llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h:1.3 llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h:1.4
--- llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h:1.3	Sun Jun 27 19:32:33 2004
+++ llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h	Wed Sep  1 17:55:35 2004
@@ -43,7 +43,7 @@
 /* #include "llvm/Analysis/PostDominators.h" -- see below */
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/DataStructure/Printer.cpp
diff -u llvm/lib/Analysis/DataStructure/Printer.cpp:1.71 llvm/lib/Analysis/DataStructure/Printer.cpp:1.72
--- llvm/lib/Analysis/DataStructure/Printer.cpp:1.71	Sat Jul 17 19:18:30 2004
+++ llvm/lib/Analysis/DataStructure/Printer.cpp	Wed Sep  1 17:55:35 2004
@@ -17,9 +17,9 @@
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/GraphWriter.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/GraphWriter.h"
+#include "llvm/ADT/Statistic.h"
 #include <fstream>
 #include <sstream>
 using namespace llvm;


Index: llvm/lib/Analysis/DataStructure/Steensgaard.cpp
diff -u llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.41 llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.42
--- llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.41	Wed Jul 21 15:50:33 2004
+++ llvm/lib/Analysis/DataStructure/Steensgaard.cpp	Wed Sep  1 17:55:35 2004
@@ -18,7 +18,7 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Module.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.68 llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.69
--- llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.68	Wed Jul  7 01:32:21 2004
+++ llvm/lib/Analysis/DataStructure/TopDownClosure.cpp	Wed Sep  1 17:55:35 2004
@@ -18,8 +18,8 @@
 #include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp BasicBlock.cpp
	Constants.cpp Dominators.cpp Function.cpp Globals.cpp
	Instruction.cpp LeakDetector.cpp Mangler.cpp Module.cpp
	Pass.cpp PassManagerT.h SymbolTable.cpp Type.cpp Value.cpp
	Verifier.cpp 
Message-ID: <200409012255.RAA28651@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.157 -> 1.158
BasicBlock.cpp updated: 1.48 -> 1.49
Constants.cpp updated: 1.103 -> 1.104
Dominators.cpp updated: 1.57 -> 1.58
Function.cpp updated: 1.77 -> 1.78
Globals.cpp updated: 1.5 -> 1.6
Instruction.cpp updated: 1.37 -> 1.38
LeakDetector.cpp updated: 1.10 -> 1.11
Mangler.cpp updated: 1.14 -> 1.15
Module.cpp updated: 1.54 -> 1.55
Pass.cpp updated: 1.61 -> 1.62
PassManagerT.h updated: 1.51 -> 1.52
SymbolTable.cpp updated: 1.48 -> 1.49
Type.cpp updated: 1.112 -> 1.113
Value.cpp updated: 1.49 -> 1.50
Verifier.cpp updated: 1.117 -> 1.118
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+24 -24)

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.157 llvm/lib/VMCore/AsmWriter.cpp:1.158
--- llvm/lib/VMCore/AsmWriter.cpp:1.157	Sun Aug 29 14:37:59 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed Sep  1 17:55:36 2004
@@ -26,8 +26,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/VMCore/BasicBlock.cpp
diff -u llvm/lib/VMCore/BasicBlock.cpp:1.48 llvm/lib/VMCore/BasicBlock.cpp:1.49
--- llvm/lib/VMCore/BasicBlock.cpp:1.48	Thu Jul 29 11:53:53 2004
+++ llvm/lib/VMCore/BasicBlock.cpp	Wed Sep  1 17:55:36 2004
@@ -17,7 +17,7 @@
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/SymbolTable.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 #include <algorithm>
 using namespace llvm;


Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.103 llvm/lib/VMCore/Constants.cpp:1.104
--- llvm/lib/VMCore/Constants.cpp:1.103	Fri Aug 20 01:00:57 2004
+++ llvm/lib/VMCore/Constants.cpp	Wed Sep  1 17:55:37 2004
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.57 llvm/lib/VMCore/Dominators.cpp:1.58
--- llvm/lib/VMCore/Dominators.cpp:1.57	Sat Jun 19 15:13:48 2004
+++ llvm/lib/VMCore/Dominators.cpp	Wed Sep  1 17:55:37 2004
@@ -17,8 +17,8 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/VMCore/Function.cpp
diff -u llvm/lib/VMCore/Function.cpp:1.77 llvm/lib/VMCore/Function.cpp:1.78
--- llvm/lib/VMCore/Function.cpp:1.77	Thu Jul 29 11:53:53 2004
+++ llvm/lib/VMCore/Function.cpp	Wed Sep  1 17:55:37 2004
@@ -17,7 +17,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 using namespace llvm;
 


Index: llvm/lib/VMCore/Globals.cpp
diff -u llvm/lib/VMCore/Globals.cpp:1.5 llvm/lib/VMCore/Globals.cpp:1.6
--- llvm/lib/VMCore/Globals.cpp:1.5	Thu Aug  5 06:28:34 2004
+++ llvm/lib/VMCore/Globals.cpp	Wed Sep  1 17:55:37 2004
@@ -16,7 +16,7 @@
 #include "llvm/GlobalVariable.h"
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/VMCore/Instruction.cpp
diff -u llvm/lib/VMCore/Instruction.cpp:1.37 llvm/lib/VMCore/Instruction.cpp:1.38
--- llvm/lib/VMCore/Instruction.cpp:1.37	Sun Jun 27 13:38:48 2004
+++ llvm/lib/VMCore/Instruction.cpp	Wed Sep  1 17:55:37 2004
@@ -14,7 +14,7 @@
 #include "llvm/Function.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 using namespace llvm;
 
 void Instruction::init()


Index: llvm/lib/VMCore/LeakDetector.cpp
diff -u llvm/lib/VMCore/LeakDetector.cpp:1.10 llvm/lib/VMCore/LeakDetector.cpp:1.11
--- llvm/lib/VMCore/LeakDetector.cpp:1.10	Wed Jul 14 20:29:12 2004
+++ llvm/lib/VMCore/LeakDetector.cpp	Wed Sep  1 17:55:37 2004
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "llvm/Value.h"
 #include <iostream>
 #include <set>


Index: llvm/lib/VMCore/Mangler.cpp
diff -u llvm/lib/VMCore/Mangler.cpp:1.14 llvm/lib/VMCore/Mangler.cpp:1.15
--- llvm/lib/VMCore/Mangler.cpp:1.14	Tue Aug 17 01:06:54 2004
+++ llvm/lib/VMCore/Mangler.cpp	Wed Sep  1 17:55:37 2004
@@ -14,7 +14,7 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 static char HexDigit(int V) {


Index: llvm/lib/VMCore/Module.cpp
diff -u llvm/lib/VMCore/Module.cpp:1.54 llvm/lib/VMCore/Module.cpp:1.55
--- llvm/lib/VMCore/Module.cpp:1.54	Sun Jul 25 13:08:57 2004
+++ llvm/lib/VMCore/Module.cpp	Wed Sep  1 17:55:37 2004
@@ -15,8 +15,8 @@
 #include "llvm/InstrTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "Support/STLExtras.h"
-#include "Support/LeakDetector.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 #include <algorithm>
 #include <cstdarg>


Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.61 llvm/lib/VMCore/Pass.cpp:1.62
--- llvm/lib/VMCore/Pass.cpp:1.61	Tue Aug 24 12:52:35 2004
+++ llvm/lib/VMCore/Pass.cpp	Wed Sep  1 17:55:37 2004
@@ -17,8 +17,8 @@
 #include "PassManagerT.h"         // PassManagerT implementation
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
-#include "Support/STLExtras.h"
-#include "Support/TypeInfo.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/TypeInfo.h"
 #include <iostream>
 #include <set>
 using namespace llvm;


Index: llvm/lib/VMCore/PassManagerT.h
diff -u llvm/lib/VMCore/PassManagerT.h:1.51 llvm/lib/VMCore/PassManagerT.h:1.52
--- llvm/lib/VMCore/PassManagerT.h:1.51	Fri Jul 23 14:35:50 2004
+++ llvm/lib/VMCore/PassManagerT.h	Wed Sep  1 17:55:37 2004
@@ -23,9 +23,9 @@
 #define LLVM_PASSMANAGER_T_H
 
 #include "llvm/Pass.h"
-#include "Support/CommandLine.h"
-#include "Support/LeakDetector.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 #include <iostream>
 


Index: llvm/lib/VMCore/SymbolTable.cpp
diff -u llvm/lib/VMCore/SymbolTable.cpp:1.48 llvm/lib/VMCore/SymbolTable.cpp:1.49
--- llvm/lib/VMCore/SymbolTable.cpp:1.48	Tue Aug  3 19:37:31 2004
+++ llvm/lib/VMCore/SymbolTable.cpp	Wed Sep  1 17:55:37 2004
@@ -15,7 +15,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <iostream>
 


Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.112 llvm/lib/VMCore/Type.cpp:1.113
--- llvm/lib/VMCore/Type.cpp:1.112	Fri Aug 20 01:00:57 2004
+++ llvm/lib/VMCore/Type.cpp	Wed Sep  1 17:55:37 2004
@@ -15,9 +15,9 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Constants.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/VMCore/Value.cpp
diff -u llvm/lib/VMCore/Value.cpp:1.49 llvm/lib/VMCore/Value.cpp:1.50
--- llvm/lib/VMCore/Value.cpp:1.49	Sun Jul 25 01:16:52 2004
+++ llvm/lib/VMCore/Value.cpp	Wed Sep  1 17:55:37 2004
@@ -16,7 +16,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constant.h"
 #include "llvm/GlobalValue.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.117 llvm/lib/VMCore/Verifier.cpp:1.118
--- llvm/lib/VMCore/Verifier.cpp:1.117	Fri Aug 20 01:00:58 2004
+++ llvm/lib/VMCore/Verifier.cpp	Wed Sep  1 17:55:37 2004
@@ -53,7 +53,7 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 #include <sstream>





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/ParserInternals.h
	llvmAsmParser.y 
Message-ID: <200409012255.RAA28157@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

ParserInternals.h updated: 1.37 -> 1.38
llvmAsmParser.y updated: 1.200 -> 1.201
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/lib/AsmParser/ParserInternals.h
diff -u llvm/lib/AsmParser/ParserInternals.h:1.37 llvm/lib/AsmParser/ParserInternals.h:1.38
--- llvm/lib/AsmParser/ParserInternals.h:1.37	Thu Jul 29 07:17:34 2004
+++ llvm/lib/AsmParser/ParserInternals.h	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Assembly/Parser.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 
 // Global variables exported from the lexer...
 extern std::FILE *llvmAsmin;


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.200 llvm/lib/AsmParser/llvmAsmParser.y:1.201
--- llvm/lib/AsmParser/llvmAsmParser.y:1.200	Sat Aug 21 11:11:02 2004
+++ llvm/lib/AsmParser/llvmAsmParser.y	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 #include <list>





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] 
	CVS: llvm/projects/Stacker/lib/compiler/StackerParser.y
Message-ID: <200409012255.RAA28306@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/compiler:

StackerParser.y updated: 1.6 -> 1.7
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/projects/Stacker/lib/compiler/StackerParser.y
diff -u llvm/projects/Stacker/lib/compiler/StackerParser.y:1.6 llvm/projects/Stacker/lib/compiler/StackerParser.y:1.7
--- llvm/projects/Stacker/lib/compiler/StackerParser.y:1.6	Thu Jul 29 12:17:46 2004
+++ llvm/projects/Stacker/lib/compiler/StackerParser.y	Wed Sep  1 17:55:37 2004
@@ -16,8 +16,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/STLExtras.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include <list>
 #include <utility>
 #include <algorithm>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-nm/llvm-nm.cpp 
Message-ID: <200409012255.RAA28504@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-nm:

llvm-nm.cpp updated: 1.17 -> 1.18
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/llvm-nm/llvm-nm.cpp
diff -u llvm/tools/llvm-nm/llvm-nm.cpp:1.17 llvm/tools/llvm-nm/llvm-nm.cpp:1.18
--- llvm/tools/llvm-nm/llvm-nm.cpp:1.17	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-nm/llvm-nm.cpp	Wed Sep  1 17:55:37 2004
@@ -18,8 +18,8 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <cctype>
 #include <cerrno>





From llvm at cs.uiuc.edu  Wed Sep  1 17:56:00 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 17:56:00 -0500
Subject: [llvm-commits] CVS: llvm/include/Config/sys/mman.h resource.h
	stat.h time.h types.h wait.h 
Message-ID: <200409012256.RAA28827@zion.cs.uiuc.edu>



Changes in directory llvm/include/Config/sys:

mman.h (r1.4) removed
resource.h (r1.5) removed
stat.h (r1.5) removed
time.h (r1.5) removed
types.h (r1.4) removed
wait.h (r1.4) removed
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+0 -0)




From llvm at cs.uiuc.edu  Wed Sep  1 17:56:03 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 17:56:03 -0500
Subject: [llvm-commits] CVS: llvm/include/Config/alloca.h config.h.in
	dlfcn.h fcntl.h limits.h malloc.h memory.h pagesize.h
	stdint.h time.h unistd.h windows.h 
Message-ID: <200409012256.RAA28842@zion.cs.uiuc.edu>



Changes in directory llvm/include/Config:

alloca.h (r1.4) removed
config.h.in (r1.24) removed
dlfcn.h (r1.4) removed
fcntl.h (r1.4) removed
limits.h (r1.3) removed
malloc.h (r1.3) removed
memory.h (r1.3) removed
pagesize.h (r1.2) removed
stdint.h (r1.3) removed
time.h (r1.3) removed
unistd.h (r1.5) removed
windows.h (r1.3) removed
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+0 -0)




From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-link/llvm-link.cpp 
Message-ID: <200409012255.RAA28515@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-link:

llvm-link.cpp updated: 1.39 -> 1.40
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/llvm-link/llvm-link.cpp
diff -u llvm/tools/llvm-link/llvm-link.cpp:1.39 llvm/tools/llvm-link/llvm-link.cpp:1.40
--- llvm/tools/llvm-link/llvm-link.cpp:1.39	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-link/llvm-link.cpp	Wed Sep  1 17:55:37 2004
@@ -17,8 +17,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-prof/llvm-prof.cpp 
Message-ID: <200409012255.RAA28511@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-prof:

llvm-prof.cpp updated: 1.22 -> 1.23
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvm-prof/llvm-prof.cpp
diff -u llvm/tools/llvm-prof/llvm-prof.cpp:1.22 llvm/tools/llvm-prof/llvm-prof.cpp:1.23
--- llvm/tools/llvm-prof/llvm-prof.cpp:1.22	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-prof/llvm-prof.cpp	Wed Sep  1 17:55:37 2004
@@ -18,7 +18,7 @@
 #include "llvm/Assembly/AsmAnnotationWriter.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <cstdio>
 #include <iostream>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/gccld/GenerateCode.cpp Linker.cpp
	gccld.cpp 
Message-ID: <200409012255.RAA28493@zion.cs.uiuc.edu>



Changes in directory llvm/tools/gccld:

GenerateCode.cpp updated: 1.31 -> 1.32
Linker.cpp updated: 1.27 -> 1.28
gccld.cpp updated: 1.77 -> 1.78
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+9 -9)

Index: llvm/tools/gccld/GenerateCode.cpp
diff -u llvm/tools/gccld/GenerateCode.cpp:1.31 llvm/tools/gccld/GenerateCode.cpp:1.32
--- llvm/tools/gccld/GenerateCode.cpp:1.31	Mon Aug  2 05:10:08 2004
+++ llvm/tools/gccld/GenerateCode.cpp	Wed Sep  1 17:55:37 2004
@@ -24,8 +24,8 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Support/SystemUtils.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 namespace {


Index: llvm/tools/gccld/Linker.cpp
diff -u llvm/tools/gccld/Linker.cpp:1.27 llvm/tools/gccld/Linker.cpp:1.28
--- llvm/tools/gccld/Linker.cpp:1.27	Wed Jun 23 12:32:09 2004
+++ llvm/tools/gccld/Linker.cpp	Wed Sep  1 17:55:37 2004
@@ -21,11 +21,11 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Config/config.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <algorithm>
 #include <fstream>
 #include <memory>


Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.77 llvm/tools/gccld/gccld.cpp:1.78
--- llvm/tools/gccld/gccld.cpp:1.77	Sun Aug 29 14:28:55 2004
+++ llvm/tools/gccld/gccld.cpp	Wed Sep  1 17:55:37 2004
@@ -29,10 +29,10 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 #include <memory>
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/lli/lli.cpp 
Message-ID: <200409012255.RAA28431@zion.cs.uiuc.edu>



Changes in directory llvm/tools/lli:

lli.cpp updated: 1.46 -> 1.47
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.46 llvm/tools/lli/lli.cpp:1.47
--- llvm/tools/lli/lli.cpp:1.46	Sun Aug 29 14:28:55 2004
+++ llvm/tools/lli/lli.cpp	Wed Sep  1 17:55:37 2004
@@ -19,8 +19,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/Annotation.h CFG.h
	Casting.h CommandLine.h ConstantRange.h DOTGraphTraits.h
	Debug.h DynamicLinker.h ELF.h FileUtilities.h GraphWriter.h
	LeakDetector.h MallocAllocator.h Mangler.h MathExtras.h
	PassNameParser.h PluginLoader.h SlowOperationInformer.h
	SystemUtils.h ThreadSupport-NoSupport.h
	ThreadSupport-PThreads.h ThreadSupport.h.in Timer.h
	ToolRunner.h TypeInfo.h type_traits.h 
Message-ID: <200409012255.RAA28731@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

Annotation.h updated: 1.15 -> 1.16
CFG.h updated: 1.21 -> 1.22
Casting.h updated: 1.12 -> 1.13
CommandLine.h updated: 1.35 -> 1.36
ConstantRange.h updated: 1.7 -> 1.8
DOTGraphTraits.h updated: 1.9 -> 1.10
Debug.h updated: 1.4 -> 1.5
DynamicLinker.h updated: 1.3 -> 1.4
ELF.h updated: 1.4 -> 1.5
FileUtilities.h updated: 1.18 -> 1.19
GraphWriter.h updated: 1.19 -> 1.20
LeakDetector.h updated: 1.4 -> 1.5
MallocAllocator.h updated: 1.7 -> 1.8
Mangler.h updated: 1.11 -> 1.12
MathExtras.h updated: 1.14 -> 1.15
PassNameParser.h updated: 1.9 -> 1.10
PluginLoader.h updated: 1.1 -> 1.2
SlowOperationInformer.h updated: 1.3 -> 1.4
SystemUtils.h updated: 1.12 -> 1.13
ThreadSupport-NoSupport.h updated: 1.1 -> 1.2
ThreadSupport-PThreads.h updated: 1.2 -> 1.3
ThreadSupport.h.in updated: 1.1 -> 1.2
Timer.h updated: 1.12 -> 1.13
ToolRunner.h updated: 1.14 -> 1.15
TypeInfo.h updated: 1.6 -> 1.7
type_traits.h updated: 1.1 -> 1.2
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+75 -70)

Index: llvm/include/llvm/Support/Annotation.h
diff -u llvm/include/llvm/Support/Annotation.h:1.15 llvm/include/llvm/Support/Annotation.h:1.16
--- llvm/include/llvm/Support/Annotation.h:1.15	Sun Jun 27 13:36:39 2004
+++ llvm/include/llvm/Support/Annotation.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/Annotation.h - Annotation classes ---------------*- C++ -*-===//
+//===-- llvm/Support/Annotation.h - Annotation classes ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ANNOTATION_H
-#define SUPPORT_ANNOTATION_H
+#ifndef LLVM_SUPPORT_ANNOTATION_H
+#define LLVM_SUPPORT_ANNOTATION_H
 
 #include <string>
 #include <cassert>


Index: llvm/include/llvm/Support/CFG.h
diff -u llvm/include/llvm/Support/CFG.h:1.21 llvm/include/llvm/Support/CFG.h:1.22
--- llvm/include/llvm/Support/CFG.h:1.21	Fri May 21 13:37:13 2004
+++ llvm/include/llvm/Support/CFG.h	Wed Sep  1 17:55:34 2004
@@ -15,10 +15,10 @@
 #ifndef LLVM_SUPPORT_CFG_H
 #define LLVM_SUPPORT_CFG_H
 
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include "llvm/Function.h"
 #include "llvm/InstrTypes.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 


Index: llvm/include/llvm/Support/Casting.h
diff -u llvm/include/llvm/Support/Casting.h:1.12 llvm/include/llvm/Support/Casting.h:1.13
--- llvm/include/llvm/Support/Casting.h:1.12	Sun Nov 16 14:21:13 2003
+++ llvm/include/llvm/Support/Casting.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/Casting.h - Allow flexible, checked, casts ------*- C++ -*-===//
+//===-- llvm/Support/Casting.h - Allow flexible, checked, casts -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_CASTING_H
-#define SUPPORT_CASTING_H
+#ifndef LLVM_SUPPORT_CASTING_H
+#define LLVM_SUPPORT_CASTING_H
 
 namespace llvm {
 


Index: llvm/include/llvm/Support/CommandLine.h
diff -u llvm/include/llvm/Support/CommandLine.h:1.35 llvm/include/llvm/Support/CommandLine.h:1.36
--- llvm/include/llvm/Support/CommandLine.h:1.35	Fri Aug 13 14:47:30 2004
+++ llvm/include/llvm/Support/CommandLine.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- Support/CommandLine.h - Flexible Command line parser -----*- C++ -*-===//
+//===- llvm/Support/CommandLine.h - Command line handler --------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,10 +17,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_COMMANDLINE_H
-#define SUPPORT_COMMANDLINE_H
+#ifndef LLVM_SUPPORT_COMMANDLINE_H
+#define LLVM_SUPPORT_COMMANDLINE_H
 
-#include "Support/type_traits.h"
+#include "llvm/Support/type_traits.h"
 #include <string>
 #include <vector>
 #include <utility>


Index: llvm/include/llvm/Support/ConstantRange.h
diff -u llvm/include/llvm/Support/ConstantRange.h:1.7 llvm/include/llvm/Support/ConstantRange.h:1.8
--- llvm/include/llvm/Support/ConstantRange.h:1.7	Mon Mar 29 18:20:08 2004
+++ llvm/include/llvm/Support/ConstantRange.h	Wed Sep  1 17:55:35 2004
@@ -24,7 +24,7 @@
 #ifndef LLVM_SUPPORT_CONSTANT_RANGE_H
 #define LLVM_SUPPORT_CONSTANT_RANGE_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <iosfwd>
 
 namespace llvm {


Index: llvm/include/llvm/Support/DOTGraphTraits.h
diff -u llvm/include/llvm/Support/DOTGraphTraits.h:1.9 llvm/include/llvm/Support/DOTGraphTraits.h:1.10
--- llvm/include/llvm/Support/DOTGraphTraits.h:1.9	Wed May  5 01:10:06 2004
+++ llvm/include/llvm/Support/DOTGraphTraits.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/DotGraphTraits.h - Customize .dot output --------*- C++ -*-===//
+//===-- llvm/Support/DotGraphTraits.h - Customize .dot output ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DOTGRAPHTRAITS_H
-#define SUPPORT_DOTGRAPHTRAITS_H
+#ifndef LLVM_SUPPORT_DOTGRAPHTRAITS_H
+#define LLVM_SUPPORT_DOTGRAPHTRAITS_H
 
 #include <string>
 


Index: llvm/include/llvm/Support/Debug.h
diff -u llvm/include/llvm/Support/Debug.h:1.4 llvm/include/llvm/Support/Debug.h:1.5
--- llvm/include/llvm/Support/Debug.h:1.4	Wed Jul 21 15:50:22 2004
+++ llvm/include/llvm/Support/Debug.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- Debug.h - An easy way to add debug output to your code ---*- C++ -*-===//
+//===- llvm/Support/Debug.h - Easy way to add debug output ------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -23,8 +23,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DEBUG_H
-#define SUPPORT_DEBUG_H
+#ifndef LLVM_SUPPORT_DEBUG_H
+#define LLVM_SUPPORT_DEBUG_H
 
 // Unsurprisingly, most users of this macro use std::cerr too.
 #include <iostream>


Index: llvm/include/llvm/Support/DynamicLinker.h
diff -u llvm/include/llvm/Support/DynamicLinker.h:1.3 llvm/include/llvm/Support/DynamicLinker.h:1.4
--- llvm/include/llvm/Support/DynamicLinker.h:1.3	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/Support/DynamicLinker.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- DynamicLinker.h - System-indep. DynamicLinker interface -*- C++ -*-===//
+//===-- llvm/Support/DynamicLinker.h - Portable Dynamic Linker --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DYNAMICLINKER_H
-#define SUPPORT_DYNAMICLINKER_H
+#ifndef LLVM_SUPPORT_DYNAMICLINKER_H
+#define LLVM_SUPPORT_DYNAMICLINKER_H
 
 #include <string>
 


Index: llvm/include/llvm/Support/ELF.h
diff -u llvm/include/llvm/Support/ELF.h:1.4 llvm/include/llvm/Support/ELF.h:1.5
--- llvm/include/llvm/Support/ELF.h:1.4	Sun Feb 29 00:33:28 2004
+++ llvm/include/llvm/Support/ELF.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/ELF.h - ELF constants and data structures -------*- C++ -*-===//
+//===-- llvm/Support/ELF.h - ELF constants and data structures --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,7 +18,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DataTypes.h"
+#ifndef LLVM_SUPPORT_ELF_H
+#define LLVM_SUPPORT_ELF_H
+
+#include "llvm/Support/DataTypes.h"
 #include <cstring>
 #include <cstdlib>
 
@@ -293,3 +296,5 @@
 } // end namespace ELF
 
 } // end namespace llvm
+
+#endif


Index: llvm/include/llvm/Support/FileUtilities.h
diff -u llvm/include/llvm/Support/FileUtilities.h:1.18 llvm/include/llvm/Support/FileUtilities.h:1.19
--- llvm/include/llvm/Support/FileUtilities.h:1.18	Tue Jun  1 19:51:20 2004
+++ llvm/include/llvm/Support/FileUtilities.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- Support/FileUtilities.h - File System Utilities ----------*- C++ -*-===//
+//===- llvm/Support/FileUtilities.h - File System Utilities -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_FILEUTILITIES_H
-#define SUPPORT_FILEUTILITIES_H
+#ifndef LLVM_SUPPORT_FILEUTILITIES_H
+#define LLVM_SUPPORT_FILEUTILITIES_H
 
 #include <string>
 


Index: llvm/include/llvm/Support/GraphWriter.h
diff -u llvm/include/llvm/Support/GraphWriter.h:1.19 llvm/include/llvm/Support/GraphWriter.h:1.20
--- llvm/include/llvm/Support/GraphWriter.h:1.19	Wed Feb 11 14:44:17 2004
+++ llvm/include/llvm/Support/GraphWriter.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/GraphWriter.h - Write a graph to a .dot file ----*- C++ -*-===//
+//===-- llvm/Support/GraphWriter.h - Write graph to a .dot file -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -20,11 +20,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_GRAPHWRITER_H
-#define SUPPORT_GRAPHWRITER_H
+#ifndef LLVM_SUPPORT_GRAPHWRITER_H
+#define LLVM_SUPPORT_GRAPHWRITER_H
 
-#include "Support/DOTGraphTraits.h"
-#include "Support/GraphTraits.h"
+#include "llvm/Support/DOTGraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include <vector>
 #include <iostream>
 


Index: llvm/include/llvm/Support/LeakDetector.h
diff -u llvm/include/llvm/Support/LeakDetector.h:1.4 llvm/include/llvm/Support/LeakDetector.h:1.5
--- llvm/include/llvm/Support/LeakDetector.h:1.4	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/Support/LeakDetector.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/LeakDetector.h - Provide simple leak detection --*- C++ -*-===//
+//===-- llvm/Support/LeakDetector.h - Provide leak detection ----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_LEAKDETECTOR_H
-#define SUPPORT_LEAKDETECTOR_H
+#ifndef LLVM_SUPPORT_LEAKDETECTOR_H
+#define LLVM_SUPPORT_LEAKDETECTOR_H
 
 #include <string>
 


Index: llvm/include/llvm/Support/MallocAllocator.h
diff -u llvm/include/llvm/Support/MallocAllocator.h:1.7 llvm/include/llvm/Support/MallocAllocator.h:1.8
--- llvm/include/llvm/Support/MallocAllocator.h:1.7	Sun Nov 16 14:21:13 2003
+++ llvm/include/llvm/Support/MallocAllocator.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/MallocAllocator.h - Allocator using malloc/free -*- C++ -*-===//
+//===-- llvm/Support/MallocAllocator.h --------------------------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_MALLOCALLOCATOR_H
-#define SUPPORT_MALLOCALLOCATOR_H
+#ifndef LLVM_SUPPORT_MALLOCALLOCATOR_H
+#define LLVM_SUPPORT_MALLOCALLOCATOR_H
 
 #include <cstdlib>
 #include <memory>


Index: llvm/include/llvm/Support/Mangler.h
diff -u llvm/include/llvm/Support/Mangler.h:1.11 llvm/include/llvm/Support/Mangler.h:1.12
--- llvm/include/llvm/Support/Mangler.h:1.11	Tue Aug 17 01:06:37 2004
+++ llvm/include/llvm/Support/Mangler.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Mangler.h - Self-contained llvm name mangler ------------*- C++ -*-===//
+//===-- llvm/Support/Mangler.h - Self-contained name mangler ----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //


Index: llvm/include/llvm/Support/MathExtras.h
diff -u llvm/include/llvm/Support/MathExtras.h:1.14 llvm/include/llvm/Support/MathExtras.h:1.15
--- llvm/include/llvm/Support/MathExtras.h:1.14	Tue Aug 17 14:17:10 2004
+++ llvm/include/llvm/Support/MathExtras.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/MathExtras.h - Useful math functions ------------*- C++ -*-===//
+//===-- llvm/Support/MathExtras.h - Useful math functions -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_MATHEXTRAS_H
-#define SUPPORT_MATHEXTRAS_H
+#ifndef LLVM_SUPPORT_MATHEXTRAS_H
+#define LLVM_SUPPORT_MATHEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/Support/PassNameParser.h
diff -u llvm/include/llvm/Support/PassNameParser.h:1.9 llvm/include/llvm/Support/PassNameParser.h:1.10
--- llvm/include/llvm/Support/PassNameParser.h:1.9	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/Support/PassNameParser.h	Wed Sep  1 17:55:35 2004
@@ -23,7 +23,7 @@
 #ifndef LLVM_SUPPORT_PASS_NAME_PARSER_H
 #define LLVM_SUPPORT_PASS_NAME_PARSER_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Pass.h"
 #include <algorithm>
 #include <iostream>


Index: llvm/include/llvm/Support/PluginLoader.h
diff -u llvm/include/llvm/Support/PluginLoader.h:1.1 llvm/include/llvm/Support/PluginLoader.h:1.2
--- llvm/include/llvm/Support/PluginLoader.h:1.1	Sat Jul 10 20:03:57 2004
+++ llvm/include/llvm/Support/PluginLoader.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/PluginLoader.h - Provide -load option to tool ---*- C++ -*-===//
+//===-- llvm/Support/PluginLoader.h - Plugin Loader for Tools ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_PLUGINLOADER_H
-#define SUPPORT_PLUGINLOADER_H
+#ifndef LLVM_SUPPORT_PLUGINLOADER_H
+#define LLVM_SUPPORT_PLUGINLOADER_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 
 namespace llvm {
   struct PluginLoader {


Index: llvm/include/llvm/Support/SlowOperationInformer.h
diff -u llvm/include/llvm/Support/SlowOperationInformer.h:1.3 llvm/include/llvm/Support/SlowOperationInformer.h:1.4
--- llvm/include/llvm/Support/SlowOperationInformer.h:1.3	Wed Dec 31 04:20:37 2003
+++ llvm/include/llvm/Support/SlowOperationInformer.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- SlowOperationInformer.h - Keep the user informed ---------*- C++ -*-===//
+//===- llvm/Support/SlowOperationInformer.h - Keep user informed *- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -28,8 +28,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SLOW_OPERATION_INFORMER_H
-#define SUPPORT_SLOW_OPERATION_INFORMER_H
+#ifndef LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H
+#define LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H
 
 #include <string>
 #include <cassert>


Index: llvm/include/llvm/Support/SystemUtils.h
diff -u llvm/include/llvm/Support/SystemUtils.h:1.12 llvm/include/llvm/Support/SystemUtils.h:1.13
--- llvm/include/llvm/Support/SystemUtils.h:1.12	Sat Jul 24 02:41:31 2004
+++ llvm/include/llvm/Support/SystemUtils.h	Wed Sep  1 17:55:35 2004
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SYSTEMUTILS_H
-#define SYSTEMUTILS_H
+#ifndef LLVM_SUPPORT_SYSTEMUTILS_H
+#define LLVM_SUPPORT_SYSTEMUTILS_H
 
 #include <string>
 


Index: llvm/include/llvm/Support/ThreadSupport-NoSupport.h
diff -u llvm/include/llvm/Support/ThreadSupport-NoSupport.h:1.1 llvm/include/llvm/Support/ThreadSupport-NoSupport.h:1.2
--- llvm/include/llvm/Support/ThreadSupport-NoSupport.h:1.1	Sat Jan 17 13:54:29 2004
+++ llvm/include/llvm/Support/ThreadSupport-NoSupport.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/ThreadSupport-NoSupport.h - Generic impl --------*- C++ -*-===//
+//===-- llvm/Support/ThreadSupport-NoSupport.h - Generic Impl ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -16,7 +16,7 @@
 // Users should never #include this file directly!  As such, no include guards
 // are needed.
 
-#ifndef SUPPORT_THREADSUPPORT_H
+#ifndef LLVM_SUPPORT_THREADSUPPORT_H
 #error "Code should not #include Support/ThreadSupport-NoSupport.h directly!"
 #endif
 


Index: llvm/include/llvm/Support/ThreadSupport-PThreads.h
diff -u llvm/include/llvm/Support/ThreadSupport-PThreads.h:1.2 llvm/include/llvm/Support/ThreadSupport-PThreads.h:1.3
--- llvm/include/llvm/Support/ThreadSupport-PThreads.h:1.2	Sat Jan 17 13:54:29 2004
+++ llvm/include/llvm/Support/ThreadSupport-PThreads.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/ThreadSupport-PThreads.h - PThreads support -----*- C++ -*-===//
+//===-- llvm/Support/ThreadSupport-PThreads.h - PThreads support *- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,7 +15,7 @@
 // Users should never #include this file directly!  As such, no include guards
 // are needed.
 
-#ifndef SUPPORT_THREADSUPPORT_H
+#ifndef LLVM_SUPPORT_THREADSUPPORT_H
 #error "Code should not #include Support/ThreadSupport/PThreads.h directly!"
 #endif
 


Index: llvm/include/llvm/Support/ThreadSupport.h.in
diff -u llvm/include/llvm/Support/ThreadSupport.h.in:1.1 llvm/include/llvm/Support/ThreadSupport.h.in:1.2
--- llvm/include/llvm/Support/ThreadSupport.h.in:1.1	Mon Feb 23 15:30:29 2004
+++ llvm/include/llvm/Support/ThreadSupport.h.in	Wed Sep  1 17:55:35 2004
@@ -18,9 +18,9 @@
 #define SUPPORT_THREADSUPPORT_H
 
 #if @HAVE_PTHREAD_MUTEX_LOCK@
-#include "Support/ThreadSupport-PThreads.h"
+#include "llvm/Support/ThreadSupport-PThreads.h"
 #else
-#include "Support/ThreadSupport-NoSupport.h"
+#include "llvm/Support/ThreadSupport-NoSupport.h"
 #endif // If no system support is available
 
 namespace llvm {


Index: llvm/include/llvm/Support/Timer.h
diff -u llvm/include/llvm/Support/Timer.h:1.12 llvm/include/llvm/Support/Timer.h:1.13
--- llvm/include/llvm/Support/Timer.h:1.12	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/Support/Timer.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/Timer.h - Interval Timing Support ---------------*- C++ -*-===//
+//===-- llvm/Support/Timer.h - Interval Timing Support ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TIMER_H
-#define SUPPORT_TIMER_H
+#ifndef LLVM_SUPPORT_TIMER_H
+#define LLVM_SUPPORT_TIMER_H
 
 #include <string>
 #include <vector>


Index: llvm/include/llvm/Support/ToolRunner.h
diff -u llvm/include/llvm/Support/ToolRunner.h:1.14 llvm/include/llvm/Support/ToolRunner.h:1.15
--- llvm/include/llvm/Support/ToolRunner.h:1.14	Sat Jul 24 02:48:50 2004
+++ llvm/include/llvm/Support/ToolRunner.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===//
+//===-- llvm/Support/ToolRunner.h -------------------------------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef TOOLRUNNER_H
-#define TOOLRUNNER_H
+#ifndef LLVM_SUPPORT_TOOLRUNNER_H
+#define LLVM_SUPPORT_TOOLRUNNER_H
 
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <exception>
 #include <vector>
 


Index: llvm/include/llvm/Support/TypeInfo.h
diff -u llvm/include/llvm/Support/TypeInfo.h:1.6 llvm/include/llvm/Support/TypeInfo.h:1.7
--- llvm/include/llvm/Support/TypeInfo.h:1.6	Fri Jun  4 15:47:19 2004
+++ llvm/include/llvm/Support/TypeInfo.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- Support/TypeInfo.h - Support class for type_info objects -*- C++ -*-===//
+//===- llvm/Support/TypeInfo.h - Support for type_info objects -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TYPEINFO_H
-#define SUPPORT_TYPEINFO_H
+#ifndef LLVM_SUPPORT_TYPEINFO_H
+#define LLVM_SUPPORT_TYPEINFO_H
 
 #include <typeinfo>
 


Index: llvm/include/llvm/Support/type_traits.h
diff -u llvm/include/llvm/Support/type_traits.h:1.1 llvm/include/llvm/Support/type_traits.h:1.2
--- llvm/include/llvm/Support/type_traits.h:1.1	Mon Feb 23 21:49:29 2004
+++ llvm/include/llvm/Support/type_traits.h	Wed Sep  1 17:55:35 2004
@@ -1,4 +1,4 @@
-//===- Support/type_traits.h - Simplfied type traits ------------*- C++ -*-===//
+//===- llvm/Support/type_traits.h - Simplfied type traits -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
	ConstantMerge.cpp DeadArgumentElimination.cpp
	DeadTypeElimination.cpp FunctionResolution.cpp
	GlobalConstifier.cpp GlobalDCE.cpp IPConstantPropagation.cpp
	Inliner.cpp Internalize.cpp LoopExtractor.cpp LowerSetJmp.cpp
	PruneEH.cpp RaiseAllocations.cpp 
Message-ID: <200409012255.RAA28579@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/IPO:

ArgumentPromotion.cpp updated: 1.8 -> 1.9
ConstantMerge.cpp updated: 1.26 -> 1.27
DeadArgumentElimination.cpp updated: 1.17 -> 1.18
DeadTypeElimination.cpp updated: 1.51 -> 1.52
FunctionResolution.cpp updated: 1.51 -> 1.52
GlobalConstifier.cpp updated: 1.6 -> 1.7
GlobalDCE.cpp updated: 1.33 -> 1.34
IPConstantPropagation.cpp updated: 1.7 -> 1.8
Inliner.cpp updated: 1.21 -> 1.22
Internalize.cpp updated: 1.21 -> 1.22
LoopExtractor.cpp updated: 1.13 -> 1.14
LowerSetJmp.cpp updated: 1.18 -> 1.19
PruneEH.cpp updated: 1.14 -> 1.15
RaiseAllocations.cpp updated: 1.24 -> 1.25
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+27 -27)

Index: llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
diff -u llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.8 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.9
--- llvm/lib/Transforms/IPO/ArgumentPromotion.cpp:1.8	Sat Jul 17 19:23:51 2004
+++ llvm/lib/Transforms/IPO/ArgumentPromotion.cpp	Wed Sep  1 17:55:36 2004
@@ -39,10 +39,10 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/ConstantMerge.cpp
diff -u llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.26 llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.27
--- llvm/lib/Transforms/IPO/ConstantMerge.cpp:1.26	Sun Dec 28 01:19:08 2003
+++ llvm/lib/Transforms/IPO/ConstantMerge.cpp	Wed Sep  1 17:55:36 2004
@@ -20,7 +20,7 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.17 llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.18
--- llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp:1.17	Thu Jul 29 12:28:42 2004
+++ llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp	Wed Sep  1 17:55:36 2004
@@ -24,9 +24,9 @@
 #include "llvm/Constant.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/iterator"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/iterator"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
diff -u llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.51 llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.52
--- llvm/lib/Transforms/IPO/DeadTypeElimination.cpp:1.51	Thu May 27 16:16:46 2004
+++ llvm/lib/Transforms/IPO/DeadTypeElimination.cpp	Wed Sep  1 17:55:36 2004
@@ -17,7 +17,7 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.51 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.52
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.51	Thu Aug 19 19:30:39 2004
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Wed Sep  1 17:55:36 2004
@@ -27,7 +27,7 @@
 #include "llvm/Support/CallSite.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/GlobalConstifier.cpp
diff -u llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.6 llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.7
--- llvm/lib/Transforms/IPO/GlobalConstifier.cpp:1.6	Sat Aug 14 15:57:17 2004
+++ llvm/lib/Transforms/IPO/GlobalConstifier.cpp	Wed Sep  1 17:55:36 2004
@@ -23,8 +23,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/GlobalDCE.cpp
diff -u llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.33 llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.34
--- llvm/lib/Transforms/IPO/GlobalDCE.cpp:1.33	Sun Jul 18 02:22:58 2004
+++ llvm/lib/Transforms/IPO/GlobalDCE.cpp	Wed Sep  1 17:55:36 2004
@@ -19,7 +19,7 @@
 #include "llvm/Constants.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
diff -u llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.7 llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.8
--- llvm/lib/Transforms/IPO/IPConstantPropagation.cpp:1.7	Sun Jul 18 03:31:18 2004
+++ llvm/lib/Transforms/IPO/IPConstantPropagation.cpp	Wed Sep  1 17:55:36 2004
@@ -20,7 +20,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Constants.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/IPO/Inliner.cpp
diff -u llvm/lib/Transforms/IPO/Inliner.cpp:1.21 llvm/lib/Transforms/IPO/Inliner.cpp:1.22
--- llvm/lib/Transforms/IPO/Inliner.cpp:1.21	Sat Aug  7 22:29:50 2004
+++ llvm/lib/Transforms/IPO/Inliner.cpp	Wed Sep  1 17:55:36 2004
@@ -19,9 +19,9 @@
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/Internalize.cpp
diff -u llvm/lib/Transforms/IPO/Internalize.cpp:1.21 llvm/lib/Transforms/IPO/Internalize.cpp:1.22
--- llvm/lib/Transforms/IPO/Internalize.cpp:1.21	Fri Nov 21 15:54:22 2003
+++ llvm/lib/Transforms/IPO/Internalize.cpp	Wed Sep  1 17:55:36 2004
@@ -16,9 +16,9 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <fstream>
 #include <set>
 using namespace llvm;


Index: llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff -u llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.13 llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.14
--- llvm/lib/Transforms/IPO/LoopExtractor.cpp:1.13	Thu Aug 12 22:05:17 2004
+++ llvm/lib/Transforms/IPO/LoopExtractor.cpp	Wed Sep  1 17:55:36 2004
@@ -22,7 +22,7 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/FunctionUtils.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/IPO/LowerSetJmp.cpp
diff -u llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.18 llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.19
--- llvm/lib/Transforms/IPO/LowerSetJmp.cpp:1.18	Sat Mar 13 20:13:38 2004
+++ llvm/lib/Transforms/IPO/LowerSetJmp.cpp	Wed Sep  1 17:55:36 2004
@@ -43,10 +43,10 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
-#include "Support/VectorExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/VectorExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/IPO/PruneEH.cpp
diff -u llvm/lib/Transforms/IPO/PruneEH.cpp:1.14 llvm/lib/Transforms/IPO/PruneEH.cpp:1.15
--- llvm/lib/Transforms/IPO/PruneEH.cpp:1.14	Thu Jul 29 12:28:42 2004
+++ llvm/lib/Transforms/IPO/PruneEH.cpp	Wed Sep  1 17:55:36 2004
@@ -20,7 +20,7 @@
 #include "llvm/Intrinsics.h"
 #include "llvm/Instructions.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/IPO/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.24 llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.25
--- llvm/lib/Transforms/IPO/RaiseAllocations.cpp:1.24	Thu Jul 29 12:28:42 2004
+++ llvm/lib/Transforms/IPO/RaiseAllocations.cpp	Wed Sep  1 17:55:36 2004
@@ -19,7 +19,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
	CFGPrinter.cpp InstCount.cpp IntervalPartition.cpp
	LoopInfo.cpp PostDominators.cpp ProfileInfoLoaderPass.cpp
	ScalarEvolution.cpp 
Message-ID: <200409012255.RAA28361@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

AliasAnalysisEvaluator.cpp updated: 1.18 -> 1.19
CFGPrinter.cpp updated: 1.9 -> 1.10
InstCount.cpp updated: 1.7 -> 1.8
IntervalPartition.cpp updated: 1.24 -> 1.25
LoopInfo.cpp updated: 1.57 -> 1.58
PostDominators.cpp updated: 1.47 -> 1.48
ProfileInfoLoaderPass.cpp updated: 1.6 -> 1.7
ScalarEvolution.cpp updated: 1.23 -> 1.24
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+10 -10)

Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.18 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.19
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.18	Thu Jul 29 12:14:54 2004
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Wed Sep  1 17:55:35 2004
@@ -24,7 +24,7 @@
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 #include <set>
 


Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.9 llvm/lib/Analysis/CFGPrinter.cpp:1.10
--- llvm/lib/Analysis/CFGPrinter.cpp:1.9	Thu Jul 29 12:14:54 2004
+++ llvm/lib/Analysis/CFGPrinter.cpp	Wed Sep  1 17:55:35 2004
@@ -23,7 +23,7 @@
 #include "llvm/Analysis/CFGPrinter.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/GraphWriter.h"
+#include "llvm/Support/GraphWriter.h"
 #include <sstream>
 #include <fstream>
 using namespace llvm;


Index: llvm/lib/Analysis/InstCount.cpp
diff -u llvm/lib/Analysis/InstCount.cpp:1.7 llvm/lib/Analysis/InstCount.cpp:1.8
--- llvm/lib/Analysis/InstCount.cpp:1.7	Tue Nov 11 16:41:31 2003
+++ llvm/lib/Analysis/InstCount.cpp	Wed Sep  1 17:55:35 2004
@@ -14,7 +14,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/IntervalPartition.cpp
diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.24 llvm/lib/Analysis/IntervalPartition.cpp:1.25
--- llvm/lib/Analysis/IntervalPartition.cpp:1.24	Tue Nov 11 16:41:31 2003
+++ llvm/lib/Analysis/IntervalPartition.cpp	Wed Sep  1 17:55:35 2004
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/IntervalIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 


Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.57 llvm/lib/Analysis/LoopInfo.cpp:1.58
--- llvm/lib/Analysis/LoopInfo.cpp:1.57	Sun Jul  4 07:19:55 2004
+++ llvm/lib/Analysis/LoopInfo.cpp	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include <algorithm>
 #include <iostream>
 


Index: llvm/lib/Analysis/PostDominators.cpp
diff -u llvm/lib/Analysis/PostDominators.cpp:1.47 llvm/lib/Analysis/PostDominators.cpp:1.48
--- llvm/lib/Analysis/PostDominators.cpp:1.47	Thu Jul 29 12:14:54 2004
+++ llvm/lib/Analysis/PostDominators.cpp	Wed Sep  1 17:55:35 2004
@@ -14,8 +14,8 @@
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.6 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.7
--- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.6	Sun Jul  4 07:19:55 2004
+++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Analysis/ProfileInfo.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 
 using namespace llvm;


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.23 llvm/lib/Analysis/ScalarEvolution.cpp:1.24
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.23	Sat Jul 17 19:18:30 2004
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Wed Sep  1 17:55:35 2004
@@ -72,8 +72,8 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 #include <cmath>
 using namespace llvm;
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-ar/llvm-ar.cpp 
Message-ID: <200409012255.RAA28279@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-ar:

llvm-ar.cpp updated: 1.14 -> 1.15
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/llvm-ar/llvm-ar.cpp
diff -u llvm/tools/llvm-ar/llvm-ar.cpp:1.14 llvm/tools/llvm-ar/llvm-ar.cpp:1.15
--- llvm/tools/llvm-ar/llvm-ar.cpp:1.14	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-ar/llvm-ar.cpp	Wed Sep  1 17:55:37 2004
@@ -13,8 +13,8 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <string>
 #include <fstream>





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/AliasSetTracker.h
	CallGraph.h ConstantsScanner.h Interval.h LoopInfo.h 
Message-ID: <200409012255.RAA28166@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

AliasSetTracker.h updated: 1.18 -> 1.19
CallGraph.h updated: 1.38 -> 1.39
ConstantsScanner.h updated: 1.14 -> 1.15
Interval.h updated: 1.17 -> 1.18
LoopInfo.h updated: 1.40 -> 1.41
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/include/llvm/Analysis/AliasSetTracker.h
diff -u llvm/include/llvm/Analysis/AliasSetTracker.h:1.18 llvm/include/llvm/Analysis/AliasSetTracker.h:1.19
--- llvm/include/llvm/Analysis/AliasSetTracker.h:1.18	Mon Jul 26 00:50:09 2004
+++ llvm/include/llvm/Analysis/AliasSetTracker.h	Wed Sep  1 17:55:34 2004
@@ -18,9 +18,9 @@
 #define LLVM_ANALYSIS_ALIASSETTRACKER_H
 
 #include "llvm/Support/CallSite.h"
-#include "Support/iterator"
-#include "Support/hash_map"
-#include "Support/ilist"
+#include "llvm/ADT/iterator"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 


Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.38 llvm/include/llvm/Analysis/CallGraph.h:1.39
--- llvm/include/llvm/Analysis/CallGraph.h:1.38	Sat Aug  7 22:27:39 2004
+++ llvm/include/llvm/Analysis/CallGraph.h	Wed Sep  1 17:55:34 2004
@@ -51,8 +51,8 @@
 #ifndef LLVM_ANALYSIS_CALLGRAPH_H
 #define LLVM_ANALYSIS_CALLGRAPH_H
 
-#include "Support/GraphTraits.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Pass.h"
 
 namespace llvm {


Index: llvm/include/llvm/Analysis/ConstantsScanner.h
diff -u llvm/include/llvm/Analysis/ConstantsScanner.h:1.14 llvm/include/llvm/Analysis/ConstantsScanner.h:1.15
--- llvm/include/llvm/Analysis/ConstantsScanner.h:1.14	Tue Nov 11 16:41:30 2003
+++ llvm/include/llvm/Analysis/ConstantsScanner.h	Wed Sep  1 17:55:34 2004
@@ -18,7 +18,7 @@
 
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 


Index: llvm/include/llvm/Analysis/Interval.h
diff -u llvm/include/llvm/Analysis/Interval.h:1.17 llvm/include/llvm/Analysis/Interval.h:1.18
--- llvm/include/llvm/Analysis/Interval.h:1.17	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/Analysis/Interval.h	Wed Sep  1 17:55:34 2004
@@ -20,7 +20,7 @@
 #ifndef LLVM_INTERVAL_H
 #define LLVM_INTERVAL_H
 
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include <vector>
 #include <iosfwd>
 


Index: llvm/include/llvm/Analysis/LoopInfo.h
diff -u llvm/include/llvm/Analysis/LoopInfo.h:1.40 llvm/include/llvm/Analysis/LoopInfo.h:1.41
--- llvm/include/llvm/Analysis/LoopInfo.h:1.40	Mon Apr 19 01:26:46 2004
+++ llvm/include/llvm/Analysis/LoopInfo.h	Wed Sep  1 17:55:34 2004
@@ -31,7 +31,7 @@
 #define LLVM_ANALYSIS_LOOP_INFO_H
 
 #include "llvm/Pass.h"
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 
 namespace llvm {
 





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/sys/mman.h resource.h
	stat.h time.h types.h wait.h 
Message-ID: <200409012255.RAA28133@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config/sys:

mman.h updated: 1.4 -> 1.5
resource.h updated: 1.5 -> 1.6
stat.h updated: 1.5 -> 1.6
time.h updated: 1.5 -> 1.6
types.h updated: 1.4 -> 1.5
wait.h updated: 1.4 -> 1.5
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/include/llvm/Config/sys/mman.h
diff -u llvm/include/llvm/Config/sys/mman.h:1.4 llvm/include/llvm/Config/sys/mman.h:1.5
--- llvm/include/llvm/Config/sys/mman.h:1.4	Fri Jun  4 15:03:06 2004
+++ llvm/include/llvm/Config/sys/mman.h	Wed Sep  1 17:55:34 2004
@@ -18,7 +18,7 @@
 #ifndef _CONFIG_MMAN_H
 #define _CONFIG_MMAN_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_MMAN_H) && !defined(_MSC_VER)
 #include <sys/mman.h>


Index: llvm/include/llvm/Config/sys/resource.h
diff -u llvm/include/llvm/Config/sys/resource.h:1.5 llvm/include/llvm/Config/sys/resource.h:1.6
--- llvm/include/llvm/Config/sys/resource.h:1.5	Fri Jun  4 19:27:38 2004
+++ llvm/include/llvm/Config/sys/resource.h	Wed Sep  1 17:55:34 2004
@@ -16,7 +16,7 @@
 #ifndef _CONFIG_SYS_RESOURCE_H
 #define _CONFIG_SYS_RESOURCE_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER)
 
@@ -25,9 +25,9 @@
  * stuff.  Some man pages say that you also need sys/time.h and unistd.h.
  * So, to be paranoid, we will try to include all three if possible.
  */
-#include "Config/sys/time.h"
+#include "llvm/Config/sys/time.h"
 #include <sys/resource.h>
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 
 #endif
 


Index: llvm/include/llvm/Config/sys/stat.h
diff -u llvm/include/llvm/Config/sys/stat.h:1.5 llvm/include/llvm/Config/sys/stat.h:1.6
--- llvm/include/llvm/Config/sys/stat.h:1.5	Fri Jun  4 15:03:06 2004
+++ llvm/include/llvm/Config/sys/stat.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_STAT_H
 #define _CONFIG_SYS_STAT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>


Index: llvm/include/llvm/Config/sys/time.h
diff -u llvm/include/llvm/Config/sys/time.h:1.5 llvm/include/llvm/Config/sys/time.h:1.6
--- llvm/include/llvm/Config/sys/time.h:1.5	Fri Jun  4 19:27:38 2004
+++ llvm/include/llvm/Config/sys/time.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_TIME_H
 #define _CONFIG_SYS_TIME_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
 #include <sys/time.h>


Index: llvm/include/llvm/Config/sys/types.h
diff -u llvm/include/llvm/Config/sys/types.h:1.4 llvm/include/llvm/Config/sys/types.h:1.5
--- llvm/include/llvm/Config/sys/types.h:1.4	Thu Feb 26 02:01:30 2004
+++ llvm/include/llvm/Config/sys/types.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_TYPES_H
 #define _CONFIG_SYS_TYPES_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>


Index: llvm/include/llvm/Config/sys/wait.h
diff -u llvm/include/llvm/Config/sys/wait.h:1.4 llvm/include/llvm/Config/sys/wait.h:1.5
--- llvm/include/llvm/Config/sys/wait.h:1.4	Thu Feb 26 02:01:30 2004
+++ llvm/include/llvm/Config/sys/wait.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_SYS_WAIT_H
 #define _CONFIG_SYS_WAIT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Emitter.cpp
	Intercept.cpp JIT.cpp 
Message-ID: <200409012255.RAA28203@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/JIT:

Emitter.cpp updated: 1.42 -> 1.43
Intercept.cpp updated: 1.16 -> 1.17
JIT.cpp updated: 1.43 -> 1.44
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+5 -5)

Index: llvm/lib/ExecutionEngine/JIT/Emitter.cpp
diff -u llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.42 llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.43
--- llvm/lib/ExecutionEngine/JIT/Emitter.cpp:1.42	Thu May 27 19:57:27 2004
+++ llvm/lib/ExecutionEngine/JIT/Emitter.cpp	Wed Sep  1 17:55:35 2004
@@ -20,9 +20,9 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/SystemUtils.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/ExecutionEngine/JIT/Intercept.cpp
diff -u llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.16 llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.17
--- llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.16	Tue Jun  1 16:49:00 2004
+++ llvm/lib/ExecutionEngine/JIT/Intercept.cpp	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "JIT.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 #include <sys/stat.h>
 using namespace llvm;


Index: llvm/lib/ExecutionEngine/JIT/JIT.cpp
diff -u llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.43 llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.44
--- llvm/lib/ExecutionEngine/JIT/JIT.cpp:1.43	Sun Aug 15 20:07:04 2004
+++ llvm/lib/ExecutionEngine/JIT/JIT.cpp	Wed Sep  1 17:55:35 2004
@@ -24,7 +24,7 @@
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetJITInfo.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/projects/sample/lib/sample/sample.c 
Message-ID: <200409012255.RAA28377@zion.cs.uiuc.edu>



Changes in directory llvm/projects/sample/lib/sample:

sample.c updated: 1.2 -> 1.3
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/sample/lib/sample/sample.c
diff -u llvm/projects/sample/lib/sample/sample.c:1.2 llvm/projects/sample/lib/sample/sample.c:1.3
--- llvm/projects/sample/lib/sample/sample.c:1.2	Mon Jun 30 17:13:05 2003
+++ llvm/projects/sample/lib/sample/sample.c	Wed Sep  1 17:55:37 2004
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 // LLVM Header File
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 // Header file global to this project
 #include "sample.h"





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/Andersens.cpp
	CallGraph.cpp CallGraphSCCPass.cpp FindUnsafePointerTypes.cpp
	GlobalsModRef.cpp PrintSCC.cpp 
Message-ID: <200409012255.RAA28425@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis/IPA:

Andersens.cpp updated: 1.6 -> 1.7
CallGraph.cpp updated: 1.40 -> 1.41
CallGraphSCCPass.cpp updated: 1.7 -> 1.8
FindUnsafePointerTypes.cpp updated: 1.25 -> 1.26
GlobalsModRef.cpp updated: 1.5 -> 1.6
PrintSCC.cpp updated: 1.10 -> 1.11
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+9 -9)

Index: llvm/lib/Analysis/IPA/Andersens.cpp
diff -u llvm/lib/Analysis/IPA/Andersens.cpp:1.6 llvm/lib/Analysis/IPA/Andersens.cpp:1.7
--- llvm/lib/Analysis/IPA/Andersens.cpp:1.6	Mon Aug 16 00:38:02 2004
+++ llvm/lib/Analysis/IPA/Andersens.cpp	Wed Sep  1 17:55:35 2004
@@ -58,8 +58,8 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Analysis/AliasAnalysis.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.40 llvm/lib/Analysis/IPA/CallGraph.cpp:1.41
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.40	Sat Aug  7 22:27:49 2004
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
diff -u llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.7 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.8
--- llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp:1.7	Tue Apr 20 16:52:26 2004
+++ llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 
 #include "llvm/CallGraphSCCPass.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "Support/SCCIterator.h"
+#include "llvm/ADT/SCCIterator.h"
 using namespace llvm;
 
 /// getAnalysisUsage - For this class, we declare that we require and preserve


Index: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.25 llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.26
--- llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.25	Wed Jul 14 21:31:46 2004
+++ llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp	Wed Sep  1 17:55:35 2004
@@ -28,7 +28,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 static RegisterAnalysis<FindUnsafePointerTypes>


Index: llvm/lib/Analysis/IPA/GlobalsModRef.cpp
diff -u llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.5 llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.6
--- llvm/lib/Analysis/IPA/GlobalsModRef.cpp:1.5	Tue Jul 27 03:03:18 2004
+++ llvm/lib/Analysis/IPA/GlobalsModRef.cpp	Wed Sep  1 17:55:35 2004
@@ -22,9 +22,9 @@
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
-#include "Support/SCCIterator.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/SCCIterator.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Analysis/IPA/PrintSCC.cpp
diff -u llvm/lib/Analysis/IPA/PrintSCC.cpp:1.10 llvm/lib/Analysis/IPA/PrintSCC.cpp:1.11
--- llvm/lib/Analysis/IPA/PrintSCC.cpp:1.10	Sun Jul  4 07:19:55 2004
+++ llvm/lib/Analysis/IPA/PrintSCC.cpp	Wed Sep  1 17:55:35 2004
@@ -29,7 +29,7 @@
 #include "llvm/Module.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SCCIterator.h"
+#include "llvm/ADT/SCCIterator.h"
 #include <iostream>
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/Annotation.cpp CommandLine.cpp
	Debug.cpp DynamicLinker.cpp FileUtilities.cpp IsInf.cpp
	IsNAN.cpp PluginLoader.cpp SlowOperationInformer.cpp
	Statistic.cpp StringExtras.cpp SystemUtils.cpp Timer.cpp
	ToolRunner.cpp 
Message-ID: <200409012255.RAA28408@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

Annotation.cpp updated: 1.14 -> 1.15
CommandLine.cpp updated: 1.49 -> 1.50
Debug.cpp updated: 1.5 -> 1.6
DynamicLinker.cpp updated: 1.7 -> 1.8
FileUtilities.cpp updated: 1.24 -> 1.25
IsInf.cpp updated: 1.2 -> 1.3
IsNAN.cpp updated: 1.1 -> 1.2
PluginLoader.cpp updated: 1.11 -> 1.12
SlowOperationInformer.cpp updated: 1.4 -> 1.5
Statistic.cpp updated: 1.14 -> 1.15
StringExtras.cpp updated: 1.1 -> 1.2
SystemUtils.cpp updated: 1.33 -> 1.34
Timer.cpp updated: 1.30 -> 1.31
ToolRunner.cpp updated: 1.29 -> 1.30
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+44 -44)

Index: llvm/lib/Support/Annotation.cpp
diff -u llvm/lib/Support/Annotation.cpp:1.14 llvm/lib/Support/Annotation.cpp:1.15
--- llvm/lib/Support/Annotation.cpp:1.14	Thu Feb 26 01:23:57 2004
+++ llvm/lib/Support/Annotation.cpp	Wed Sep  1 17:55:35 2004
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <map>
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 using namespace llvm;
 
 Annotation::~Annotation() {}  // Designed to be subclassed


Index: llvm/lib/Support/CommandLine.cpp
diff -u llvm/lib/Support/CommandLine.cpp:1.49 llvm/lib/Support/CommandLine.cpp:1.50
--- llvm/lib/Support/CommandLine.cpp:1.49	Tue Aug 31 23:41:28 2004
+++ llvm/lib/Support/CommandLine.cpp	Wed Sep  1 17:55:35 2004
@@ -16,8 +16,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
-#include "Support/CommandLine.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <map>
 #include <set>


Index: llvm/lib/Support/Debug.cpp
diff -u llvm/lib/Support/Debug.cpp:1.5 llvm/lib/Support/Debug.cpp:1.6
--- llvm/lib/Support/Debug.cpp:1.5	Sun Dec 14 15:35:53 2003
+++ llvm/lib/Support/Debug.cpp	Wed Sep  1 17:55:35 2004
@@ -23,8 +23,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Debug.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 bool llvm::DebugFlag;  // DebugFlag - Exported boolean set by the -debug option


Index: llvm/lib/Support/DynamicLinker.cpp
diff -u llvm/lib/Support/DynamicLinker.cpp:1.7 llvm/lib/Support/DynamicLinker.cpp:1.8
--- llvm/lib/Support/DynamicLinker.cpp:1.7	Fri May 28 18:54:07 2004
+++ llvm/lib/Support/DynamicLinker.cpp	Wed Sep  1 17:55:35 2004
@@ -18,9 +18,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DynamicLinker.h"
-#include "Config/dlfcn.h"
-#include "Config/windows.h"
+#include "llvm/Support/DynamicLinker.h"
+#include "llvm/Config/dlfcn.h"
+#include "llvm/Config/windows.h"
 #include <cassert>
 #include <vector>
 using namespace llvm;


Index: llvm/lib/Support/FileUtilities.cpp
diff -u llvm/lib/Support/FileUtilities.cpp:1.24 llvm/lib/Support/FileUtilities.cpp:1.25
--- llvm/lib/Support/FileUtilities.cpp:1.24	Mon Jun  7 14:37:24 2004
+++ llvm/lib/Support/FileUtilities.cpp	Wed Sep  1 17:55:35 2004
@@ -12,14 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/FileUtilities.h"
-#include "Support/DataTypes.h"
-#include "Config/unistd.h"
-#include "Config/fcntl.h"
-#include "Config/sys/types.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/mman.h"
-#include "Config/alloca.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/mman.h"
+#include "llvm/Config/alloca.h"
 #include <cerrno>
 #include <cstdio>
 #include <fstream>


Index: llvm/lib/Support/IsInf.cpp
diff -u llvm/lib/Support/IsInf.cpp:1.2 llvm/lib/Support/IsInf.cpp:1.3
--- llvm/lib/Support/IsInf.cpp:1.2	Tue Jul 20 22:32:51 2004
+++ llvm/lib/Support/IsInf.cpp	Wed Sep  1 17:55:35 2004
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 #if HAVE_ISINF_IN_MATH_H
 # include <math.h>
 #elif HAVE_ISINF_IN_CMATH


Index: llvm/lib/Support/IsNAN.cpp
diff -u llvm/lib/Support/IsNAN.cpp:1.1 llvm/lib/Support/IsNAN.cpp:1.2
--- llvm/lib/Support/IsNAN.cpp:1.1	Tue Jun 22 18:54:38 2004
+++ llvm/lib/Support/IsNAN.cpp	Wed Sep  1 17:55:35 2004
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 #if HAVE_ISNAN_IN_MATH_H
 # include <math.h>
 #elif HAVE_ISNAN_IN_CMATH


Index: llvm/lib/Support/PluginLoader.cpp
diff -u llvm/lib/Support/PluginLoader.cpp:1.11 llvm/lib/Support/PluginLoader.cpp:1.12
--- llvm/lib/Support/PluginLoader.cpp:1.11	Sat Jul 10 20:04:33 2004
+++ llvm/lib/Support/PluginLoader.cpp	Wed Sep  1 17:55:35 2004
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #define DONT_GET_PLUGIN_LOADER_OPTION
-#include "Support/PluginLoader.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/lib/Support/SlowOperationInformer.cpp
diff -u llvm/lib/Support/SlowOperationInformer.cpp:1.4 llvm/lib/Support/SlowOperationInformer.cpp:1.5
--- llvm/lib/Support/SlowOperationInformer.cpp:1.4	Thu Jan  1 09:14:28 2004
+++ llvm/lib/Support/SlowOperationInformer.cpp	Wed Sep  1 17:55:35 2004
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/SlowOperationInformer.h"
-#include "Config/config.h"     // Get the signal handler return type
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/Config/config.h"     // Get the signal handler return type
 #include <iostream>
 #include <sstream>
 #include <signal.h>


Index: llvm/lib/Support/Statistic.cpp
diff -u llvm/lib/Support/Statistic.cpp:1.14 llvm/lib/Support/Statistic.cpp:1.15
--- llvm/lib/Support/Statistic.cpp:1.14	Tue Jan  6 03:16:02 2004
+++ llvm/lib/Support/Statistic.cpp	Wed Sep  1 17:55:35 2004
@@ -21,8 +21,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Statistic.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 #include <sstream>
 #include <iostream>
 #include <algorithm>


Index: llvm/lib/Support/StringExtras.cpp
diff -u llvm/lib/Support/StringExtras.cpp:1.1 llvm/lib/Support/StringExtras.cpp:1.2
--- llvm/lib/Support/StringExtras.cpp:1.1	Sun Dec 28 23:07:02 2003
+++ llvm/lib/Support/StringExtras.cpp	Wed Sep  1 17:55:35 2004
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// getToken - This function extracts one token from source, ignoring any


Index: llvm/lib/Support/SystemUtils.cpp
diff -u llvm/lib/Support/SystemUtils.cpp:1.33 llvm/lib/Support/SystemUtils.cpp:1.34
--- llvm/lib/Support/SystemUtils.cpp:1.33	Sun Jul 25 02:34:00 2004
+++ llvm/lib/Support/SystemUtils.cpp	Wed Sep  1 17:55:35 2004
@@ -13,15 +13,15 @@
 //===----------------------------------------------------------------------===//
 
 #define _POSIX_MAPPED_FILES
-#include "Support/SystemUtils.h"
-#include "Config/fcntl.h"
-#include "Config/pagesize.h"
-#include "Config/unistd.h"
-#include "Config/windows.h"
-#include "Config/sys/mman.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/types.h"
-#include "Config/sys/wait.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/pagesize.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/windows.h"
+#include "llvm/Config/sys/mman.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/wait.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstdlib>


Index: llvm/lib/Support/Timer.cpp
diff -u llvm/lib/Support/Timer.cpp:1.30 llvm/lib/Support/Timer.cpp:1.31
--- llvm/lib/Support/Timer.cpp:1.30	Mon Jun  7 14:34:51 2004
+++ llvm/lib/Support/Timer.cpp	Wed Sep  1 17:55:35 2004
@@ -11,18 +11,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Timer.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <iostream>
 #include <functional>
 #include <fstream>
 #include <map>
-#include "Config/sys/resource.h"
-#include "Config/sys/time.h"
-#include "Config/unistd.h"
-#include "Config/malloc.h"
-#include "Config/windows.h"
+#include "llvm/Config/sys/resource.h"
+#include "llvm/Config/sys/time.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/malloc.h"
+#include "llvm/Config/windows.h"
 using namespace llvm;
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on.


Index: llvm/lib/Support/ToolRunner.cpp
diff -u llvm/lib/Support/ToolRunner.cpp:1.29 llvm/lib/Support/ToolRunner.cpp:1.30
--- llvm/lib/Support/ToolRunner.cpp:1.29	Sat Jul 24 02:49:11 2004
+++ llvm/lib/Support/ToolRunner.cpp	Wed Sep  1 17:55:35 2004
@@ -13,9 +13,9 @@
 
 #define DEBUG_TYPE "toolrunner"
 #include "llvm/Support/ToolRunner.h"
-#include "Config/config.h"   // for HAVE_LINK_R
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Config/config.h"   // for HAVE_LINK_R
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <sstream>
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:54 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:54 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
	TargetInstrInfo.h TargetMachineRegistry.h TargetSchedInfo.h 
Message-ID: <200409012255.RAA28095@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.26 -> 1.27
TargetInstrInfo.h updated: 1.69 -> 1.70
TargetMachineRegistry.h updated: 1.3 -> 1.4
TargetSchedInfo.h updated: 1.29 -> 1.30
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+4 -4)

Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.26 llvm/include/llvm/Target/TargetData.h:1.27
--- llvm/include/llvm/Target/TargetData.h:1.26	Tue Aug 17 14:12:44 2004
+++ llvm/include/llvm/Target/TargetData.h	Wed Sep  1 17:55:35 2004
@@ -21,7 +21,7 @@
 #define LLVM_TARGET_TARGETDATA_H
 
 #include "llvm/Pass.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <vector>
 #include <string>
 


Index: llvm/include/llvm/Target/TargetInstrInfo.h
diff -u llvm/include/llvm/Target/TargetInstrInfo.h:1.69 llvm/include/llvm/Target/TargetInstrInfo.h:1.70
--- llvm/include/llvm/Target/TargetInstrInfo.h:1.69	Wed Aug 18 15:04:28 2004
+++ llvm/include/llvm/Target/TargetInstrInfo.h	Wed Sep  1 17:55:35 2004
@@ -15,7 +15,7 @@
 #define LLVM_TARGET_TARGETINSTRINFO_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <vector>
 #include <cassert>
 


Index: llvm/include/llvm/Target/TargetMachineRegistry.h
diff -u llvm/include/llvm/Target/TargetMachineRegistry.h:1.3 llvm/include/llvm/Target/TargetMachineRegistry.h:1.4
--- llvm/include/llvm/Target/TargetMachineRegistry.h:1.3	Sun Jul 11 01:02:59 2004
+++ llvm/include/llvm/Target/TargetMachineRegistry.h	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #ifndef LLVM_TARGET_TARGETMACHINEREGISTRY_H
 #define LLVM_TARGET_TARGETMACHINEREGISTRY_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 
 namespace llvm {
   class Module;


Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.29 llvm/include/llvm/Target/TargetSchedInfo.h:1.30
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.29	Sun Aug  1 13:57:38 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #define LLVM_TARGET_TARGETSCHEDINFO_H
 
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ArchiveReader.cpp
	Reader.cpp ReaderWrappers.cpp 
Message-ID: <200409012255.RAA28205@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Reader:

ArchiveReader.cpp updated: 1.18 -> 1.19
Reader.cpp updated: 1.127 -> 1.128
ReaderWrappers.cpp updated: 1.28 -> 1.29
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+14 -8)

Index: llvm/lib/Bytecode/Reader/ArchiveReader.cpp
diff -u llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.18 llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.19
--- llvm/lib/Bytecode/Reader/ArchiveReader.cpp:1.18	Sun Jul  4 06:01:27 2004
+++ llvm/lib/Bytecode/Reader/ArchiveReader.cpp	Wed Sep  1 17:55:35 2004
@@ -18,7 +18,7 @@
 
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.127 llvm/lib/Bytecode/Reader/Reader.cpp:1.128
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.127	Sat Aug 21 15:53:56 2004
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Wed Sep  1 17:55:35 2004
@@ -24,7 +24,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Bytecode/Format.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <sstream>
 using namespace llvm;
 
@@ -428,14 +428,20 @@
 
   if (!Create) return 0;  // Do not create a placeholder?
 
+  // Did we already create a place holder?
   std::pair<unsigned,unsigned> KeyValue(type, oNum);
   ForwardReferenceMap::iterator I = ForwardReferences.lower_bound(KeyValue);
   if (I != ForwardReferences.end() && I->first == KeyValue)
     return I->second;   // We have already created this placeholder
 
-  Value *Val = new Argument(getType(type));
-  ForwardReferences.insert(I, std::make_pair(KeyValue, Val));
-  return Val;
+  // If the type exists (it should)
+  if (const Type* Ty = getType(type)) {
+    // Create the place holder
+    Value *Val = new Argument(Ty);
+    ForwardReferences.insert(I, std::make_pair(KeyValue, Val));
+    return Val;
+  }
+  throw "Can't create placeholder for value of type slot #" + utostr(type);
 }
 
 /// This is just like getValue, but when a compaction table is in use, it 


Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.28 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.29
--- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.28	Tue Aug 24 17:46:20 2004
+++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp	Wed Sep  1 17:55:35 2004
@@ -17,9 +17,9 @@
 #include "Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
-#include "Config/unistd.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Config/unistd.h"
 #include <cerrno>
 using namespace llvm;
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/opt/opt.cpp 
Message-ID: <200409012255.RAA28610@zion.cs.uiuc.edu>



Changes in directory llvm/tools/opt:

opt.cpp updated: 1.96 -> 1.97
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/opt/opt.cpp
diff -u llvm/tools/opt/opt.cpp:1.96 llvm/tools/opt/opt.cpp:1.97
--- llvm/tools/opt/opt.cpp:1.96	Sun Aug 29 14:28:55 2004
+++ llvm/tools/opt/opt.cpp	Wed Sep  1 17:55:40 2004
@@ -21,8 +21,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 #include <memory>
 #include <algorithm>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/BranchFolding.cpp
	LiveInterval.cpp LiveIntervalAnalysis.cpp LiveVariables.cpp
	MachineBasicBlock.cpp MachineFunction.cpp MachineInstr.cpp
	PHIElimination.cpp Passes.cpp RegAllocIterativeScan.cpp
	RegAllocLinearScan.cpp RegAllocLocal.cpp RegAllocSimple.cpp
	TwoAddressInstructionPass.cpp UnreachableBlockElim.cpp
	VirtRegMap.cpp VirtRegMap.h 
Message-ID: <200409012255.RAA28561@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

BranchFolding.cpp updated: 1.6 -> 1.7
LiveInterval.cpp updated: 1.11 -> 1.12
LiveIntervalAnalysis.cpp updated: 1.121 -> 1.122
LiveVariables.cpp updated: 1.43 -> 1.44
MachineBasicBlock.cpp updated: 1.18 -> 1.19
MachineFunction.cpp updated: 1.71 -> 1.72
MachineInstr.cpp updated: 1.104 -> 1.105
PHIElimination.cpp updated: 1.32 -> 1.33
Passes.cpp updated: 1.13 -> 1.14
RegAllocIterativeScan.cpp updated: 1.15 -> 1.16
RegAllocLinearScan.cpp updated: 1.91 -> 1.92
RegAllocLocal.cpp updated: 1.68 -> 1.69
RegAllocSimple.cpp updated: 1.60 -> 1.61
TwoAddressInstructionPass.cpp updated: 1.26 -> 1.27
UnreachableBlockElim.cpp updated: 1.3 -> 1.4
VirtRegMap.cpp updated: 1.18 -> 1.19
VirtRegMap.h updated: 1.12 -> 1.13
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+38 -38)

Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.6 llvm/lib/CodeGen/BranchFolding.cpp:1.7
--- llvm/lib/CodeGen/BranchFolding.cpp:1.6	Sun Aug  1 04:51:42 2004
+++ llvm/lib/CodeGen/BranchFolding.cpp	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/LiveInterval.cpp
diff -u llvm/lib/CodeGen/LiveInterval.cpp:1.11 llvm/lib/CodeGen/LiveInterval.cpp:1.12
--- llvm/lib/CodeGen/LiveInterval.cpp:1.11	Sun Jul 25 02:47:25 2004
+++ llvm/lib/CodeGen/LiveInterval.cpp	Wed Sep  1 17:55:35 2004
@@ -19,7 +19,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "LiveInterval.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 #include <map>
 using namespace llvm;


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.121 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.122
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.121	Tue Aug 31 12:39:15 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed Sep  1 17:55:35 2004
@@ -27,10 +27,10 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "VirtRegMap.h"
 #include <cmath>
 


Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.43 llvm/lib/CodeGen/LiveVariables.cpp:1.44
--- llvm/lib/CodeGen/LiveVariables.cpp:1.43	Wed Sep  1 17:34:52 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Wed Sep  1 17:55:35 2004
@@ -31,8 +31,8 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 static RegisterAnalysis<LiveVariables> X("livevars", "Live Variable Analysis");


Index: llvm/lib/CodeGen/MachineBasicBlock.cpp
diff -u llvm/lib/CodeGen/MachineBasicBlock.cpp:1.18 llvm/lib/CodeGen/MachineBasicBlock.cpp:1.19
--- llvm/lib/CodeGen/MachineBasicBlock.cpp:1.18	Sun Jul  4 07:19:55 2004
+++ llvm/lib/CodeGen/MachineBasicBlock.cpp	Wed Sep  1 17:55:35 2004
@@ -17,7 +17,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.71 llvm/lib/CodeGen/MachineFunction.cpp:1.72
--- llvm/lib/CodeGen/MachineFunction.cpp:1.71	Mon Aug 16 17:36:34 2004
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed Sep  1 17:55:35 2004
@@ -23,8 +23,8 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
-#include "Support/LeakDetector.h"
-#include "Support/GraphWriter.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/GraphWriter.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>


Index: llvm/lib/CodeGen/MachineInstr.cpp
diff -u llvm/lib/CodeGen/MachineInstr.cpp:1.104 llvm/lib/CodeGen/MachineInstr.cpp:1.105
--- llvm/lib/CodeGen/MachineInstr.cpp:1.104	Fri Jul  9 09:45:17 2004
+++ llvm/lib/CodeGen/MachineInstr.cpp	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/MRegisterInfo.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <iostream>
 
 using namespace llvm;


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.32 llvm/lib/CodeGen/PHIElimination.cpp:1.33
--- llvm/lib/CodeGen/PHIElimination.cpp:1.32	Fri Jul 23 00:27:43 2004
+++ llvm/lib/CodeGen/PHIElimination.cpp	Wed Sep  1 17:55:35 2004
@@ -20,8 +20,8 @@
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/DenseMap.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/Passes.cpp
diff -u llvm/lib/CodeGen/Passes.cpp:1.13 llvm/lib/CodeGen/Passes.cpp:1.14
--- llvm/lib/CodeGen/Passes.cpp:1.13	Thu Jul 22 16:46:02 2004
+++ llvm/lib/CodeGen/Passes.cpp	Wed Sep  1 17:55:35 2004
@@ -13,7 +13,7 @@
 //===---------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/Passes.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/lib/CodeGen/RegAllocIterativeScan.cpp
diff -u llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.15 llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.16
--- llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.15	Wed Sep  1 17:52:29 2004
+++ llvm/lib/CodeGen/RegAllocIterativeScan.cpp	Wed Sep  1 17:55:35 2004
@@ -25,9 +25,9 @@
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "LiveIntervalAnalysis.h"
 #include "PhysRegTracker.h"
 #include "VirtRegMap.h"


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.91 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.92
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.91	Wed Sep  1 17:52:29 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Wed Sep  1 17:55:35 2004
@@ -19,9 +19,9 @@
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "LiveIntervalAnalysis.h"
 #include "PhysRegTracker.h"
 #include "VirtRegMap.h"


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.68 llvm/lib/CodeGen/RegAllocLocal.cpp:1.69
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.68	Sun Aug 15 17:23:09 2004
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Wed Sep  1 17:55:35 2004
@@ -21,10 +21,10 @@
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DenseMap.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.60 llvm/lib/CodeGen/RegAllocSimple.cpp:1.61
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.60	Sun Aug 15 17:02:22 2004
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Wed Sep  1 17:55:35 2004
@@ -22,9 +22,9 @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
diff -u llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.26 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.27
--- llvm/lib/CodeGen/TwoAddressInstructionPass.cpp:1.26	Sun Aug 15 17:14:31 2004
+++ llvm/lib/CodeGen/TwoAddressInstructionPass.cpp	Wed Sep  1 17:55:35 2004
@@ -37,9 +37,9 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/UnreachableBlockElim.cpp
diff -u llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.3 llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.4
--- llvm/lib/CodeGen/UnreachableBlockElim.cpp:1.3	Thu Jul 29 12:23:00 2004
+++ llvm/lib/CodeGen/UnreachableBlockElim.cpp	Wed Sep  1 17:55:35 2004
@@ -26,7 +26,7 @@
 #include "llvm/Function.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/CodeGen/VirtRegMap.cpp
diff -u llvm/lib/CodeGen/VirtRegMap.cpp:1.18 llvm/lib/CodeGen/VirtRegMap.cpp:1.19
--- llvm/lib/CodeGen/VirtRegMap.cpp:1.18	Sun Aug 15 17:02:22 2004
+++ llvm/lib/CodeGen/VirtRegMap.cpp	Wed Sep  1 17:55:35 2004
@@ -22,11 +22,11 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DenseMap.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 
 using namespace llvm;
 


Index: llvm/lib/CodeGen/VirtRegMap.h
diff -u llvm/lib/CodeGen/VirtRegMap.h:1.12 llvm/lib/CodeGen/VirtRegMap.h:1.13
--- llvm/lib/CodeGen/VirtRegMap.h:1.12	Tue Jul 20 08:28:17 2004
+++ llvm/lib/CodeGen/VirtRegMap.h	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/SSARegMap.h"
-#include "Support/DenseMap.h"
+#include "llvm/ADT/DenseMap.h"
 #include <climits>
 #include <map>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86AsmPrinter.cpp
	X86CodeEmitter.cpp X86FloatingPoint.cpp X86ISelSimple.cpp
	X86PeepholeOpt.cpp X86RegisterInfo.cpp X86TargetMachine.cpp 
Message-ID: <200409012255.RAA28462@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86AsmPrinter.cpp updated: 1.120 -> 1.121
X86CodeEmitter.cpp updated: 1.63 -> 1.64
X86FloatingPoint.cpp updated: 1.39 -> 1.40
X86ISelSimple.cpp updated: 1.277 -> 1.278
X86PeepholeOpt.cpp updated: 1.34 -> 1.35
X86RegisterInfo.cpp updated: 1.92 -> 1.93
X86TargetMachine.cpp updated: 1.66 -> 1.67
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+17 -17)

Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.120 llvm/lib/Target/X86/X86AsmPrinter.cpp:1.121
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.120	Tue Aug 17 21:22:53 2004
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp	Wed Sep  1 17:55:36 2004
@@ -29,9 +29,9 @@
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.63 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.64
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.63	Tue Aug 10 21:26:39 2004
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Wed Sep  1 17:55:36 2004
@@ -21,9 +21,9 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Function.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Config/alloca.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Config/alloca.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Target/X86/X86FloatingPoint.cpp
diff -u llvm/lib/Target/X86/X86FloatingPoint.cpp:1.39 llvm/lib/Target/X86/X86FloatingPoint.cpp:1.40
--- llvm/lib/Target/X86/X86FloatingPoint.cpp:1.39	Mon Jul 26 13:45:48 2004
+++ llvm/lib/Target/X86/X86FloatingPoint.cpp	Wed Sep  1 17:55:36 2004
@@ -37,10 +37,10 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;


Index: llvm/lib/Target/X86/X86ISelSimple.cpp
diff -u llvm/lib/Target/X86/X86ISelSimple.cpp:1.277 llvm/lib/Target/X86/X86ISelSimple.cpp:1.278
--- llvm/lib/Target/X86/X86ISelSimple.cpp:1.277	Sun Aug 29 19:13:26 2004
+++ llvm/lib/Target/X86/X86ISelSimple.cpp	Wed Sep  1 17:55:36 2004
@@ -28,7 +28,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Target/X86/X86PeepholeOpt.cpp
diff -u llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.34 llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.35
--- llvm/lib/Target/X86/X86PeepholeOpt.cpp:1.34	Mon Jul 26 13:45:48 2004
+++ llvm/lib/Target/X86/X86PeepholeOpt.cpp	Wed Sep  1 17:55:36 2004
@@ -17,8 +17,8 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 
 using namespace llvm;
 


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.92 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.93
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.92	Sat Aug 21 15:13:52 2004
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -24,8 +24,8 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 using namespace llvm;


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.66 llvm/lib/Target/X86/X86TargetMachine.cpp:1.67
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.66	Tue Aug 24 03:18:44 2004
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Wed Sep  1 17:55:36 2004
@@ -21,8 +21,8 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 X86VectorEnum llvm::X86Vector = NoSSE;





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/stkrc/stkrc.cpp 
Message-ID: <200409012255.RAA28376@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools/stkrc:

stkrc.cpp updated: 1.5 -> 1.6
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/Stacker/tools/stkrc/stkrc.cpp
diff -u llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.5 llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.6
--- llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.5	Sun Aug 29 17:01:17 2004
+++ llvm/projects/Stacker/tools/stkrc/stkrc.cpp	Wed Sep  1 17:55:37 2004
@@ -21,7 +21,7 @@
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Analysis/Verifier.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>





From reid at x10sys.com  Wed Sep  1 17:55:53 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:53 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/BasicBlock.h Constants.h
	Function.h Type.h Use.h Value.h 
Message-ID: <200409012255.RAA28083@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

BasicBlock.h updated: 1.41 -> 1.42
Constants.h updated: 1.56 -> 1.57
Function.h updated: 1.51 -> 1.52
Type.h updated: 1.57 -> 1.58
Use.h updated: 1.5 -> 1.6
Value.h updated: 1.62 -> 1.63
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/include/llvm/BasicBlock.h
diff -u llvm/include/llvm/BasicBlock.h:1.41 llvm/include/llvm/BasicBlock.h:1.42
--- llvm/include/llvm/BasicBlock.h:1.41	Thu Jun  3 16:12:02 2004
+++ llvm/include/llvm/BasicBlock.h	Wed Sep  1 17:55:34 2004
@@ -30,7 +30,7 @@
 
 #include "llvm/Instruction.h"
 #include "llvm/SymbolTableListTraits.h"
-#include "Support/ilist"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 


Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.56 llvm/include/llvm/Constants.h:1.57
--- llvm/include/llvm/Constants.h:1.56	Fri Aug 20 01:00:57 2004
+++ llvm/include/llvm/Constants.h	Wed Sep  1 17:55:34 2004
@@ -17,7 +17,7 @@
 
 #include "llvm/Constant.h"
 #include "llvm/Type.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/Function.h
diff -u llvm/include/llvm/Function.h:1.51 llvm/include/llvm/Function.h:1.52
--- llvm/include/llvm/Function.h:1.51	Mon Mar  1 12:31:19 2004
+++ llvm/include/llvm/Function.h	Wed Sep  1 17:55:34 2004
@@ -21,7 +21,7 @@
 #include "llvm/GlobalValue.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Argument.h"
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.57 llvm/include/llvm/Type.h:1.58
--- llvm/include/llvm/Type.h:1.57	Fri Aug 20 01:00:57 2004
+++ llvm/include/llvm/Type.h	Wed Sep  1 17:55:34 2004
@@ -35,9 +35,9 @@
 #define LLVM_TYPE_H
 
 #include "AbstractTypeUser.h"
-#include "Support/Casting.h"
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/Support/Casting.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {


Index: llvm/include/llvm/Use.h
diff -u llvm/include/llvm/Use.h:1.5 llvm/include/llvm/Use.h:1.6
--- llvm/include/llvm/Use.h:1.5	Sun Nov 16 14:21:15 2003
+++ llvm/include/llvm/Use.h	Wed Sep  1 17:55:34 2004
@@ -16,7 +16,7 @@
 #ifndef LLVM_USE_H
 #define LLVM_USE_H
 
-#include "Support/ilist"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 


Index: llvm/include/llvm/Value.h
diff -u llvm/include/llvm/Value.h:1.62 llvm/include/llvm/Value.h:1.63
--- llvm/include/llvm/Value.h:1.62	Tue Aug  3 23:45:42 2004
+++ llvm/include/llvm/Value.h	Wed Sep  1 17:55:34 2004
@@ -19,7 +19,7 @@
 
 #include "llvm/AbstractTypeUser.h"
 #include "llvm/Use.h"
-#include "Support/Casting.h"
+#include "llvm/Support/Casting.h"
 #include <string>
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp
	MSchedGraph.cpp MSchedGraph.h ModuloScheduling.cpp 
Message-ID: <200409012255.RAA28339@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/ModuloScheduling:

MSSchedule.cpp updated: 1.4 -> 1.5
MSchedGraph.cpp updated: 1.6 -> 1.7
MSchedGraph.h updated: 1.3 -> 1.4
ModuloScheduling.cpp updated: 1.26 -> 1.27
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp
diff -u llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp:1.4 llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp:1.5
--- llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp:1.4	Sat Aug  7 10:19:31 2004
+++ llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp	Wed Sep  1 17:55:35 2004
@@ -13,7 +13,7 @@
 #define DEBUG_TYPE "ModuloSched"
 
 #include "MSSchedule.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetSchedInfo.h"
 
 using namespace llvm;


Index: llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
diff -u llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp:1.6 llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp:1.7
--- llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp:1.6	Mon Aug  2 09:02:21 2004
+++ llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 #include "../../Target/SparcV9/SparcV9RegisterInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <cstdlib>
 using namespace llvm;
 


Index: llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h
diff -u llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h:1.3 llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h:1.4
--- llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h:1.3	Wed May 26 01:27:18 2004
+++ llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h	Wed Sep  1 17:55:35 2004
@@ -16,9 +16,9 @@
 
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/GraphTraits.h"
-#include "Support/STLExtras.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {


Index: llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
diff -u llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp:1.26 llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp:1.27
--- llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp:1.26	Wed Aug 18 15:04:23 2004
+++ llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp	Wed Sep  1 17:55:35 2004
@@ -21,9 +21,9 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetSchedInfo.h"
-#include "Support/Debug.h"
-#include "Support/GraphWriter.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/GraphWriter.h"
+#include "llvm/ADT/StringExtras.h"
 #include <cmath>
 #include <fstream>
 #include <sstream>





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp 
Message-ID: <200409012255.RAA28281@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.58 -> 1.59
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.58 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.59
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.58	Sun Aug 15 20:05:35 2004
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Wed Sep  1 17:55:35 2004
@@ -23,9 +23,9 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/DynamicLinker.h"
 using namespace llvm;
 
 namespace {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
	CodeExtractor.cpp Local.cpp PromoteMemoryToRegister.cpp
	SimplifyCFG.cpp 
Message-ID: <200409012255.RAA28602@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.22 -> 1.23
CodeExtractor.cpp updated: 1.30 -> 1.31
Local.cpp updated: 1.33 -> 1.34
PromoteMemoryToRegister.cpp updated: 1.65 -> 1.66
SimplifyCFG.cpp updated: 1.49 -> 1.50
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+7 -7)

Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.22 llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.23
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.22	Sat Jul 31 05:01:58 2004
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp	Wed Sep  1 17:55:36 2004
@@ -22,7 +22,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp
diff -u llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.30 llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.31
--- llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.30	Thu Aug 12 22:27:07 2004
+++ llvm/lib/Transforms/Utils/CodeExtractor.cpp	Wed Sep  1 17:55:36 2004
@@ -24,9 +24,9 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;


Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.33 llvm/lib/Transforms/Utils/Local.cpp:1.34
--- llvm/lib/Transforms/Utils/Local.cpp:1.33	Tue Jun 22 19:25:35 2004
+++ llvm/lib/Transforms/Utils/Local.cpp	Wed Sep  1 17:55:36 2004
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/MathExtras.h"
+#include "llvm/Support/MathExtras.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"


Index: llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
diff -u llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.65 llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.66
--- llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.65	Thu Jul 29 12:21:57 2004
+++ llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp	Wed Sep  1 17:55:36 2004
@@ -23,7 +23,7 @@
 #include "llvm/Constant.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/StableBasicBlockNumbering.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// isAllocaPromotable - Return true if this alloca is legal for promotion.


Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.49 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.50
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.49	Wed Jul 21 15:50:33 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Wed Sep  1 17:55:36 2004
@@ -17,7 +17,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 #include <functional>
 #include <set>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp 
Message-ID: <200409012255.RAA28468@zion.cs.uiuc.edu>



Changes in directory llvm/tools/gccas:

gccas.cpp updated: 1.99 -> 1.100
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/gccas/gccas.cpp
diff -u llvm/tools/gccas/gccas.cpp:1.99 llvm/tools/gccas/gccas.cpp:1.100
--- llvm/tools/gccas/gccas.cpp:1.99	Sun Aug 29 14:28:55 2004
+++ llvm/tools/gccas/gccas.cpp	Wed Sep  1 17:55:37 2004
@@ -22,7 +22,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <memory>
 #include <fstream>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/analyze/GraphPrinters.cpp
	analyze.cpp 
Message-ID: <200409012255.RAA28450@zion.cs.uiuc.edu>



Changes in directory llvm/tools/analyze:

GraphPrinters.cpp updated: 1.7 -> 1.8
analyze.cpp updated: 1.60 -> 1.61
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/tools/analyze/GraphPrinters.cpp
diff -u llvm/tools/analyze/GraphPrinters.cpp:1.7 llvm/tools/analyze/GraphPrinters.cpp:1.8
--- llvm/tools/analyze/GraphPrinters.cpp:1.7	Mon Apr 12 00:38:01 2004
+++ llvm/tools/analyze/GraphPrinters.cpp	Wed Sep  1 17:55:37 2004
@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/GraphWriter.h"
+#include "llvm/Support/GraphWriter.h"
 #include "llvm/Pass.h"
 #include "llvm/Value.h"
 #include "llvm/Analysis/CallGraph.h"


Index: llvm/tools/analyze/analyze.cpp
diff -u llvm/tools/analyze/analyze.cpp:1.60 llvm/tools/analyze/analyze.cpp:1.61
--- llvm/tools/analyze/analyze.cpp:1.60	Sun Aug 29 14:28:55 2004
+++ llvm/tools/analyze/analyze.cpp	Wed Sep  1 17:55:37 2004
@@ -24,8 +24,8 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Support/Timer.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
	ExternalFunctions.cpp Interpreter.h 
Message-ID: <200409012255.RAA28136@zion.cs.uiuc.edu>



Changes in directory llvm/lib/ExecutionEngine/Interpreter:

Execution.cpp updated: 1.131 -> 1.132
ExternalFunctions.cpp updated: 1.77 -> 1.78
Interpreter.h updated: 1.65 -> 1.66
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.131 llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.132
--- llvm/lib/ExecutionEngine/Interpreter/Execution.cpp:1.131	Wed Jul 14 21:47:51 2004
+++ llvm/lib/ExecutionEngine/Interpreter/Execution.cpp	Wed Sep  1 17:55:35 2004
@@ -18,8 +18,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 #include <cmath>  // For fmod
 using namespace llvm;
 


Index: llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.77 llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.78
--- llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.77	Thu Jun 17 13:18:30 2004
+++ llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp	Wed Sep  1 17:55:35 2004
@@ -23,7 +23,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <cmath>
 #include <csignal>
 #include <map>


Index: llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
diff -u llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.65 llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.66
--- llvm/lib/ExecutionEngine/Interpreter/Interpreter.h:1.65	Sun Jul  4 07:19:56 2004
+++ llvm/lib/ExecutionEngine/Interpreter/Interpreter.h	Wed Sep  1 17:55:35 2004
@@ -20,7 +20,7 @@
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <iostream>
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/utils/fpcmp/fpcmp.cpp 
Message-ID: <200409012255.RAA28588@zion.cs.uiuc.edu>



Changes in directory llvm/utils/fpcmp:

fpcmp.cpp updated: 1.9 -> 1.10
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/utils/fpcmp/fpcmp.cpp
diff -u llvm/utils/fpcmp/fpcmp.cpp:1.9 llvm/utils/fpcmp/fpcmp.cpp:1.10
--- llvm/utils/fpcmp/fpcmp.cpp:1.9	Sat Jun 19 22:12:18 2004
+++ llvm/utils/fpcmp/fpcmp.cpp	Wed Sep  1 17:55:40 2004
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <cmath>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
	LiveRange.h LiveRangeInfo.cpp LiveRangeInfo.h PhyRegAlloc.cpp
Message-ID: <200409012255.RAA28313@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

InterferenceGraph.cpp updated: 1.21 -> 1.22
LiveRange.h updated: 1.28 -> 1.29
LiveRangeInfo.cpp updated: 1.55 -> 1.56
LiveRangeInfo.h updated: 1.25 -> 1.26
PhyRegAlloc.cpp updated: 1.164 -> 1.165
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+7 -7)

Index: llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp:1.21 llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp:1.22
--- llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp:1.21	Thu Jul 29 01:43:09 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp	Wed Sep  1 17:55:36 2004
@@ -14,7 +14,7 @@
 #include "IGNode.h"
 #include "InterferenceGraph.h"
 #include "RegAllocCommon.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 


Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h:1.28 llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h:1.29
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h:1.28	Thu Jul 29 01:43:06 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h	Wed Sep  1 17:55:36 2004
@@ -16,7 +16,7 @@
 #define LIVERANGE_H
 
 #include "llvm/Value.h"
-#include "Support/SetVector.h"
+#include "llvm/ADT/SetVector.h"
 #include <iostream>
 
 namespace llvm {


Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.55 llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.56
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp:1.55	Thu Jul 29 01:43:08 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -21,7 +21,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "../SparcV9RegInfo.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/SetOperations.h"
 #include <iostream>
 
 namespace llvm {


Index: llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
diff -u llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.25 llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.26
--- llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h:1.25	Thu Jul 29 01:43:10 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h	Wed Sep  1 17:55:36 2004
@@ -27,7 +27,7 @@
 #define LIVERANGEINFO_H
 
 #include "llvm/CodeGen/ValueSet.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.164 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.165
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.164	Tue Aug 24 01:41:39 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Wed Sep  1 17:55:36 2004
@@ -43,9 +43,9 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/CommandLine.h"
-#include "Support/SetOperations.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cmath>
 #include <iostream>
 





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] 
	CVS: llvm/include/llvm/ExecutionEngine/GenericValue.h
Message-ID: <200409012255.RAA28308@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ExecutionEngine:

GenericValue.h updated: 1.5 -> 1.6
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/include/llvm/ExecutionEngine/GenericValue.h
diff -u llvm/include/llvm/ExecutionEngine/GenericValue.h:1.5 llvm/include/llvm/ExecutionEngine/GenericValue.h:1.6
--- llvm/include/llvm/ExecutionEngine/GenericValue.h:1.5	Wed Feb 25 17:01:46 2004
+++ llvm/include/llvm/ExecutionEngine/GenericValue.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef GENERIC_VALUE_H
 #define GENERIC_VALUE_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/runtime/Makefile 
Message-ID: <200409012255.RAA28506@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/runtime:

Makefile updated: 1.1 -> 1.2
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -1)

Index: llvm/projects/Stacker/lib/runtime/Makefile
diff -u llvm/projects/Stacker/lib/runtime/Makefile:1.1 llvm/projects/Stacker/lib/runtime/Makefile:1.2
--- llvm/projects/Stacker/lib/runtime/Makefile:1.1	Sun Nov 23 11:53:46 2003
+++ llvm/projects/Stacker/lib/runtime/Makefile	Wed Sep  1 17:55:37 2004
@@ -8,7 +8,8 @@
 #
 # Give the name of a library.  This will build a dynamic version.
 #
-SHARED_LIBRARY=1
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
 LIBRARYNAME=stkr_runtime
 
 #





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
	GraphAuxiliary.cpp InstLoops.cpp 
Message-ID: <200409012255.RAA28503@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation/ProfilePaths:

Graph.cpp updated: 1.17 -> 1.18
GraphAuxiliary.cpp updated: 1.24 -> 1.25
InstLoops.cpp updated: 1.16 -> 1.17
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp:1.17 llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp:1.18
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp:1.17	Thu Jul 29 12:25:24 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp	Wed Sep  1 17:55:36 2004
@@ -14,7 +14,7 @@
 
 #include "Graph.h"
 #include "llvm/Instructions.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 
 using std::vector;


Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp:1.24 llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp:1.25
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp:1.24	Thu Jul 29 12:26:53 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp	Wed Sep  1 17:55:36 2004
@@ -15,7 +15,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 #include "Graph.h"
 


Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.16 llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.17
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.16	Thu Jul 29 12:25:24 2004
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp	Wed Sep  1 17:55:36 2004
@@ -20,7 +20,7 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Type.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "../ProfilingUtils.h"
 
 namespace llvm {





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/utils/TableGen/CodeEmitterGen.cpp
	FileParser.y InstrSelectorEmitter.cpp RegisterInfoEmitter.cpp
	TableGen.cpp 
Message-ID: <200409012255.RAA28614@zion.cs.uiuc.edu>



Changes in directory llvm/utils/TableGen:

CodeEmitterGen.cpp updated: 1.37 -> 1.38
FileParser.y updated: 1.30 -> 1.31
InstrSelectorEmitter.cpp updated: 1.41 -> 1.42
RegisterInfoEmitter.cpp updated: 1.24 -> 1.25
TableGen.cpp updated: 1.33 -> 1.34
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/utils/TableGen/CodeEmitterGen.cpp
diff -u llvm/utils/TableGen/CodeEmitterGen.cpp:1.37 llvm/utils/TableGen/CodeEmitterGen.cpp:1.38
--- llvm/utils/TableGen/CodeEmitterGen.cpp:1.37	Mon Aug 16 22:08:27 2004
+++ llvm/utils/TableGen/CodeEmitterGen.cpp	Wed Sep  1 17:55:40 2004
@@ -16,7 +16,7 @@
 #include "CodeEmitterGen.h"
 #include "CodeGenTarget.h"
 #include "Record.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 void CodeEmitterGen::run(std::ostream &o) {


Index: llvm/utils/TableGen/FileParser.y
diff -u llvm/utils/TableGen/FileParser.y:1.30 llvm/utils/TableGen/FileParser.y:1.31
--- llvm/utils/TableGen/FileParser.y:1.30	Mon Jul 26 18:21:34 2004
+++ llvm/utils/TableGen/FileParser.y	Wed Sep  1 17:55:40 2004
@@ -13,7 +13,7 @@
 
 %{
 #include "Record.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <cstdio>
 #define YYERROR_VERBOSE 1


Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.41 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.42
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.41	Mon Aug 16 22:08:27 2004
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Wed Sep  1 17:55:40 2004
@@ -14,8 +14,8 @@
 
 #include "InstrSelectorEmitter.h"
 #include "Record.h"
-#include "Support/Debug.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/utils/TableGen/RegisterInfoEmitter.cpp
diff -u llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.24 llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.25
--- llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.24	Sat Aug 21 15:00:36 2004
+++ llvm/utils/TableGen/RegisterInfoEmitter.cpp	Wed Sep  1 17:55:40 2004
@@ -17,8 +17,8 @@
 #include "CodeGenTarget.h"
 #include "CodeGenRegisters.h"
 #include "Record.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.33 llvm/utils/TableGen/TableGen.cpp:1.34
--- llvm/utils/TableGen/TableGen.cpp:1.33	Sun Aug 29 14:30:41 2004
+++ llvm/utils/TableGen/TableGen.cpp	Wed Sep  1 17:55:40 2004
@@ -16,9 +16,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "Record.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include "CodeEmitterGen.h"
 #include "RegisterInfoEmitter.h"
 #include "InstrInfoEmitter.h"





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/BugDriver.cpp
	CrashDebugger.cpp ExecutionDriver.cpp ExtractFunction.cpp
	Miscompilation.cpp OptimizerDriver.cpp bugpoint.cpp 
Message-ID: <200409012255.RAA28360@zion.cs.uiuc.edu>



Changes in directory llvm/tools/bugpoint:

BugDriver.cpp updated: 1.36 -> 1.37
CrashDebugger.cpp updated: 1.37 -> 1.38
ExecutionDriver.cpp updated: 1.47 -> 1.48
ExtractFunction.cpp updated: 1.37 -> 1.38
Miscompilation.cpp updated: 1.51 -> 1.52
OptimizerDriver.cpp updated: 1.22 -> 1.23
bugpoint.cpp updated: 1.19 -> 1.20
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+20 -25)

Index: llvm/tools/bugpoint/BugDriver.cpp
diff -u llvm/tools/bugpoint/BugDriver.cpp:1.36 llvm/tools/bugpoint/BugDriver.cpp:1.37
--- llvm/tools/bugpoint/BugDriver.cpp:1.36	Sat Jul 24 02:53:26 2004
+++ llvm/tools/bugpoint/BugDriver.cpp	Wed Sep  1 17:55:37 2004
@@ -20,8 +20,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Support/Linker.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <memory>
 


Index: llvm/tools/bugpoint/CrashDebugger.cpp
diff -u llvm/tools/bugpoint/CrashDebugger.cpp:1.37 llvm/tools/bugpoint/CrashDebugger.cpp:1.38
--- llvm/tools/bugpoint/CrashDebugger.cpp:1.37	Thu Jul 29 12:16:41 2004
+++ llvm/tools/bugpoint/CrashDebugger.cpp	Wed Sep  1 17:55:37 2004
@@ -26,7 +26,7 @@
 #include "llvm/Support/ToolRunner.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <set>
 using namespace llvm;


Index: llvm/tools/bugpoint/ExecutionDriver.cpp
diff -u llvm/tools/bugpoint/ExecutionDriver.cpp:1.47 llvm/tools/bugpoint/ExecutionDriver.cpp:1.48
--- llvm/tools/bugpoint/ExecutionDriver.cpp:1.47	Sat Jul 24 02:53:26 2004
+++ llvm/tools/bugpoint/ExecutionDriver.cpp	Wed Sep  1 17:55:37 2004
@@ -14,10 +14,10 @@
 
 #include "BugDriver.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 using namespace llvm;
 


Index: llvm/tools/bugpoint/ExtractFunction.cpp
diff -u llvm/tools/bugpoint/ExtractFunction.cpp:1.37 llvm/tools/bugpoint/ExtractFunction.cpp:1.38
--- llvm/tools/bugpoint/ExtractFunction.cpp:1.37	Wed Aug 11 21:36:50 2004
+++ llvm/tools/bugpoint/ExtractFunction.cpp	Wed Sep  1 17:55:37 2004
@@ -24,9 +24,9 @@
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/FunctionUtils.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/tools/bugpoint/Miscompilation.cpp
diff -u llvm/tools/bugpoint/Miscompilation.cpp:1.51 llvm/tools/bugpoint/Miscompilation.cpp:1.52
--- llvm/tools/bugpoint/Miscompilation.cpp:1.51	Thu Jul 22 20:30:49 2004
+++ llvm/tools/bugpoint/Miscompilation.cpp	Wed Sep  1 17:55:37 2004
@@ -23,8 +23,8 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 using namespace llvm;
 
 namespace llvm {


Index: llvm/tools/bugpoint/OptimizerDriver.cpp
diff -u llvm/tools/bugpoint/OptimizerDriver.cpp:1.22 llvm/tools/bugpoint/OptimizerDriver.cpp:1.23
--- llvm/tools/bugpoint/OptimizerDriver.cpp:1.22	Tue May 11 21:55:45 2004
+++ llvm/tools/bugpoint/OptimizerDriver.cpp	Wed Sep  1 17:55:37 2004
@@ -21,7 +21,7 @@
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <unistd.h>
 #include <sys/types.h>


Index: llvm/tools/bugpoint/bugpoint.cpp
diff -u llvm/tools/bugpoint/bugpoint.cpp:1.19 llvm/tools/bugpoint/bugpoint.cpp:1.20
--- llvm/tools/bugpoint/bugpoint.cpp:1.19	Sun Aug 29 14:28:55 2004
+++ llvm/tools/bugpoint/bugpoint.cpp	Wed Sep  1 17:55:37 2004
@@ -16,11 +16,12 @@
 #include "BugDriver.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
+#include "llvm/System/SysConfig.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Config/unistd.h"
-#include <sys/resource.h>
+#include "llvm/Config/unistd.h"
+//#include <sys/resource.h>
 using namespace llvm;
 
 static cl::list<std::string>
@@ -45,14 +46,8 @@
   D.addPasses(PassList.begin(), PassList.end());
 
   // Bugpoint has the ability of generating a plethora of core files, so to
-  // avoid filling up the disk, set the max core file size to 0.
-  struct rlimit rlim;
-  rlim.rlim_cur = rlim.rlim_max = 0;
-  int res = setrlimit(RLIMIT_CORE, &rlim);
-  if (res < 0) {
-    // setrlimit() may have failed, but we're not going to let that stop us
-    perror("setrlimit: RLIMIT_CORE");
-  }
+  // avoid filling up the disk, we prevent it
+  sys::PreventCoreFiles();
 
   try {
     return D.run();





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/CompilerDriver.cpp
	Configuration.cpp Configuration.h llvmc.cpp 
Message-ID: <200409012255.RAA28711@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

CompilerDriver.cpp updated: 1.13 -> 1.14
Configuration.cpp updated: 1.12 -> 1.13
Configuration.h updated: 1.4 -> 1.5
llvmc.cpp updated: 1.13 -> 1.14
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/tools/llvmc/CompilerDriver.cpp
diff -u llvm/tools/llvmc/CompilerDriver.cpp:1.13 llvm/tools/llvmc/CompilerDriver.cpp:1.14
--- llvm/tools/llvmc/CompilerDriver.cpp:1.13	Mon Aug 30 01:29:06 2004
+++ llvm/tools/llvmc/CompilerDriver.cpp	Wed Sep  1 17:55:39 2004
@@ -17,9 +17,9 @@
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/System/Signals.h"
-#include "Support/FileUtilities.h"
-#include "Support/SetVector.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 
 using namespace llvm;


Index: llvm/tools/llvmc/Configuration.cpp
diff -u llvm/tools/llvmc/Configuration.cpp:1.12 llvm/tools/llvmc/Configuration.cpp:1.13
--- llvm/tools/llvmc/Configuration.cpp:1.12	Mon Aug 30 01:29:06 2004
+++ llvm/tools/llvmc/Configuration.cpp	Wed Sep  1 17:55:40 2004
@@ -15,9 +15,9 @@
 #include "Configuration.h"
 #include "ConfigLexer.h"
 #include "CompilerDriver.h"
-#include "Config/config.h"
-#include "Support/CommandLine.h"
-#include "Support/StringExtras.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 #include <fstream>
 


Index: llvm/tools/llvmc/Configuration.h
diff -u llvm/tools/llvmc/Configuration.h:1.4 llvm/tools/llvmc/Configuration.h:1.5
--- llvm/tools/llvmc/Configuration.h:1.4	Sun Aug 29 14:26:56 2004
+++ llvm/tools/llvmc/Configuration.h	Wed Sep  1 17:55:40 2004
@@ -15,7 +15,7 @@
 #define LLVM_TOOLS_LLVMC_CONFIGDATA_H
 
 #include "CompilerDriver.h"
-#include <Support/hash_map>
+#include <llvm/ADT/hash_map>
 
 namespace llvm {
   /// This class provides the high level interface to the LLVM Compiler Driver.


Index: llvm/tools/llvmc/llvmc.cpp
diff -u llvm/tools/llvmc/llvmc.cpp:1.13 llvm/tools/llvmc/llvmc.cpp:1.14
--- llvm/tools/llvmc/llvmc.cpp:1.13	Mon Aug 30 01:27:32 2004
+++ llvm/tools/llvmc/llvmc.cpp	Wed Sep  1 17:55:40 2004
@@ -18,7 +18,7 @@
 #include "Configuration.h"
 #include "llvm/Pass.h"
 #include "llvm/System/Signals.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ADCE.cpp
	BasicBlockPlacement.cpp ConstantProp.cpp CorrelatedExprs.cpp
	DCE.cpp DeadStoreElimination.cpp DecomposeMultiDimRefs.cpp
	GCSE.cpp IndVarSimplify.cpp InstructionCombining.cpp LICM.cpp
	LoopSimplify.cpp LoopUnroll.cpp LoopUnswitch.cpp
	LowerAllocations.cpp LowerInvoke.cpp LowerPacked.cpp
	LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp PRE.cpp
	PiNodeInsertion.cpp Reassociate.cpp SCCP.cpp
	ScalarReplAggregates.cpp SimplifyCFG.cpp TailDuplication.cpp
	TailRecursionElimination.cpp 
Message-ID: <200409012255.RAA28730@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

ADCE.cpp updated: 1.78 -> 1.79
BasicBlockPlacement.cpp updated: 1.2 -> 1.3
ConstantProp.cpp updated: 1.48 -> 1.49
CorrelatedExprs.cpp updated: 1.23 -> 1.24
DCE.cpp updated: 1.54 -> 1.55
DeadStoreElimination.cpp updated: 1.5 -> 1.6
DecomposeMultiDimRefs.cpp updated: 1.35 -> 1.36
GCSE.cpp updated: 1.42 -> 1.43
IndVarSimplify.cpp updated: 1.68 -> 1.69
InstructionCombining.cpp updated: 1.239 -> 1.240
LICM.cpp updated: 1.64 -> 1.65
LoopSimplify.cpp updated: 1.48 -> 1.49
LoopUnroll.cpp updated: 1.10 -> 1.11
LoopUnswitch.cpp updated: 1.1 -> 1.2
LowerAllocations.cpp updated: 1.48 -> 1.49
LowerInvoke.cpp updated: 1.17 -> 1.18
LowerPacked.cpp updated: 1.1 -> 1.2
LowerSelect.cpp updated: 1.1 -> 1.2
LowerSwitch.cpp updated: 1.13 -> 1.14
Mem2Reg.cpp updated: 1.10 -> 1.11
PRE.cpp updated: 1.10 -> 1.11
PiNodeInsertion.cpp updated: 1.16 -> 1.17
Reassociate.cpp updated: 1.33 -> 1.34
SCCP.cpp updated: 1.99 -> 1.100
ScalarReplAggregates.cpp updated: 1.24 -> 1.25
SimplifyCFG.cpp updated: 1.10 -> 1.11
TailDuplication.cpp updated: 1.21 -> 1.22
TailRecursionElimination.cpp updated: 1.13 -> 1.14
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+62 -62)

Index: llvm/lib/Transforms/Scalar/ADCE.cpp
diff -u llvm/lib/Transforms/Scalar/ADCE.cpp:1.78 llvm/lib/Transforms/Scalar/ADCE.cpp:1.79
--- llvm/lib/Transforms/Scalar/ADCE.cpp:1.78	Wed Jul 14 20:50:47 2004
+++ llvm/lib/Transforms/Scalar/ADCE.cpp	Wed Sep  1 17:55:36 2004
@@ -23,10 +23,10 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
diff -u llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.2 llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.3
--- llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp:1.2	Tue Feb 10 23:20:50 2004
+++ llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp	Wed Sep  1 17:55:36 2004
@@ -30,7 +30,7 @@
 #include "llvm/Function.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/ConstantProp.cpp
diff -u llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.48 llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.49
--- llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.48	Tue Apr 27 10:12:22 2004
+++ llvm/lib/Transforms/Scalar/ConstantProp.cpp	Wed Sep  1 17:55:36 2004
@@ -24,7 +24,7 @@
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.23 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.24
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.23	Sat Jul 17 19:28:19 2004
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Wed Sep  1 17:55:36 2004
@@ -38,9 +38,9 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/DCE.cpp
diff -u llvm/lib/Transforms/Scalar/DCE.cpp:1.54 llvm/lib/Transforms/Scalar/DCE.cpp:1.55
--- llvm/lib/Transforms/Scalar/DCE.cpp:1.54	Tue Jul 27 12:43:21 2004
+++ llvm/lib/Transforms/Scalar/DCE.cpp	Wed Sep  1 17:55:36 2004
@@ -21,7 +21,7 @@
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
diff -u llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.5 llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.6
--- llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp:1.5	Mon Jul 26 01:14:11 2004
+++ llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp	Wed Sep  1 17:55:36 2004
@@ -22,8 +22,8 @@
 #include "llvm/Analysis/AliasSetTracker.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/SetVector.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
diff -u llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.35 llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.36
--- llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.35	Thu Jul 29 12:23:24 2004
+++ llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp	Wed Sep  1 17:55:36 2004
@@ -22,8 +22,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/GCSE.cpp
diff -u llvm/lib/Transforms/Scalar/GCSE.cpp:1.42 llvm/lib/Transforms/Scalar/GCSE.cpp:1.43
--- llvm/lib/Transforms/Scalar/GCSE.cpp:1.42	Sun Jul 18 03:32:10 2004
+++ llvm/lib/Transforms/Scalar/GCSE.cpp	Wed Sep  1 17:55:36 2004
@@ -22,8 +22,8 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/ValueNumbering.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
diff -u llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.68 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.69
--- llvm/lib/Transforms/Scalar/IndVarSimplify.cpp:1.68	Sun Jul 25 21:47:12 2004
+++ llvm/lib/Transforms/Scalar/IndVarSimplify.cpp	Wed Sep  1 17:55:36 2004
@@ -46,8 +46,8 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.239 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.240
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.239	Tue Aug 10 19:50:51 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Sep  1 17:55:36 2004
@@ -49,8 +49,8 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/PatternMatch.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 using namespace llvm::PatternMatch;


Index: llvm/lib/Transforms/Scalar/LICM.cpp
diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.64 llvm/lib/Transforms/Scalar/LICM.cpp:1.65
--- llvm/lib/Transforms/Scalar/LICM.cpp:1.64	Tue Jul 27 02:38:32 2004
+++ llvm/lib/Transforms/Scalar/LICM.cpp	Wed Sep  1 17:55:36 2004
@@ -42,9 +42,9 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/PromoteMemToReg.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Scalar/LoopSimplify.cpp:1.48 llvm/lib/Transforms/Scalar/LoopSimplify.cpp:1.49
--- llvm/lib/Transforms/Scalar/LoopSimplify.cpp:1.48	Thu Jul 29 12:23:25 2004
+++ llvm/lib/Transforms/Scalar/LoopSimplify.cpp	Wed Sep  1 17:55:36 2004
@@ -41,10 +41,10 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/SetOperations.h"
-#include "Support/SetVector.h"
-#include "Support/Statistic.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/LoopUnroll.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.10 llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.11
--- llvm/lib/Transforms/Scalar/LoopUnroll.cpp:1.10	Thu May 13 15:43:31 2004
+++ llvm/lib/Transforms/Scalar/LoopUnroll.cpp	Wed Sep  1 17:55:36 2004
@@ -24,10 +24,10 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdio>
 #include <set>
 using namespace llvm;


Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.1 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.2
--- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.1	Mon Apr 19 13:07:02 2004
+++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp	Wed Sep  1 17:55:36 2004
@@ -35,8 +35,8 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.48 llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.49
--- llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.48	Thu Jul 29 12:23:25 2004
+++ llvm/lib/Transforms/Scalar/LowerAllocations.cpp	Wed Sep  1 17:55:36 2004
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Constants.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.17 llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.18
--- llvm/lib/Transforms/Scalar/LowerInvoke.cpp:1.17	Sat Jul 17 19:30:25 2004
+++ llvm/lib/Transforms/Scalar/LowerInvoke.cpp	Wed Sep  1 17:55:36 2004
@@ -41,8 +41,8 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/Statistic.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 #include <csetjmp>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/LowerPacked.cpp
diff -u llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.1 llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.2
--- llvm/lib/Transforms/Scalar/LowerPacked.cpp:1.1	Sat Aug 21 16:39:24 2004
+++ llvm/lib/Transforms/Scalar/LowerPacked.cpp	Wed Sep  1 17:55:36 2004
@@ -19,7 +19,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <map>
 #include <iostream>


Index: llvm/lib/Transforms/Scalar/LowerSelect.cpp
diff -u llvm/lib/Transforms/Scalar/LowerSelect.cpp:1.1 llvm/lib/Transforms/Scalar/LowerSelect.cpp:1.2
--- llvm/lib/Transforms/Scalar/LowerSelect.cpp:1.1	Tue Mar 30 12:41:10 2004
+++ llvm/lib/Transforms/Scalar/LowerSelect.cpp	Wed Sep  1 17:55:36 2004
@@ -23,7 +23,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Type.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.13 llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.14
--- llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.13	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/LowerSwitch.cpp	Wed Sep  1 17:55:36 2004
@@ -18,8 +18,8 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/Mem2Reg.cpp
diff -u llvm/lib/Transforms/Scalar/Mem2Reg.cpp:1.10 llvm/lib/Transforms/Scalar/Mem2Reg.cpp:1.11
--- llvm/lib/Transforms/Scalar/Mem2Reg.cpp:1.10	Thu Jul 29 12:23:25 2004
+++ llvm/lib/Transforms/Scalar/Mem2Reg.cpp	Wed Sep  1 17:55:36 2004
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Function.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/PRE.cpp
diff -u llvm/lib/Transforms/Scalar/PRE.cpp:1.10 llvm/lib/Transforms/Scalar/PRE.cpp:1.11
--- llvm/lib/Transforms/Scalar/PRE.cpp:1.10	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/PRE.cpp	Wed Sep  1 17:55:36 2004
@@ -29,11 +29,11 @@
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Analysis/ValueNumbering.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
-#include "Support/hash_set"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/hash_set"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
diff -u llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.16 llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.17
--- llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp:1.16	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp	Wed Sep  1 17:55:36 2004
@@ -38,7 +38,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.33 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.34
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.33	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Wed Sep  1 17:55:36 2004
@@ -30,9 +30,9 @@
 #include "llvm/Pass.h"
 #include "llvm/Constant.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/SCCP.cpp
diff -u llvm/lib/Transforms/Scalar/SCCP.cpp:1.99 llvm/lib/Transforms/Scalar/SCCP.cpp:1.100
--- llvm/lib/Transforms/Scalar/SCCP.cpp:1.99	Wed Aug  4 03:28:33 2004
+++ llvm/lib/Transforms/Scalar/SCCP.cpp	Wed Sep  1 17:55:36 2004
@@ -30,10 +30,10 @@
 #include "llvm/Type.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Debug.h"
-#include "Support/hash_map"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.24 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.25
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.24	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Wed Sep  1 17:55:36 2004
@@ -29,9 +29,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/PromoteMemToReg.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.10 llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.11
--- llvm/lib/Transforms/Scalar/SimplifyCFG.cpp:1.10	Fri Jan  9 00:02:20 2004
+++ llvm/lib/Transforms/Scalar/SimplifyCFG.cpp	Wed Sep  1 17:55:36 2004
@@ -23,7 +23,7 @@
 #include "llvm/Module.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Scalar/TailDuplication.cpp
diff -u llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.21 llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.22
--- llvm/lib/Transforms/Scalar/TailDuplication.cpp:1.21	Thu Jul 29 12:05:13 2004
+++ llvm/lib/Transforms/Scalar/TailDuplication.cpp	Wed Sep  1 17:55:36 2004
@@ -26,9 +26,9 @@
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.13 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.14
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.13	Tue Feb  3 21:58:28 2004
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Wed Sep  1 17:55:36 2004
@@ -51,7 +51,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
	BBLiveVar.h FunctionLiveVarInfo.cpp FunctionLiveVarInfo.h 
Message-ID: <200409012255.RAA28278@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9/LiveVar:

BBLiveVar.cpp updated: 1.47 -> 1.48
BBLiveVar.h updated: 1.26 -> 1.27
FunctionLiveVarInfo.cpp updated: 1.57 -> 1.58
FunctionLiveVarInfo.h updated: 1.1 -> 1.2
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+6 -6)

Index: llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
diff -u llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp:1.47 llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp:1.48
--- llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp:1.47	Sun Jul  4 07:19:56 2004
+++ llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp	Wed Sep  1 17:55:36 2004
@@ -16,7 +16,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/SetOperations.h"
 #include "../SparcV9Internals.h"
 #include <iostream>
 


Index: llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h
diff -u llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h:1.26 llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h:1.27
--- llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h:1.26	Wed Feb 11 11:55:09 2004
+++ llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h	Wed Sep  1 17:55:36 2004
@@ -16,7 +16,7 @@
 #define LIVE_VAR_BB_H
 
 #include "llvm/CodeGen/ValueSet.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
diff -u llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.57 llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.58
--- llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp:1.57	Thu Jul 15 19:06:54 2004
+++ llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -18,9 +18,9 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Support/CFG.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/SetOperations.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/Support/CommandLine.h"
 #include "BBLiveVar.h"
 #include <iostream>
 


Index: llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h
diff -u llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h:1.1 llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h:1.2
--- llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h:1.1	Tue Feb 24 13:45:45 2004
+++ llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h	Wed Sep  1 17:55:36 2004
@@ -35,7 +35,7 @@
 #ifndef FUNCTION_LIVE_VAR_INFO_H
 #define FUNCTION_LIVE_VAR_INFO_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/ValueSet.h"
 





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp 
Message-ID: <200409012255.RAA28342@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-bcanalyzer:

llvm-bcanalyzer.cpp updated: 1.3 -> 1.4
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
diff -u llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp:1.3 llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp:1.4
--- llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp:1.3	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp	Wed Sep  1 17:55:37 2004
@@ -31,7 +31,7 @@
 
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bytecode/Analyzer.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
	PPC32CodeEmitter.cpp PPC32ISelSimple.cpp
	PPC32RegisterInfo.cpp PPC64AsmPrinter.cpp PPC64ISelSimple.cpp
	PPC64RegisterInfo.cpp PowerPCBranchSelector.cpp
	PowerPCTargetMachine.cpp 
Message-ID: <200409012255.RAA28423@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPC32AsmPrinter.cpp updated: 1.56 -> 1.57
PPC32CodeEmitter.cpp updated: 1.3 -> 1.4
PPC32ISelSimple.cpp updated: 1.75 -> 1.76
PPC32RegisterInfo.cpp updated: 1.4 -> 1.5
PPC64AsmPrinter.cpp updated: 1.9 -> 1.10
PPC64ISelSimple.cpp updated: 1.12 -> 1.13
PPC64RegisterInfo.cpp updated: 1.4 -> 1.5
PowerPCBranchSelector.cpp updated: 1.4 -> 1.5
PowerPCTargetMachine.cpp updated: 1.32 -> 1.33
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+22 -22)

Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.56 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.57
--- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.56	Sun Aug 29 21:28:06 2004
+++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp	Wed Sep  1 17:55:36 2004
@@ -29,10 +29,10 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.3 llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.4
--- llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp:1.3	Tue Aug 10 19:09:42 2004
+++ llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp	Wed Sep  1 17:55:36 2004
@@ -15,7 +15,7 @@
 #include "llvm/CodeGen/MachineCodeEmitter.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/Passes.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 
 namespace llvm {
 


Index: llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
diff -u llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.75 llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.76
--- llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.75	Sun Aug 29 03:19:32 2004
+++ llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp	Wed Sep  1 17:55:36 2004
@@ -26,8 +26,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 


Index: llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp:1.4 llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp:1.5
--- llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp:1.4	Thu Aug 26 23:28:10 2004
+++ llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -24,9 +24,9 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp:1.9 llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp:1.10
--- llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp:1.9	Thu Aug 19 16:56:12 2004
+++ llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp	Wed Sep  1 17:55:36 2004
@@ -25,11 +25,11 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/MathExtras.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 
 namespace llvm {


Index: llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp
diff -u llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.12 llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.13
--- llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp:1.12	Sun Aug 29 17:02:43 2004
+++ llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp	Wed Sep  1 17:55:36 2004
@@ -26,8 +26,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 


Index: llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp:1.4 llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp:1.5
--- llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp:1.4	Thu Aug 26 23:28:10 2004
+++ llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -24,9 +24,9 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;


Index: llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.4 llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.5
--- llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.4	Mon Aug 16 23:58:50 2004
+++ llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp	Wed Sep  1 17:55:36 2004
@@ -22,7 +22,7 @@
 #include "PPC32InstrInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <map>
 using namespace llvm;
 


Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.32 llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.33
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.32	Fri Aug 20 13:09:18 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp	Wed Sep  1 17:55:36 2004
@@ -25,7 +25,7 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 using namespace llvm;
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/ExprTypeConvert.cpp
	LevelRaise.cpp 
Message-ID: <200409012255.RAA28500@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms:

ExprTypeConvert.cpp updated: 1.97 -> 1.98
LevelRaise.cpp updated: 1.101 -> 1.102
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+6 -6)

Index: llvm/lib/Transforms/ExprTypeConvert.cpp
diff -u llvm/lib/Transforms/ExprTypeConvert.cpp:1.97 llvm/lib/Transforms/ExprTypeConvert.cpp:1.98
--- llvm/lib/Transforms/ExprTypeConvert.cpp:1.97	Sat Aug  7 20:30:07 2004
+++ llvm/lib/Transforms/ExprTypeConvert.cpp	Wed Sep  1 17:55:36 2004
@@ -17,8 +17,8 @@
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Analysis/Expressions.h"
-#include "Support/STLExtras.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 using namespace llvm;
 


Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.101 llvm/lib/Transforms/LevelRaise.cpp:1.102
--- llvm/lib/Transforms/LevelRaise.cpp:1.101	Sat Aug  7 20:27:56 2004
+++ llvm/lib/Transforms/LevelRaise.cpp	Wed Sep  1 17:55:36 2004
@@ -19,10 +19,10 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Debugger/Debugger.cpp ProgramInfo.cpp
	SourceFile.cpp UnixLocalInferiorProcess.cpp 
Message-ID: <200409012255.RAA28505@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Debugger:

Debugger.cpp updated: 1.2 -> 1.3
ProgramInfo.cpp updated: 1.5 -> 1.6
SourceFile.cpp updated: 1.1 -> 1.2
UnixLocalInferiorProcess.cpp updated: 1.5 -> 1.6
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/lib/Debugger/Debugger.cpp
diff -u llvm/lib/Debugger/Debugger.cpp:1.2 llvm/lib/Debugger/Debugger.cpp:1.3
--- llvm/lib/Debugger/Debugger.cpp:1.2	Wed Jan 14 14:58:17 2004
+++ llvm/lib/Debugger/Debugger.cpp	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 #include "llvm/ModuleProvider.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Debugger/InferiorProcess.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// Debugger constructor - Initialize the debugger to its initial, empty, state.


Index: llvm/lib/Debugger/ProgramInfo.cpp
diff -u llvm/lib/Debugger/ProgramInfo.cpp:1.5 llvm/lib/Debugger/ProgramInfo.cpp:1.6
--- llvm/lib/Debugger/ProgramInfo.cpp:1.5	Thu Jul 29 12:15:38 2004
+++ llvm/lib/Debugger/ProgramInfo.cpp	Wed Sep  1 17:55:35 2004
@@ -20,9 +20,9 @@
 #include "llvm/Module.h"
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/SourceLanguage.h"
-#include "Support/FileUtilities.h"
-#include "Support/SlowOperationInformer.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 using namespace llvm;


Index: llvm/lib/Debugger/SourceFile.cpp
diff -u llvm/lib/Debugger/SourceFile.cpp:1.1 llvm/lib/Debugger/SourceFile.cpp:1.2
--- llvm/lib/Debugger/SourceFile.cpp:1.1	Sun Jan  4 23:25:10 2004
+++ llvm/lib/Debugger/SourceFile.cpp	Wed Sep  1 17:55:35 2004
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Debugger/SourceFile.h"
-#include "Support/SlowOperationInformer.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <cerrno>
 #include <fcntl.h>


Index: llvm/lib/Debugger/UnixLocalInferiorProcess.cpp
diff -u llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.5 llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.6
--- llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.5	Thu Jul 29 12:15:38 2004
+++ llvm/lib/Debugger/UnixLocalInferiorProcess.cpp	Wed Sep  1 17:55:35 2004
@@ -32,8 +32,8 @@
 #include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
 #include <cerrno>
 #include <csignal>
 #include <unistd.h>        // Unix-specific debugger support





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Writer/SlotCalculator.cpp
	Writer.cpp WriterInternals.h 
Message-ID: <200409012255.RAA28573@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Writer:

SlotCalculator.cpp updated: 1.62 -> 1.63
Writer.cpp updated: 1.77 -> 1.78
WriterInternals.h updated: 1.23 -> 1.24
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+5 -5)

Index: llvm/lib/Bytecode/Writer/SlotCalculator.cpp
diff -u llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.62 llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.63
--- llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.62	Thu Aug 26 17:32:00 2004
+++ llvm/lib/Bytecode/Writer/SlotCalculator.cpp	Wed Sep  1 17:55:35 2004
@@ -23,8 +23,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
 #include "llvm/Analysis/ConstantsScanner.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <functional>
 


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.77 llvm/lib/Bytecode/Writer/Writer.cpp:1.78
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.77	Thu Aug 26 19:38:44 2004
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Wed Sep  1 17:55:35 2004
@@ -25,8 +25,8 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
 #include <cstring>
 #include <algorithm>
 using namespace llvm;


Index: llvm/lib/Bytecode/Writer/WriterInternals.h
diff -u llvm/lib/Bytecode/Writer/WriterInternals.h:1.23 llvm/lib/Bytecode/Writer/WriterInternals.h:1.24
--- llvm/lib/Bytecode/Writer/WriterInternals.h:1.23	Tue Aug 17 02:45:14 2004
+++ llvm/lib/Bytecode/Writer/WriterInternals.h	Wed Sep  1 17:55:35 2004
@@ -23,7 +23,7 @@
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Bytecode/Format.h"
 #include "llvm/Instruction.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <string>
 #include <vector>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llee/ExecveHandler.c OSInterface.h
	StorageProxy.c SysUtils.c 
Message-ID: <200409012255.RAA28368@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llee:

ExecveHandler.c updated: 1.8 -> 1.9
OSInterface.h updated: 1.3 -> 1.4
StorageProxy.c updated: 1.2 -> 1.3
SysUtils.c updated: 1.6 -> 1.7
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+12 -12)

Index: llvm/tools/llee/ExecveHandler.c
diff -u llvm/tools/llee/ExecveHandler.c:1.8 llvm/tools/llee/ExecveHandler.c:1.9
--- llvm/tools/llee/ExecveHandler.c:1.8	Wed Aug  4 16:19:49 2004
+++ llvm/tools/llee/ExecveHandler.c	Wed Sep  1 17:55:37 2004
@@ -13,7 +13,7 @@
 \*===----------------------------------------------------------------------===*/
 
 #include "SysUtils.h"
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>


Index: llvm/tools/llee/OSInterface.h
diff -u llvm/tools/llee/OSInterface.h:1.3 llvm/tools/llee/OSInterface.h:1.4
--- llvm/tools/llee/OSInterface.h:1.3	Wed Aug  4 16:19:49 2004
+++ llvm/tools/llee/OSInterface.h	Wed Sep  1 17:55:37 2004
@@ -16,7 +16,7 @@
 #ifndef OS_INTERFACE_H
 #define OS_INTERFACE_H
 
-#include "Config/sys/types.h"
+#include "llvm/Config/sys/types.h"
 
 struct stat;
 


Index: llvm/tools/llee/StorageProxy.c
diff -u llvm/tools/llee/StorageProxy.c:1.2 llvm/tools/llee/StorageProxy.c:1.3
--- llvm/tools/llee/StorageProxy.c:1.2	Sat Jan 10 13:12:09 2004
+++ llvm/tools/llee/StorageProxy.c	Wed Sep  1 17:55:37 2004
@@ -7,10 +7,10 @@
 
 #include "OSInterface.h"
 #include "SysUtils.h"
-#include "Config/fcntl.h"
-#include "Config/unistd.h"
-#include "Config/sys/types.h"
-#include "Config/sys/stat.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/stat.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>


Index: llvm/tools/llee/SysUtils.c
diff -u llvm/tools/llee/SysUtils.c:1.6 llvm/tools/llee/SysUtils.c:1.7
--- llvm/tools/llee/SysUtils.c:1.6	Wed Aug  4 16:19:49 2004
+++ llvm/tools/llee/SysUtils.c	Wed Sep  1 17:55:37 2004
@@ -13,12 +13,12 @@
 \*===----------------------------------------------------------------------===*/
 
 #include "SysUtils.h"
-#include "Config/dlfcn.h"
-#include "Config/fcntl.h"
-#include "Config/unistd.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/types.h"
-#include "Config/sys/wait.h"
+#include "llvm/Config/dlfcn.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/wait.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Path.cpp Program.cpp
	Unix.h 
Message-ID: <200409012255.RAA28149@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Unix:

Path.cpp updated: 1.3 -> 1.4
Program.cpp updated: 1.2 -> 1.3
Unix.h updated: 1.4 -> 1.5
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/System/Unix/Path.cpp
diff -u llvm/lib/System/Unix/Path.cpp:1.3 llvm/lib/System/Unix/Path.cpp:1.4
--- llvm/lib/System/Unix/Path.cpp:1.3	Mon Aug 30 16:46:55 2004
+++ llvm/lib/System/Unix/Path.cpp	Wed Sep  1 17:55:35 2004
@@ -16,10 +16,10 @@
 //===          is guaranteed to work on *all* UNIX variants.
 //===----------------------------------------------------------------------===//
 
+#include <llvm/Config/config.h>
 #include "Unix.h"
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <Config/config.h>
 
 namespace llvm {
 using namespace sys;


Index: llvm/lib/System/Unix/Program.cpp
diff -u llvm/lib/System/Unix/Program.cpp:1.2 llvm/lib/System/Unix/Program.cpp:1.3
--- llvm/lib/System/Unix/Program.cpp:1.2	Sun Aug 29 15:10:07 2004
+++ llvm/lib/System/Unix/Program.cpp	Wed Sep  1 17:55:35 2004
@@ -16,10 +16,10 @@
 //===          is guaranteed to work on *all* UNIX variants.
 //===----------------------------------------------------------------------===//
 
+#include <llvm/Config/config.h>
 #include "Unix.h"
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <Config/config.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif


Index: llvm/lib/System/Unix/Unix.h
diff -u llvm/lib/System/Unix/Unix.h:1.4 llvm/lib/System/Unix/Unix.h:1.5
--- llvm/lib/System/Unix/Unix.h:1.4	Tue Aug 31 12:43:29 2004
+++ llvm/lib/System/Unix/Unix.h	Wed Sep  1 17:55:35 2004
@@ -16,7 +16,7 @@
 //===          is guaranteed to work on all UNIX variants.
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"     // Get autoconf configuration settings
+#include "llvm/Config/config.h"     // Get autoconf configuration settings
 #include <unistd.h>
 #include <cstdlib>
 #include <cstdio>





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
	MachineCodeEmitter.h MachineFunction.h MachineInstr.h
	SSARegMap.h SchedGraphCommon.h SelectionDAG.h 
Message-ID: <200409012255.RAA28114@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.38 -> 1.39
MachineCodeEmitter.h updated: 1.17 -> 1.18
MachineFunction.h updated: 1.42 -> 1.43
MachineInstr.h updated: 1.153 -> 1.154
SSARegMap.h updated: 1.10 -> 1.11
SchedGraphCommon.h updated: 1.11 -> 1.12
SelectionDAG.h updated: 1.5 -> 1.6
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+8 -8)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.38 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.39
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.38	Thu Aug 26 23:00:26 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Wed Sep  1 17:55:34 2004
@@ -15,8 +15,8 @@
 #define LLVM_CODEGEN_MACHINEBASICBLOCK_H
 
 #include "llvm/CodeGen/MachineInstr.h"
-#include "Support/GraphTraits.h"
-#include "Support/ilist"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/ilist"
 #include <iosfwd>
 
 namespace llvm {


Index: llvm/include/llvm/CodeGen/MachineCodeEmitter.h
diff -u llvm/include/llvm/CodeGen/MachineCodeEmitter.h:1.17 llvm/include/llvm/CodeGen/MachineCodeEmitter.h:1.18
--- llvm/include/llvm/CodeGen/MachineCodeEmitter.h:1.17	Fri Apr 23 12:11:12 2004
+++ llvm/include/llvm/CodeGen/MachineCodeEmitter.h	Wed Sep  1 17:55:34 2004
@@ -18,7 +18,7 @@
 #define LLVM_CODEGEN_MACHINECODEEMITTER_H
 
 #include <string>
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/CodeGen/MachineFunction.h
diff -u llvm/include/llvm/CodeGen/MachineFunction.h:1.42 llvm/include/llvm/CodeGen/MachineFunction.h:1.43
--- llvm/include/llvm/CodeGen/MachineFunction.h:1.42	Thu Aug 26 23:02:35 2004
+++ llvm/include/llvm/CodeGen/MachineFunction.h	Wed Sep  1 17:55:34 2004
@@ -19,7 +19,7 @@
 #define LLVM_CODEGEN_MACHINEFUNCTION_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/CodeGen/MachineInstr.h
diff -u llvm/include/llvm/CodeGen/MachineInstr.h:1.153 llvm/include/llvm/CodeGen/MachineInstr.h:1.154
--- llvm/include/llvm/CodeGen/MachineInstr.h:1.153	Fri Jul 30 20:59:11 2004
+++ llvm/include/llvm/CodeGen/MachineInstr.h	Wed Sep  1 17:55:34 2004
@@ -16,7 +16,7 @@
 #ifndef LLVM_CODEGEN_MACHINEINSTR_H
 #define LLVM_CODEGEN_MACHINEINSTR_H
 
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 #include <string>
 #include <vector>
 #include <cassert>


Index: llvm/include/llvm/CodeGen/SSARegMap.h
diff -u llvm/include/llvm/CodeGen/SSARegMap.h:1.10 llvm/include/llvm/CodeGen/SSARegMap.h:1.11
--- llvm/include/llvm/CodeGen/SSARegMap.h:1.10	Wed Feb 25 15:55:45 2004
+++ llvm/include/llvm/CodeGen/SSARegMap.h	Wed Sep  1 17:55:34 2004
@@ -18,7 +18,7 @@
 #define LLVM_CODEGEN_SSAREGMAP_H
 
 #include "llvm/Target/MRegisterInfo.h"
-#include "Support/DenseMap.h"
+#include "llvm/ADT/DenseMap.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/CodeGen/SchedGraphCommon.h
diff -u llvm/include/llvm/CodeGen/SchedGraphCommon.h:1.11 llvm/include/llvm/CodeGen/SchedGraphCommon.h:1.12
--- llvm/include/llvm/CodeGen/SchedGraphCommon.h:1.11	Sat May  8 11:14:24 2004
+++ llvm/include/llvm/CodeGen/SchedGraphCommon.h	Wed Sep  1 17:55:34 2004
@@ -16,7 +16,7 @@
 #define LLVM_CODEGEN_SCHEDGRAPHCOMMON_H
 
 #include "llvm/Value.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {


Index: llvm/include/llvm/CodeGen/SelectionDAG.h
diff -u llvm/include/llvm/CodeGen/SelectionDAG.h:1.5 llvm/include/llvm/CodeGen/SelectionDAG.h:1.6
--- llvm/include/llvm/CodeGen/SelectionDAG.h:1.5	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/CodeGen/SelectionDAG.h	Wed Sep  1 17:55:34 2004
@@ -23,7 +23,7 @@
 #define LLVM_CODEGEN_SELECTIONDAG_H
 
 #include "llvm/CodeGen/ValueTypes.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <map>
 #include <vector>
 #include <cassert>





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp 
Message-ID: <200409012255.RAA28290@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.195 -> 1.196
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.195 llvm/lib/Target/CBackend/Writer.cpp:1.196
--- llvm/lib/Target/CBackend/Writer.cpp:1.195	Wed Aug 25 14:37:26 2004
+++ llvm/lib/Target/CBackend/Writer.cpp	Wed Sep  1 17:55:35 2004
@@ -32,9 +32,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/StringExtras.h"
-#include "Support/MathExtras.h"
-#include "Config/config.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/Config/config.h"
 #include <algorithm>
 #include <iostream>
 #include <sstream>





From reid at x10sys.com  Wed Sep  1 17:55:54 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:54 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200409012255.RAA28084@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.104 -> 1.105
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+7 -7)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.104 llvm/autoconf/configure.ac:1.105
--- llvm/autoconf/configure.ac:1.104	Tue Aug 31 13:03:23 2004
+++ llvm/autoconf/configure.ac	Wed Sep  1 17:55:34 2004
@@ -8,7 +8,7 @@
 dnl NOTE: This relies upon undocumented autoconf behavior.
 if test ${srcdir} != "."
 then
-	if test -f ${srcdir}/include/Config/config.h
+	if test -f ${srcdir}/include/llvm/Config/config.h
 	then
 		AC_MSG_ERROR([Already configured in ${srcdir}])
 	fi
@@ -27,15 +27,15 @@
 done
 
 dnl Configure header files
-AC_CONFIG_HEADERS(include/Config/config.h)
+AC_CONFIG_HEADERS(include/llvm/Config/config.h)
 
 dnl Configure other output file
 AC_CONFIG_FILES(Makefile.config
- include/Support/DataTypes.h
- include/Support/ThreadSupport.h
- include/Support/hash_map
- include/Support/hash_set
- include/Support/iterator)
+ include/llvm/Support/DataTypes.h
+ include/llvm/Support/ThreadSupport.h
+ include/llvm/ADT/hash_map
+ include/llvm/ADT/hash_set
+ include/llvm/ADT/iterator)
 
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] CVS: llvm/tools/extract/extract.cpp 
Message-ID: <200409012255.RAA28177@zion.cs.uiuc.edu>



Changes in directory llvm/tools/extract:

extract.cpp updated: 1.24 -> 1.25
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/extract/extract.cpp
diff -u llvm/tools/extract/extract.cpp:1.24 llvm/tools/extract/extract.cpp:1.25
--- llvm/tools/extract/extract.cpp:1.24	Sun Aug 29 14:28:55 2004
+++ llvm/tools/extract/extract.cpp	Wed Sep  1 17:55:37 2004
@@ -18,7 +18,7 @@
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <memory>
 #include <fstream>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] 
	CVS: llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
	TraceValues.cpp 
Message-ID: <200409012255.RAA28461@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Instrumentation:

TraceBasicBlocks.cpp updated: 1.7 -> 1.8
TraceValues.cpp updated: 1.68 -> 1.69
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
diff -u llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.7 llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.8
--- llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.7	Thu Jul 29 12:27:02 2004
+++ llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp	Wed Sep  1 17:55:36 2004
@@ -20,7 +20,7 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Instructions.h"
 #include "ProfilingUtils.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <set>
 using namespace llvm;
 


Index: llvm/lib/Transforms/Instrumentation/TraceValues.cpp
diff -u llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.68 llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.69
--- llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.68	Thu Jul 29 12:25:20 2004
+++ llvm/lib/Transforms/Instrumentation/TraceValues.cpp	Wed Sep  1 17:55:36 2004
@@ -19,8 +19,8 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <sstream>
 using namespace llvm;





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/MachineFunctionInfo.h
	MappingInfo.cpp SparcV9AsmPrinter.cpp SparcV9BurgISel.cpp
	SparcV9CodeEmitter.cpp SparcV9Internals.h
	SparcV9PeepholeOpts.cpp SparcV9RegInfo.h
	SparcV9TargetMachine.cpp SparcV9TmpInstr.cpp 
Message-ID: <200409012255.RAA28532@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9:

MachineFunctionInfo.h updated: 1.8 -> 1.9
MappingInfo.cpp updated: 1.18 -> 1.19
SparcV9AsmPrinter.cpp updated: 1.120 -> 1.121
SparcV9BurgISel.cpp updated: 1.8 -> 1.9
SparcV9CodeEmitter.cpp updated: 1.70 -> 1.71
SparcV9Internals.h updated: 1.115 -> 1.116
SparcV9PeepholeOpts.cpp updated: 1.25 -> 1.26
SparcV9RegInfo.h updated: 1.15 -> 1.16
SparcV9TargetMachine.cpp updated: 1.121 -> 1.122
SparcV9TmpInstr.cpp updated: 1.1 -> 1.2
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+20 -20)

Index: llvm/lib/Target/SparcV9/MachineFunctionInfo.h
diff -u llvm/lib/Target/SparcV9/MachineFunctionInfo.h:1.8 llvm/lib/Target/SparcV9/MachineFunctionInfo.h:1.9
--- llvm/lib/Target/SparcV9/MachineFunctionInfo.h:1.8	Wed Aug 18 13:13:34 2004
+++ llvm/lib/Target/SparcV9/MachineFunctionInfo.h	Wed Sep  1 17:55:36 2004
@@ -20,8 +20,8 @@
 
 #include "MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "Support/HashExtras.h"
-#include "Support/hash_set"
+#include "llvm/ADT/HashExtras.h"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/MappingInfo.cpp
diff -u llvm/lib/Target/SparcV9/MappingInfo.cpp:1.18 llvm/lib/Target/SparcV9/MappingInfo.cpp:1.19
--- llvm/lib/Target/SparcV9/MappingInfo.cpp:1.18	Mon Aug 16 16:54:29 2004
+++ llvm/lib/Target/SparcV9/MappingInfo.cpp	Wed Sep  1 17:55:36 2004
@@ -47,7 +47,7 @@
 #include "llvm/Module.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "MachineCodeForInstruction.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.120 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.121
--- llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp:1.120	Wed Aug 18 15:04:23 2004
+++ llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp	Wed Sep  1 17:55:36 2004
@@ -28,8 +28,8 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/StringExtras.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/Statistic.h"
 #include "SparcV9Internals.h"
 #include "MachineFunctionInfo.h"
 #include <string>


Index: llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.8 llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.9
--- llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp:1.8	Wed Aug 18 13:13:34 2004
+++ llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp	Wed Sep  1 17:55:36 2004
@@ -37,12 +37,12 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Type.h"
-#include "Config/alloca.h"
-#include "Support/CommandLine.h"
-#include "Support/LeakDetector.h"
-#include "Support/MathExtras.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_map"
+#include "llvm/Config/alloca.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_map"
 #include <algorithm>
 #include <cmath>
 #include <iostream>


Index: llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.70 llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.71
--- llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp:1.70	Mon Aug 16 16:54:30 2004
+++ llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp	Wed Sep  1 17:55:36 2004
@@ -30,15 +30,15 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/hash_set"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/hash_set"
+#include "llvm/ADT/Statistic.h"
 #include "SparcV9Internals.h"
 #include "SparcV9TargetMachine.h"
 #include "SparcV9RegInfo.h"
 #include "SparcV9CodeEmitter.h"
 #include "MachineFunctionInfo.h"
-#include "Config/alloca.h"
+#include "llvm/Config/alloca.h"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/SparcV9Internals.h
diff -u llvm/lib/Target/SparcV9/SparcV9Internals.h:1.115 llvm/lib/Target/SparcV9/SparcV9Internals.h:1.116
--- llvm/lib/Target/SparcV9/SparcV9Internals.h:1.115	Wed Aug 18 00:29:08 2004
+++ llvm/lib/Target/SparcV9/SparcV9Internals.h	Wed Sep  1 17:55:36 2004
@@ -22,7 +22,7 @@
 #include "SparcV9RegInfo.h"
 #include "llvm/Type.h"
 #include "SparcV9RegClassInfo.h"
-#include "Config/sys/types.h"
+#include "llvm/Config/sys/types.h"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.25 llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.26
--- llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp:1.25	Tue Jul 27 12:43:24 2004
+++ llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp	Wed Sep  1 17:55:36 2004
@@ -19,7 +19,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 


Index: llvm/lib/Target/SparcV9/SparcV9RegInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.15 llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.16
--- llvm/lib/Target/SparcV9/SparcV9RegInfo.h:1.15	Thu Jun  3 00:03:00 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegInfo.h	Wed Sep  1 17:55:36 2004
@@ -15,7 +15,7 @@
 #ifndef SPARCV9REGINFO_H
 #define SPARCV9REGINFO_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 #include <cassert>
 


Index: llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.121 llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.122
--- llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp:1.121	Wed Aug 18 13:13:34 2004
+++ llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp	Wed Sep  1 17:55:36 2004
@@ -29,7 +29,7 @@
 #include "SparcV9Internals.h"
 #include "SparcV9TargetMachine.h"
 #include "SparcV9BurgISel.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 static const unsigned ImplicitRegUseList[] = { 0 }; /* not used yet */


Index: llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp
diff -u llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp:1.1 llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp:1.2
--- llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp:1.1	Wed Aug  4 02:29:04 2004
+++ llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp	Wed Sep  1 17:55:36 2004
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SparcV9TmpInstr.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 
 namespace llvm {
 





From reid at x10sys.com  Wed Sep  1 17:55:53 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:53 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetData.cpp
	TargetMachine.cpp 
Message-ID: <200409012255.RAA28087@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

TargetData.cpp updated: 1.51 -> 1.52
TargetMachine.cpp updated: 1.33 -> 1.34
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/lib/Target/TargetData.cpp
diff -u llvm/lib/Target/TargetData.cpp:1.51 llvm/lib/Target/TargetData.cpp:1.52
--- llvm/lib/Target/TargetData.cpp:1.51	Tue Aug 17 14:13:00 2004
+++ llvm/lib/Target/TargetData.cpp	Wed Sep  1 17:55:35 2004
@@ -21,7 +21,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/MathExtras.h"
+#include "llvm/Support/MathExtras.h"
 using namespace llvm;
 
 // Handle the Pass registration stuff necessary to use TargetData's.


Index: llvm/lib/Target/TargetMachine.cpp
diff -u llvm/lib/Target/TargetMachine.cpp:1.33 llvm/lib/Target/TargetMachine.cpp:1.34
--- llvm/lib/Target/TargetMachine.cpp:1.33	Tue Aug 10 18:10:25 2004
+++ llvm/lib/Target/TargetMachine.cpp	Wed Sep  1 17:55:35 2004
@@ -14,7 +14,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Type.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 //---------------------------------------------------------------------------





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/BitSetVector.h DenseMap.h
	DepthFirstIterator.h EquivalenceClasses.h GraphTraits.h
	HashExtras.h PostOrderIterator.h SCCIterator.h STLExtras.h
	SetOperations.h SetVector.h Statistic.h StringExtras.h Tree.h
	VectorExtras.h hash_map.in hash_set.in ilist iterator.in 
Message-ID: <200409012255.RAA28641@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

BitSetVector.h updated: 1.12 -> 1.13
DenseMap.h updated: 1.5 -> 1.6
DepthFirstIterator.h updated: 1.12 -> 1.13
EquivalenceClasses.h updated: 1.7 -> 1.8
GraphTraits.h updated: 1.6 -> 1.7
HashExtras.h updated: 1.10 -> 1.11
PostOrderIterator.h updated: 1.14 -> 1.15
SCCIterator.h updated: 1.19 -> 1.20
STLExtras.h updated: 1.17 -> 1.18
SetOperations.h updated: 1.5 -> 1.6
SetVector.h updated: 1.5 -> 1.6
Statistic.h updated: 1.12 -> 1.13
StringExtras.h updated: 1.22 -> 1.23
Tree.h updated: 1.10 -> 1.11
VectorExtras.h updated: 1.3 -> 1.4
hash_map.in updated: 1.1 -> 1.2
hash_set.in updated: 1.1 -> 1.2
ilist updated: 1.20 -> 1.21
iterator.in updated: 1.1 -> 1.2
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+72 -72)

Index: llvm/include/llvm/ADT/BitSetVector.h
diff -u llvm/include/llvm/ADT/BitSetVector.h:1.12 llvm/include/llvm/ADT/BitSetVector.h:1.13
--- llvm/include/llvm/ADT/BitSetVector.h:1.12	Wed Apr 21 11:10:40 2004
+++ llvm/include/llvm/ADT/BitSetVector.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- BitVectorSet.h - A bit-vector representation of sets ----*- C++ -*-===//
+//===-- llvm/ADT/BitVectorSet.h - A bit-vector rep. of sets -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -22,8 +22,8 @@
 // 
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_BITSETVECTOR_H
-#define SUPPORT_BITSETVECTOR_H
+#ifndef LLVM_ADT_BITSETVECTOR_H
+#define LLVM_ADT_BITSETVECTOR_H
 
 #include <bitset>
 #include <vector>


Index: llvm/include/llvm/ADT/DenseMap.h
diff -u llvm/include/llvm/ADT/DenseMap.h:1.5 llvm/include/llvm/ADT/DenseMap.h:1.6
--- llvm/include/llvm/ADT/DenseMap.h:1.5	Thu Aug 26 22:58:31 2004
+++ llvm/include/llvm/ADT/DenseMap.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- DenseMap.h - A dense map implmentation -------------------*- C++ -*-===//
+//===- llvm/ADT/DenseMap.h - A dense map implmentation ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DENSEMAP_H
-#define SUPPORT_DENSEMAP_H
+#ifndef LLVM_ADT_DENSEMAP_H
+#define LLVM_ADT_DENSEMAP_H
 
 #include <vector>
 


Index: llvm/include/llvm/ADT/DepthFirstIterator.h
diff -u llvm/include/llvm/ADT/DepthFirstIterator.h:1.12 llvm/include/llvm/ADT/DepthFirstIterator.h:1.13
--- llvm/include/llvm/ADT/DepthFirstIterator.h:1.12	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/ADT/DepthFirstIterator.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- Support/DepthFirstIterator.h - Depth First iterator ------*- C++ -*-===//
+//===- llvm/ADT/DepthFirstIterator.h - Depth First iterator -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This file builds on the Support/GraphTraits.h file to build generic depth
+// This file builds on the ADT/GraphTraits.h file to build generic depth
 // first graph iterator.  This file exposes the following functions/types:
 //
 // df_begin/df_end/df_iterator
@@ -30,11 +30,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DEPTHFIRSTITERATOR_H
-#define SUPPORT_DEPTHFIRSTITERATOR_H
+#ifndef LLVM_ADT_DEPTHFIRSTITERATOR_H
+#define LLVM_ADT_DEPTHFIRSTITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 #include <set>
 


Index: llvm/include/llvm/ADT/EquivalenceClasses.h
diff -u llvm/include/llvm/ADT/EquivalenceClasses.h:1.7 llvm/include/llvm/ADT/EquivalenceClasses.h:1.8
--- llvm/include/llvm/ADT/EquivalenceClasses.h:1.7	Sun May 23 03:05:14 2004
+++ llvm/include/llvm/ADT/EquivalenceClasses.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/EquivalenceClasses.h ----------------------------*- C++ -*-===//
+//===-- llvm/ADT/EquivalenceClasses.h - Generic Equiv. Classes --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 // 
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_EQUIVALENCECLASSES_H
-#define SUPPORT_EQUIVALENCECLASSES_H
+#ifndef LLVM_ADT_EQUIVALENCECLASSES_H
+#define LLVM_ADT_EQUIVALENCECLASSES_H
 
 #include <map>
 #include <set>


Index: llvm/include/llvm/ADT/GraphTraits.h
diff -u llvm/include/llvm/ADT/GraphTraits.h:1.6 llvm/include/llvm/ADT/GraphTraits.h:1.7
--- llvm/include/llvm/ADT/GraphTraits.h:1.6	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/ADT/GraphTraits.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/GraphTraits.h - Graph traits template -----------*- C++ -*-===//
+//===-- llvm/ADT/GraphTraits.h - Graph traits template ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_GRAPHTRAITS_H
-#define SUPPORT_GRAPHTRAITS_H
+#ifndef LLVM_ADT_GRAPHTRAITS_H
+#define LLVM_ADT_GRAPHTRAITS_H
 
 namespace llvm {
 


Index: llvm/include/llvm/ADT/HashExtras.h
diff -u llvm/include/llvm/ADT/HashExtras.h:1.10 llvm/include/llvm/ADT/HashExtras.h:1.11
--- llvm/include/llvm/ADT/HashExtras.h:1.10	Sun Nov 16 14:21:13 2003
+++ llvm/include/llvm/ADT/HashExtras.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- HashExtras.h - Useful functions for STL hash containers -*- C++ -*-===//
+//===-- llvm/ADT/HashExtras.h - Useful functions for STL hash ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASHEXTRAS_H
-#define SUPPORT_HASHEXTRAS_H
+#ifndef LLVM_ADT_HASHEXTRAS_H
+#define LLVM_ADT_HASHEXTRAS_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 
 // Cannot specialize hash template from outside of the std namespace.


Index: llvm/include/llvm/ADT/PostOrderIterator.h
diff -u llvm/include/llvm/ADT/PostOrderIterator.h:1.14 llvm/include/llvm/ADT/PostOrderIterator.h:1.15
--- llvm/include/llvm/ADT/PostOrderIterator.h:1.14	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/ADT/PostOrderIterator.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*-===//
+//===- llvm/ADT/PostOrderIterator.h - PostOrder iterator --------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,17 +7,17 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This file builds on the Support/GraphTraits.h file to build a generic graph
+// This file builds on the ADT/GraphTraits.h file to build a generic graph
 // post order iterator.  This should work over any graph type that has a
 // GraphTraits specialization.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_POSTORDERITERATOR_H
-#define SUPPORT_POSTORDERITERATOR_H
+#ifndef LLVM_ADT_POSTORDERITERATOR_H
+#define LLVM_ADT_POSTORDERITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <stack>
 #include <set>
 


Index: llvm/include/llvm/ADT/SCCIterator.h
diff -u llvm/include/llvm/ADT/SCCIterator.h:1.19 llvm/include/llvm/ADT/SCCIterator.h:1.20
--- llvm/include/llvm/ADT/SCCIterator.h:1.19	Wed Nov 12 20:30:22 2003
+++ llvm/include/llvm/ADT/SCCIterator.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/SCCIterator.h - SCC iterator --------------------*- C++ -*-===//
+//===-- Support/SCCIterator.h - Strongly Connected Comp. Iter. --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This builds on the Support/GraphTraits.h file to find the strongly connected
+// This builds on the llvm/ADT/GraphTraits.h file to find the strongly connected
 // components (SCCs) of a graph in O(N+E) time using Tarjan's DFS algorithm.
 //
 // The SCC iterator has the important property that if a node in SCC S1 has an
@@ -18,11 +18,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SCCITERATOR_H
-#define SUPPORT_SCCITERATOR_H
+#ifndef LLVM_ADT_SCCITERATOR_H
+#define LLVM_ADT_SCCITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 #include <map>
 


Index: llvm/include/llvm/ADT/STLExtras.h
diff -u llvm/include/llvm/ADT/STLExtras.h:1.17 llvm/include/llvm/ADT/STLExtras.h:1.18
--- llvm/include/llvm/ADT/STLExtras.h:1.17	Wed Jul 21 03:38:06 2004
+++ llvm/include/llvm/ADT/STLExtras.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- STLExtras.h - Useful functions when working with the STL -*- C++ -*-===//
+//===- llvm/ADT/STLExtras.h - Useful STL related functions ------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,12 +14,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STLEXTRAS_H
-#define SUPPORT_STLEXTRAS_H
+#ifndef LLVM_ADT_STLEXTRAS_H
+#define LLVM_ADT_STLEXTRAS_H
 
 #include <functional>
 #include <utility> // for std::pair
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 


Index: llvm/include/llvm/ADT/SetOperations.h
diff -u llvm/include/llvm/ADT/SetOperations.h:1.5 llvm/include/llvm/ADT/SetOperations.h:1.6
--- llvm/include/llvm/ADT/SetOperations.h:1.5	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/ADT/SetOperations.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/SetOperations.h - Generic Set Operations --------*- C++ -*-===//
+//===-- llvm/ADT/SetOperations.h - Generic Set Operations -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SETOPERATIONS_H
-#define SUPPORT_SETOPERATIONS_H
+#ifndef LLVM_ADT_SETOPERATIONS_H
+#define LLVM_ADT_SETOPERATIONS_H
 
 namespace llvm {
 


Index: llvm/include/llvm/ADT/SetVector.h
diff -u llvm/include/llvm/ADT/SetVector.h:1.5 llvm/include/llvm/ADT/SetVector.h:1.6
--- llvm/include/llvm/ADT/SetVector.h:1.5	Wed Jul 28 23:22:30 2004
+++ llvm/include/llvm/ADT/SetVector.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- SetVector.h - A set with insertion order iteration -------*- C++ -*-===//
+//===- llvm/ADT/SetVector.h - Set with insert order iteration ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SETVECTOR_H
-#define SUPPORT_SETVECTOR_H
+#ifndef LLVM_ADT_SETVECTOR_H
+#define LLVM_ADT_SETVECTOR_H
 
 #include <set>
 #include <vector>


Index: llvm/include/llvm/ADT/Statistic.h
diff -u llvm/include/llvm/ADT/Statistic.h:1.12 llvm/include/llvm/ADT/Statistic.h:1.13
--- llvm/include/llvm/ADT/Statistic.h:1.12	Sat Jul  3 20:30:54 2004
+++ llvm/include/llvm/ADT/Statistic.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/Statistic.h - Easy way to expose stats ----------*- C++ -*-===//
+//===-- llvm/ADT/Statistic.h - Easy way to expose stats ---------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -21,8 +21,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STATISTIC_H
-#define SUPPORT_STATISTIC_H
+#ifndef LLVM_ADT_STATISTIC_H
+#define LLVM_ADT_STATISTIC_H
 
 #include <iostream>
 


Index: llvm/include/llvm/ADT/StringExtras.h
diff -u llvm/include/llvm/ADT/StringExtras.h:1.22 llvm/include/llvm/ADT/StringExtras.h:1.23
--- llvm/include/llvm/ADT/StringExtras.h:1.22	Wed Aug 18 17:56:12 2004
+++ llvm/include/llvm/ADT/StringExtras.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/StringExtras.h - Useful string functions --------*- C++ -*-===//
+//===-- llvm/ADT/StringExtras.h - Useful string functions -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STRINGEXTRAS_H
-#define SUPPORT_STRINGEXTRAS_H
+#ifndef LLVM_ADT_STRINGEXTRAS_H
+#define LLVM_ADT_STRINGEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <cctype>
 #include <cstdio>
 #include <string>


Index: llvm/include/llvm/ADT/Tree.h
diff -u llvm/include/llvm/ADT/Tree.h:1.10 llvm/include/llvm/ADT/Tree.h:1.11
--- llvm/include/llvm/ADT/Tree.h:1.10	Sat Nov 29 13:55:02 2003
+++ llvm/include/llvm/ADT/Tree.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===- Support/Tree.h - Generic n-way tree structure ------------*- C++ -*-===//
+//===- llvm/ADT/Tree.h - Generic n-way tree structure -----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TREE_H
-#define SUPPORT_TREE_H
+#ifndef LLVM_ADT_TREE_H
+#define LLVM_ADT_TREE_H
 
 #include <vector>
 


Index: llvm/include/llvm/ADT/VectorExtras.h
diff -u llvm/include/llvm/ADT/VectorExtras.h:1.3 llvm/include/llvm/ADT/VectorExtras.h:1.4
--- llvm/include/llvm/ADT/VectorExtras.h:1.3	Tue Nov 11 16:41:29 2003
+++ llvm/include/llvm/ADT/VectorExtras.h	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- VectorExtras.h - Helper functions for std::vector -------*- C++ -*-===//
+//===-- llvm/ADT/VectorExtras.h - Helpers for std::vector -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_VECTOREXTRAS_H
-#define SUPPORT_VECTOREXTRAS_H
+#ifndef LLVM_ADT_VECTOREXTRAS_H
+#define LLVM_ADT_VECTOREXTRAS_H
 
 #include <cstdarg>
 


Index: llvm/include/llvm/ADT/hash_map.in
diff -u llvm/include/llvm/ADT/hash_map.in:1.1 llvm/include/llvm/ADT/hash_map.in:1.2
--- llvm/include/llvm/ADT/hash_map.in:1.1	Mon Feb 23 12:56:35 2004
+++ llvm/include/llvm/ADT/hash_map.in	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===//
+//===-- llvm/ADT/hash_map - "Portable" wrapper around hash_map --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASH_MAP
-#define SUPPORT_HASH_MAP
+#ifndef LLVM_ADT_HASH_MAP
+#define LLVM_ADT_HASH_MAP
 
 // Compiler Support Matrix
 //
@@ -61,6 +61,6 @@
 // out specializations like stl_bvector.h, causing link conflicts.
 #include <vector>
 
-#include <Support/HashExtras.h>
+#include <llvm/ADT/HashExtras.h>
 
 #endif


Index: llvm/include/llvm/ADT/hash_set.in
diff -u llvm/include/llvm/ADT/hash_set.in:1.1 llvm/include/llvm/ADT/hash_set.in:1.2
--- llvm/include/llvm/ADT/hash_set.in:1.1	Mon Feb 23 12:56:36 2004
+++ llvm/include/llvm/ADT/hash_set.in	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/hash_set - "Portable" wrapper around hash_set ---*- C++ -*-===//
+//===-- llvm/ADT/hash_set - "Portable" wrapper around hash_set --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASH_SET
-#define SUPPORT_HASH_SET
+#ifndef LLVM_ADT_HASH_SET
+#define LLVM_ADT_HASH_SET
 
 // Compiler Support Matrix
 //
@@ -62,6 +62,6 @@
 // out specializations like stl_bvector.h, causing link conflicts.
 #include <vector>
 
-#include <Support/HashExtras.h>
+#include <llvm/ADT/HashExtras.h>
 
 #endif


Index: llvm/include/llvm/ADT/ilist
diff -u llvm/include/llvm/ADT/ilist:1.20 llvm/include/llvm/ADT/ilist:1.21
--- llvm/include/llvm/ADT/ilist:1.20	Fri Jun  4 15:10:17 2004
+++ llvm/include/llvm/ADT/ilist	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/ilist - Intrusive Linked List Template ----------*- C++ -*-===//
+//===-- llvm/ADT/ilist - Intrusive Linked List Template ---------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -35,10 +35,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ILIST
-#define SUPPORT_ILIST
+#ifndef LLVM_ADT_ILIST
+#define LLVM_ADT_ILIST
 
-#include <Support/iterator>
+#include <llvm/ADT/iterator>
 #include <cassert>
 
 namespace llvm {


Index: llvm/include/llvm/ADT/iterator.in
diff -u llvm/include/llvm/ADT/iterator.in:1.1 llvm/include/llvm/ADT/iterator.in:1.2
--- llvm/include/llvm/ADT/iterator.in:1.1	Mon Feb 23 12:16:10 2004
+++ llvm/include/llvm/ADT/iterator.in	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-//===-- Support/iterator - "Portable" wrapper around <iterator> -*- C++ -*-===//
+//===-- llvm/ADT/iterator - Portable wrapper around <iterator> --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -25,8 +25,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ITERATOR
-#define SUPPORT_ITERATOR
+#ifndef LLVM_ADT_ITERATOR
+#define LLVM_ADT_ITERATOR
 
 #include <iterator>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llc/llc.cpp 
Message-ID: <200409012255.RAA28446@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llc:

llc.cpp updated: 1.101 -> 1.102
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+2 -2)

Index: llvm/tools/llc/llc.cpp
diff -u llvm/tools/llc/llc.cpp:1.101 llvm/tools/llc/llc.cpp:1.102
--- llvm/tools/llc/llc.cpp:1.101	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llc/llc.cpp	Wed Sep  1 17:55:37 2004
@@ -20,8 +20,8 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Pass.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>





From reid at x10sys.com  Wed Sep  1 17:55:56 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:56 -0500
Subject: [llvm-commits] 
	CVS: llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h
	DSSupport.h DataStructure.h 
Message-ID: <200409012255.RAA28124@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis/DataStructure:

DSGraphTraits.h updated: 1.21 -> 1.22
DSSupport.h updated: 1.32 -> 1.33
DataStructure.h updated: 1.78 -> 1.79
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+5 -5)

Index: llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h
diff -u llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h:1.21 llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h:1.22
--- llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h:1.21	Wed Jul  7 01:29:26 2004
+++ llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h	Wed Sep  1 17:55:34 2004
@@ -17,9 +17,9 @@
 #define LLVM_ANALYSIS_DSGRAPHTRAITS_H
 
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 


Index: llvm/include/llvm/Analysis/DataStructure/DSSupport.h
diff -u llvm/include/llvm/Analysis/DataStructure/DSSupport.h:1.32 llvm/include/llvm/Analysis/DataStructure/DSSupport.h:1.33
--- llvm/include/llvm/Analysis/DataStructure/DSSupport.h:1.32	Wed Jul  7 01:12:36 2004
+++ llvm/include/llvm/Analysis/DataStructure/DSSupport.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
 #include <functional>
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 #include "llvm/Support/CallSite.h"
 
 namespace llvm {


Index: llvm/include/llvm/Analysis/DataStructure/DataStructure.h
diff -u llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.78 llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.79
--- llvm/include/llvm/Analysis/DataStructure/DataStructure.h:1.78	Thu Mar 11 17:08:20 2004
+++ llvm/include/llvm/Analysis/DataStructure/DataStructure.h	Wed Sep  1 17:55:34 2004
@@ -16,7 +16,7 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-dis/llvm-dis.cpp 
Message-ID: <200409012255.RAA28507@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-dis:

llvm-dis.cpp updated: 1.45 -> 1.46
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvm-dis/llvm-dis.cpp
diff -u llvm/tools/llvm-dis/llvm-dis.cpp:1.45 llvm/tools/llvm-dis/llvm-dis.cpp:1.46
--- llvm/tools/llvm-dis/llvm-dis.cpp:1.45	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-dis/llvm-dis.cpp	Wed Sep  1 17:55:37 2004
@@ -20,7 +20,7 @@
 #include "llvm/PassManager.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Assembly/PrintModulePass.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <memory>





From reid at x10sys.com  Wed Sep  1 17:55:57 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:57 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/alloca.h config.h.in
	dlfcn.h fcntl.h limits.h malloc.h memory.h pagesize.h
	stdint.h time.h unistd.h windows.h 
Message-ID: <200409012255.RAA28287@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config:

alloca.h updated: 1.4 -> 1.5
config.h.in updated: 1.24 -> 1.25
dlfcn.h updated: 1.4 -> 1.5
fcntl.h updated: 1.4 -> 1.5
limits.h updated: 1.3 -> 1.4
malloc.h updated: 1.3 -> 1.4
memory.h updated: 1.3 -> 1.4
pagesize.h updated: 1.2 -> 1.3
stdint.h updated: 1.3 -> 1.4
time.h updated: 1.3 -> 1.4
unistd.h updated: 1.5 -> 1.6
windows.h updated: 1.3 -> 1.4
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+12 -12)

Index: llvm/include/llvm/Config/alloca.h
diff -u llvm/include/llvm/Config/alloca.h:1.4 llvm/include/llvm/Config/alloca.h:1.5
--- llvm/include/llvm/Config/alloca.h:1.4	Fri Jun  4 14:25:50 2004
+++ llvm/include/llvm/Config/alloca.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_ALLOC_H
 #define _CONFIG_ALLOC_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 /*
  * This is a modified version of that suggested by the Autoconf manual.


Index: llvm/include/llvm/Config/config.h.in
diff -u llvm/include/llvm/Config/config.h.in:1.24 llvm/include/llvm/Config/config.h.in:1.25
--- llvm/include/llvm/Config/config.h.in:1.24	Fri Aug 20 04:10:31 2004
+++ llvm/include/llvm/Config/config.h.in	Wed Sep  1 17:55:34 2004
@@ -1,4 +1,4 @@
-/* include/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
+/* include/llvm/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.


Index: llvm/include/llvm/Config/dlfcn.h
diff -u llvm/include/llvm/Config/dlfcn.h:1.4 llvm/include/llvm/Config/dlfcn.h:1.5
--- llvm/include/llvm/Config/dlfcn.h:1.4	Fri Jul 16 22:09:12 2004
+++ llvm/include/llvm/Config/dlfcn.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_DLFCN_H
 #define _CONFIG_DLFCN_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>


Index: llvm/include/llvm/Config/fcntl.h
diff -u llvm/include/llvm/Config/fcntl.h:1.4 llvm/include/llvm/Config/fcntl.h:1.5
--- llvm/include/llvm/Config/fcntl.h:1.4	Mon Oct 20 15:16:14 2003
+++ llvm/include/llvm/Config/fcntl.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_FCNTL_H
 #define _CONFIG_FCNTL_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>


Index: llvm/include/llvm/Config/limits.h
diff -u llvm/include/llvm/Config/limits.h:1.3 llvm/include/llvm/Config/limits.h:1.4
--- llvm/include/llvm/Config/limits.h:1.3	Mon Oct 20 15:11:35 2003
+++ llvm/include/llvm/Config/limits.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_LIMITS_H
 #define _CONFIG_LIMITS_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>


Index: llvm/include/llvm/Config/malloc.h
diff -u llvm/include/llvm/Config/malloc.h:1.3 llvm/include/llvm/Config/malloc.h:1.4
--- llvm/include/llvm/Config/malloc.h:1.3	Mon Oct 20 15:11:36 2003
+++ llvm/include/llvm/Config/malloc.h	Wed Sep  1 17:55:34 2004
@@ -15,7 +15,7 @@
 #ifndef _SUPPORT_MALLOC_H
 #define _SUPPORT_MALLOC_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>


Index: llvm/include/llvm/Config/memory.h
diff -u llvm/include/llvm/Config/memory.h:1.3 llvm/include/llvm/Config/memory.h:1.4
--- llvm/include/llvm/Config/memory.h:1.3	Mon Oct 20 15:11:36 2003
+++ llvm/include/llvm/Config/memory.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_MEMORY_H
 #define _CONFIG_MEMORY_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>


Index: llvm/include/llvm/Config/pagesize.h
diff -u llvm/include/llvm/Config/pagesize.h:1.2 llvm/include/llvm/Config/pagesize.h:1.3
--- llvm/include/llvm/Config/pagesize.h:1.2	Mon Jun 21 13:43:23 2004
+++ llvm/include/llvm/Config/pagesize.h	Wed Sep  1 17:55:34 2004
@@ -12,7 +12,7 @@
 #ifndef PAGESIZE_H
 #define PAGESIZE_H
 
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 #include <sys/param.h>
 
 namespace llvm {


Index: llvm/include/llvm/Config/stdint.h
diff -u llvm/include/llvm/Config/stdint.h:1.3 llvm/include/llvm/Config/stdint.h:1.4
--- llvm/include/llvm/Config/stdint.h:1.3	Mon Oct 20 15:11:36 2003
+++ llvm/include/llvm/Config/stdint.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_STDINT_H
 #define _CONFIG_STDINT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>


Index: llvm/include/llvm/Config/time.h
diff -u llvm/include/llvm/Config/time.h:1.3 llvm/include/llvm/Config/time.h:1.4
--- llvm/include/llvm/Config/time.h:1.3	Mon Oct 20 15:11:38 2003
+++ llvm/include/llvm/Config/time.h	Wed Sep  1 17:55:34 2004
@@ -24,7 +24,7 @@
 #ifndef _CONFIG_TIME_H
 #define _CONFIG_TIME_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_TIME_H
 #include <time.h>


Index: llvm/include/llvm/Config/unistd.h
diff -u llvm/include/llvm/Config/unistd.h:1.5 llvm/include/llvm/Config/unistd.h:1.6
--- llvm/include/llvm/Config/unistd.h:1.5	Fri Jun  4 15:05:35 2004
+++ llvm/include/llvm/Config/unistd.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_UNISTD_H
 #define _CONFIG_UNISTD_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
 #include <unistd.h>


Index: llvm/include/llvm/Config/windows.h
diff -u llvm/include/llvm/Config/windows.h:1.3 llvm/include/llvm/Config/windows.h:1.4
--- llvm/include/llvm/Config/windows.h:1.3	Fri Jun  4 19:54:11 2004
+++ llvm/include/llvm/Config/windows.h	Wed Sep  1 17:55:34 2004
@@ -14,7 +14,7 @@
 #ifndef LLVM_CONFIG_WINDOWS_H
 #define LLVM_CONFIG_WINDOWS_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-stub/llvm-stub.c 
Message-ID: <200409012255.RAA28528@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-stub:

llvm-stub.c updated: 1.3 -> 1.4
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvm-stub/llvm-stub.c
diff -u llvm/tools/llvm-stub/llvm-stub.c:1.3 llvm/tools/llvm-stub/llvm-stub.c:1.4
--- llvm/tools/llvm-stub/llvm-stub.c:1.3	Tue Jun  1 19:29:52 2004
+++ llvm/tools/llvm-stub/llvm-stub.c	Wed Sep  1 17:55:38 2004
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Config/unistd.h"  /* provides definition of execve */
+#include "llvm/Config/unistd.h"  /* provides definition of execve */
 
 int main(int argc, char** argv) {
   const char *Interp = getenv("LLVMINTERP");





From llvm at cs.uiuc.edu  Wed Sep  1 17:56:14 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 1 Sep 2004 17:56:14 -0500
Subject: [llvm-commits] CVS: llvm/include/Support/Annotation.h
	BitSetVector.h Casting.h CommandLine.h DOTGraphTraits.h
	DataTypes.h.in Debug.h DenseMap.h DepthFirstIterator.h
	DynamicLinker.h ELF.h EquivalenceClasses.h FileUtilities.h
	GraphTraits.h GraphWriter.h HashExtras.h LeakDetector.h
	MallocAllocator.h MathExtras.h PluginLoader.h
	PostOrderIterator.h SCCIterator.h STLExtras.h SetOperations.h
	SetVector.h SlowOperationInformer.h Statistic.h
	StringExtras.h SystemUtils.h ThreadSupport-NoSupport.h
	ThreadSupport-PThreads.h ThreadSupport.h.in Timer.h Tree.h
	TypeInfo.h VectorExtras.h hash_map.in hash_set.in ilist
	iterator.in type_traits.h 
Message-ID: <200409012256.RAA28875@zion.cs.uiuc.edu>



Changes in directory llvm/include/Support:

Annotation.h (r1.15) removed
BitSetVector.h (r1.12) removed
Casting.h (r1.12) removed
CommandLine.h (r1.35) removed
DOTGraphTraits.h (r1.9) removed
DataTypes.h.in (r1.6) removed
Debug.h (r1.4) removed
DenseMap.h (r1.5) removed
DepthFirstIterator.h (r1.12) removed
DynamicLinker.h (r1.3) removed
ELF.h (r1.4) removed
EquivalenceClasses.h (r1.7) removed
FileUtilities.h (r1.18) removed
GraphTraits.h (r1.6) removed
GraphWriter.h (r1.19) removed
HashExtras.h (r1.10) removed
LeakDetector.h (r1.4) removed
MallocAllocator.h (r1.7) removed
MathExtras.h (r1.14) removed
PluginLoader.h (r1.1) removed
PostOrderIterator.h (r1.14) removed
SCCIterator.h (r1.19) removed
STLExtras.h (r1.17) removed
SetOperations.h (r1.5) removed
SetVector.h (r1.5) removed
SlowOperationInformer.h (r1.3) removed
Statistic.h (r1.12) removed
StringExtras.h (r1.22) removed
SystemUtils.h (r1.12) removed
ThreadSupport-NoSupport.h (r1.1) removed
ThreadSupport-PThreads.h (r1.2) removed
ThreadSupport.h.in (r1.1) removed
Timer.h (r1.12) removed
Tree.h (r1.10) removed
TypeInfo.h (r1.6) removed
VectorExtras.h (r1.3) removed
hash_map.in (r1.1) removed
hash_set.in (r1.1) removed
ilist (r1.20) removed
iterator.in (r1.1) removed
type_traits.h (r1.1) removed
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+0 -0)




From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-db/CLIDebugger.cpp Commands.cpp
	llvm-db.cpp 
Message-ID: <200409012255.RAA28454@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-db:

CLIDebugger.cpp updated: 1.2 -> 1.3
Commands.cpp updated: 1.4 -> 1.5
llvm-db.cpp updated: 1.5 -> 1.6
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+5 -5)

Index: llvm/tools/llvm-db/CLIDebugger.cpp
diff -u llvm/tools/llvm-db/CLIDebugger.cpp:1.2 llvm/tools/llvm-db/CLIDebugger.cpp:1.3
--- llvm/tools/llvm-db/CLIDebugger.cpp:1.2	Mon Jan  5 23:36:30 2004
+++ llvm/tools/llvm-db/CLIDebugger.cpp	Wed Sep  1 17:55:37 2004
@@ -15,7 +15,7 @@
 #include "CLIDebugger.h"
 #include "CLICommand.h"
 #include "llvm/Debugger/SourceFile.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/tools/llvm-db/Commands.cpp
diff -u llvm/tools/llvm-db/Commands.cpp:1.4 llvm/tools/llvm-db/Commands.cpp:1.5
--- llvm/tools/llvm-db/Commands.cpp:1.4	Sat Feb  7 18:06:20 2004
+++ llvm/tools/llvm-db/Commands.cpp	Wed Sep  1 17:55:37 2004
@@ -18,8 +18,8 @@
 #include "llvm/Debugger/SourceLanguage.h"
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/InferiorProcess.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 using namespace llvm;
 


Index: llvm/tools/llvm-db/llvm-db.cpp
diff -u llvm/tools/llvm-db/llvm-db.cpp:1.5 llvm/tools/llvm-db/llvm-db.cpp:1.6
--- llvm/tools/llvm-db/llvm-db.cpp:1.5	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-db/llvm-db.cpp	Wed Sep  1 17:55:37 2004
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "CLIDebugger.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
 





From reid at x10sys.com  Wed Sep  1 17:55:58 2004
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 1 Sep 2004 17:55:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-as/llvm-as.cpp 
Message-ID: <200409012255.RAA28463@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-as:

llvm-as.cpp updated: 1.33 -> 1.34
---
Log message:

Changes For Bug 352: http://llvm.cs.uiuc.edu/PR352 
Move include/Config and include/Support into include/llvm/Config,
include/llvm/ADT and include/llvm/Support. From here on out, all LLVM 
public header files must be under include/llvm/.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvm-as/llvm-as.cpp
diff -u llvm/tools/llvm-as/llvm-as.cpp:1.33 llvm/tools/llvm-as/llvm-as.cpp:1.34
--- llvm/tools/llvm-as/llvm-as.cpp:1.33	Sun Aug 29 14:28:55 2004
+++ llvm/tools/llvm-as/llvm-as.cpp	Wed Sep  1 17:55:37 2004
@@ -19,7 +19,7 @@
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Analysis/Verifier.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>





From gaeke at cs.uiuc.edu  Wed Sep  1 22:24:18 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed, 1 Sep 2004 22:24:18 -0500
Subject: [llvm-commits] 
	CVS: llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp
	StackerCompiler.h 
Message-ID: <200409020324.WAA25477@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/compiler:

StackerCompiler.cpp updated: 1.8 -> 1.9
StackerCompiler.h updated: 1.3 -> 1.4
---
Log message:

Unbreak build


---
Diffs of the changes:  (+2 -2)

Index: llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp
diff -u llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.8 llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.9
--- llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.8	Tue Aug 24 17:52:01 2004
+++ llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp	Wed Sep  1 22:24:08 2004
@@ -18,7 +18,7 @@
 
 #include <llvm/Analysis/Verifier.h>
 #include <llvm/Instructions.h>
-#include <Support/Statistic.h>
+#include <llvm/ADT/Statistic.h>
 #include "StackerCompiler.h"
 #include "StackerParser.h"
 #include <string>


Index: llvm/projects/Stacker/lib/compiler/StackerCompiler.h
diff -u llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.3 llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.4
--- llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.3	Sun May  9 18:20:19 2004
+++ llvm/projects/Stacker/lib/compiler/StackerCompiler.h	Wed Sep  1 22:24:08 2004
@@ -22,7 +22,7 @@
 #include <llvm/Instruction.h>
 #include <llvm/Module.h>
 #include <llvm/Assembly/Parser.h>
-#include <Support/StringExtras.h>
+#include <llvm/ADT/StringExtras.h>
 
 using namespace llvm;
 





From alkis at cs.uiuc.edu  Wed Sep  1 22:24:55 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 22:24:55 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/DenseMap.h 
Message-ID: <200409020324.WAA25535@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

DenseMap.h updated: 1.6 -> 1.7
---
Log message:

Pull in definition of std::unary_function.


---
Diffs of the changes:  (+1 -0)

Index: llvm/include/llvm/ADT/DenseMap.h
diff -u llvm/include/llvm/ADT/DenseMap.h:1.6 llvm/include/llvm/ADT/DenseMap.h:1.7
--- llvm/include/llvm/ADT/DenseMap.h:1.6	Wed Sep  1 17:55:34 2004
+++ llvm/include/llvm/ADT/DenseMap.h	Wed Sep  1 22:24:45 2004
@@ -20,6 +20,7 @@
 #ifndef LLVM_ADT_DENSEMAP_H
 #define LLVM_ADT_DENSEMAP_H
 
+#include <functional>
 #include <vector>
 
 namespace llvm {





From alkis at cs.uiuc.edu  Wed Sep  1 23:52:24 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 23:52:24 -0500
Subject: [llvm-commits] CVS: llvm-java/lib/ClassFile/ClassFile.cpp 
Message-ID: <200409020452.XAA26160@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/ClassFile:

ClassFile.cpp updated: 1.24 -> 1.25
---
Log message:

Make these compile again (after changes to the llvm header structure).


---
Diffs of the changes:  (+4 -4)

Index: llvm-java/lib/ClassFile/ClassFile.cpp
diff -u llvm-java/lib/ClassFile/ClassFile.cpp:1.24 llvm-java/lib/ClassFile/ClassFile.cpp:1.25
--- llvm-java/lib/ClassFile/ClassFile.cpp:1.24	Sun Aug 22 18:06:18 2004
+++ llvm-java/lib/ClassFile/ClassFile.cpp	Wed Sep  1 23:52:13 2004
@@ -15,10 +15,10 @@
 #define DEBUG_TYPE "classfile"
 
 #include <llvm/Java/ClassFile.h>
-#include <Support/CommandLine.h>
-#include <Support/Debug.h>
-#include <Support/FileUtilities.h>
-#include <Support/STLExtras.h>
+#include <llvm/ADT/STLExtras.h>
+#include <llvm/Support/CommandLine.h>
+#include <llvm/Support/Debug.h>
+#include <llvm/Support/FileUtilities.h>
 
 #include <cassert>
 #include <fstream>





From alkis at cs.uiuc.edu  Wed Sep  1 23:52:24 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 23:52:24 -0500
Subject: [llvm-commits] CVS: llvm-java/tools/classdump/classdump.cpp 
Message-ID: <200409020452.XAA26159@zion.cs.uiuc.edu>



Changes in directory llvm-java/tools/classdump:

classdump.cpp updated: 1.13 -> 1.14
---
Log message:

Make these compile again (after changes to the llvm header structure).


---
Diffs of the changes:  (+1 -1)

Index: llvm-java/tools/classdump/classdump.cpp
diff -u llvm-java/tools/classdump/classdump.cpp:1.13 llvm-java/tools/classdump/classdump.cpp:1.14
--- llvm-java/tools/classdump/classdump.cpp:1.13	Sun Aug 29 23:08:49 2004
+++ llvm-java/tools/classdump/classdump.cpp	Wed Sep  1 23:52:13 2004
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include <llvm/Java/ClassFile.h>
+#include <llvm/Support/CommandLine.h>
 #include <llvm/System/Signals.h>
-#include <Support/CommandLine.h>
 
 #include <cstddef>
 #include <iostream>





From alkis at cs.uiuc.edu  Wed Sep  1 23:52:24 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 23:52:24 -0500
Subject: [llvm-commits] CVS: llvm-java/lib/Compiler/Compiler.cpp 
Message-ID: <200409020452.XAA26165@zion.cs.uiuc.edu>



Changes in directory llvm-java/lib/Compiler:

Compiler.cpp updated: 1.92 -> 1.93
---
Log message:

Make these compile again (after changes to the llvm header structure).


---
Diffs of the changes:  (+4 -4)

Index: llvm-java/lib/Compiler/Compiler.cpp
diff -u llvm-java/lib/Compiler/Compiler.cpp:1.92 llvm-java/lib/Compiler/Compiler.cpp:1.93
--- llvm-java/lib/Compiler/Compiler.cpp:1.92	Sun Aug 22 18:15:24 2004
+++ llvm-java/lib/Compiler/Compiler.cpp	Wed Sep  1 23:52:13 2004
@@ -22,10 +22,10 @@
 #include <llvm/Instructions.h>
 #include <llvm/Value.h>
 #include <llvm/Type.h>
-#include <Support/Debug.h>
-#include <Support/SetVector.h>
-#include <Support/STLExtras.h>
-#include <Support/StringExtras.h>
+#include <llvm/ADT/STLExtras.h>
+#include <llvm/ADT/SetVector.h>
+#include <llvm/ADT/StringExtras.h>
+#include <llvm/Support/Debug.h>
 #include <iostream>
 #include <stack>
 #include <vector>





From alkis at cs.uiuc.edu  Wed Sep  1 23:52:24 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Wed, 1 Sep 2004 23:52:24 -0500
Subject: [llvm-commits] CVS: llvm-java/tools/class2llvm/class2llvm.cpp 
Message-ID: <200409020452.XAA26168@zion.cs.uiuc.edu>



Changes in directory llvm-java/tools/class2llvm:

class2llvm.cpp updated: 1.14 -> 1.15
---
Log message:

Make these compile again (after changes to the llvm header structure).


---
Diffs of the changes:  (+1 -1)

Index: llvm-java/tools/class2llvm/class2llvm.cpp
diff -u llvm-java/tools/class2llvm/class2llvm.cpp:1.14 llvm-java/tools/class2llvm/class2llvm.cpp:1.15
--- llvm-java/tools/class2llvm/class2llvm.cpp:1.14	Sun Aug 29 23:08:49 2004
+++ llvm-java/tools/class2llvm/class2llvm.cpp	Wed Sep  1 23:52:13 2004
@@ -17,8 +17,8 @@
 #include <llvm/PassManager.h>
 #include <llvm/Analysis/Verifier.h>
 #include <llvm/Bytecode/WriteBytecodePass.h>
+#include <llvm/Support/CommandLine.h>
 #include <llvm/System/Signals.h>
-#include <Support/CommandLine.h>
 
 #include <cstddef>
 #include <iostream>





From natebegeman at mac.com  Thu Sep  2 03:13:11 2004
From: natebegeman at mac.com (Nate Begeman)
Date: Thu, 2 Sep 2004 03:13:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
	PPC32ISelSimple.cpp PowerPCBranchSelector.cpp
	PowerPCInstrFormats.td PowerPCInstrInfo.td 
Message-ID: <200409020813.DAA28474@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPC32AsmPrinter.cpp updated: 1.57 -> 1.58
PPC32ISelSimple.cpp updated: 1.76 -> 1.77
PowerPCBranchSelector.cpp updated: 1.5 -> 1.6
PowerPCInstrFormats.td updated: 1.18 -> 1.19
PowerPCInstrInfo.td updated: 1.32 -> 1.33
---
Log message:

Convert remaining X-Form and Pseudo instructions over to asm writer

---
Diffs of the changes:  (+82 -84)

Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.57 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.58
--- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.57	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp	Thu Sep  2 03:13:00 2004
@@ -102,6 +102,16 @@
                             MVT::ValueType VT) {
       O << (unsigned short)MI->getOperand(OpNo).getImmedValue();
     }
+    void printBranchOperand(const MachineInstr *MI, unsigned OpNo,
+                          MVT::ValueType VT) {
+      printOp(MI->getOperand(OpNo));
+    }
+    void printPICLabel(const MachineInstr *MI, unsigned OpNo,
+                         MVT::ValueType VT) {
+      // FIXME: should probably be converted to cout.width and cout.fill
+      O << "\"L0000" << LabelNumber << "$pb\"\n";
+      O << "\"L0000" << LabelNumber << "$pb\":";
+    }
 
     void printConstantPool(MachineConstantPool *MCP);
     bool runOnMachineFunction(MachineFunction &F);    
@@ -293,42 +303,6 @@
   assert(((Desc.TSFlags & PPCII::PPC64) == 0) &&
          "Instruction requires 64 bit support");
 
-  // CALLpcrel and CALLindirect are handled specially here to print only the
-  // appropriate number of args that the assembler expects.  This is because
-  // may have many arguments appended to record the uses of registers that are
-  // holding arguments to the called function.
-  if (Opcode == PPC::COND_BRANCH) {
-    std::cerr << "Error: untranslated conditional branch psuedo instruction!\n";
-    abort();
-  } else if (Opcode == PPC::IMPLICIT_DEF) {
-    --EmittedInsts; // Not an actual machine instruction
-    O << "; IMPLICIT DEF ";
-    printOp(MI->getOperand(0));
-    O << "\n";
-    return;
-  } else if (Opcode == PPC::CALLpcrel) {
-    O << TII.getName(Opcode) << " ";
-    printOp(MI->getOperand(0));
-    O << "\n";
-    return;
-  } else if (Opcode == PPC::CALLindirect) {
-    O << TII.getName(Opcode) << " ";
-    printImmOp(MI->getOperand(0), ArgType[0]);
-    O << ", ";
-    printImmOp(MI->getOperand(1), ArgType[0]);
-    O << "\n";
-    return;
-  } else if (Opcode == PPC::MovePCtoLR) {
-    ++EmittedInsts; // Actually two machine instructions
-    // FIXME: should probably be converted to cout.width and cout.fill
-    O << "bl \"L0000" << LabelNumber << "$pb\"\n";
-    O << "\"L0000" << LabelNumber << "$pb\":\n";
-    O << "\tmflr ";
-    printOp(MI->getOperand(0));
-    O << "\n";
-    return;
-  }
-
   O << TII.getName(Opcode) << " ";
   if (Opcode == PPC::LOADHiAddr) {
     printOp(MI->getOperand(0));


Index: llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
diff -u llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.76 llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.77
--- llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.76	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp	Thu Sep  2 03:13:00 2004
@@ -532,8 +532,8 @@
     MachineBasicBlock &FirstMBB = F->front();
     MachineBasicBlock::iterator MBBI = FirstMBB.begin();
     GlobalBaseReg = makeAnotherReg(Type::IntTy);
-    BuildMI(FirstMBB, MBBI, PPC::IMPLICIT_DEF, 0, PPC::LR);
-    BuildMI(FirstMBB, MBBI, PPC::MovePCtoLR, 0, GlobalBaseReg);
+    BuildMI(FirstMBB, MBBI, PPC::MovePCtoLR, 0, PPC::LR);
+    BuildMI(FirstMBB, MBBI, PPC::MFLR, 0, GlobalBaseReg).addReg(PPC::LR);
     GlobalBaseInitialized = true;
   }
   // Emit our copy of GlobalBaseReg to the destination register in the


Index: llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.5 llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.6
--- llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp:1.5	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp	Thu Sep  2 03:13:00 2004
@@ -41,11 +41,6 @@
         // minor pessimization that saves us from having to worry about 
         // keeping the offsets up to date later when we emit long branch glue.
         return 12;
-      case PPC::MovePCtoLR:
-        // MovePCtoLR is actually a combination of a branch-and-link (bl)
-        // followed by a move from link register to dest reg (mflr)
-        return 8;
-        break;
       case PPC::IMPLICIT_DEF: // no asm emitted
         return 0;
         break;


Index: llvm/lib/Target/PowerPC/PowerPCInstrFormats.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.18 llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.19
--- llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.18	Mon Aug 30 21:28:08 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrFormats.td	Thu Sep  2 03:13:00 2004
@@ -60,8 +60,8 @@
 }
 
 // 1.7.1 I-Form
-class IForm<string name, bits<6> opcode, bit aa, bit lk, bit ppc64, bit vmx>
-  : I<name, opcode, ppc64, vmx> {
+class IForm<bits<6> opcode, bit aa, bit lk, bit ppc64, bit vmx,
+            dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   field bits<24> LI;
 
   let ArgCount = 1;
@@ -74,6 +74,8 @@
   let Inst{6-29}  = LI;
   let Inst{30}    = aa;
   let Inst{31}    = lk;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
 // 1.7.2 B-Form
@@ -311,8 +313,8 @@
   let B = 0;
 }
 
-class XForm_16<string name, bits<6> opcode, bits<10> xo, bit ppc64, bit vmx>
-  : I<name, opcode, ppc64, vmx> {
+class XForm_16<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
+               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   field bits<3>  BF;
   field bits<1>  L; 
   field bits<5>  RA;
@@ -332,10 +334,17 @@
   let Inst{16-20} = RB;
   let Inst{21-30} = xo;
   let Inst{31}    = 0;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
-class XForm_16_ext<string name, bits<6> opcode, bits<10> xo, bit ppc64, bit vmx>
-  : XForm_16<name, opcode, xo, ppc64, vmx> {
+class XForm_16_ext<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
+                   dag OL, string asmstr>
+  : XForm_16<opcode, xo, ppc64, vmx, OL, asmstr> {
+  let ArgCount = 3;
+  let Arg1Type = Gpr.Value;
+  let Arg2Type = Gpr.Value;
+  let Arg3Type = 0;
   let L = ppc64;
 }
 
@@ -395,8 +404,8 @@
   let Arg2Type = Imm5.Value;
 }
 
-class XLForm_2<string name, bits<6> opcode, bits<10> xo, bit lk, bit ppc64, 
-               bit vmx> : I<name, opcode, ppc64, vmx> {
+class XLForm_2<bits<6> opcode, bits<10> xo, bit lk, bit ppc64, bit vmx, 
+               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
   field bits<5>  BO;
   field bits<5>  BI;
   field bits<2>  BH;
@@ -414,11 +423,14 @@
   let Inst{19-20} = BH;
   let Inst{21-30} = xo;
   let Inst{31}    = lk;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
-class XLForm_2_ext<string name, bits<6> opcode, bits<10> xo, bits<5> bo, 
-                   bits<5> bi, bit lk, bit ppc64, bit vmx>
-  : XLForm_2<name, opcode, xo, lk, ppc64, vmx> {
+class XLForm_2_ext<bits<6> opcode, bits<10> xo, bits<5> bo, 
+                   bits<5> bi, bit lk, bit ppc64, bit vmx, 
+                   dag OL, string asmstr>
+  : XLForm_2<opcode, xo, lk, ppc64, vmx, OL, asmstr> {
   let ArgCount = 0;
   let Arg0Type = 0;
   let Arg1Type = 0;
@@ -634,17 +646,18 @@
 
 //===----------------------------------------------------------------------===//
 
-class Pseudo<string name> : I<name, 0, 0, 0> {
-	let Name = name;
-	let ArgCount = 0;
-	let PPC64 = 0;
-	let VMX = 0;
-
-	let Arg0Type = Pseudo.Value;
-	let Arg1Type = Pseudo.Value;
-	let Arg2Type = Pseudo.Value;
-	let Arg3Type = Pseudo.Value;
-	let Arg4Type = 0;
+class Pseudo<dag OL, string asmstr> : I<"", 0, 0, 0> {
+  let ArgCount = 0;
+  let PPC64 = 0;
+  let VMX = 0;
 
-	let Inst{31-0} = 0;
+  let Arg0Type = Pseudo.Value;
+  let Arg1Type = Pseudo.Value;
+  let Arg2Type = Pseudo.Value;
+  let Arg3Type = Pseudo.Value;
+  let Arg4Type = 0;
+
+  let Inst{31-0} = 0;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }


Index: llvm/lib/Target/PowerPC/PowerPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.32 llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.33
--- llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.32	Mon Aug 30 21:28:08 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrInfo.td	Thu Sep  2 03:13:00 2004
@@ -15,7 +15,7 @@
 include "PowerPCInstrFormats.td"
 
 let isTerminator = 1, isReturn = 1 in
-  def BLR : XLForm_2_ext<"blr", 19, 16, 20, 31, 1, 0, 0>;
+  def BLR : XLForm_2_ext<19, 16, 20, 31, 1, 0, 0, (ops), "blr">;
 
 def u5imm   : Operand<i8> {
   let PrintMethod = "printU5ImmOperand";
@@ -26,18 +26,23 @@
 def u16imm  : Operand<i16> {
   let PrintMethod = "printU16ImmOperand";
 }
+def target : Operand<i32> {
+  let PrintMethod = "printBranchOperand";
+}
+def piclabel: Operand<i32> {
+  let PrintMethod = "printPICLabel";
+}
 
 // Pseudo-instructions:
-def PHI : Pseudo<"PHI">;
-def ADJCALLSTACKDOWN : Pseudo<"ADJCALLSTACKDOWN">;
-def ADJCALLSTACKUP : Pseudo<"ADJCALLSTACKUP">;
-let Defs = [LR] in
-  def MovePCtoLR : Pseudo<"MovePCtoLR">;
-def IMPLICIT_DEF : Pseudo<"IMPLICIT_DEF">;
+def PHI : Pseudo<(ops), "; PHI">;
+def ADJCALLSTACKDOWN : Pseudo<(ops), "; ADJCALLSTACKDOWN">;
+def ADJCALLSTACKUP : Pseudo<(ops), "; ADJCALLSTACKUP">;
+def IMPLICIT_DEF : Pseudo<(ops), "; IMPLICIT_DEF">;
+def MovePCtoLR : Pseudo<(ops piclabel:$label), "bl $label">;
 
 let isBranch = 1, isTerminator = 1 in {
-  def COND_BRANCH : Pseudo<"COND_BRANCH">;
-  def B : IForm<"b", 18, 0, 0, 0, 0>;
+  def COND_BRANCH : Pseudo<(ops), "; COND_BRANCH">;
+  def B : IForm<18, 0, 0, 0, 0, (ops target:$func), "b $func">;
   // FIXME: 4*CR# needs to be added to the BI field!
   // This will only work for CR0 as it stands now
   def BLT : BForm_ext<"blt", 16, 0, 0, 12, 0, 0, 0>;
@@ -55,8 +60,8 @@
           LR,XER,CTR,
           CR0,CR1,CR5,CR6,CR7] in {
   // Convenient aliases for call instructions
-  def CALLpcrel : IForm<"bl", 18, 0, 1, 0, 0>;
-  def CALLindirect : XLForm_2_ext<"bctrl", 19, 528, 20, 31, 1, 0, 0>;
+  def CALLpcrel : IForm<18, 0, 1, 0, 0, (ops target:$func), "bl $func">;
+  def CALLindirect : XLForm_2_ext<19, 528, 20, 31, 1, 0, 0, (ops), "bctrl">;
 }
 
 def LA : DForm_2<"la", 14, 0, 0>;
@@ -96,13 +101,6 @@
 def STD : DSForm_2<"std", 62, 0, 1, 0>;
 def STDU : DSForm_2<"stdu", 62, 1, 1, 0>;
 
-def CMP : XForm_16<"cmp", 31, 0, 0, 0>;
-def CMPL : XForm_16<"cmpl", 31, 32, 0, 0>;
-def CMPW : XForm_16_ext<"cmpw", 31, 0, 0, 0>;
-def CMPD : XForm_16_ext<"cmpd", 31, 0, 1, 0>;
-def CMPLW : XForm_16_ext<"cmplw", 31, 32, 0, 0>;
-def CMPLD : XForm_16_ext<"cmpld", 31, 32, 1, 0>;
-
 // D-Form instructions.  Most instructions that perform an operation on a
 // register and an immediate are of this type.
 //
@@ -200,6 +198,24 @@
                       "extsh $rA, $rS">;
 def EXTSW  : XForm_11<31, 986, 0, 1, 0, (ops GPRC:$rA, GPRC:$rS),
                       "extsw $rA, $rS">;
+def CMP    : XForm_16<31, 0, 0, 0,
+                      (ops CRRC:$crD, i1imm:$long, GPRC:$rA, GPRC:$rB),
+                      "cmp $crD, $long, $rA, $rB">;
+def CMPL   : XForm_16<31, 32, 0, 0,
+                      (ops CRRC:$crD, i1imm:$long, GPRC:$rA, GPRC:$rB),
+                      "cmpl $crD, $long, $rA, $rB">;
+def CMPW   : XForm_16_ext<31, 0, 0, 0,
+                          (ops CRRC:$crD, GPRC:$rA, GPRC:$rB),
+                          "cmpw $crD, $rA, $rB">;
+def CMPD   : XForm_16_ext<31, 0, 1, 0,
+                          (ops CRRC:$crD, GPRC:$rA, GPRC:$rB),
+                          "cmpd $crD, $rA, $rB">;
+def CMPLW  : XForm_16_ext<31, 32, 0, 0,
+                          (ops CRRC:$crD, GPRC:$rA, GPRC:$rB),
+                          "cmplw $crD, $rA, $rB">;
+def CMPLD  : XForm_16_ext<31, 32, 1, 0,
+                          (ops CRRC:$crD, GPRC:$rA, GPRC:$rB),
+                          "cmpld $crD, $rA, $rB">;
 def FCMPU  : XForm_17<63, 0, 0, 0, (ops CRRC:$crD, FPRC:$fA, FPRC:$fB),
                       "fcmpu $crD, $fA, $fB">;
 def LFSX   : XForm_25<31, 535, 0, 0, (ops FPRC:$dst, GPRC:$base, GPRC:$index),





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:54 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:54 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/include/reopt/VirtualMem.h 
Message-ID: <200409021655.LAA26409@kain.cs.uiuc.edu>



Changes in directory reopt/include/reopt:

VirtualMem.h updated: 1.13 -> 1.14
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+3 -3)

Index: reopt/include/reopt/VirtualMem.h
diff -u reopt/include/reopt/VirtualMem.h:1.13 reopt/include/reopt/VirtualMem.h:1.14
--- reopt/include/reopt/VirtualMem.h:1.13	Fri Apr 23 16:25:11 2004
+++ reopt/include/reopt/VirtualMem.h	Thu Sep  2 11:55:42 2004
@@ -8,9 +8,9 @@
 #ifndef REOPT_VIRTUALMEM_H
 #define REOPT_VIRTUALMEM_H
 
-#include "Support/DataTypes.h"
-#include "Config/fcntl.h"
-#include "Config/unistd.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/unistd.h"
 #include <iostream>
 #include <vector>
 #include <map>





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:54 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:54 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/BinInterface/LLVMTrace.cpp 
Message-ID: <200409021655.LAA26412@kain.cs.uiuc.edu>



Changes in directory reopt/lib/BinInterface:

LLVMTrace.cpp updated: 1.8 -> 1.9
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+1 -1)

Index: reopt/lib/BinInterface/LLVMTrace.cpp
diff -u reopt/lib/BinInterface/LLVMTrace.cpp:1.8 reopt/lib/BinInterface/LLVMTrace.cpp:1.9
--- reopt/lib/BinInterface/LLVMTrace.cpp:1.8	Thu Jul 29 23:04:44 2004
+++ reopt/lib/BinInterface/LLVMTrace.cpp	Thu Sep  2 11:55:43 2004
@@ -12,7 +12,7 @@
 #include "reopt/InstrUtils.h"
 #include "llvm/Instructions.h"
 #include "llvm/BasicBlock.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 
 using namespace llvm;
 





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:55 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:55 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/Optimizations/RuntimeLICM.cpp 
Message-ID: <200409021655.LAA26432@kain.cs.uiuc.edu>



Changes in directory reopt/lib/Optimizations:

RuntimeLICM.cpp updated: 1.5 -> 1.6
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+1 -1)

Index: reopt/lib/Optimizations/RuntimeLICM.cpp
diff -u reopt/lib/Optimizations/RuntimeLICM.cpp:1.5 reopt/lib/Optimizations/RuntimeLICM.cpp:1.6
--- reopt/lib/Optimizations/RuntimeLICM.cpp:1.5	Thu Jul 29 23:04:44 2004
+++ reopt/lib/Optimizations/RuntimeLICM.cpp	Thu Sep  2 11:55:44 2004
@@ -10,7 +10,7 @@
 #include "llvm/Instruction.h"
 #include "llvm/Instructions.h"
 #include "reopt/BinInterface/LLVMTrace.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <set>
 using namespace llvm;
 





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:55 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:55 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/Inst/lib/Phase1/Phase1.cpp
	PrimInfo.cpp 
Message-ID: <200409021655.LAA26433@kain.cs.uiuc.edu>



Changes in directory reopt/lib/Inst/lib/Phase1:

Phase1.cpp updated: 1.33 -> 1.34
PrimInfo.cpp updated: 1.21 -> 1.22
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+2 -2)

Index: reopt/lib/Inst/lib/Phase1/Phase1.cpp
diff -u reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.33 reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.34
--- reopt/lib/Inst/lib/Phase1/Phase1.cpp:1.33	Thu Jul 29 23:04:44 2004
+++ reopt/lib/Inst/lib/Phase1/Phase1.cpp	Thu Sep  2 11:55:43 2004
@@ -19,7 +19,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Constant.h"
 #include "llvm/Constants.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Target/TargetData.h"
 #include "PrimInfo.h"


Index: reopt/lib/Inst/lib/Phase1/PrimInfo.cpp
diff -u reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.21 reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.22
--- reopt/lib/Inst/lib/Phase1/PrimInfo.cpp:1.21	Thu Jul 29 23:04:44 2004
+++ reopt/lib/Inst/lib/Phase1/PrimInfo.cpp	Thu Sep  2 11:55:43 2004
@@ -20,7 +20,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/Constant.h"
-#include "Support/VectorExtras.h"
+#include "llvm/ADT/VectorExtras.h"
 #include "PrimInfo.h"
 #include "Intraphase.h"
 #include <cassert>





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:54 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:54 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/Mapping/ValueAllocState.cpp 
Message-ID: <200409021655.LAA26426@kain.cs.uiuc.edu>



Changes in directory reopt/lib/Mapping:

ValueAllocState.cpp updated: 1.3 -> 1.4
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+1 -1)

Index: reopt/lib/Mapping/ValueAllocState.cpp
diff -u reopt/lib/Mapping/ValueAllocState.cpp:1.3 reopt/lib/Mapping/ValueAllocState.cpp:1.4
--- reopt/lib/Mapping/ValueAllocState.cpp:1.3	Thu Jul 29 23:04:44 2004
+++ reopt/lib/Mapping/ValueAllocState.cpp	Thu Sep  2 11:55:44 2004
@@ -19,7 +19,7 @@
 #include "llvm/Argument.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "../../../../lib/Target/SparcV9/RegAlloc/AllocInfo.h"
 #include "../../../../lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h"
 





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:55 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:55 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/FirstTrigger.cpp
	Initialization.cpp RuntimeOptimizations.cpp SLI.cpp
	SecondTrigger.cpp UnpackTraceFunction.cpp 
Message-ID: <200409021655.LAA26449@kain.cs.uiuc.edu>



Changes in directory reopt/lib/LightWtProfiling:

FirstTrigger.cpp updated: 1.20 -> 1.21
Initialization.cpp updated: 1.18 -> 1.19
RuntimeOptimizations.cpp updated: 1.49 -> 1.50
SLI.cpp updated: 1.21 -> 1.22
SecondTrigger.cpp updated: 1.33 -> 1.34
UnpackTraceFunction.cpp updated: 1.110 -> 1.111
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+10 -10)

Index: reopt/lib/LightWtProfiling/FirstTrigger.cpp
diff -u reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.20 reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.21
--- reopt/lib/LightWtProfiling/FirstTrigger.cpp:1.20	Mon Aug 30 14:56:41 2004
+++ reopt/lib/LightWtProfiling/FirstTrigger.cpp	Thu Sep  2 11:55:43 2004
@@ -17,7 +17,7 @@
 
 #include "ReoptimizerInternal.h"
 #include "RegSaveRestore.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "reopt/VirtualMem.h"
 #include "reopt/InstrUtils.h"
 #include "reopt/TraceCache.h"


Index: reopt/lib/LightWtProfiling/Initialization.cpp
diff -u reopt/lib/LightWtProfiling/Initialization.cpp:1.18 reopt/lib/LightWtProfiling/Initialization.cpp:1.19
--- reopt/lib/LightWtProfiling/Initialization.cpp:1.18	Tue Jun 22 03:43:05 2004
+++ reopt/lib/LightWtProfiling/Initialization.cpp	Thu Sep  2 11:55:43 2004
@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ReoptimizerInternal.h"
-#include "Support/CommandLine.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/DataTypes.h"
 #include "llvm/Bytecode/Reader.h"
 #include "reopt/ScratchMemory.h"
 #include "reopt/TraceCache.h"


Index: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
diff -u reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.49 reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.50
--- reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.49	Sun Aug 22 22:10:30 2004
+++ reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp	Thu Sep  2 11:55:43 2004
@@ -20,8 +20,8 @@
 #include "reopt/TraceJIT.h"
 #include "reopt/TraceToFunction.h"
 #include "reopt/VirtualMem.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
 #include <set>
 
 namespace llvm {


Index: reopt/lib/LightWtProfiling/SLI.cpp
diff -u reopt/lib/LightWtProfiling/SLI.cpp:1.21 reopt/lib/LightWtProfiling/SLI.cpp:1.22
--- reopt/lib/LightWtProfiling/SLI.cpp:1.21	Thu Jul 29 23:04:44 2004
+++ reopt/lib/LightWtProfiling/SLI.cpp	Thu Sep  2 11:55:44 2004
@@ -17,8 +17,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ReoptimizerInternal.h"
-#include "Support/DataTypes.h"
-#include "Support/Debug.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/Debug.h"
 #include "reopt/MappingInfo.h"
 #include "reopt/InstrUtils.h"
 #include "reopt/TraceCache.h"


Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp
diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.33 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.34
--- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.33	Mon Aug 30 14:56:42 2004
+++ reopt/lib/LightWtProfiling/SecondTrigger.cpp	Thu Sep  2 11:55:44 2004
@@ -18,7 +18,7 @@
 
 #include "ReoptimizerInternal.h"
 #include "RegSaveRestore.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "reopt/GetTraceTime.h"


Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.110 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.111
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.110	Mon Aug 30 14:56:43 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Thu Sep  2 11:55:44 2004
@@ -20,8 +20,8 @@
 #include "../../../../lib/Target/SparcV9/SparcV9RegInfo.h"
 #include "../../../../lib/Target/SparcV9/SparcV9TargetMachine.h"
 #include "../../../../lib/Target/SparcV9/SparcV9TmpInstr.h"
-#include "Support/Debug.h"
-#include "Support/StringExtras.h"                   // for utostr()
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/StringExtras.h"                   // for utostr()
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:55 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:55 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/TraceCache/InstrUtils.cpp
	VirtualMem.cpp 
Message-ID: <200409021655.LAA26450@kain.cs.uiuc.edu>



Changes in directory reopt/lib/TraceCache:

InstrUtils.cpp updated: 1.20 -> 1.21
VirtualMem.cpp updated: 1.18 -> 1.19
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+2 -2)

Index: reopt/lib/TraceCache/InstrUtils.cpp
diff -u reopt/lib/TraceCache/InstrUtils.cpp:1.20 reopt/lib/TraceCache/InstrUtils.cpp:1.21
--- reopt/lib/TraceCache/InstrUtils.cpp:1.20	Wed Jul 21 15:53:28 2004
+++ reopt/lib/TraceCache/InstrUtils.cpp	Thu Sep  2 11:55:44 2004
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "reopt/InstrUtils.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <cassert>
 
 namespace llvm {


Index: reopt/lib/TraceCache/VirtualMem.cpp
diff -u reopt/lib/TraceCache/VirtualMem.cpp:1.18 reopt/lib/TraceCache/VirtualMem.cpp:1.19
--- reopt/lib/TraceCache/VirtualMem.cpp:1.18	Mon May 17 15:56:09 2004
+++ reopt/lib/TraceCache/VirtualMem.cpp	Thu Sep  2 11:55:44 2004
@@ -9,7 +9,7 @@
 #include "reopt/InstrUtils.h"
 #include "reopt/TraceCache.h"
 #include "reopt/GetTraceTime.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <cassert>
 #include <string>
 #include <cstdio>





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:55 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:55 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/TraceIO/TraceReader.cpp
	TraceWriter.cpp 
Message-ID: <200409021655.LAA26458@kain.cs.uiuc.edu>



Changes in directory reopt/lib/TraceIO:

TraceReader.cpp updated: 1.4 -> 1.5
TraceWriter.cpp updated: 1.1 -> 1.2
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+4 -4)

Index: reopt/lib/TraceIO/TraceReader.cpp
diff -u reopt/lib/TraceIO/TraceReader.cpp:1.4 reopt/lib/TraceIO/TraceReader.cpp:1.5
--- reopt/lib/TraceIO/TraceReader.cpp:1.4	Thu Jul 29 23:07:36 2004
+++ reopt/lib/TraceIO/TraceReader.cpp	Thu Sep  2 11:55:45 2004
@@ -1,6 +1,6 @@
 
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Analysis/Trace.h"
 #include "llvm/Module.h"
 #include <iterator>


Index: reopt/lib/TraceIO/TraceWriter.cpp
diff -u reopt/lib/TraceIO/TraceWriter.cpp:1.1 reopt/lib/TraceIO/TraceWriter.cpp:1.2
--- reopt/lib/TraceIO/TraceWriter.cpp:1.1	Wed Jun 30 01:33:18 2004
+++ reopt/lib/TraceIO/TraceWriter.cpp	Thu Sep  2 11:55:45 2004
@@ -15,8 +15,8 @@
 #include "llvm/Analysis/Trace.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Function.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
 #include <fstream>
 using namespace llvm;
 





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:56 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:56 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/TraceToFunction/TraceToFunction.cpp 
Message-ID: <200409021655.LAA26477@kain.cs.uiuc.edu>



Changes in directory reopt/lib/TraceToFunction:

TraceToFunction.cpp updated: 1.85 -> 1.86
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+2 -2)

Index: reopt/lib/TraceToFunction/TraceToFunction.cpp
diff -u reopt/lib/TraceToFunction/TraceToFunction.cpp:1.85 reopt/lib/TraceToFunction/TraceToFunction.cpp:1.86
--- reopt/lib/TraceToFunction/TraceToFunction.cpp:1.85	Thu Aug 26 12:09:34 2004
+++ reopt/lib/TraceToFunction/TraceToFunction.cpp	Thu Sep  2 11:55:46 2004
@@ -32,9 +32,9 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"      // for succ_iterator, etc.
-#include "Support/StringExtras.h"  // for utostr()
+#include "llvm/ADT/StringExtras.h"  // for utostr()
 #define DEBUG_TYPE "tracetofunction"
-#include "Support/Debug.h"         // for DEBUG()
+#include "llvm/Support/Debug.h"         // for DEBUG()
 #include <cassert>
 
 namespace llvm {





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:56 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:56 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/lib/TraceJIT/TraceJIT.cpp
	TraceJITEmitter.cpp TraceJITGlobals.cpp TraceJITIntercept.cpp
	TraceJITOpts.cpp 
Message-ID: <200409021655.LAA26486@kain.cs.uiuc.edu>



Changes in directory reopt/lib/TraceJIT:

TraceJIT.cpp updated: 1.6 -> 1.7
TraceJITEmitter.cpp updated: 1.3 -> 1.4
TraceJITGlobals.cpp updated: 1.5 -> 1.6
TraceJITIntercept.cpp updated: 1.2 -> 1.3
TraceJITOpts.cpp updated: 1.3 -> 1.4
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+8 -8)

Index: reopt/lib/TraceJIT/TraceJIT.cpp
diff -u reopt/lib/TraceJIT/TraceJIT.cpp:1.6 reopt/lib/TraceJIT/TraceJIT.cpp:1.7
--- reopt/lib/TraceJIT/TraceJIT.cpp:1.6	Tue Jul 20 17:41:42 2004
+++ reopt/lib/TraceJIT/TraceJIT.cpp	Thu Sep  2 11:55:45 2004
@@ -30,9 +30,9 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Target/TargetJITInfo.h"
-#include "Support/CommandLine.h"
-#include "Support/DynamicLinker.h"
-#include "Support/Debug.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/DynamicLinker.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace llvm {


Index: reopt/lib/TraceJIT/TraceJITEmitter.cpp
diff -u reopt/lib/TraceJIT/TraceJITEmitter.cpp:1.3 reopt/lib/TraceJIT/TraceJITEmitter.cpp:1.4
--- reopt/lib/TraceJIT/TraceJITEmitter.cpp:1.3	Wed Jun 30 01:33:12 2004
+++ reopt/lib/TraceJIT/TraceJITEmitter.cpp	Thu Sep  2 11:55:45 2004
@@ -28,8 +28,8 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/DynamicLinker.h"
 using namespace llvm;
 
 namespace {


Index: reopt/lib/TraceJIT/TraceJITGlobals.cpp
diff -u reopt/lib/TraceJIT/TraceJITGlobals.cpp:1.5 reopt/lib/TraceJIT/TraceJITGlobals.cpp:1.6
--- reopt/lib/TraceJIT/TraceJITGlobals.cpp:1.5	Wed Jul 21 15:53:28 2004
+++ reopt/lib/TraceJIT/TraceJITGlobals.cpp	Thu Sep  2 11:55:45 2004
@@ -15,7 +15,7 @@
 
 #include "reopt/TraceJIT.h"
 #include "llvm/Module.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 struct InternalGlobalMap {


Index: reopt/lib/TraceJIT/TraceJITIntercept.cpp
diff -u reopt/lib/TraceJIT/TraceJITIntercept.cpp:1.2 reopt/lib/TraceJIT/TraceJITIntercept.cpp:1.3
--- reopt/lib/TraceJIT/TraceJITIntercept.cpp:1.2	Wed Jun 30 01:33:12 2004
+++ reopt/lib/TraceJIT/TraceJITIntercept.cpp	Thu Sep  2 11:55:45 2004
@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "reopt/TraceJIT.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 #include <sys/stat.h>
 using namespace llvm;


Index: reopt/lib/TraceJIT/TraceJITOpts.cpp
diff -u reopt/lib/TraceJIT/TraceJITOpts.cpp:1.3 reopt/lib/TraceJIT/TraceJITOpts.cpp:1.4
--- reopt/lib/TraceJIT/TraceJITOpts.cpp:1.3	Tue Jul 27 13:47:22 2004
+++ reopt/lib/TraceJIT/TraceJITOpts.cpp	Thu Sep  2 11:55:45 2004
@@ -14,7 +14,7 @@
 #include "reopt/TraceJIT.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Analysis/LoadValueNumbering.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 namespace {





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:56 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:56 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/tools/dumptrace/dumptrace.cpp 
Message-ID: <200409021655.LAA26481@kain.cs.uiuc.edu>



Changes in directory reopt/tools/dumptrace:

dumptrace.cpp updated: 1.2 -> 1.3
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+1 -1)

Index: reopt/tools/dumptrace/dumptrace.cpp
diff -u reopt/tools/dumptrace/dumptrace.cpp:1.2 reopt/tools/dumptrace/dumptrace.cpp:1.3
--- reopt/tools/dumptrace/dumptrace.cpp:1.2	Wed Jun 30 01:33:15 2004
+++ reopt/tools/dumptrace/dumptrace.cpp	Thu Sep  2 11:55:46 2004
@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Analysis/Trace.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Reader.h"





From gaeke at cs.uiuc.edu  Thu Sep  2 11:55:56 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu, 2 Sep 2004 11:55:56 -0500 (CDT)
Subject: [llvm-commits] CVS: reopt/tools/ttftest/ttftest.cpp 
Message-ID: <200409021655.LAA26492@kain.cs.uiuc.edu>



Changes in directory reopt/tools/ttftest:

ttftest.cpp updated: 1.8 -> 1.9
---
Log message:

Clean up after header files moved in main llvm tree

---
Diffs of the changes:  (+1 -1)

Index: reopt/tools/ttftest/ttftest.cpp
diff -u reopt/tools/ttftest/ttftest.cpp:1.8 reopt/tools/ttftest/ttftest.cpp:1.9
--- reopt/tools/ttftest/ttftest.cpp:1.8	Thu Jul 15 16:55:06 2004
+++ reopt/tools/ttftest/ttftest.cpp	Thu Sep  2 11:55:46 2004
@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Analysis/Trace.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Assembly/Writer.h"





From alkis at cs.uiuc.edu  Thu Sep  2 13:00:49 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 2 Sep 2004 13:00:49 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp 
Message-ID: <200409021800.NAA01238@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.92 -> 1.93
---
Log message:

We don't need to sort the added vector as unhandled intervals are
stored in a binary heap.


---
Diffs of the changes:  (+0 -1)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.92 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.93
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.92	Wed Sep  1 17:55:35 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Thu Sep  2 13:00:38 2004
@@ -515,7 +515,6 @@
     }
   }
 
-  std::sort(added.begin(), added.end(), less_ptr<LiveInterval>());
   // merge added with unhandled
   for (unsigned i = 0, e = added.size(); i != e; ++i)
     unhandled_.push(added[i]);





From criswell at cs.uiuc.edu  Thu Sep  2 13:41:43 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Thu, 2 Sep 2004 13:41:43 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Config/config.h.in 
Message-ID: <200409021841.NAA01795@choi.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Config:

config.h.in updated: 1.25 -> 1.26
---
Log message:

Added u_int64_t because some systems use that instead of uint64_t.


---
Diffs of the changes:  (+3 -0)

Index: llvm/include/llvm/Config/config.h.in
diff -u llvm/include/llvm/Config/config.h.in:1.25 llvm/include/llvm/Config/config.h.in:1.26
--- llvm/include/llvm/Config/config.h.in:1.25	Wed Sep  1 17:55:34 2004
+++ llvm/include/llvm/Config/config.h.in	Thu Sep  2 13:41:30 2004
@@ -158,6 +158,9 @@
 /* Define to 1 if the system has the type `uint64_t'. */
 #undef HAVE_UINT64_T
 
+/* Define to 1 if the system has the type `u_int64_t'. */
+#undef HAVE_U_INT64_T
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 





From criswell at cs.uiuc.edu  Thu Sep  2 13:44:53 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Thu, 2 Sep 2004 13:44:53 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200409021844.NAA09906@choi.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.109 -> 1.110
---
Log message:

Added a check for u_int64_t, which is used by Interix.


---
Diffs of the changes:  (+839 -1986)

Index: llvm/configure
diff -u llvm/configure:1.109 llvm/configure:1.110
--- llvm/configure:1.109	Wed Sep  1 17:55:34 2004
+++ llvm/configure	Thu Sep  2 13:44:40 2004
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for LLVM 1.4.
+# Generated by GNU Autoconf 2.57 for LLVM 1.4.
 #
 # Report bugs to <llvmbugs at cs.uiuc.edu>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -21,10 +22,9 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -43,7 +43,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -220,17 +220,16 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
 # IFS
@@ -825,7 +824,7 @@
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+              localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -865,10 +864,10 @@
   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$0" : 'X\(//\)[^/]' \| \
+         X"$0" : 'X\(//\)$' \| \
+         X"$0" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -980,9 +979,9 @@
   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1103,45 +1102,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -1152,7 +1118,7 @@
       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
+           test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
@@ -1166,9 +1132,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 LLVM configure 1.4
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.57
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1180,7 +1147,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by LLVM $as_me 1.4, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 
@@ -1257,19 +1224,19 @@
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
+        ac_must_keep_next=false # Got value, back to normal.
       else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
+        case $ac_arg in
+          *=* | --config-cache | -C | -disable-* | --disable-* \
+          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+          | -with-* | --with-* | -without-* | --without-* | --x)
+            case "$ac_configure_args0 " in
+              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+            esac
+            ;;
+          -* ) ac_must_keep_next=true ;;
+        esac
       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1303,12 +1270,12 @@
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 }
@@ -1337,7 +1304,7 @@
       for ac_var in $ac_subst_files
       do
 	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+        echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1356,7 +1323,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
+  rm -f core core.* *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1436,7 +1403,7 @@
 # value.
 ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1453,13 +1420,13 @@
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+        ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -1737,7 +1704,6 @@
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1754,7 +1720,6 @@
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1762,20 +1727,20 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+          if test $ac_prog = install &&
+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # AIX install.  It has an incompatible calling convention.
+            :
+          elif test $ac_prog = install &&
+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
+          else
+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+            break 3
+          fi
+        fi
       done
     done
     ;;
@@ -2110,6 +2075,7 @@
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2129,8 +2095,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
+echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
@@ -2150,23 +2116,23 @@
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
+        ;;
     conftest.$ac_ext )
-	# This is the source file.
-	;;
+        # This is the source file.
+        ;;
     [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
+        # We found the default executable, but exeext='' is most
+        # certainly right.
+        break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
+        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+        # FIXME: I believe we export ac_cv_exeext for Libtool,
+        # but it would be cool to find out if it's true.  Does anybody
+        # maintain Libtool? --akim.
+        export ac_cv_exeext
+        break;;
     * )
-	break;;
+        break;;
   esac
 done
 else
@@ -2240,8 +2206,8 @@
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
+          export ac_cv_exeext
+          break;;
     * ) break;;
   esac
 done
@@ -2266,6 +2232,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2316,6 +2283,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2335,21 +2303,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2362,7 +2320,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2378,6 +2336,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2394,21 +2353,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2421,7 +2370,7 @@
 
 ac_cv_prog_cxx_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -2441,7 +2390,8 @@
   fi
 fi
 for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2449,13 +2399,14 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -2466,21 +2417,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2493,8 +2434,9 @@
 
 continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2511,21 +2453,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2537,7 +2469,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2676,6 +2608,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2695,21 +2628,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2722,7 +2645,7 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2738,6 +2661,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2754,21 +2678,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2781,7 +2695,7 @@
 
 ac_cv_prog_cc_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2808,6 +2722,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2835,16 +2750,6 @@
   va_end (v);
   return s;
 }
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2871,21 +2776,11 @@
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2898,7 +2793,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
@@ -2926,28 +2821,19 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2955,13 +2841,14 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -2972,21 +2859,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2999,8 +2876,9 @@
 
 continue
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3017,21 +2895,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3043,7 +2911,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -3057,7 +2925,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3092,6 +2960,7 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3102,7 +2971,7 @@
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3114,7 +2983,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3135,6 +3003,7 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3152,7 +3021,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3199,6 +3067,7 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3209,7 +3078,7 @@
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3221,7 +3090,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3242,6 +3110,7 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3259,7 +3128,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3410,6 +3278,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3433,21 +3302,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3460,8 +3319,7 @@
 
 ac_cv_lib_fl_yywrap=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
@@ -3477,6 +3335,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3500,21 +3359,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3527,8 +3376,7 @@
 
 ac_cv_lib_l_yywrap=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
@@ -3590,21 +3438,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3616,8 +3454,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
@@ -4272,7 +4109,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4275 "configure"' > conftest.$ac_ext
+  echo '#line 4112 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4369,6 +4206,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4385,21 +4223,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4412,8 +4240,7 @@
 
 lt_cv_cc_needs_belf=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4441,6 +4268,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4461,21 +4289,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4488,11 +4306,12 @@
 
 ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4514,6 +4333,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4538,6 +4358,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4549,9 +4370,9 @@
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -4562,7 +4383,7 @@
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
+        || toupper (i) != TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -4587,7 +4408,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -4612,7 +4433,7 @@
 
 
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
+                  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4621,6 +4442,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4632,21 +4454,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4659,7 +4471,7 @@
 
 eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4690,6 +4502,7 @@
 echo "$as_me:$LINENO: checking $ac_header usability" >&5
 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4700,21 +4513,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4727,7 +4530,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -4735,6 +4538,7 @@
 echo "$as_me:$LINENO: checking $ac_header presence" >&5
 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4752,7 +4556,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -4772,32 +4575,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -4808,7 +4612,7 @@
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  eval "$as_ac_Header=$ac_header_preproc"
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4847,6 +4651,7 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4857,7 +4662,7 @@
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4869,7 +4674,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=
   fi
@@ -4890,6 +4694,7 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4907,7 +4712,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=
   fi
@@ -4954,6 +4758,7 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4964,7 +4769,7 @@
 #else
 # include <assert.h>
 #endif
-		     Syntax error
+                     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4976,7 +4781,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=
   fi
@@ -4997,6 +4801,7 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5014,7 +4819,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=
   fi
@@ -5059,7 +4863,7 @@
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5101,7 +4905,7 @@
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -5146,7 +4950,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5149:" \
+echo "$as_me:4953:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5164,10 +4968,9 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-rm -f a.out
 
 # If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
+# input file.
 ac_save_ext=$ac_ext
 ac_ext=F
 echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
@@ -5185,21 +4988,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5212,13 +5005,14 @@
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
 echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
 ac_ext=$ac_save_ext
+G77=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
@@ -5235,21 +5029,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5262,7 +5046,7 @@
 
 ac_cv_prog_f77_g=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -5270,20 +5054,18 @@
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+  if test "$G77" = yes; then
     FFLAGS="-g -O2"
   else
     FFLAGS="-g"
   fi
 else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+  if test "$G77" = yes; then
     FFLAGS="-O2"
   else
     FFLAGS=
   fi
 fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6149,10 +5931,6 @@
 
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 
 lt_prog_compiler_no_builtin_flag=
 
@@ -6177,11 +5955,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6180: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:5958: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6184: \$? = $ac_status" >&5
+   echo "$as_me:5962: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6409,11 +6187,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6412: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6190: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6416: \$? = $ac_status" >&5
+   echo "$as_me:6194: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6476,11 +6254,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6479: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6257: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6483: \$? = $ac_status" >&5
+   echo "$as_me:6261: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -6816,6 +6594,7 @@
 	allow_undefined_flag='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6832,21 +6611,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6863,8 +6632,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6877,6 +6645,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6893,21 +6662,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6924,8 +6683,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -8024,6 +7782,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8047,21 +7806,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8074,8 +7823,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8099,28 +7847,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef shl_load
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -8151,21 +7892,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8178,8 +7909,7 @@
 
 ac_cv_func_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -8194,6 +7924,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8217,21 +7948,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8244,8 +7965,7 @@
 
 ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -8259,28 +7979,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef dlopen
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -8311,21 +8024,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8338,8 +8041,7 @@
 
 ac_cv_func_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -8354,6 +8056,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8377,21 +8080,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8404,8 +8097,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8421,6 +8113,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8444,21 +8137,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8471,8 +8154,7 @@
 
 ac_cv_lib_svld_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -8488,6 +8170,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8511,21 +8194,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8538,8 +8211,7 @@
 
 ac_cv_lib_dld_dld_link=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -8594,7 +8266,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8597 "configure"
+#line 8269 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8692,7 +8364,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8695 "configure"
+#line 8367 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9728,6 +9400,7 @@
       allow_undefined_flag_CXX='-berok'
       # Determine the default libpath from the value encoded in an empty executable.
       cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9744,21 +9417,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9775,8 +9438,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9790,6 +9452,7 @@
       else
 	# Determine the default libpath from the value encoded in an empty executable.
 	cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9806,21 +9469,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -9837,8 +9490,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10457,10 +10109,6 @@
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 
 cat > conftest.$ac_ext <<EOF
 class Foo
@@ -10848,11 +10496,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10851: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10499: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10855: \$? = $ac_status" >&5
+   echo "$as_me:10503: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10915,11 +10563,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10918: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10566: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10922: \$? = $ac_status" >&5
+   echo "$as_me:10570: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11674,6 +11322,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11697,21 +11346,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11724,8 +11363,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -11749,28 +11387,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef shl_load
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -11801,21 +11432,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11828,8 +11449,7 @@
 
 ac_cv_func_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -11844,6 +11464,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11867,21 +11488,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11894,8 +11505,7 @@
 
 ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -11909,28 +11519,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef dlopen
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -11961,21 +11564,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11988,8 +11581,7 @@
 
 ac_cv_func_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -12004,6 +11596,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12027,21 +11620,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12054,8 +11637,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -12071,6 +11653,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12094,21 +11677,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12121,8 +11694,7 @@
 
 ac_cv_lib_svld_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -12138,6 +11710,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12161,21 +11734,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12188,8 +11751,7 @@
 
 ac_cv_lib_dld_dld_link=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -12244,7 +11806,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12247 "configure"
+#line 11809 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12342,7 +11904,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12345 "configure"
+#line 11907 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13164,11 +12726,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13167: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12729: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13171: \$? = $ac_status" >&5
+   echo "$as_me:12733: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13231,11 +12793,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12796: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13238: \$? = $ac_status" >&5
+   echo "$as_me:12800: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13577,21 +13139,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13608,8 +13160,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13628,21 +13179,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13659,8 +13200,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15169,10 +14709,6 @@
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 archive_cmds_need_lc_GCJ=no
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 
 lt_prog_compiler_no_builtin_flag_GCJ=
 
@@ -15197,11 +14733,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15200: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14736: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15204: \$? = $ac_status" >&5
+   echo "$as_me:14740: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15429,11 +14965,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15432: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14968: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15436: \$? = $ac_status" >&5
+   echo "$as_me:14972: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15496,11 +15032,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15499: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15035: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15503: \$? = $ac_status" >&5
+   echo "$as_me:15039: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15836,6 +15372,7 @@
 	allow_undefined_flag_GCJ='-berok'
        # Determine the default libpath from the value encoded in an empty executable.
        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15852,21 +15389,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15883,8 +15410,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15897,6 +15423,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15913,21 +15440,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15944,8 +15461,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -17044,6 +16560,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17067,21 +16584,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17094,8 +16601,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17119,28 +16625,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef shl_load
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -17171,21 +16670,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17198,8 +16687,7 @@
 
 ac_cv_func_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -17214,6 +16702,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17237,21 +16726,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17264,8 +16743,7 @@
 
 ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -17279,28 +16757,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef dlopen
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -17331,21 +16802,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17358,8 +16819,7 @@
 
 ac_cv_func_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -17374,6 +16834,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17397,21 +16858,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17424,8 +16875,7 @@
 
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17441,6 +16891,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17464,21 +16915,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17491,8 +16932,7 @@
 
 ac_cv_lib_svld_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -17508,6 +16948,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17531,21 +16972,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17558,8 +16989,7 @@
 
 ac_cv_lib_dld_dld_link=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -17614,7 +17044,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17617 "configure"
+#line 17047 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17712,7 +17142,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17715 "configure"
+#line 17145 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18928,6 +18358,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18951,21 +18382,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18978,8 +18399,7 @@
 
 ac_cv_lib_elf_elf_begin=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5
@@ -19002,6 +18422,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_dlopen=no
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19025,21 +18446,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19051,12 +18462,12 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_dlopen" = no; then
   for ac_lib in dl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19080,21 +18491,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19107,8 +18508,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   done
 fi
 LIBS=$ac_func_search_save_LIBS
@@ -19136,6 +18536,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_mallinfo=no
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19159,21 +18560,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19185,12 +18576,12 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_mallinfo" = no; then
   for ac_lib in malloc; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19214,21 +18605,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19241,8 +18622,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   done
 fi
 LIBS=$ac_func_search_save_LIBS
@@ -19267,6 +18647,7 @@
   ac_func_search_save_LIBS=$LIBS
 ac_cv_search_pthread_mutex_lock=no
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19290,21 +18671,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19316,12 +18687,12 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$ac_cv_search_pthread_mutex_lock" = no; then
   for ac_lib in pthread; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19345,21 +18716,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19372,8 +18733,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   done
 fi
 LIBS=$ac_func_search_save_LIBS
@@ -19395,6 +18755,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19415,21 +18776,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19442,11 +18793,12 @@
 
 ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19468,6 +18820,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19492,6 +18845,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19503,9 +18857,9 @@
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
+                   (('a' <= (c) && (c) <= 'i') \
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -19516,7 +18870,7 @@
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
+        || toupper (i) != TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -19541,7 +18895,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -19561,6 +18915,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19587,21 +18942,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19614,7 +18959,7 @@
 
 ac_cv_header_sys_wait_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
@@ -19654,6 +18999,7 @@
 echo "$as_me:$LINENO: checking $ac_header usability" >&5
 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19664,21 +19010,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19691,7 +19027,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -19699,6 +19035,7 @@
 echo "$as_me:$LINENO: checking $ac_header presence" >&5
 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19716,7 +19053,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -19736,32 +19072,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -19772,7 +19109,7 @@
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  eval "$as_ac_Header=$ac_header_preproc"
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -19801,6 +19138,7 @@
 echo "$as_me:$LINENO: checking sys/types.h usability" >&5
 echo $ECHO_N "checking sys/types.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19811,21 +19149,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19838,7 +19166,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -19846,6 +19174,7 @@
 echo "$as_me:$LINENO: checking sys/types.h presence" >&5
 echo $ECHO_N "checking sys/types.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19863,7 +19192,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -19883,32 +19211,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: sys/types.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/types.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sys/types.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: sys/types.h: present but cannot be compiled" >&5
 echo "$as_me: WARNING: sys/types.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/types.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/types.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/types.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/types.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/types.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/types.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sys/types.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/types.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: sys/types.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: sys/types.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/types.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/types.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -19946,6 +19275,7 @@
 echo "$as_me:$LINENO: checking inttypes.h usability" >&5
 echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19956,21 +19286,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19983,7 +19303,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -19991,6 +19311,7 @@
 echo "$as_me:$LINENO: checking inttypes.h presence" >&5
 echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20008,7 +19329,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -20028,32 +19348,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
 echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: inttypes.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: inttypes.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -20091,6 +19412,7 @@
 echo "$as_me:$LINENO: checking stdint.h usability" >&5
 echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20101,21 +19423,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20128,7 +19440,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -20136,6 +19448,7 @@
 echo "$as_me:$LINENO: checking stdint.h presence" >&5
 echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20153,7 +19466,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -20173,32 +19485,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
 echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdint.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdint.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdint.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: stdint.h: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -20231,6 +19544,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20250,21 +19564,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20277,7 +19581,7 @@
 
 ac_cv_type_pid_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
@@ -20297,6 +19601,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20316,21 +19621,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20343,7 +19638,7 @@
 
 ac_cv_type_size_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -20363,6 +19658,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20382,21 +19678,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20409,7 +19695,7 @@
 
 ac_cv_type_int64_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
 echo "${ECHO_T}$ac_cv_type_int64_t" >&6
@@ -20432,6 +19718,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20451,21 +19738,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20478,7 +19755,7 @@
 
 ac_cv_type_uint64_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
 echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
@@ -20495,12 +19772,69 @@
    { (exit 1); exit 1; }; }
 fi
 
+echo "$as_me:$LINENO: checking for u_int64_t" >&5
+echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6
+if test "${ac_cv_type_u_int64_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((u_int64_t *) 0)
+  return 0;
+if (sizeof (u_int64_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_u_int64_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_u_int64_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5
+echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6
+if test $ac_cv_type_u_int64_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_U_INT64_T 1
+_ACEOF
+
+
+fi
+
 echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20521,21 +19855,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20548,7 +19872,7 @@
 
 ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
@@ -20566,6 +19890,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20584,21 +19909,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20611,7 +19926,7 @@
 
 ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
 echo "${ECHO_T}$ac_cv_struct_tm" >&6
@@ -20643,6 +19958,7 @@
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20689,7 +20005,7 @@
 ( exit $ac_status )
 ac_c_printf_a=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 	ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -20715,6 +20031,7 @@
 else
   # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20736,21 +20053,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20758,6 +20065,7 @@
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20779,21 +20087,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20806,7 +20104,7 @@
 
 ac_cv_c_bigendian=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -20816,6 +20114,7 @@
   # try to guess the endianness by grepping values into an object file
   ac_cv_c_bigendian=unknown
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20837,21 +20136,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20873,9 +20162,10 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20914,10 +20204,10 @@
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -20951,6 +20241,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -20967,21 +20258,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20994,7 +20275,7 @@
 
 ac_cv_cxx_namespaces=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21028,6 +20309,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21047,21 +20329,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21074,7 +20346,7 @@
 
 ac_cv_cxx_have_std_ext_hash_map=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21105,6 +20377,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21124,21 +20397,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21151,7 +20414,7 @@
 
 ac_cv_cxx_have_gnu_ext_hash_map=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21182,6 +20445,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21198,21 +20462,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21225,7 +20479,7 @@
 
 ac_cv_cxx_have_global_hash_map=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21256,6 +20510,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21275,21 +20530,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21302,7 +20547,7 @@
 
 ac_cv_cxx_have_std_ext_hash_set=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21333,6 +20578,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21352,21 +20598,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21379,7 +20615,7 @@
 
 ac_cv_cxx_have_gnu_ext_hash_set=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21410,6 +20646,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21426,21 +20663,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21453,7 +20680,7 @@
 
 ac_cv_cxx_have_global_hash_set=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21484,6 +20711,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21503,21 +20731,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21530,7 +20748,7 @@
 
 ac_cv_cxx_have_std_iterator=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21562,6 +20780,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21581,21 +20800,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21608,7 +20817,7 @@
 
 ac_cv_cxx_have_bi_iterator=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21640,6 +20849,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21659,21 +20869,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21686,7 +20886,7 @@
 
 ac_cv_cxx_have_fwd_iterator=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21717,6 +20917,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21727,21 +20928,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21754,7 +20945,7 @@
 
 ac_cv_func_isnan_in_math_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21784,6 +20975,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21794,21 +20986,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21821,7 +21003,7 @@
 
 ac_cv_func_isnan_in_cmath=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21851,6 +21033,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21861,21 +21044,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21888,7 +21061,7 @@
 
 ac_cv_func_std_isnan_in_cmath=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21920,6 +21093,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21930,21 +21104,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21957,7 +21121,7 @@
 
 ac_cv_func_isinf_in_math_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21987,6 +21151,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -21997,21 +21162,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22024,7 +21179,7 @@
 
 ac_cv_func_isinf_in_cmath=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -22054,6 +21209,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22064,21 +21220,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22091,7 +21237,7 @@
 
 ac_cv_func_std_isinf_in_cmath=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -22121,6 +21267,7 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22131,21 +21278,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22158,7 +21295,7 @@
 
 ac_cv_func_finite_in_ieeefp_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -22186,6 +21323,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22202,21 +21340,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22229,8 +21357,7 @@
 
 ac_cv_working_alloca_h=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
@@ -22248,6 +21375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22284,21 +21412,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22311,8 +21429,7 @@
 
 ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
@@ -22342,6 +21459,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22374,28 +21492,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef $ac_func
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -22426,21 +21537,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22453,8 +21554,7 @@
 
 eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -22479,6 +21579,7 @@
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22524,7 +21625,7 @@
 ( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
@@ -22555,6 +21656,7 @@
 echo "$as_me:$LINENO: checking $ac_header usability" >&5
 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22565,21 +21667,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22592,7 +21684,7 @@
 
 ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
 
@@ -22600,6 +21692,7 @@
 echo "$as_me:$LINENO: checking $ac_header presence" >&5
 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22617,7 +21710,6 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -22637,32 +21729,33 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
 
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
     ;;
-  no:yes:* )
+  no:yes )
     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     (
       cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to llvmbugs at cs.uiuc.edu ##
-## ----------------------------------- ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -22673,7 +21766,7 @@
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+  eval "$as_ac_Header=$ac_header_preproc"
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -22698,28 +21791,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef $ac_func
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -22750,21 +21836,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22777,8 +21853,7 @@
 
 eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -22799,6 +21874,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -22906,9 +21982,9 @@
   data2 = (char *) malloc (2 * pagesize);
   if (!data2)
     exit (1);
-  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
+  data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
   if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+                     MAP_PRIVATE | MAP_FIXED, fd, 0L))
     exit (1);
   for (i = 0; i < pagesize; ++i)
     if (*(data + i) != *(data2 + i))
@@ -22951,7 +22027,7 @@
 ( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
@@ -22991,6 +22067,7 @@
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23033,7 +22110,7 @@
 ( exit $ac_status )
 ac_cv_func_mmap_file=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -23074,6 +22151,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23092,21 +22170,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23119,7 +22187,7 @@
 
 ac_cv_header_mmap_anon=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -23144,6 +22212,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -23170,21 +22239,11 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+  (eval $ac_compile) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
+         { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23197,7 +22256,7 @@
 
 ac_cv_type_signal=int
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
@@ -23225,28 +22284,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef $ac_func
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -23277,21 +22329,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23304,8 +22346,7 @@
 
 eval "$as_ac_var=no"
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -23323,28 +22364,21 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define mprotect to an innocuous variant, in case <limits.h> declares mprotect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define mprotect innocuous_mprotect
-
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mprotect (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
-
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
-
-#undef mprotect
-
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -23375,21 +22409,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23402,8 +22426,7 @@
 
 ac_cv_func_mprotect=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_mprotect" >&5
 echo "${ECHO_T}$ac_cv_func_mprotect" >&6
@@ -23434,21 +22457,11 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+  (eval $ac_link) 2>&5
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+         { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23461,8 +22474,7 @@
 
 ac_cv_link_use_r=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$oldcflags"
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -23889,13 +22901,13 @@
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+        "s/'/'\\\\''/g;
+    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } |
@@ -23925,13 +22937,13 @@
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
 s/:*\$(srcdir):*/:/;
 s/:*\${srcdir}:*/:/;
 s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
+s/^\([^=]*=[ 	]*\):*/\1/;
 s/:*$//;
-s/^[^=]*=[	 ]*$//;
+s/^[^=]*=[ 	]*$//;
 }'
 fi
 
@@ -23942,7 +22954,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
   # 2. Add them.
   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -23986,10 +22998,9 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -24008,7 +23019,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -24187,17 +23198,16 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
-  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
 
 
 # IFS
@@ -24224,7 +23234,7 @@
 cat >&5 <<_CSEOF
 
 This file was extended by LLVM $as_me 1.4, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -24268,9 +23278,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -24290,10 +23300,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 LLVM config.status 1.4
-configured by $0, generated by GNU Autoconf 2.59,
+configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 srcdir=$srcdir
@@ -24721,9 +23732,9 @@
       (echo ':t
   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
       if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
       else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       ac_sed_frag=`expr $ac_sed_frag + 1`
       ac_beg=$ac_end
@@ -24741,21 +23752,21 @@
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -24771,10 +23782,10 @@
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -24812,45 +23823,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
 
   case $INSTALL in
@@ -24872,7 +23850,7 @@
     configure_input="$ac_file.  "
   fi
   configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
+                                     sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -24881,24 +23859,24 @@
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-	 echo "$f";;
+         echo $f;;
       *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-	 fi;;
+         fi;;
       esac
     done` || { (exit 1); exit 1; }
 _ACEOF
@@ -24940,12 +23918,12 @@
 # NAME is the cpp macro being defined and VALUE is the value it is being given.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
+ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='[ 	].*$,\1#\2'
 ac_dC=' '
 ac_dD=',;t'
 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
 ac_uB='$,\1#\2define\3'
 ac_uC=' '
 ac_uD=',;t'
@@ -24954,11 +23932,11 @@
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+        cat >$tmp/stdin
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=$ac_file.in ;;
   esac
 
@@ -24972,29 +23950,28 @@
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
+         echo $f;;
       *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-	 fi;;
+         fi;;
       esac
     done` || { (exit 1); exit 1; }
   # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
 
 _ACEOF
 
@@ -25017,9 +23994,9 @@
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
 t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 : end
 _ACEOF
 # If some macros were called several times there might be several times
@@ -25033,13 +24010,13 @@
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
 cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 _ACEOF
 
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
 echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
 echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
@@ -25048,7 +24025,7 @@
   # Write a limited-size here document to $tmp/defines.sed.
   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -25075,7 +24052,7 @@
   # Write a limited-size here document to $tmp/undefs.sed.
   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -25109,10 +24086,10 @@
     else
       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -25128,10 +24105,10 @@
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -25176,10 +24153,10 @@
   # Make relative symlinks.
   ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
 $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_dest" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -25195,10 +24172,10 @@
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -25236,45 +24213,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dest_dir";;
-*)
-  case "$ac_dest_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+# Don't blindly perform a `cd "$ac_dest_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dest_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dest_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dest_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dest_dir" && cd $ac_top_srcdir && pwd`
 
 
   case $srcdir in
@@ -25301,41 +24245,16 @@
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
 $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$ac_dest" : 'X\(//\)[^/]' \| \
+         X"$ac_dest" : 'X\(//\)$' \| \
+         X"$ac_dest" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_dest" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
   ac_builddir=.
 
 if test "$ac_dir" != .; then
@@ -25361,45 +24280,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
 
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -25546,10 +24432,10 @@
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -25587,45 +24473,12 @@
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
 
 
     cd $ac_dir
@@ -25649,15 +24502,15 @@
       case $cache_file in
       [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
       *) # Relative path.
-	ac_sub_cache_file=$ac_top_builddir$cache_file ;;
+        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
       esac
 
       { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
 echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
       # The eval makes quoting arguments work.
       eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+           --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
 echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi





From criswell at cs.uiuc.edu  Thu Sep  2 13:44:55 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Thu, 2 Sep 2004 13:44:55 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200409021844.NAA09912@choi.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.105 -> 1.106
---
Log message:

Added a check for u_int64_t, which is used by Interix.



---
Diffs of the changes:  (+1 -0)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.105 llvm/autoconf/configure.ac:1.106
--- llvm/autoconf/configure.ac:1.105	Wed Sep  1 17:55:34 2004
+++ llvm/autoconf/configure.ac	Thu Sep  2 13:44:44 2004
@@ -316,6 +316,7 @@
 AC_TYPE_SIZE_T
 AC_CHECK_TYPES([int64_t],,AC_MSG_ERROR([Type int64_t required but not found]))
 AC_CHECK_TYPES([uint64_t],,AC_MSG_ERROR([Type uint64_t required but not found]))
+AC_CHECK_TYPES([u_int64_t])
 AC_HEADER_TIME
 AC_STRUCT_TM
 





From criswell at cs.uiuc.edu  Thu Sep  2 14:07:24 2004
From: criswell at cs.uiuc.edu (John Criswell)
Date: Thu, 2 Sep 2004 14:07:24 -0500
Subject: [llvm-commits] CVS: llvm-test/Makefile.common.in 
Message-ID: <200409021907.OAA09932@choi.cs.uiuc.edu>



Changes in directory llvm-test:

Makefile.common.in added (r1.1)
---
Log message:

Adding Makefile.common.in.


---
Diffs of the changes:  (+23 -0)

Index: llvm-test/Makefile.common.in
diff -c /dev/null llvm-test/Makefile.common.in:1.1
*** /dev/null	Thu Sep  2 14:07:21 2004
--- llvm-test/Makefile.common.in	Thu Sep  2 14:07:11 2004
***************
*** 0 ****
--- 1,23 ----
+ #
+ # Configure the location of the LLVM object root.  We know it is two
+ # directories up.  The source tree location we do not know; let the LLVM
+ # Makefiles find it for us.
+ #
+ LLVM_OBJ_ROOT=$(LEVEL)/../..
+ 
+ #
+ # Grab the LLVM configuration file.
+ #
+ include $(LEVEL)/../../Makefile.config
+ 
+ #
+ # Reconfigure the source directories
+ #
+ BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/testsuite
+ BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+ 
+ #
+ # Include LLVM's build rules.
+ #
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 





From alkis at cs.uiuc.edu  Thu Sep  2 16:23:43 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 2 Sep 2004 16:23:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp 
Message-ID: <200409022123.QAA15741@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.93 -> 1.94
---
Log message:

Change the way we choose a free register: instead of picking the first
free allocatable register, we prefer the a free one with the most uses
of inactive intervals. This causes less spills and performes a bit
better compared to gcc:

Program                 | GCC/LLC (Before)| GCC/LLC (After) 
164.gzip/164.gzip       | 0.59            | 0.60            
175.vpr/175.vpr         | 0.57            | 0.58            
176.gcc/176.gcc         | 0.59            | 0.61            
181.mcf/181.mcf         | 0.94            | 0.95            
186.crafty/186.crafty   | 0.62            | 0.62            
197.parser/197.parser   | 0.89            | 0.88            
252.eon/252.eon         | 0.61            | 0.66            
253.perlbmk/253.perlbmk | 0.79            | 0.84            
254.gap/254.gap         | 0.81            | 0.81            
255.vortex/255.vortex   | 0.92            | 0.93            
256.bzip2/256.bzip2     | 0.69            | 0.69            
300.twolf/300.twolf     | 0.91            | 0.90


---
Diffs of the changes:  (+14 -3)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.93 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.94
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.93	Thu Sep  2 13:00:38 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Thu Sep  2 16:23:32 2004
@@ -522,15 +522,26 @@
 
 unsigned RA::getFreePhysReg(LiveInterval* cur)
 {
+  std::vector<unsigned> inactiveCounts(mri_->getNumRegs(), 0);
+  for (IntervalPtrs::iterator i = inactive_.begin(), e = inactive_.end();
+       i != e; ++i) {
+    unsigned reg = (*i)->reg;
+    if (MRegisterInfo::isVirtualRegister(reg))
+      reg = vrm_->getPhys(reg);
+    ++inactiveCounts[reg];
+  }
+
   const TargetRegisterClass* rc = mf_->getSSARegMap()->getRegClass(cur->reg);
 
+  unsigned freeReg = 0;
   for (TargetRegisterClass::iterator i = rc->allocation_order_begin(*mf_);
        i != rc->allocation_order_end(*mf_); ++i) {
     unsigned reg = *i;
-    if (prt_->isRegAvail(reg))
-      return reg;
+    if (prt_->isRegAvail(reg) &&
+        (!freeReg || inactiveCounts[freeReg] < inactiveCounts[reg]))
+        freeReg = reg;
   }
-  return 0;
+  return freeReg;
 }
 
 FunctionPass* llvm::createLinearScanRegisterAllocator() {





From alkis at cs.uiuc.edu  Thu Sep  2 16:24:43 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Thu, 2 Sep 2004 16:24:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocIterativeScan.cpp 
Message-ID: <200409022124.QAA15762@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocIterativeScan.cpp updated: 1.16 -> 1.17
---
Log message:

Change the way we choose a free register: instead of picking the first
free allocatable register, we prefer the a free one with the most uses
of inactive intervals.


---
Diffs of the changes:  (+15 -4)

Index: llvm/lib/CodeGen/RegAllocIterativeScan.cpp
diff -u llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.16 llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.17
--- llvm/lib/CodeGen/RegAllocIterativeScan.cpp:1.16	Wed Sep  1 17:55:35 2004
+++ llvm/lib/CodeGen/RegAllocIterativeScan.cpp	Thu Sep  2 16:24:33 2004
@@ -463,17 +463,28 @@
 
 }
 
-unsigned RA::getFreePhysReg(IntervalPtrs::value_type cur)
+unsigned RA::getFreePhysReg(LiveInterval* cur)
 {
+  std::vector<unsigned> inactiveCounts(mri_->getNumRegs(), 0);
+  for (IntervalPtrs::iterator i = inactive_.begin(), e = inactive_.end();
+       i != e; ++i) {
+    unsigned reg = (*i)->reg;
+    if (MRegisterInfo::isVirtualRegister(reg))
+      reg = vrm_->getPhys(reg);
+    ++inactiveCounts[reg];
+  }
+
   const TargetRegisterClass* rc = mf_->getSSARegMap()->getRegClass(cur->reg);
 
+  unsigned freeReg = 0;
   for (TargetRegisterClass::iterator i = rc->allocation_order_begin(*mf_);
        i != rc->allocation_order_end(*mf_); ++i) {
     unsigned reg = *i;
-    if (prt_->isRegAvail(reg))
-      return reg;
+    if (prt_->isRegAvail(reg) &&
+        (!freeReg || inactiveCounts[freeReg] < inactiveCounts[reg]))
+        freeReg = reg;
   }
-  return 0;
+  return freeReg;
 }
 
 FunctionPass* llvm::createIterativeScanRegisterAllocator() {





From reid at x10sys.com  Thu Sep  2 16:38:35 2004
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 2 Sep 2004 16:38:35 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac 
Message-ID: <200409022138.QAA15878@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.106 -> 1.107
---
Log message:

Don't just assume that either uint64_t or u_int64_t is available. Instead,
give preference to uint64_t if it exists. If not, check for u_int64_t. If
that doesn't exist either, then error out.


---
Diffs of the changes:  (+3 -2)

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.106 llvm/autoconf/configure.ac:1.107
--- llvm/autoconf/configure.ac:1.106	Thu Sep  2 13:44:44 2004
+++ llvm/autoconf/configure.ac	Thu Sep  2 16:38:24 2004
@@ -315,8 +315,9 @@
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_CHECK_TYPES([int64_t],,AC_MSG_ERROR([Type int64_t required but not found]))
-AC_CHECK_TYPES([uint64_t],,AC_MSG_ERROR([Type uint64_t required but not found]))
-AC_CHECK_TYPES([u_int64_t])
+AC_CHECK_TYPES([uint64_t],,
+               AC_CHECK_TYPES([u_int64_t],,
+                              AC_MSG_ERROR([Type uint64_t or u_int64_t required but not found])))
 AC_HEADER_TIME
 AC_STRUCT_TM
 





From reid at x10sys.com  Thu Sep  2 17:49:37 2004
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 2 Sep 2004 17:49:37 -0500
Subject: [llvm-commits] CVS: llvm/README.txt 
Message-ID: <200409022249.RAA16756@zion.cs.uiuc.edu>



Changes in directory llvm:

README.txt updated: 1.6 -> 1.7
---
Log message:

Make the text of this file a little more useful.


---
Diffs of the changes:  (+12 -1)

Index: llvm/README.txt
diff -u llvm/README.txt:1.6 llvm/README.txt:1.7
--- llvm/README.txt:1.6	Tue May 11 21:48:30 2004
+++ llvm/README.txt	Thu Sep  2 17:49:27 2004
@@ -1 +1,12 @@
-This file is a placeholder; see docs/index.html for documentation.
+Low Level Virtual Machine (LLVM)
+================================
+
+This directory and its subdirectories contain source code for the Low Level 
+Virtual Machine, a toolkit for the construction of highly optimized compilers,
+optimizers, and runtime environments. 
+
+LLVM is open source software. You may freely distribute it under the terms of
+the license agreement found in LICENSE.txt.
+
+Please see the HTML documentation provided in docs/index.html for further
+assistance with LLVM.





From brukman at cs.uiuc.edu  Thu Sep  2 18:02:40 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu, 2 Sep 2004 18:02:40 -0500
Subject: [llvm-commits] CVS: llvm/configure 
Message-ID: <200409022302.SAA17244@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.110 -> 1.111
---
Log message:

Regenerated after Reid's change for uint64_t/u_int64_t (patch by Bill Wendling)


---
Diffs of the changes:  (+7 -6)

Index: llvm/configure
diff -u llvm/configure:1.110 llvm/configure:1.111
--- llvm/configure:1.110	Thu Sep  2 13:44:40 2004
+++ llvm/configure	Thu Sep  2 18:02:30 2004
@@ -19767,12 +19767,7 @@
 
 
 else
-  { { echo "$as_me:$LINENO: error: Type uint64_t required but not found" >&5
-echo "$as_me: error: Type uint64_t required but not found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-echo "$as_me:$LINENO: checking for u_int64_t" >&5
+  echo "$as_me:$LINENO: checking for u_int64_t" >&5
 echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6
 if test "${ac_cv_type_u_int64_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19826,6 +19821,12 @@
 _ACEOF
 
 
+else
+  { { echo "$as_me:$LINENO: error: Type uint64_t or u_int64_t required but not found" >&5
+echo "$as_me: error: Type uint64_t or u_int64_t required but not found" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 fi
 
 echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp
	LiveIntervalAnalysis.cpp 
Message-ID: <200409031820.NAA07937@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.94 -> 1.95
LiveIntervalAnalysis.cpp updated: 1.122 -> 1.123
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+3 -2)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.94 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.95
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.94	Thu Sep  2 16:23:32 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Fri Sep  3 13:19:51 2004
@@ -470,7 +470,7 @@
     // is active or inactive to properly update the PhysRegTracker
     // and the VirtRegMap
     IntervalPtrs::iterator it;
-    if ((it = find(active_.begin(), active_.end(), i)) != active_.end()) {
+    if ((it = std::find(active_.begin(), active_.end(), i)) != active_.end()) {
       active_.erase(it);
       if (MRegisterInfo::isPhysicalRegister(i->reg)) {
         prt_->delRegUse(i->reg);
@@ -483,7 +483,7 @@
         vrm_->clearVirt(i->reg);
       }
     }
-    else if ((it = find(inactive_.begin(), inactive_.end(), i)) != inactive_.end()) {
+    else if ((it = std::find(inactive_.begin(), inactive_.end(), i)) != inactive_.end()) {
       inactive_.erase(it);
       if (MRegisterInfo::isPhysicalRegister(i->reg))
         unhandled_.push(i);


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.122 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.123
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.122	Wed Sep  1 17:55:35 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Fri Sep  3 13:19:51 2004
@@ -33,6 +33,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "VirtRegMap.h"
 #include <cmath>
+#include <algorithm>
 
 using namespace llvm;
 





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:02 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:02 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LowerSwitch.cpp
	LoopUnswitch.cpp 
Message-ID: <200409031820.NAA07922@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LowerSwitch.cpp updated: 1.14 -> 1.15
LoopUnswitch.cpp updated: 1.2 -> 1.3
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+2 -0)

Index: llvm/lib/Transforms/Scalar/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.14 llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.15
--- llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.14	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Scalar/LowerSwitch.cpp	Fri Sep  3 13:19:51 2004
@@ -20,6 +20,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
+#include <algorithm>
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
diff -u llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.2 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.3
--- llvm/lib/Transforms/Scalar/LoopUnswitch.cpp:1.2	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Scalar/LoopUnswitch.cpp	Fri Sep  3 13:19:51 2004
@@ -37,6 +37,7 @@
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
+#include <algorithm>
 using namespace llvm;
 
 namespace {





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/Reader.cpp 
Message-ID: <200409031820.NAA07938@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Bytecode/Reader:

Reader.cpp updated: 1.128 -> 1.129
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.128 llvm/lib/Bytecode/Reader/Reader.cpp:1.129
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.128	Wed Sep  1 17:55:35 2004
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Fri Sep  3 13:19:51 2004
@@ -26,6 +26,7 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/ADT/StringExtras.h"
 #include <sstream>
+#include <algorithm>
 using namespace llvm;
 
 namespace {





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:03 -0500
Subject: [llvm-commits] 
	CVS: llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
Message-ID: <200409031820.NAA07941@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ExecutionEngine:

ExecutionEngine.h updated: 1.26 -> 1.27
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+1 -0)

Index: llvm/include/llvm/ExecutionEngine/ExecutionEngine.h
diff -u llvm/include/llvm/ExecutionEngine/ExecutionEngine.h:1.26 llvm/include/llvm/ExecutionEngine/ExecutionEngine.h:1.27
--- llvm/include/llvm/ExecutionEngine/ExecutionEngine.h:1.26	Wed Dec 31 14:19:31 2003
+++ llvm/include/llvm/ExecutionEngine/ExecutionEngine.h	Fri Sep  3 13:19:51 2004
@@ -18,6 +18,7 @@
 #include <vector>
 #include <map>
 #include <cassert>
+#include <string>
 
 namespace llvm {
 





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:02 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:02 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
	PromoteMemoryToRegister.cpp 
Message-ID: <200409031820.NAA07925@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.50 -> 1.51
PromoteMemoryToRegister.cpp updated: 1.66 -> 1.67
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+2 -1)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.50 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.51
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.50	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Fri Sep  3 13:19:51 2004
@@ -49,7 +49,7 @@
   // with incompatible values coming in from the two edges!
   //
   for (pred_iterator PI = pred_begin(Succ), PE = pred_end(Succ); PI != PE; ++PI)
-    if (find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) {
+    if (std::find(BBPreds.begin(), BBPreds.end(), *PI) != BBPreds.end()) {
       // Loop over all of the PHI nodes checking to see if there are
       // incompatible values coming in.
       for (BasicBlock::iterator I = Succ->begin();


Index: llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
diff -u llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.66 llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.67
--- llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp:1.66	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp	Fri Sep  3 13:19:51 2004
@@ -24,6 +24,7 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/StableBasicBlockNumbering.h"
 #include "llvm/ADT/StringExtras.h"
+#include <algorithm>
 using namespace llvm;
 
 /// isAllocaPromotable - Return true if this alloca is legal for promotion.





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/ScalarEvolution.cpp
	LoopInfo.cpp LoadValueNumbering.cpp IntervalPartition.cpp
	BasicAliasAnalysis.cpp 
Message-ID: <200409031820.NAA07936@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

ScalarEvolution.cpp updated: 1.24 -> 1.25
LoopInfo.cpp updated: 1.58 -> 1.59
LoadValueNumbering.cpp updated: 1.21 -> 1.22
IntervalPartition.cpp updated: 1.25 -> 1.26
BasicAliasAnalysis.cpp updated: 1.52 -> 1.53
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+6 -2)

Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.24 llvm/lib/Analysis/ScalarEvolution.cpp:1.25
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.24	Wed Sep  1 17:55:35 2004
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Fri Sep  3 13:19:51 2004
@@ -75,6 +75,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/ADT/Statistic.h"
 #include <cmath>
+#include <algorithm>
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.58 llvm/lib/Analysis/LoopInfo.cpp:1.59
--- llvm/lib/Analysis/LoopInfo.cpp:1.58	Wed Sep  1 17:55:35 2004
+++ llvm/lib/Analysis/LoopInfo.cpp	Fri Sep  3 13:19:51 2004
@@ -33,7 +33,7 @@
 // Loop implementation
 //
 bool Loop::contains(const BasicBlock *BB) const {
-  return find(Blocks.begin(), Blocks.end(), BB) != Blocks.end();
+  return std::find(Blocks.begin(), Blocks.end(), BB) != Blocks.end();
 }
 
 bool Loop::isLoopExit(const BasicBlock *BB) const {


Index: llvm/lib/Analysis/LoadValueNumbering.cpp
diff -u llvm/lib/Analysis/LoadValueNumbering.cpp:1.21 llvm/lib/Analysis/LoadValueNumbering.cpp:1.22
--- llvm/lib/Analysis/LoadValueNumbering.cpp:1.21	Thu Jul 29 12:14:54 2004
+++ llvm/lib/Analysis/LoadValueNumbering.cpp	Fri Sep  3 13:19:51 2004
@@ -33,6 +33,7 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetData.h"
 #include <set>
+#include <algorithm>
 using namespace llvm;
 
 namespace {


Index: llvm/lib/Analysis/IntervalPartition.cpp
diff -u llvm/lib/Analysis/IntervalPartition.cpp:1.25 llvm/lib/Analysis/IntervalPartition.cpp:1.26
--- llvm/lib/Analysis/IntervalPartition.cpp:1.25	Wed Sep  1 17:55:35 2004
+++ llvm/lib/Analysis/IntervalPartition.cpp	Fri Sep  3 13:19:51 2004
@@ -14,6 +14,7 @@
 
 #include "llvm/Analysis/IntervalIterator.h"
 #include "llvm/ADT/STLExtras.h"
+#include <algorithm>
 
 namespace llvm {
 
@@ -26,7 +27,7 @@
 
 // destroy - Reset state back to before function was analyzed
 void IntervalPartition::destroy() {
-  for_each(Intervals.begin(), Intervals.end(), deleter<Interval>);
+  std::for_each(Intervals.begin(), Intervals.end(), deleter<Interval>);
   IntervalMap.clear();
   RootInterval = 0;
 }


Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.52 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.53
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.52	Thu Jul 29 07:17:34 2004
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp	Fri Sep  3 13:19:51 2004
@@ -22,6 +22,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
+#include <algorithm>
 using namespace llvm;
 
 // Make sure that anything that uses AliasAnalysis pulls in this file...





From alkis at cs.uiuc.edu  Fri Sep  3 13:20:03 2004
From: alkis at cs.uiuc.edu (Alkis Evlogimenos)
Date: Fri, 3 Sep 2004 13:20:03 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/IntervalIterator.h 
Message-ID: <200409031820.NAA07948@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

IntervalIterator.h updated: 1.17 -> 1.18
---
Log message:

Fixes to make LLVM compile with vc7.1.

Patch contributed by Paolo Invernizzi!


---
Diffs of the changes:  (+1 -1)

Index: llvm/include/llvm/Analysis/IntervalIterator.h
diff -u llvm/include/llvm/Analysis/IntervalIterator.h:1.17 llvm/include/llvm/Analysis/IntervalIterator.h:1.18
--- llvm/include/llvm/Analysis/IntervalIterator.h:1.17	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/Analysis/IntervalIterator.h	Fri Sep  3 13:19:51 2004
@@ -177,7 +177,7 @@
            E = GT::child_end(Node); I != E; ++I)
       ProcessNode(Int, getSourceGraphNode(OrigContainer, *I));
 
-    IntStack.push(make_pair(Int, succ_begin(Int)));
+    IntStack.push(std::make_pair(Int, succ_begin(Int)));
     return true;
   }
   





From brukman at cs.uiuc.edu  Fri Sep  3 13:26:03 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 3 Sep 2004 13:26:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp 
Message-ID: <200409031826.NAA08030@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.123 -> 1.124
---
Log message:

Order #includes alphabetically, local .h files first.


---
Diffs of the changes:  (+2 -3)

Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.123 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.124
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.123	Fri Sep  3 13:19:51 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Fri Sep  3 13:25:53 2004
@@ -17,6 +17,7 @@
 
 #define DEBUG_TYPE "liveintervals"
 #include "LiveIntervalAnalysis.h"
+#include "VirtRegMap.h"
 #include "llvm/Value.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/CodeGen/LiveVariables.h"
@@ -31,10 +32,8 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/STLExtras.h"
-#include "VirtRegMap.h"
-#include <cmath>
 #include <algorithm>
-
+#include <cmath>
 using namespace llvm;
 
 namespace {





From reid at x10sys.com  Fri Sep  3 14:37:50 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 14:37:50 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/DataTypes.h.in 
Message-ID: <200409031937.OAA08801@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

DataTypes.h.in updated: 1.6 -> 1.7
---
Log message:

Provide correct definition of uint64_t for platforms that have only
u_int64_t defined.


---
Diffs of the changes:  (+12 -0)

Index: llvm/include/llvm/Support/DataTypes.h.in
diff -u llvm/include/llvm/Support/DataTypes.h.in:1.6 llvm/include/llvm/Support/DataTypes.h.in:1.7
--- llvm/include/llvm/Support/DataTypes.h.in:1.6	Mon Jul 19 11:12:29 2004
+++ llvm/include/llvm/Support/DataTypes.h.in	Fri Sep  3 14:37:39 2004
@@ -21,6 +21,8 @@
 #ifndef SUPPORT_DATATYPES_H
 #define SUPPORT_DATATYPES_H
 
+#include <llvm/Config/config.h>
+
 // Note that this header's correct operation depends on __STDC_LIMIT_MACROS
 // being defined.  We would define it here, but in order to prevent Bad Things
 // happening when system headers or C++ STL headers include stdint.h before
@@ -34,6 +36,16 @@
 @INCLUDE_INTTYPES_H@
 @INCLUDE_SYS_TYPES_H@
 @INCLUDE_STDINT_H@
+
+// Handle incorrect definition of uint64_t as u_int64_t
+#ifndef HAVE_UINT64_T
+#ifdef HAVE_U_INT64_T
+typedef u_int64_t uint64_t;
+#else
+# error "Don't have a definition for uint64_t on this platform"
+#endif
+#endif
+
 #else
 // Visual C++ doesn't provide standard integer headers, but it does provide
 // built-in data types.





From brukman at cs.uiuc.edu  Fri Sep  3 14:44:39 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 3 Sep 2004 14:44:39 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/DataTypes.h.in 
Message-ID: <200409031944.OAA08881@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

DataTypes.h.in updated: 1.7 -> 1.8
---
Log message:

Simplify check for uint64_t and u_int64_t


---
Diffs of the changes:  (+2 -5)

Index: llvm/include/llvm/Support/DataTypes.h.in
diff -u llvm/include/llvm/Support/DataTypes.h.in:1.7 llvm/include/llvm/Support/DataTypes.h.in:1.8
--- llvm/include/llvm/Support/DataTypes.h.in:1.7	Fri Sep  3 14:37:39 2004
+++ llvm/include/llvm/Support/DataTypes.h.in	Fri Sep  3 14:44:28 2004
@@ -36,15 +36,12 @@
 @INCLUDE_INTTYPES_H@
 @INCLUDE_SYS_TYPES_H@
 @INCLUDE_STDINT_H@
-
-// Handle incorrect definition of uint64_t as u_int64_t
-#ifndef HAVE_UINT64_T
-#ifdef HAVE_U_INT64_T
+// Interix has u_int64_t, but not uint64_t
+#if !defined(HAVE_UINT64_T) && defined(HAVE_U_INT64_T)
 typedef u_int64_t uint64_t;
 #else
 # error "Don't have a definition for uint64_t on this platform"
 #endif
-#endif
 
 #else
 // Visual C++ doesn't provide standard integer headers, but it does provide





From brukman at cs.uiuc.edu  Fri Sep  3 14:46:53 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri, 3 Sep 2004 14:46:53 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/DataTypes.h.in 
Message-ID: <200409031946.OAA08959@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

DataTypes.h.in updated: 1.8 -> 1.9
---
Log message:

I was actually wrong in my "simplification".


---
Diffs of the changes:  (+5 -2)

Index: llvm/include/llvm/Support/DataTypes.h.in
diff -u llvm/include/llvm/Support/DataTypes.h.in:1.8 llvm/include/llvm/Support/DataTypes.h.in:1.9
--- llvm/include/llvm/Support/DataTypes.h.in:1.8	Fri Sep  3 14:44:28 2004
+++ llvm/include/llvm/Support/DataTypes.h.in	Fri Sep  3 14:46:43 2004
@@ -36,12 +36,15 @@
 @INCLUDE_INTTYPES_H@
 @INCLUDE_SYS_TYPES_H@
 @INCLUDE_STDINT_H@
-// Interix has u_int64_t, but not uint64_t
-#if !defined(HAVE_UINT64_T) && defined(HAVE_U_INT64_T)
+
+// Handle incorrect definition of uint64_t as u_int64_t
+#ifndef HAVE_UINT64_T
+#ifdef HAVE_U_INT64_T
 typedef u_int64_t uint64_t;
 #else
 # error "Don't have a definition for uint64_t on this platform"
 #endif
+#endif
 
 #else
 // Visual C++ doesn't provide standard integer headers, but it does provide





From reid at x10sys.com  Fri Sep  3 17:25:51 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 17:25:51 -0500
Subject: [llvm-commits] CVS: llvm/projects/Makefile 
Message-ID: <200409032225.RAA04666@zion.cs.uiuc.edu>



Changes in directory llvm/projects:

Makefile updated: 1.7 -> 1.8
---
Log message:

Correct the specification of the DIRS variable to not include the source
directory prefix, just the name of the subdirectory. This prevents the
makefile from trying to find makefiles (like Makefile.common) in the wrong 
place.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/Makefile
diff -u llvm/projects/Makefile:1.7 llvm/projects/Makefile:1.8
--- llvm/projects/Makefile:1.7	Mon Aug 23 12:47:16 2004
+++ llvm/projects/Makefile	Fri Sep  3 17:25:40 2004
@@ -10,6 +10,6 @@
 
 include $(LEVEL)/Makefile.config
 
-DIRS:= $(patsubst %/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
+DIRS:= $(patsubst $(SourceDir)%/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
 
 include $(BUILD_SRC_ROOT)/Makefile.rules





From reid at x10sys.com  Fri Sep  3 17:28:35 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 17:28:35 -0500
Subject: [llvm-commits] CVS: llvm/projects/Makefile 
Message-ID: <200409032228.RAA04721@zion.cs.uiuc.edu>



Changes in directory llvm/projects:

Makefile updated: 1.8 -> 1.9
---
Log message:

Uh, changing in build dir and committing in src dir doesn't lead to correct
commits. Fix it so it actually works.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/Makefile
diff -u llvm/projects/Makefile:1.8 llvm/projects/Makefile:1.9
--- llvm/projects/Makefile:1.8	Fri Sep  3 17:25:40 2004
+++ llvm/projects/Makefile	Fri Sep  3 17:28:24 2004
@@ -10,6 +10,6 @@
 
 include $(LEVEL)/Makefile.config
 
-DIRS:= $(patsubst $(SourceDir)%/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
+DIRS:= $(patsubst $(SourceDir)/%/Makefile,%,$(wildcard $(SourceDir)/*/Makefile))
 
 include $(BUILD_SRC_ROOT)/Makefile.rules





From reid at x10sys.com  Fri Sep  3 17:59:42 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 17:59:42 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvmc/llvmc.cpp 
Message-ID: <200409032259.RAA06697@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvmc:

llvmc.cpp updated: 1.14 -> 1.15
---
Log message:

Don't re-instantiate the std::string in catch block.


---
Diffs of the changes:  (+1 -1)

Index: llvm/tools/llvmc/llvmc.cpp
diff -u llvm/tools/llvmc/llvmc.cpp:1.14 llvm/tools/llvmc/llvmc.cpp:1.15
--- llvm/tools/llvmc/llvmc.cpp:1.14	Wed Sep  1 17:55:40 2004
+++ llvm/tools/llvmc/llvmc.cpp	Fri Sep  3 17:59:32 2004
@@ -323,7 +323,7 @@
 
     // All is good, return success
     return 0;
-  } catch (std::string& msg) {
+  } catch (const std::string& msg) {
     std::cerr << argv[0] << ": " << msg << "\n";
   } catch (...) {
     std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n";





From reid at x10sys.com  Fri Sep  3 18:18:04 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:18:04 -0500
Subject: [llvm-commits] CVS: llvm/utils/TableGen/TableGen.cpp 
Message-ID: <200409032318.SAA06857@zion.cs.uiuc.edu>



Changes in directory llvm/utils/TableGen:

TableGen.cpp updated: 1.34 -> 1.35
---
Log message:

Make tblgen's exception handling a little more robust by printing the 
program name and also catching ... 


---
Diffs of the changes:  (+8 -1)

Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.34 llvm/utils/TableGen/TableGen.cpp:1.35
--- llvm/utils/TableGen/TableGen.cpp:1.34	Wed Sep  1 17:55:40 2004
+++ llvm/utils/TableGen/TableGen.cpp	Fri Sep  3 18:17:54 2004
@@ -478,12 +478,19 @@
       return 1;
     }
   } catch (const std::string &Error) {
-    std::cerr << Error << "\n";
+    std::cerr << argv[0] << ": " << Error << "\n";
     if (Out != &std::cout) {
       delete Out;                             // Close the file
       std::remove(OutputFilename.c_str());    // Remove the file, it's broken
     }
     return 1;
+  } catch (...) {
+    std::cerr << argv[0] << ": Unknown unexpected exception occurred.\n";
+    if (Out != &std::cout) {
+      delete Out;                             // Close the file
+      std::remove(OutputFilename.c_str());    // Remove the file, it's broken
+    }
+    return 2;
   }
 
   if (Out != &std::cout) {





From reid at x10sys.com  Fri Sep  3 18:20:03 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:20:03 -0500
Subject: [llvm-commits] CVS: llvm/runtime/Makefile 
Message-ID: <200409032320.SAA06899@zion.cs.uiuc.edu>



Changes in directory llvm/runtime:

Makefile updated: 1.19 -> 1.20
---
Log message:

Clean up some "clean:" targets so they use $(VERB) and don't print anything
by default, like every other "clean" target in LLVM.


---
Diffs of the changes:  (+1 -1)

Index: llvm/runtime/Makefile
diff -u llvm/runtime/Makefile:1.19 llvm/runtime/Makefile:1.20
--- llvm/runtime/Makefile:1.19	Mon Aug  9 15:07:44 2004
+++ llvm/runtime/Makefile	Fri Sep  3 18:19:53 2004
@@ -28,5 +28,5 @@
 install::
 
 clean::
-	rm -f $(DESTLIBBYTECODE)/*
+	$(VERB) rm -f $(DESTLIBBYTECODE)/*
 





From reid at x10sys.com  Fri Sep  3 18:20:03 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:20:03 -0500
Subject: [llvm-commits] CVS: llvm/utils/TableGen/Makefile 
Message-ID: <200409032320.SAA06900@zion.cs.uiuc.edu>



Changes in directory llvm/utils/TableGen:

Makefile updated: 1.12 -> 1.13
---
Log message:

Clean up some "clean:" targets so they use $(VERB) and don't print anything
by default, like every other "clean" target in LLVM.


---
Diffs of the changes:  (+2 -2)

Index: llvm/utils/TableGen/Makefile
diff -u llvm/utils/TableGen/Makefile:1.12 llvm/utils/TableGen/Makefile:1.13
--- llvm/utils/TableGen/Makefile:1.12	Sun Aug 29 14:31:19 2004
+++ llvm/utils/TableGen/Makefile	Fri Sep  3 18:19:53 2004
@@ -20,5 +20,5 @@
 FileLexer.cpp: FileParser.h
 
 clean::
-	-rm -f FileParser.cpp FileParser.h FileLexer.cpp CommandLine.cpp
-	-rm -f FileParser.output
+	$(VERB) $(RM) -f FileParser.cpp FileParser.h FileLexer.cpp CommandLine.cpp
+	$(VERB) $(RM) -f FileParser.output





From reid at x10sys.com  Fri Sep  3 18:20:03 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:20:03 -0500
Subject: [llvm-commits] CVS: llvm/utils/Burg/Makefile 
Message-ID: <200409032320.SAA06903@zion.cs.uiuc.edu>



Changes in directory llvm/utils/Burg:

Makefile updated: 1.23 -> 1.24
---
Log message:

Clean up some "clean:" targets so they use $(VERB) and don't print anything
by default, like every other "clean" target in LLVM.


---
Diffs of the changes:  (+2 -2)

Index: llvm/utils/Burg/Makefile
diff -u llvm/utils/Burg/Makefile:1.23 llvm/utils/Burg/Makefile:1.24
--- llvm/utils/Burg/Makefile:1.23	Mon Oct 20 17:29:16 2003
+++ llvm/utils/Burg/Makefile	Fri Sep  3 18:19:53 2004
@@ -18,12 +18,12 @@
 $(SourceDir)/lex.c: gram.tab.h
 
 clean::
-	rm -rf gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp
+	$(VERB) $(RM) -rf gram.tab.h gram.tab.c core* *.aux *.log *.dvi sample sample.c tmp
 
 #$(BUILD_OBJ_DIR)/Release/lex.o $(BUILD_OBJ_DIR)/Profile/lex.o $(BUILD_OBJ_DIR)/Debug/lex.o: gram.tab.h
 
 doc.dvi: doc.tex
-	latex doc; latex doc
+	$(VERB) latex doc; latex doc
 
 
 test:: $(TOOLEXENAME_G) sample.gr





From reid at x10sys.com  Fri Sep  3 18:20:04 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:20:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/Makefile 
Message-ID: <200409032320.SAA06908@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/SparcV9:

Makefile updated: 1.44 -> 1.45
---
Log message:

Clean up some "clean:" targets so they use $(VERB) and don't print anything
by default, like every other "clean" target in LLVM.


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Target/SparcV9/Makefile
diff -u llvm/lib/Target/SparcV9/Makefile:1.44 llvm/lib/Target/SparcV9/Makefile:1.45
--- llvm/lib/Target/SparcV9/Makefile:1.44	Wed Aug  4 16:48:45 2004
+++ llvm/lib/Target/SparcV9/Makefile	Fri Sep  3 18:19:53 2004
@@ -54,5 +54,5 @@
 	$(TBLGEN) -I $(SourceDir) $< -gen-emitter -o $@
 
 clean::
-	$(RM) -f SparcV9CodeEmitter.inc SparcV9.burg.in1 SparcV9.burm SparcV9.burm.cpp
+	$(VERB) $(RM) -f SparcV9CodeEmitter.inc SparcV9.burg.in1 SparcV9.burm SparcV9.burm.cpp
 





From reid at x10sys.com  Fri Sep  3 18:38:35 2004
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 3 Sep 2004 18:38:35 -0500
Subject: [llvm-commits] CVS: llvm/Makefile.rules 
Message-ID: <200409032338.SAA07099@zion.cs.uiuc.edu>



Changes in directory llvm:

Makefile.rules updated: 1.191 -> 1.192
---
Log message:

Get rid of an un-needed and un-used GCCism. ATTR_DEPRECATED is used nowhere 
in the LLVM source base.


---
Diffs of the changes:  (+0 -3)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.191 llvm/Makefile.rules:1.192
--- llvm/Makefile.rules:1.191	Fri Aug 20 04:32:32 2004
+++ llvm/Makefile.rules	Fri Sep  3 18:38:25 2004
@@ -307,9 +307,6 @@
 # Pull in limit macros from stdint.h, even in C++:
 CPPFLAGS += -D__STDC_LIMIT_MACROS
 
-### FIXME: this is GCC specific
-CPPFLAGS += -DATTR_DEPRECATED='__attribute__ ((deprecated))'
-
 CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
 





From natebegeman at mac.com  Sat Sep  4 00:00:11 2004
From: natebegeman at mac.com (Nate Begeman)
Date: Sat, 4 Sep 2004 00:00:11 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
	PPC32ISelSimple.cpp PPC32TargetMachine.h PowerPC.h
	PowerPCInstrFormats.td PowerPCInstrInfo.td
	PowerPCTargetMachine.cpp PowerPCTargetMachine.h README.txt
	PPC64AsmPrinter.cpp 
Message-ID: <200409040500.AAA08645@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPC32AsmPrinter.cpp updated: 1.58 -> 1.59
PPC32ISelSimple.cpp updated: 1.77 -> 1.78
PPC32TargetMachine.h updated: 1.4 -> 1.5
PowerPC.h updated: 1.9 -> 1.10
PowerPCInstrFormats.td updated: 1.19 -> 1.20
PowerPCInstrInfo.td updated: 1.33 -> 1.34
PowerPCTargetMachine.cpp updated: 1.33 -> 1.34
PowerPCTargetMachine.h updated: 1.8 -> 1.9
README.txt updated: 1.18 -> 1.19
PPC64AsmPrinter.cpp (r1.10) removed
---
Log message:

All PPC instructions are now auto-printed
32 and 64 bit AsmWriters unified
Darwin and AIX specific features of AsmWriter split out


---
Diffs of the changes:  (+561 -313)

Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.58 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.59
--- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.58	Thu Sep  2 03:13:00 2004
+++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp	Sat Sep  4 00:00:00 2004
@@ -1,4 +1,4 @@
-//===-- PPC32AsmPrinter.cpp - Print machine instrs to PowerPC assembly ----===//
+//===-- PowerPCAsmPrinter.cpp - Print machine instrs to PowerPC assembly --===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,7 +18,7 @@
 
 #define DEBUG_TYPE "asmprinter"
 #include "PowerPC.h"
-#include "PPC32TargetMachine.h"
+#include "PowerPCTargetMachine.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
@@ -42,26 +42,20 @@
   struct PPC32AsmPrinter : public AsmPrinter {
     std::set<std::string> FnStubs, GVStubs, LinkOnceStubs;
     std::set<std::string> Strings;
-
+    
     PPC32AsmPrinter(std::ostream &O, TargetMachine &TM)
-      : AsmPrinter(O, TM), LabelNumber(0) {
-      CommentString = ";";
-      GlobalPrefix = "_";
-      ZeroDirective = "\t.space\t";  // ".space N" emits N zeros.
-      Data64bitsDirective = 0;       // we can't emit a 64-bit unit
-      AlignmentIsInBytes = false;    // Alignment is by power of 2.
-    }
+      : AsmPrinter(O, TM), LabelNumber(0) {}
 
     /// Unique incrementer for label values for referencing Global values.
     ///
     unsigned LabelNumber;
   
     virtual const char *getPassName() const {
-      return "PPC32 Assembly Printer";
+      return "PowerPC Assembly Printer";
     }
 
-    PPC32TargetMachine &getTM() {
-      return static_cast<PPC32TargetMachine&>(TM);
+    PowerPCTargetMachine &getTM() {
+      return static_cast<PowerPCTargetMachine&>(TM);
     }
 
     /// printInstruction - This method is automatically generated by tablegen
@@ -72,7 +66,6 @@
 
     void printMachineInstruction(const MachineInstr *MI);
     void printOp(const MachineOperand &MO, bool LoadAddrOp = false);
-    void printImmOp(const MachineOperand &MO, unsigned ArgType);
 
     void printOperand(const MachineInstr *MI, unsigned OpNo, MVT::ValueType VT){
       const MachineOperand &MO = MI->getOperand(OpNo);
@@ -98,13 +91,24 @@
       assert(value <= 63 && "Invalid u6imm argument!");
       O << (unsigned int)value;
     }
+    void printS16ImmOperand(const MachineInstr *MI, unsigned OpNo,
+                            MVT::ValueType VT) {
+      O << (short)MI->getOperand(OpNo).getImmedValue();
+    }
     void printU16ImmOperand(const MachineInstr *MI, unsigned OpNo,
                             MVT::ValueType VT) {
       O << (unsigned short)MI->getOperand(OpNo).getImmedValue();
     }
     void printBranchOperand(const MachineInstr *MI, unsigned OpNo,
                           MVT::ValueType VT) {
-      printOp(MI->getOperand(OpNo));
+      
+      // Branches can take an immediate operand.  This is used by the branch
+      // selection pass to print $+8, an eight byte displacement from the PC.
+      if (MI->getOperand(OpNo).isImmediate()) {
+        O << "$+" << MI->getOperand(OpNo).getImmedValue() << '\n';
+      } else {
+        printOp(MI->getOperand(OpNo));
+      }
     }
     void printPICLabel(const MachineInstr *MI, unsigned OpNo,
                          MVT::ValueType VT) {
@@ -112,80 +116,195 @@
       O << "\"L0000" << LabelNumber << "$pb\"\n";
       O << "\"L0000" << LabelNumber << "$pb\":";
     }
+    void printSymbolHi(const MachineInstr *MI, unsigned OpNo,
+                         MVT::ValueType VT) {
+      O << "ha16(";
+      printOp(MI->getOperand(OpNo), true /* LoadAddrOp */);
+      O << "-\"L0000" << LabelNumber << "$pb\")";
+    }
+    void printSymbolLo(const MachineInstr *MI, unsigned OpNo,
+                         MVT::ValueType VT) {
+      // FIXME: Because LFS, LFD, and LWZ can be used either with a s16imm or
+      // a lo16 of a global or constant pool operand, we must handle both here.
+      // this isn't a great design, but it works for now.
+      if (MI->getOperand(OpNo).isImmediate()) {
+        O << (short)MI->getOperand(OpNo).getImmedValue();
+      } else {
+        O << "lo16(";
+        printOp(MI->getOperand(OpNo), true /* LoadAddrOp */);
+        O << "-\"L0000" << LabelNumber << "$pb\")";
+      }
+    }
+  
+    virtual void printConstantPool(MachineConstantPool *MCP) = 0;
+    virtual bool runOnMachineFunction(MachineFunction &F) = 0;    
+    virtual bool doFinalization(Module &M) = 0;
+  };
+  
+  //
+  //
+  struct DarwinAsmPrinter : public PPC32AsmPrinter {
+
+    DarwinAsmPrinter(std::ostream &O, TargetMachine &TM)
+      : PPC32AsmPrinter(O, TM) {
+      CommentString = ";";
+      GlobalPrefix = "_";
+      ZeroDirective = "\t.space\t";  // ".space N" emits N zeros.
+      Data64bitsDirective = 0;       // we can't emit a 64-bit unit
+      AlignmentIsInBytes = false;    // Alignment is by power of 2.
+    }
+
+    virtual const char *getPassName() const {
+      return "Darwin PPC Assembly Printer";
+    }
 
     void printConstantPool(MachineConstantPool *MCP);
     bool runOnMachineFunction(MachineFunction &F);    
     bool doFinalization(Module &M);
   };
+  
+  //
+  //
+  struct AIXAsmPrinter : public PPC32AsmPrinter {
+    /// Map for labels corresponding to global variables
+    ///
+    std::map<const GlobalVariable*,std::string> GVToLabelMap;
+
+    AIXAsmPrinter(std::ostream &O, TargetMachine &TM)
+      : PPC32AsmPrinter(O, TM) {
+      CommentString = "#";
+      GlobalPrefix = "_";
+      ZeroDirective = "\t.space\t";  // ".space N" emits N zeros.
+      Data64bitsDirective = 0;       // we can't emit a 64-bit unit
+      AlignmentIsInBytes = false;    // Alignment is by power of 2.
+    }
+    
+    virtual const char *getPassName() const {
+      return "AIX PPC Assembly Printer";
+    }
+
+    void printConstantPool(MachineConstantPool *MCP);
+    bool runOnMachineFunction(MachineFunction &F);    
+    bool doInitialization(Module &M);
+    bool doFinalization(Module &M);
+  };
 } // end of anonymous namespace
 
-/// createPPC32AsmPrinterPass - Returns a pass that prints the PPC
-/// assembly code for a MachineFunction to the given output stream,
-/// using the given target machine description.  This should work
-/// regardless of whether the function is in SSA form or not.
-///
-FunctionPass *llvm::createPPC32AsmPrinter(std::ostream &o, TargetMachine &tm) {
-  return new PPC32AsmPrinter(o, tm);
+// SwitchSection - Switch to the specified section of the executable if we are
+// not already in it!
+//
+static void SwitchSection(std::ostream &OS, std::string &CurSection,
+                          const char *NewSection) {
+  if (CurSection != NewSection) {
+    CurSection = NewSection;
+    if (!CurSection.empty())
+      OS << "\t" << NewSection << "\n";
+  }
 }
 
-// Include the auto-generated portion of the assembly writer
-#include "PowerPCGenAsmWriter.inc"
+/// isStringCompatible - Can we treat the specified array as a string?
+/// Only if it is an array of ubytes or non-negative sbytes.
+///
+static bool isStringCompatible(const ConstantArray *CVA) {
+  const Type *ETy = cast<ArrayType>(CVA->getType())->getElementType();
+  if (ETy == Type::UByteTy) return true;
+  if (ETy != Type::SByteTy) return false;
+
+  for (unsigned i = 0; i < CVA->getNumOperands(); ++i)
+    if (cast<ConstantSInt>(CVA->getOperand(i))->getValue() < 0)
+      return false;
 
-/// printConstantPool - Print to the current output stream assembly
-/// representations of the constants in the constant pool MCP. This is
-/// used to print out constants which have been "spilled to memory" by
-/// the code generator.
+  return true;
+}
+
+/// toOctal - Convert the low order bits of X into an octal digit.
 ///
-void PPC32AsmPrinter::printConstantPool(MachineConstantPool *MCP) {
-  const std::vector<Constant*> &CP = MCP->getConstants();
-  const TargetData &TD = TM.getTargetData();
- 
-  if (CP.empty()) return;
+static inline char toOctal(int X) {
+  return (X&7)+'0';
+}
 
-  for (unsigned i = 0, e = CP.size(); i != e; ++i) {
-    O << "\t.const\n";
-    emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType()));
-    O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString
-      << *CP[i] << "\n";
-    emitGlobalConstant(CP[i]);
+// Possible states while outputting ASCII strings
+namespace {
+  enum StringSection {
+    None,
+    Alpha,
+    Numeric
+  };
+}
+
+/// SwitchStringSection - manage the changes required to output bytes as
+/// characters in a string vs. numeric decimal values
+/// 
+static inline void SwitchStringSection(std::ostream &O, StringSection NewSect,
+                                       StringSection &Current) {
+  if (Current == None) {
+    if (NewSect == Alpha)
+      O << "\t.byte \"";
+    else if (NewSect == Numeric)
+      O << "\t.byte ";
+  } else if (Current == Alpha) {
+    if (NewSect == None)
+      O << "\"";
+    else if (NewSect == Numeric) 
+      O << "\"\n"
+        << "\t.byte ";
+  } else if (Current == Numeric) {
+    if (NewSect == Alpha)
+      O << '\n'
+        << "\t.byte \"";
+    else if (NewSect == Numeric)
+      O << ", ";
   }
+
+  Current = NewSect;
 }
 
-/// runOnMachineFunction - This uses the printMachineInstruction()
-/// method to print assembly for each instruction.
+/// getAsCString - Return the specified array as a C compatible
+/// string, only if the predicate isStringCompatible is true.
 ///
-bool PPC32AsmPrinter::runOnMachineFunction(MachineFunction &MF) {
-  setupMachineFunction(MF);
-  O << "\n\n";
+static void printAsCString(std::ostream &O, const ConstantArray *CVA) {
+  assert(isStringCompatible(CVA) && "Array is not string compatible!");
 
-  // Print out constants referenced by the function
-  printConstantPool(MF.getConstantPool());
-
-  // Print out labels for the function.
-  O << "\t.text\n";
-  emitAlignment(2);
-  O << "\t.globl\t" << CurrentFnName << "\n";
-  O << CurrentFnName << ":\n";
+  if (CVA->getNumOperands() == 0)
+    return;
 
-  // Print out code for the function.
-  for (MachineFunction::const_iterator I = MF.begin(), E = MF.end();
-       I != E; ++I) {
-    // Print a label for the basic block.
-    O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t"
-      << CommentString << " " << I->getBasicBlock()->getName() << "\n";
-    for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();
-         II != E; ++II) {
-      // Print the assembly for the instruction.
-      O << "\t";
-      printMachineInstruction(II);
+  StringSection Current = None;
+  for (unsigned i = 0, e = CVA->getNumOperands(); i != e; ++i) {
+    unsigned char C = cast<ConstantInt>(CVA->getOperand(i))->getRawValue();
+    if (C == '"') {
+      SwitchStringSection(O, Alpha, Current);
+      O << "\"\"";
+    } else if (isprint(C)) {
+      SwitchStringSection(O, Alpha, Current);
+      O << C;
+    } else {
+      SwitchStringSection(O, Numeric, Current);
+      O << utostr((unsigned)C);
     }
   }
-  ++LabelNumber;
+  SwitchStringSection(O, None, Current);
+  O << '\n';
+}
 
-  // We didn't modify anything.
-  return false;
+/// createDarwinAsmPrinterPass - Returns a pass that prints the PPC assembly 
+/// code for a MachineFunction to the given output stream, in a format that the 
+/// Darwin assembler can deal with.
+///
+FunctionPass *llvm::createDarwinAsmPrinter(std::ostream &o, TargetMachine &tm) {
+  return new DarwinAsmPrinter(o, tm);
 }
 
+/// createAIXAsmPrinterPass - Returns a pass that prints the PPC assembly code
+/// for a MachineFunction to the given output stream, in a format that the 
+/// AIX 5L assembler can deal with.
+///
+FunctionPass *llvm::createAIXAsmPrinter(std::ostream &o, TargetMachine &tm) {
+  return new AIXAsmPrinter(o, tm);
+}
+
+// Include the auto-generated portion of the assembly writer
+#include "PowerPCGenAsmWriter.inc"
+
 void PPC32AsmPrinter::printOp(const MachineOperand &MO,
                               bool LoadAddrOp /* = false */) {
   const MRegisterInfo &RI = *TM.getRegisterInfo();
@@ -268,15 +387,6 @@
   }
 }
 
-void PPC32AsmPrinter::printImmOp(const MachineOperand &MO, unsigned ArgType) {
-  int Imm = MO.getImmedValue();
-  if (ArgType == PPCII::Simm16 || ArgType == PPCII::Disimm16) {
-    O << (short)Imm;
-  } else {
-    O << Imm;
-  }
-}
-
 /// printMachineInstruction -- Print out a single PowerPC MI in Darwin syntax to
 /// the current output stream.
 ///
@@ -284,100 +394,68 @@
   ++EmittedInsts;
   if (printInstruction(MI))
     return; // Printer was automatically generated
-    
-  unsigned Opcode = MI->getOpcode();
-  const TargetInstrInfo &TII = *TM.getInstrInfo();
-  const TargetInstrDescriptor &Desc = TII.get(Opcode);
-  unsigned i;
-
-  unsigned ArgCount = MI->getNumOperands();
-  unsigned ArgType[] = {
-    (Desc.TSFlags >> PPCII::Arg0TypeShift) & PPCII::ArgTypeMask,
-    (Desc.TSFlags >> PPCII::Arg1TypeShift) & PPCII::ArgTypeMask,
-    (Desc.TSFlags >> PPCII::Arg2TypeShift) & PPCII::ArgTypeMask,
-    (Desc.TSFlags >> PPCII::Arg3TypeShift) & PPCII::ArgTypeMask,
-    (Desc.TSFlags >> PPCII::Arg4TypeShift) & PPCII::ArgTypeMask
-  };
-  assert(((Desc.TSFlags & PPCII::VMX) == 0) &&
-         "Instruction requires VMX support");
-  assert(((Desc.TSFlags & PPCII::PPC64) == 0) &&
-         "Instruction requires 64 bit support");
-
-  O << TII.getName(Opcode) << " ";
-  if (Opcode == PPC::LOADHiAddr) {
-    printOp(MI->getOperand(0));
-    O << ", ";
-    if (MI->getOperand(1).getReg() == PPC::R0)
-      O << "0";
-    else
-      printOp(MI->getOperand(1));
-    O << ", ha16(" ;
-    printOp(MI->getOperand(2), true /* LoadAddrOp */);
-     O << "-\"L0000" << LabelNumber << "$pb\")\n";
-  } else if (ArgCount == 3 && (MI->getOperand(2).isConstantPoolIndex() 
-                            || MI->getOperand(2).isGlobalAddress())) {
-    printOp(MI->getOperand(0));
-    O << ", lo16(";
-    printOp(MI->getOperand(2), true /* LoadAddrOp */);
-    O << "-\"L0000" << LabelNumber << "$pb\")";
-    O << "(";
-    if (MI->getOperand(1).getReg() == PPC::R0)
-      O << "0";
-    else
-      printOp(MI->getOperand(1));
-    O << ")\n";
-  } else if (ArgCount == 3 && ArgType[1] == PPCII::Disimm16) {
-    printOp(MI->getOperand(0));
-    O << ", ";
-    printImmOp(MI->getOperand(1), ArgType[1]);
-    O << "(";
-    if (MI->getOperand(2).hasAllocatedReg() &&
-        MI->getOperand(2).getReg() == PPC::R0)
-      O << "0";
-    else
-      printOp(MI->getOperand(2));
-    O << ")\n";
-  } else {
-    for (i = 0; i < ArgCount; ++i) {
-      // addi and friends
-      if (i == 1 && ArgCount == 3 && ArgType[2] == PPCII::Simm16 &&
-          MI->getOperand(1).hasAllocatedReg() && 
-          MI->getOperand(1).getReg() == PPC::R0) {
-        O << "0";
-      // for long branch support, bc $+8
-      } else if (i == 1 && ArgCount == 2 && MI->getOperand(1).isImmediate() &&
-                 TII.isBranch(MI->getOpcode())) {
-        O << "$+8";
-        assert(8 == MI->getOperand(i).getImmedValue()
-          && "branch off PC not to pc+8?");
-        //printOp(MI->getOperand(i));
-      } else if (MI->getOperand(i).isImmediate()) {
-        printImmOp(MI->getOperand(i), ArgType[i]);
-      } else {
-        printOp(MI->getOperand(i));
-      }
-      if (ArgCount - 1 == i)
-        O << "\n";
-      else
-        O << ", ";
+  
+  assert(0 && "Unhandled instruction in asm writer!");
+  abort();
+  return;
+}
+
+/// runOnMachineFunction - This uses the printMachineInstruction()
+/// method to print assembly for each instruction.
+///
+bool DarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
+  setupMachineFunction(MF);
+  O << "\n\n";
+
+  // Print out constants referenced by the function
+  printConstantPool(MF.getConstantPool());
+
+  // Print out labels for the function.
+  O << "\t.text\n";
+  emitAlignment(2);
+  O << "\t.globl\t" << CurrentFnName << "\n";
+  O << CurrentFnName << ":\n";
+
+  // Print out code for the function.
+  for (MachineFunction::const_iterator I = MF.begin(), E = MF.end();
+       I != E; ++I) {
+    // Print a label for the basic block.
+    O << ".LBB" << CurrentFnName << "_" << I->getNumber() << ":\t"
+      << CommentString << " " << I->getBasicBlock()->getName() << "\n";
+    for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();
+         II != E; ++II) {
+      // Print the assembly for the instruction.
+      O << "\t";
+      printMachineInstruction(II);
     }
   }
-  return;
+  ++LabelNumber;
+
+  // We didn't modify anything.
+  return false;
 }
 
-// SwitchSection - Switch to the specified section of the executable if we are
-// not already in it!
-//
-static void SwitchSection(std::ostream &OS, std::string &CurSection,
-                          const char *NewSection) {
-  if (CurSection != NewSection) {
-    CurSection = NewSection;
-    if (!CurSection.empty())
-      OS << "\t" << NewSection << "\n";
+/// printConstantPool - Print to the current output stream assembly
+/// representations of the constants in the constant pool MCP. This is
+/// used to print out constants which have been "spilled to memory" by
+/// the code generator.
+///
+void DarwinAsmPrinter::printConstantPool(MachineConstantPool *MCP) {
+  const std::vector<Constant*> &CP = MCP->getConstants();
+  const TargetData &TD = TM.getTargetData();
+ 
+  if (CP.empty()) return;
+
+  for (unsigned i = 0, e = CP.size(); i != e; ++i) {
+    O << "\t.const\n";
+    emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType()));
+    O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString
+      << *CP[i] << "\n";
+    emitGlobalConstant(CP[i]);
   }
 }
 
-bool PPC32AsmPrinter::doFinalization(Module &M) {
+bool DarwinAsmPrinter::doFinalization(Module &M) {
   const TargetData &TD = TM.getTargetData();
   std::string CurSection;
 
@@ -487,3 +565,145 @@
   AsmPrinter::doFinalization(M);
   return false; // success
 }
+
+/// runOnMachineFunction - This uses the printMachineInstruction()
+/// method to print assembly for each instruction.
+///
+bool AIXAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
+  CurrentFnName = MF.getFunction()->getName();
+
+  // Print out constants referenced by the function
+  printConstantPool(MF.getConstantPool());
+
+  // Print out header for the function.
+  O << "\t.csect .text[PR]\n"
+    << "\t.align 2\n"
+    << "\t.globl "  << CurrentFnName << '\n'
+    << "\t.globl ." << CurrentFnName << '\n'
+    << "\t.csect "  << CurrentFnName << "[DS],3\n"
+    << CurrentFnName << ":\n"
+    << "\t.llong ." << CurrentFnName << ", TOC[tc0], 0\n"
+    << "\t.csect .text[PR]\n"
+    << '.' << CurrentFnName << ":\n";
+
+  // Print out code for the function.
+  for (MachineFunction::const_iterator I = MF.begin(), E = MF.end();
+       I != E; ++I) {
+    // Print a label for the basic block.
+    O << "LBB" << CurrentFnName << "_" << I->getNumber() << ":\t# "
+      << I->getBasicBlock()->getName() << "\n";
+    for (MachineBasicBlock::const_iterator II = I->begin(), E = I->end();
+      II != E; ++II) {
+      // Print the assembly for the instruction.
+      O << "\t";
+      printMachineInstruction(II);
+    }
+  }
+  ++LabelNumber;
+
+  O << "LT.." << CurrentFnName << ":\n"
+    << "\t.long 0\n"
+    << "\t.byte 0,0,32,65,128,0,0,0\n"
+    << "\t.long LT.." << CurrentFnName << "-." << CurrentFnName << '\n'
+    << "\t.short 3\n"
+    << "\t.byte \"" << CurrentFnName << "\"\n"
+    << "\t.align 2\n";
+
+  // We didn't modify anything.
+  return false;
+}
+
+/// printConstantPool - Print to the current output stream assembly
+/// representations of the constants in the constant pool MCP. This is
+/// used to print out constants which have been "spilled to memory" by
+/// the code generator.
+///
+void AIXAsmPrinter::printConstantPool(MachineConstantPool *MCP) {
+  const std::vector<Constant*> &CP = MCP->getConstants();
+  const TargetData &TD = TM.getTargetData();
+ 
+  if (CP.empty()) return;
+
+  for (unsigned i = 0, e = CP.size(); i != e; ++i) {
+    O << "\t.const\n";
+    O << "\t.align " << (unsigned)TD.getTypeAlignment(CP[i]->getType())
+      << "\n";
+    O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t;"
+      << *CP[i] << "\n";
+    emitGlobalConstant(CP[i]);
+  }
+}
+
+bool AIXAsmPrinter::doInitialization(Module &M) {
+  const TargetData &TD = TM.getTargetData();
+  std::string CurSection;
+
+  O << "\t.machine \"ppc64\"\n" 
+    << "\t.toc\n"
+    << "\t.csect .text[PR]\n";
+
+  // Print out module-level global variables
+  for (Module::const_giterator I = M.gbegin(), E = M.gend(); I != E; ++I) {
+    if (!I->hasInitializer())
+      continue;
+ 
+    std::string Name = I->getName();
+    Constant *C = I->getInitializer();
+    // N.B.: We are defaulting to writable strings
+    if (I->hasExternalLinkage()) { 
+      O << "\t.globl " << Name << '\n'
+        << "\t.csect .data[RW],3\n";
+    } else {
+      O << "\t.csect _global.rw_c[RW],3\n";
+    }
+    O << Name << ":\n";
+    emitGlobalConstant(C);
+  }
+
+  // Output labels for globals
+  if (M.gbegin() != M.gend()) O << "\t.toc\n";
+  for (Module::const_giterator I = M.gbegin(), E = M.gend(); I != E; ++I) {
+    const GlobalVariable *GV = I;
+    // Do not output labels for unused variables
+    if (GV->isExternal() && GV->use_begin() == GV->use_end())
+      continue;
+
+    std::string Name = GV->getName();
+    std::string Label = "LC.." + utostr(LabelNumber++);
+    GVToLabelMap[GV] = Label;
+    O << Label << ":\n"
+      << "\t.tc " << Name << "[TC]," << Name;
+    if (GV->isExternal()) O << "[RW]";
+    O << '\n';
+  }
+
+  Mang = new Mangler(M, ".");
+  return false; // success
+}
+
+bool AIXAsmPrinter::doFinalization(Module &M) {
+  const TargetData &TD = TM.getTargetData();
+  // Print out module-level global variables
+  for (Module::const_giterator I = M.gbegin(), E = M.gend(); I != E; ++I) {
+    if (I->hasInitializer() || I->hasExternalLinkage())
+      continue;
+
+    std::string Name = I->getName();
+    if (I->hasInternalLinkage()) {
+      O << "\t.lcomm " << Name << ",16,_global.bss_c";
+    } else {
+      O << "\t.comm " << Name << "," << TD.getTypeSize(I->getType())
+        << "," << log2((unsigned)TD.getTypeAlignment(I->getType()));
+    }
+    O << "\t\t# ";
+    WriteAsOperand(O, I, true, true, &M);
+    O << "\n";
+  }
+
+  O << "_section_.text:\n"
+    << "\t.csect .data[RW],3\n"
+    << "\t.llong _section_.text\n";
+
+  delete Mang;
+  return false; // success
+}


Index: llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
diff -u llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.77 llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.78
--- llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp:1.77	Thu Sep  2 03:13:00 2004
+++ llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp	Sat Sep  4 00:00:00 2004
@@ -624,12 +624,13 @@
     copyGlobalBaseToRegister(MBB, IP, GlobalBase);
     BuildMI(*MBB, IP, PPC::LOADHiAddr, 2, Reg1).addReg(GlobalBase)
       .addConstantPoolIndex(CPI);
-    BuildMI(*MBB, IP, Opcode, 2, R).addReg(Reg1).addConstantPoolIndex(CPI);
+    BuildMI(*MBB, IP, Opcode, 2, R).addConstantPoolIndex(CPI).addReg(Reg1);
   } else if (isa<ConstantPointerNull>(C)) {
     // Copy zero (null pointer) to the register.
     BuildMI(*MBB, IP, PPC::LI, 1, R).addSImm(0);
   } else if (GlobalValue *GV = dyn_cast<GlobalValue>(C)) {
     // GV is located at base + distance
+    
     unsigned GlobalBase = makeAnotherReg(Type::IntTy);
     unsigned TmpReg = makeAnotherReg(GV->getType());
     unsigned Opcode = (GV->hasWeakLinkage() 
@@ -640,7 +641,7 @@
     copyGlobalBaseToRegister(MBB, IP, GlobalBase);
     BuildMI(*MBB, IP, PPC::LOADHiAddr, 2, TmpReg).addReg(GlobalBase)
       .addGlobalAddress(GV);
-    BuildMI(*MBB, IP, Opcode, 2, R).addReg(TmpReg).addGlobalAddress(GV);
+    BuildMI(*MBB, IP, Opcode, 2, R).addGlobalAddress(GV).addReg(TmpReg);
   
     // Add the GV to the list of things whose addresses have been taken.
     TM.AddressTaken.insert(GV);
@@ -1179,7 +1180,7 @@
     Opcode = getPPCOpcodeForSetCCNumber(SCI->getOpcode());
   } else {
     unsigned CondReg = getReg(Cond, MBB, IP);
-    BuildMI(*MBB, IP, PPC::CMPI, 2, PPC::CR0).addReg(CondReg).addSImm(0);
+    BuildMI(*MBB, IP, PPC::CMPWI, 2, PPC::CR0).addReg(CondReg).addSImm(0);
     Opcode = getPPCOpcodeForSetCCNumber(Instruction::SetNE);
   }
   unsigned TrueValue = getReg(TrueVal, BB, BB->end());


Index: llvm/lib/Target/PowerPC/PPC32TargetMachine.h
diff -u llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.4 llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.5
--- llvm/lib/Target/PowerPC/PPC32TargetMachine.h:1.4	Mon Aug 16 23:55:41 2004
+++ llvm/lib/Target/PowerPC/PPC32TargetMachine.h	Sat Sep  4 00:00:00 2004
@@ -17,11 +17,9 @@
 #include "PowerPCTargetMachine.h"
 #include "PPC32InstrInfo.h"
 #include "llvm/PassManager.h"
-#include <set>
 
 namespace llvm {
 
-class GlobalValue;
 class IntrinsicLowering;
 
 class PPC32TargetMachine : public PowerPCTargetMachine {
@@ -38,11 +36,6 @@
 
   bool addPassesToEmitMachineCode(FunctionPassManager &PM,
                                   MachineCodeEmitter &MCE);
-
-  // Two shared sets between the instruction selector and the printer allow for
-  // correct linkage on Darwin
-  std::set<GlobalValue*> CalledFunctions;
-  std::set<GlobalValue*> AddressTaken;
 };
 
 } // end namespace llvm


Index: llvm/lib/Target/PowerPC/PowerPC.h
diff -u llvm/lib/Target/PowerPC/PowerPC.h:1.9 llvm/lib/Target/PowerPC/PowerPC.h:1.10
--- llvm/lib/Target/PowerPC/PowerPC.h:1.9	Tue Aug 17 00:02:58 2004
+++ llvm/lib/Target/PowerPC/PowerPC.h	Sat Sep  4 00:00:00 2004
@@ -24,9 +24,9 @@
 
 FunctionPass *createPPCBranchSelectionPass();
 FunctionPass *createPPC32ISelSimple(TargetMachine &TM);
-FunctionPass *createPPC32AsmPrinter(std::ostream &OS, TargetMachine &TM);
 FunctionPass *createPPC64ISelSimple(TargetMachine &TM);
-FunctionPass *createPPC64AsmPrinter(std::ostream &OS, TargetMachine &TM);
+FunctionPass *createDarwinAsmPrinter(std::ostream &OS, TargetMachine &TM);
+FunctionPass *createAIXAsmPrinter(std::ostream &OS, TargetMachine &TM);
 
 } // end namespace llvm;
 


Index: llvm/lib/Target/PowerPC/PowerPCInstrFormats.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.19 llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.20
--- llvm/lib/Target/PowerPC/PowerPCInstrFormats.td:1.19	Thu Sep  2 03:13:00 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrFormats.td	Sat Sep  4 00:00:00 2004
@@ -42,7 +42,8 @@
 //
 // PowerPC instruction formats
 
-class I<string name, bits<6> opcode, bit ppc64, bit vmx> : Instruction {
+class I<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr> 
+  : Instruction {
   field bits<32> Inst;
 
   bits<3> ArgCount;
@@ -54,14 +55,16 @@
   bit PPC64 = ppc64;
   bit VMX = vmx;
 
-  let Name = name;
+  let Name = "";
   let Namespace = "PPC";
   let Inst{0-5} = opcode;
+  let OperandList = OL;
+  let AsmString = asmstr;
 }
 
 // 1.7.1 I-Form
 class IForm<bits<6> opcode, bit aa, bit lk, bit ppc64, bit vmx,
-            dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+            dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<24> LI;
 
   let ArgCount = 1;
@@ -74,13 +77,11 @@
   let Inst{6-29}  = LI;
   let Inst{30}    = aa;
   let Inst{31}    = lk;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 // 1.7.2 B-Form
-class BForm<string name, bits<6> opcode, bit aa, bit lk, bit ppc64, bit vmx>
-  : I<name, opcode, ppc64, vmx> {
+class BForm<bits<6> opcode, bit aa, bit lk, bit ppc64, bit vmx,
+            dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  BO;
   field bits<5>  BI;
   field bits<14> BD;
@@ -99,9 +100,9 @@
   let Inst{31}    = lk;
 }
 
-class BForm_ext<string name, bits<6> opcode, bit aa, bit lk, bits<5> bo, 
-                bits<5> bi, bit ppc64, bit vmx>
-  : BForm<name, opcode, aa, lk, ppc64, vmx> {
+class BForm_ext<bits<6> opcode, bit aa, bit lk, bits<5> bo, bits<5> bi, 
+                bit ppc64, bit vmx, dag OL, string asmstr>
+  : BForm<opcode, aa, lk, ppc64, vmx, OL, asmstr> {
   let ArgCount = 2;
   let Arg2Type = Imm5.Value;
   let Arg1Type = PCRelimm14.Value;
@@ -111,8 +112,8 @@
 }
 
 // 1.7.4 D-Form
-class DForm_base<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class DForm_base<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  A;
   field bits<5>  B;
   field bits<16> C;
@@ -129,32 +130,41 @@
   let Inst{16-31} = C;
 }
 
-class DForm_1<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_base<name, opcode, ppc64, vmx> {
+class DForm_1<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_base<opcode, ppc64, vmx, OL, asmstr> {
   let Arg1Type = Disimm16.Value;
-  let Arg2Type = Gpr0.Value;
+  let Arg2Type = Gpr.Value;
 }
 
-class DForm_2<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_base<name, opcode, ppc64, vmx>;
+class DForm_2<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_base<opcode, ppc64, vmx, OL, asmstr>;
 
-class DForm_2_r0<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_base<name, opcode, ppc64, vmx> {
-  let Arg1Type = Gpr0.Value;
+class DForm_2_r0<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : I<opcode, ppc64, vmx, OL, asmstr> {
+  field bits<5>  A;
+  field bits<16> B;
+  
+  let ArgCount = 2;
+  let Arg0Type = Gpr.Value;
+  let Arg1Type = Simm16.Value;
+  let Arg2Type = 0;
+  let Arg3Type = 0;
+  let Arg4Type = 0;
+ 
+  let Inst{6-10}  = A;
+  let Inst{11-15} = 0;
+  let Inst{16-31} = B;
 }
 
 // Currently we make the use/def reg distinction in ISel, not tablegen
-class DForm_3<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_1<name, opcode, ppc64, vmx>;
+class DForm_3<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_1<opcode, ppc64, vmx, OL, asmstr>;
 
-class DForm_4<bits<6> opcode, bit ppc64, bit vmx,
-              dag OL, string asmstr> : DForm_base<"", opcode, ppc64, vmx> {
-  let OperandList = OL;
-  let AsmString = asmstr;
-}
-
-class DForm_4_zero<string name, bits<6> opcode, bit ppc64, bit vmx,
-                   dag OL, string asmstr> : DForm_1<"", opcode, ppc64, vmx> {
+class DForm_4<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr> 
+  : DForm_base<opcode, ppc64, vmx, OL, asmstr>;
+              
+class DForm_4_zero<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_1<opcode, ppc64, vmx, OL, asmstr> {
   let ArgCount = 0;
   let Arg0Type = 0;
   let Arg1Type = 0;
@@ -162,12 +172,10 @@
   let A = 0;
   let B = 0;
   let C = 0;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
-class DForm_5<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class DForm_5<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<3>  BF;
   field bits<1>  L;
   field bits<5>  RA;
@@ -187,8 +195,8 @@
   let Inst{16-31} = I;
 }
 
-class DForm_5_ext<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_5<name, opcode, ppc64, vmx> {
+class DForm_5_ext<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_5<opcode, ppc64, vmx, OL, asmstr> {
   let L = ppc64;
   let ArgCount = 3;
   let Arg0Type = Imm3.Value;
@@ -197,15 +205,10 @@
   let Arg3Type = 0;
 }
 
-class DForm_6<bits<6> opcode, bit ppc64, bit vmx,
-              dag OL, string asmstr> 
-  : DForm_5<"", opcode, ppc64, vmx> {
-  let OperandList = OL;
-  let AsmString = asmstr;
-}
+class DForm_6<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr> 
+  : DForm_5<opcode, ppc64, vmx, OL, asmstr>;
 
-class DForm_6_ext<bits<6> opcode, bit ppc64, bit vmx,
-                  dag OL, string asmstr> 
+class DForm_6_ext<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
   : DForm_6<opcode, ppc64, vmx, OL, asmstr> {
   let L = ppc64;
   let ArgCount = 3;
@@ -215,24 +218,19 @@
   let Arg3Type = 0;
 }
 
-class DForm_7<string name, bits<6> opcode, bit ppc64, bit vmx> 
-  : DForm_base<name, opcode, ppc64, vmx> {
-  let Arg1Type = Imm5.Value;
-}
-
-class DForm_8<string name, bits<6> opcode, bit ppc64, bit vmx>
-  : DForm_1<name, opcode, ppc64, vmx> {
+class DForm_8<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_1<opcode, ppc64, vmx, OL, asmstr> {
   let Arg0Type = Fpr.Value;
 }
 
-class DForm_9<string name, bits<6> opcode, bit ppc64, bit vmx>
-  : DForm_1<name, opcode, ppc64, vmx> {
+class DForm_9<bits<6> opcode, bit ppc64, bit vmx, dag OL, string asmstr>
+  : DForm_1<opcode, ppc64, vmx, OL, asmstr> {
   let Arg0Type = Fpr.Value;
 }
 
 // 1.7.5 DS-Form
-class DSForm_1<string name, bits<6> opcode, bits<2> xo, bit ppc64, bit vmx> 
-  : I<name, opcode, ppc64, vmx> {
+class DSForm_1<bits<6> opcode, bits<2> xo, bit ppc64, bit vmx,
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  RST;
   field bits<14> DS;
   field bits<5>  RA;
@@ -250,12 +248,14 @@
   let Inst{30-31} = xo;
 }
 
-class DSForm_2<string name, bits<6> opcode, bits<2> xo, bit ppc64, bit vmx>
-  : DSForm_1<name, opcode, xo, ppc64, vmx>;
+class DSForm_2<bits<6> opcode, bits<2> xo, bit ppc64, bit vmx, 
+               dag OL, string asmstr>
+  : DSForm_1<opcode, xo, ppc64, vmx, OL, asmstr>;
 
 // 1.7.6 X-Form
 class XForm_base_r3xo<bits<6> opcode, bits<10> xo, bit rc, bit ppc64, bit vmx,
-                      dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+                      dag OL, string asmstr> 
+  : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5> RST;
   field bits<5> A;
   field bits<5> B;
@@ -272,8 +272,6 @@
   let Inst{16-20} = B;
   let Inst{21-30} = xo;
   let Inst{31}    = rc;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 
@@ -314,7 +312,7 @@
 }
 
 class XForm_16<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<3>  BF;
   field bits<1>  L; 
   field bits<5>  RA;
@@ -334,8 +332,6 @@
   let Inst{16-20} = RB;
   let Inst{21-30} = xo;
   let Inst{31}    = 0;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class XForm_16_ext<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
@@ -349,7 +345,7 @@
 }
 
 class XForm_17<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<3> BF;
   field bits<5> FRA;
   field bits<5> FRB;
@@ -367,8 +363,6 @@
   let Inst{16-20} = FRB;
   let Inst{21-30} = xo;
   let Inst{31}    = 0;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class XForm_25<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx,
@@ -405,7 +399,7 @@
 }
 
 class XLForm_2<bits<6> opcode, bits<10> xo, bit lk, bit ppc64, bit vmx, 
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  BO;
   field bits<5>  BI;
   field bits<2>  BH;
@@ -423,8 +417,6 @@
   let Inst{19-20} = BH;
   let Inst{21-30} = xo;
   let Inst{31}    = lk;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class XLForm_2_ext<bits<6> opcode, bits<10> xo, bits<5> bo, 
@@ -442,7 +434,7 @@
 
 // 1.7.8 XFX-Form
 class XFXForm_1<bits<6> opcode, bits<10> xo, bit ppc64, bit vmx, 
-                dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+                dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  ST;
   field bits<10> SPR;
 
@@ -457,8 +449,6 @@
   let Inst{11-20} = SPR;
   let Inst{21-30} = xo;
   let Inst{31}    = 0;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class XFXForm_1_ext<bits<6> opcode, bits<10> xo, bits<10> spr, bit ppc64, 
@@ -485,7 +475,7 @@
 
 // 1.7.10 XS-Form
 class XSForm_1<bits<6> opcode, bits<9> xo, bit rc, bit ppc64, bit vmx,
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5> RS;
   field bits<5> A;
   field bits<6> SH;
@@ -503,13 +493,11 @@
   let Inst{21-29} = xo;
   let Inst{30}    = SH{0};
   let Inst{31}    = rc;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 // 1.7.11 XO-Form
 class XOForm_1<bits<6> opcode, bits<9> xo, bit oe, bit rc, bit ppc64, bit vmx,
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   field bits<5>  RT;
   field bits<5>  RA;
   field bits<5>  RB;
@@ -527,8 +515,6 @@
   let Inst{21}    = oe;
   let Inst{22-30} = xo;
   let Inst{31}    = rc;  
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class XOForm_1r<bits<6> opcode, bits<9> xo, bit oe, bit rc, bit ppc64, bit vmx,
@@ -547,7 +533,7 @@
 
 // 1.7.12 A-Form
 class AForm_1<bits<6> opcode, bits<5> xo, bit rc, bit ppc64, bit vmx, 
-              dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+              dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   let ArgCount = 4;
   field bits<5>  FRT;
   field bits<5>  FRA;
@@ -566,8 +552,6 @@
   let Inst{21-25} = FRC;
   let Inst{26-30} = xo;
   let Inst{31}    = rc;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class AForm_2<bits<6> opcode, bits<5> xo, bit rc, bit ppc64, bit vmx, dag OL,
@@ -588,7 +572,7 @@
 
 // 1.7.13 M-Form
 class MForm_1<bits<6> opcode, bit rc, bit ppc64, bit vmx,
-              dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+              dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   let ArgCount = 5;
   field bits<5>  RS;
   field bits<5>  RA;
@@ -608,8 +592,6 @@
   let Inst{21-25} = MB;
   let Inst{26-30} = ME;
   let Inst{31}    = rc;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 class MForm_2<bits<6> opcode, bit rc, bit ppc64, bit vmx, 
@@ -620,7 +602,7 @@
 
 // 1.7.14 MD-Form
 class MDForm_1<bits<6> opcode, bits<3> xo, bit rc, bit ppc64, bit vmx,
-               dag OL, string asmstr> : I<"", opcode, ppc64, vmx> {
+               dag OL, string asmstr> : I<opcode, ppc64, vmx, OL, asmstr> {
   let ArgCount = 4;
   field bits<5>  RS;
   field bits<5>  RA;
@@ -640,13 +622,11 @@
   let Inst{27-29} = xo;
   let Inst{30}    = SH{0};
   let Inst{31}    = rc;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }
 
 //===----------------------------------------------------------------------===//
 
-class Pseudo<dag OL, string asmstr> : I<"", 0, 0, 0> {
+class Pseudo<dag OL, string asmstr> : I<0, 0, 0, OL, asmstr> {
   let ArgCount = 0;
   let PPC64 = 0;
   let VMX = 0;
@@ -658,6 +638,4 @@
   let Arg4Type = 0;
 
   let Inst{31-0} = 0;
-  let OperandList = OL;
-  let AsmString = asmstr;
 }


Index: llvm/lib/Target/PowerPC/PowerPCInstrInfo.td
diff -u llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.33 llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.34
--- llvm/lib/Target/PowerPC/PowerPCInstrInfo.td:1.33	Thu Sep  2 03:13:00 2004
+++ llvm/lib/Target/PowerPC/PowerPCInstrInfo.td	Sat Sep  4 00:00:00 2004
@@ -23,6 +23,9 @@
 def u6imm   : Operand<i8> {
   let PrintMethod = "printU6ImmOperand";
 }
+def s16imm  : Operand<i16> {
+  let PrintMethod = "printS16ImmOperand";
+}
 def u16imm  : Operand<i16> {
   let PrintMethod = "printU16ImmOperand";
 }
@@ -32,6 +35,12 @@
 def piclabel: Operand<i32> {
   let PrintMethod = "printPICLabel";
 }
+def symbolHi: Operand<i32> {
+  let PrintMethod = "printSymbolHi";
+}
+def symbolLo: Operand<i32> {
+  let PrintMethod = "printSymbolLo";
+}
 
 // Pseudo-instructions:
 def PHI : Pseudo<(ops), "; PHI">;
@@ -45,12 +54,18 @@
   def B : IForm<18, 0, 0, 0, 0, (ops target:$func), "b $func">;
   // FIXME: 4*CR# needs to be added to the BI field!
   // This will only work for CR0 as it stands now
-  def BLT : BForm_ext<"blt", 16, 0, 0, 12, 0, 0, 0>;
-  def BLE : BForm_ext<"ble", 16, 0, 0, 4,  1, 0, 0>;
-  def BEQ : BForm_ext<"beq", 16, 0, 0, 12, 2, 0, 0>;
-  def BGE : BForm_ext<"bge", 16, 0, 0, 4,  0, 0, 0>;
-  def BGT : BForm_ext<"bgt", 16, 0, 0, 12, 1, 0, 0>;
-  def BNE : BForm_ext<"bne", 16, 0, 0, 4,  2, 0, 0>;
+  def BLT : BForm_ext<16, 0, 0, 12, 0, 0, 0, (ops CRRC:$crS, target:$block),
+                      "blt $block">;
+  def BLE : BForm_ext<16, 0, 0, 4,  1, 0, 0, (ops CRRC:$crS, target:$block),
+                      "ble $block">;
+  def BEQ : BForm_ext<16, 0, 0, 12, 2, 0, 0, (ops CRRC:$crS, target:$block),
+                      "beq $block">;
+  def BGE : BForm_ext<16, 0, 0, 4,  0, 0, 0, (ops CRRC:$crS, target:$block),
+                      "bge $block">;
+  def BGT : BForm_ext<16, 0, 0, 12, 1, 0, 0, (ops CRRC:$crS, target:$block),
+                      "bgt $block">;
+  def BNE : BForm_ext<16, 0, 0, 4,  2, 0, 0, (ops CRRC:$crS, target:$block),
+                      "bne $block">;
 }
 
 let isBranch = 1, isTerminator = 1, isCall = 1, 
@@ -64,46 +79,55 @@
   def CALLindirect : XLForm_2_ext<19, 528, 20, 31, 1, 0, 0, (ops), "bctrl">;
 }
 
-def LA : DForm_2<"la", 14, 0, 0>;
-def LOADHiAddr : DForm_2_r0<"addis", 15, 0, 0>;
-
-def LBZ : DForm_1<"lbz", 35, 0, 0>;
-def LHA : DForm_1<"lha", 42, 0, 0>;
-def LHZ : DForm_1<"lhz", 40, 0, 0>;
-def LMW : DForm_1<"lmw", 46, 0, 0>;
-def LWZ : DForm_1<"lwz", 32, 0, 0>;
-def ADDI : DForm_2<"addi", 14, 0, 0>;
-def ADDIC : DForm_2<"addic",  12, 0, 0>;
-def ADDICo : DForm_2<"addic.",  13, 0, 0>;
-def ADDIS : DForm_2<"addis", 15, 0, 0>;
-def MULLI : DForm_2<"mulli", 7, 0, 0>;
-def SUBFIC : DForm_2<"subfic", 8, 0, 0>;
-def SUBI : DForm_2<"subi", 14, 0, 0>;
-def LI : DForm_2_r0<"li", 14, 0, 0>;
-def LIS : DForm_2_r0<"lis", 15, 0, 0>;
-def STMW : DForm_3<"stmw", 47, 0, 0>;
-def STB : DForm_3<"stb", 38, 0, 0>;
-def STBU : DForm_3<"stbu", 39, 0, 0>;
-def STH : DForm_3<"sth", 44, 0, 0>;
-def STHU : DForm_3<"sthu", 45, 0, 0>;
-def STW : DForm_3<"stw", 36, 0, 0>;
-def STWU : DForm_3<"stwu", 37, 0, 0>;
-def CMPI : DForm_5<"cmpi", 11, 0, 0>;
-def CMPWI : DForm_5_ext<"cmpwi", 11, 0, 0>;
-def CMPDI : DForm_5_ext<"cmpdi", 11, 1, 0>;
-def LFS : DForm_8<"lfs", 48, 0, 0>;
-def LFD : DForm_8<"lfd", 50, 0, 0>;
-def STFS : DForm_9<"stfs", 52, 0, 0>;
-def STFD : DForm_9<"stfd", 54, 0, 0>;
-
-def LWA : DSForm_1<"lwa", 58, 2, 1, 0>;
-def LD : DSForm_2<"ld", 58, 0, 1, 0>;
-def STD : DSForm_2<"std", 62, 0, 1, 0>;
-def STDU : DSForm_2<"stdu", 62, 1, 1, 0>;
-
 // D-Form instructions.  Most instructions that perform an operation on a
 // register and an immediate are of this type.
 //
+def LBZ : DForm_1<35, 0, 0, (ops GPRC:$rD, s16imm:$disp, GPRC:$rA),
+                  "lbz $rD, $disp($rA)">;
+def LHA : DForm_1<42, 0, 0, (ops GPRC:$rD, s16imm:$disp, GPRC:$rA),
+                  "lha $rD, $disp($rA)">;
+def LHZ : DForm_1<40, 0, 0, (ops GPRC:$rD, s16imm:$disp, GPRC:$rA),
+                  "lhz $rD, $disp($rA)">;
+def LMW : DForm_1<46, 0, 0, (ops GPRC:$rD, s16imm:$disp, GPRC:$rA),
+                  "lmw $rD, $disp($rA)">;
+def LWZ : DForm_1<32, 0, 0, (ops GPRC:$rD, symbolLo:$disp, GPRC:$rA),
+                  "lwz $rD, $disp($rA)">;
+def ADDI   : DForm_2<14, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "addi $rD, $rA, $imm">;
+def ADDIC  : DForm_2<12, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "addic $rD, $rA, $imm">;
+def ADDICo : DForm_2<13, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "addic. $rD, $rA, $imm">;
+def ADDIS  : DForm_2<15, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "addis $rD, $rA, $imm">;
+def LA     : DForm_2<14, 0, 0, (ops GPRC:$rD, symbolLo:$sym, GPRC:$rA),
+                     "la $rD, $sym($rA)">;
+def LOADHiAddr : DForm_2<15, 0, 0, (ops GPRC:$rD, GPRC:$rA, symbolHi:$sym),
+                         "addis $rD, $rA, $sym">;
+def MULLI  : DForm_2< 7, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "mulli $rD, $rA, $imm">;
+def SUBFIC : DForm_2< 8, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "subfic $rD, $rA, $imm">;
+def SUBI   : DForm_2<14, 0, 0, (ops GPRC:$rD, GPRC:$rA, s16imm:$imm),
+                     "subi $rD, $rA, $imm">;
+def LI  : DForm_2_r0<14, 0, 0, (ops GPRC:$rD, s16imm:$imm),
+                     "li $rD, $imm">;
+def LIS : DForm_2_r0<15, 0, 0, (ops GPRC:$rD, s16imm:$imm),
+                     "lis $rD, $imm">;
+def STMW : DForm_3<47, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stmw $rS, $disp($rA)">;
+def STB  : DForm_3<38, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stb $rS, $disp($rA)">;
+def STBU : DForm_3<39, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stbu $rS, $disp($rA)">;
+def STH  : DForm_3<44, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "sth $rS, $disp($rA)">;
+def STHU : DForm_3<45, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "sthu $rS, $disp($rA)">;
+def STW  : DForm_3<36, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stw $rS, $disp($rA)">;
+def STWU : DForm_3<37, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stwu $rS, $disp($rA)">;
 def ANDIo : DForm_4<28, 0, 0,
                     (ops GPRC:$dst, GPRC:$src1, u16imm:$src2),
                     "andi. $dst, $src1, $src2">;
@@ -119,16 +143,42 @@
 def XORIS : DForm_4<27, 0, 0,
                     (ops GPRC:$dst, GPRC:$src1, u16imm:$src2),
                     "xoris $dst, $src1, $src2">;
-def NOP   : DForm_4_zero<"nop", 24, 0, 0, (ops), "nop">;
+def NOP   : DForm_4_zero<24, 0, 0, (ops), "nop">;
+def CMPI  : DForm_5<11, 0, 0, (ops CRRC:$crD, i1imm:$L, GPRC:$rA, s16imm:$imm),
+                    "cmpi $crD, $L, $rA, $imm">;
+def CMPWI : DForm_5_ext<11, 0, 0, (ops CRRC:$crD, GPRC:$rA, s16imm:$imm),
+                        "cmpwi $crD, $rA, $imm">;
+def CMPDI : DForm_5_ext<11, 1, 0, (ops CRRC:$crD, GPRC:$rA, s16imm:$imm),
+                        "cmpdi $crD, $rA, $imm">;
 def CMPLI  : DForm_6<10, 0, 0,
-                    (ops CRRC:$dst, i1imm:$size, GPRC:$src1, u16imm:$src2),
-                         "cmpli $dst, $size, $src1, $src2">;
+                     (ops CRRC:$dst, i1imm:$size, GPRC:$src1, u16imm:$src2),
+                     "cmpli $dst, $size, $src1, $src2">;
 def CMPLWI : DForm_6_ext<10, 0, 0,
                          (ops CRRC:$dst, GPRC:$src1, u16imm:$src2),
                          "cmplwi $dst, $src1, $src2">;
 def CMPLDI : DForm_6_ext<10, 1, 0,
                          (ops CRRC:$dst, GPRC:$src1, u16imm:$src2),
                          "cmpldi $dst, $src1, $src2">;
+def LFS : DForm_8<48, 0, 0, (ops GPRC:$rD, symbolLo:$disp, GPRC:$rA),
+                  "lfs $rD, $disp($rA)">;
+def LFD : DForm_8<50, 0, 0, (ops GPRC:$rD, symbolLo:$disp, GPRC:$rA),
+                  "lfd $rD, $disp($rA)">;
+def STFS : DForm_9<52, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stfs $rS, $disp($rA)">;
+def STFD : DForm_9<54, 0, 0, (ops GPRC:$rS, s16imm:$disp, GPRC:$rA),
+                   "stfd $rS, $disp($rA)">;
+
+
+// DS-Form instructions.  Load/Store instructions available in PPC-64
+//
+def LWA  : DSForm_1<58, 2, 1, 0, (ops GPRC:$rT, s16imm:$DS, GPRC:$rA),
+                    "lwa $rT, $DS($rA)">;
+def LD   : DSForm_2<58, 0, 1, 0, (ops GPRC:$rT, s16imm:$DS, GPRC:$rA),
+                    "ld $rT, $DS($rA)">;
+def STD  : DSForm_2<62, 0, 1, 0, (ops GPRC:$rT, s16imm:$DS, GPRC:$rA),
+                    "std $rT, $DS($rA)">;
+def STDU : DSForm_2<62, 1, 1, 0, (ops GPRC:$rT, s16imm:$DS, GPRC:$rA),
+                    "stdu $rT, $DS($rA)">;
 
 // X-Form instructions.  Most instructions that perform an operation on a
 // register and another register are of this type.


Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.33 llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.34
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp:1.33	Wed Sep  1 17:55:36 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp	Sat Sep  4 00:00:00 2004
@@ -105,9 +105,9 @@
   PM.add(createPPCBranchSelectionPass());
   
   if (AIX)
-    PM.add(createPPC64AsmPrinter(Out, *this));
+    PM.add(createAIXAsmPrinter(Out, *this));
   else
-    PM.add(createPPC32AsmPrinter(Out, *this));
+    PM.add(createDarwinAsmPrinter(Out, *this));
     
   PM.add(createMachineCodeDeleter());
   return false;


Index: llvm/lib/Target/PowerPC/PowerPCTargetMachine.h
diff -u llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.8 llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.9
--- llvm/lib/Target/PowerPC/PowerPCTargetMachine.h:1.8	Tue Aug 17 00:08:44 2004
+++ llvm/lib/Target/PowerPC/PowerPCTargetMachine.h	Sat Sep  4 00:00:00 2004
@@ -18,6 +18,7 @@
 #include "PowerPCJITInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/PassManager.h"
+#include <set>
 
 namespace llvm {
 
@@ -41,6 +42,11 @@
   static unsigned getJITMatchQuality();
 
   virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
+
+  // Two shared sets between the instruction selector and the printer allow for
+  // correct linkage on Darwin
+  std::set<GlobalValue*> CalledFunctions;
+  std::set<GlobalValue*> AddressTaken;
 };
 
 } // end namespace llvm


Index: llvm/lib/Target/PowerPC/README.txt
diff -u llvm/lib/Target/PowerPC/README.txt:1.18 llvm/lib/Target/PowerPC/README.txt:1.19
--- llvm/lib/Target/PowerPC/README.txt:1.18	Sun Aug 29 17:02:43 2004
+++ llvm/lib/Target/PowerPC/README.txt	Sat Sep  4 00:00:00 2004
@@ -1,5 +1,5 @@
 TODO:
-* switch to auto-generated asm writer
+* implement not-R0 register GPR class
 * fix rlwimi generation to be use-and-def
 * implement scheduling info
 * implement powerpc-64 for darwin





From natebegeman at mac.com  Sat Sep  4 09:51:37 2004
From: natebegeman at mac.com (Nate Begeman)
Date: Sat, 4 Sep 2004 09:51:37 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp 
Message-ID: <200409041451.JAA20323@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPC32AsmPrinter.cpp updated: 1.59 -> 1.60
---
Log message:

Include MathExtras.h to fix build breakage, thanks to Vladimir

---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
diff -u llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.59 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.60
--- llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp:1.59	Sat Sep  4 00:00:00 2004
+++ llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp	Sat Sep  4 09:51:26 2004
@@ -29,6 +29,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Support/Mangler.h"
+#include "llvm/Support/MathExtras.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"





From reid at x10sys.com  Sat Sep  4 14:06:04 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:06:04 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/stkrc/Makefile
	stkrc.cpp 
Message-ID: <200409041906.OAA21226@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools/stkrc:

Makefile updated: 1.2 -> 1.3
stkrc.cpp updated: 1.6 -> 1.7
---
Log message:

Make the Stacker compiler handle -O1 .. -O5 options so it is compliant with
the compiler driver interface as an optimizing translator. Also clean up
error message handling.


---
Diffs of the changes:  (+98 -71)

Index: llvm/projects/Stacker/tools/stkrc/Makefile
diff -u llvm/projects/Stacker/tools/stkrc/Makefile:1.2 llvm/projects/Stacker/tools/stkrc/Makefile:1.3
--- llvm/projects/Stacker/tools/stkrc/Makefile:1.2	Sun Aug 29 17:01:44 2004
+++ llvm/projects/Stacker/tools/stkrc/Makefile	Sat Sep  4 14:05:53 2004
@@ -9,7 +9,10 @@
 # Give the name of a library.  This will build a dynamic version.
 #
 TOOLNAME=stkrc
-USEDLIBS=stkr_compiler asmparser bcwriter vmcore support.a LLVMsystem.a
+USEDLIBS=stkr_compiler asmparser bcwriter transforms ipo.a ipa.a \
+	 scalaropts analysis.a target.a transformutils \
+	 vmcore support.a LLVMsystem.a 
+
 
 ifdef PARSE_DEBUG
 CPPFLAGS = -DPARSE_DEBUG=1


Index: llvm/projects/Stacker/tools/stkrc/stkrc.cpp
diff -u llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.6 llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.7
--- llvm/projects/Stacker/tools/stkrc/stkrc.cpp:1.6	Wed Sep  1 17:55:37 2004
+++ llvm/projects/Stacker/tools/stkrc/stkrc.cpp	Sat Sep  4 14:05:53 2004
@@ -59,94 +59,118 @@
 static cl::opt<bool>
 EchoSource("e", cl::desc("Print Stacker Source as parsed"), cl::Hidden);
 
+enum OptLev {
+  None = 0,
+  One = 1,
+  Two = 2,
+  Three = 3,
+  Four = 4,
+  Five = 5
+};
+
+static cl::opt<OptLev> OptLevel(
+  cl::desc("Choose optimization level to apply:"),
+  cl::init(One),
+  cl::values(
+    clEnumValN(None,"O0","An alias for the -O1 option"),
+    clEnumValN(One,"O1","Optimize for compilation speed"),
+    clEnumValN(Two,"O2","Perform simple optimizations to reduce code size"),
+    clEnumValN(Three,"O3","More aggressive optimizations"),
+    clEnumValN(Four,"O4","High level of optimization"),
+    clEnumValN(Five,"O5","An alias for the -O4 option"),
+    clEnumValEnd
+  ));
+
 int main(int argc, char **argv) 
 {
   cl::ParseCommandLineOptions(argc, argv, " stacker .st -> .bc compiler\n");
 
   std::ostream *Out = 0;
-  StackerCompiler compiler;
-  try 
-  {
-#ifdef PARSE_DEBUG
+  try {
+    StackerCompiler compiler;
+    try 
     {
-	extern int Stackerdebug;
-	Stackerdebug = ParseDebug;
-    }
+#ifdef PARSE_DEBUG
+      {
+          extern int Stackerdebug;
+          Stackerdebug = ParseDebug;
+      }
 #endif
 #ifdef FLEX_DEBUG
-    {
-	extern int Stacker_flex_debug;
-	Stacker_flex_debug = FlexDebug;
-    }
+      {
+          extern int Stacker_flex_debug;
+          Stacker_flex_debug = FlexDebug;
+      }
 #endif
-    // Parse the file now...
-    
-    std::auto_ptr<Module> M ( 
-	compiler.compile(InputFilename,EchoSource, StackSize) );
-    if (M.get() == 0) {
-      std::cerr << argv[0] << ": assembly didn't read correctly.\n";
-      return 1;
-    }
+      // Parse the file now...
+      
+      std::auto_ptr<Module> M ( 
+          compiler.compile(InputFilename,EchoSource,OptLevel,StackSize));
+      if (M.get() == 0) {
+        throw std::string("program didn't parse correctly.");
+      }
 
-    if (verifyModule(*M.get())) {
-      std::cerr << argv[0]
-                << ": assembly parsed, but does not verify as correct!\n";
-      return 1;
-    }
-  
-    if (DumpAsm) std::cerr << "Here's the assembly:\n" << M.get();
+      if (verifyModule(*M.get())) {
+        throw std::string("program parsed, but does not verify as correct!");
+      }
+    
+      if (DumpAsm) 
+        std::cerr << "Here's the assembly:" << M.get();
 
-    if (OutputFilename != "") {   // Specified an output filename?
-      if (OutputFilename != "-") {  // Not stdout?
-        if (!Force && std::ifstream(OutputFilename.c_str())) {
-          // If force is not specified, make sure not to overwrite a file!
-          std::cerr << argv[0] << ": error opening '" << OutputFilename
-                    << "': file exists!\n"
-                    << "Use -f command line argument to force output\n";
-          return 1;
+      if (OutputFilename != "") {   // Specified an output filename?
+        if (OutputFilename != "-") {  // Not stdout?
+          if (!Force && std::ifstream(OutputFilename.c_str())) {
+            // If force is not specified, make sure not to overwrite a file!
+            throw std::string("error opening '") + OutputFilename +
+                    "': file exists!\n" +
+                    "Use -f command line argument to force output";
+            return 1;
+          }
+          Out = new std::ofstream(OutputFilename.c_str());
+        } else {                      // Specified stdout
+          Out = &std::cout;       
         }
-        Out = new std::ofstream(OutputFilename.c_str());
-      } else {                      // Specified stdout
-	Out = &std::cout;       
-      }
-    } else {
-      if (InputFilename == "-") {
-	OutputFilename = "-";
-	Out = &std::cout;
       } else {
-	std::string IFN = InputFilename;
-	int Len = IFN.length();
-	if (IFN[Len-3] == '.' && IFN[Len-2] == 's' && IFN[Len-1] == 't') {
-	  // Source ends in .ll
-	  OutputFilename = std::string(IFN.begin(), IFN.end()-3);
+        if (InputFilename == "-") {
+          OutputFilename = "-";
+          Out = &std::cout;
         } else {
-	  OutputFilename = IFN;   // Append a .bc to it
-	}
-	OutputFilename += ".bc";
-
-        if (!Force && std::ifstream(OutputFilename.c_str())) {
-          // If force is not specified, make sure not to overwrite a file!
-          std::cerr << argv[0] << ": error opening '" << OutputFilename
-                    << "': file exists!\n"
-                    << "Use -f command line argument to force output\n";
-          return 1;
+          std::string IFN = InputFilename;
+          int Len = IFN.length();
+          if (IFN[Len-3] == '.' && IFN[Len-2] == 's' && IFN[Len-1] == 't') {
+            // Source ends in .ll
+            OutputFilename = std::string(IFN.begin(), IFN.end()-3);
+          } else {
+            OutputFilename = IFN;   // Append a .bc to it
+          }
+          OutputFilename += ".bc";
+
+          if (!Force && std::ifstream(OutputFilename.c_str())) {
+            // If force is not specified, make sure not to overwrite a file!
+            throw std::string("error opening '") + OutputFilename +
+                    "': file exists!\n" +
+                    "Use -f command line argument to force output\n";
+          }
+
+          Out = new std::ofstream(OutputFilename.c_str());
+          // Make sure that the Out file gets unlinked from the disk if we get a
+          // SIGINT
+          sys::RemoveFileOnSignal(OutputFilename);
         }
-
-	Out = new std::ofstream(OutputFilename.c_str());
-        // Make sure that the Out file gets unlinked from the disk if we get a
-        // SIGINT
-        sys::RemoveFileOnSignal(OutputFilename);
       }
-    }
-  
-    if (!Out->good()) {
-      std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
+    
+      if (!Out->good()) {
+        throw std::string("error opening ") + OutputFilename + "!";
+      }
+     
+      WriteBytecodeToFile(M.get(), *Out);
+    } catch (const ParseException &E) {
+      std::cerr << argv[0] << ": " << E.getMessage() << "\n";
       return 1;
     }
-   
-    WriteBytecodeToFile(M.get(), *Out);
-  } catch (const ParseException &E) {
-    std::cerr << argv[0] << ": " << E.getMessage() << "\n";
+  }
+  catch (const std::string& msg ) {
+    std::cerr << argv[0] << ": " << msg << "\n";
     return 1;
   }
 





From reid at x10sys.com  Sat Sep  4 14:07:42 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:07:42 -0500
Subject: [llvm-commits] 
	CVS: llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp
	StackerCompiler.h 
Message-ID: <200409041907.OAA21250@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/compiler:

StackerCompiler.cpp updated: 1.9 -> 1.10
StackerCompiler.h updated: 1.4 -> 1.5
---
Log message:

Make the StackerCompiler and optimizing translator by running specific
optimizations after construction of the Module. The OptLevel argument
to the compile function controls the level of optimization.


---
Diffs of the changes:  (+92 -3)

Index: llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp
diff -u llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.9 llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.10
--- llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp:1.9	Wed Sep  1 22:24:08 2004
+++ llvm/projects/Stacker/lib/compiler/StackerCompiler.cpp	Sat Sep  4 14:07:32 2004
@@ -16,9 +16,15 @@
 //            Globasl - Global variables we use 
 //===----------------------------------------------------------------------===//
 
-#include <llvm/Analysis/Verifier.h>
-#include <llvm/Instructions.h>
-#include <llvm/ADT/Statistic.h>
+#include "llvm/PassManager.h"
+#include "llvm/Analysis/LoadValueNumbering.h"
+#include "llvm/Analysis/Verifier.h"
+#include "llvm/Assembly/Parser.h"
+#include "llvm/Target/TargetData.h"
+#include "llvm/Transforms/IPO.h"
+#include "llvm/Transforms/Scalar.h"
+#include "llvm/Instructions.h"
+#include "llvm/ADT/Statistic.h"
 #include "StackerCompiler.h"
 #include "StackerParser.h"
 #include <string>
@@ -80,6 +86,7 @@
 StackerCompiler::compile(
     const std::string& filename,
     bool should_echo,
+    unsigned optLevel,
     size_t the_stack_size
 )
 {
@@ -254,6 +261,87 @@
 	// Avoid potential illegal use (TheInstance might be on the stack)
 	TheInstance = 0;
 
+        // Set up a pass manager
+        PassManager Passes;
+        // Add in the passes we want to execute
+        Passes.add(new TargetData("stkrc",TheModule));
+        // Verify we start with valid
+        Passes.add(createVerifierPass());          
+
+        if (optLevel > 0) {
+            if (optLevel > 1) {
+                // Clean up disgusting code
+                Passes.add(createCFGSimplificationPass()); 
+                // Mark read-only globals const
+                Passes.add(createGlobalConstifierPass());  
+                // Remove unused globals
+                Passes.add(createGlobalDCEPass());         
+                // IP Constant Propagation
+                Passes.add(createIPConstantPropagationPass());
+                // Clean up after IPCP 
+                Passes.add(createInstructionCombiningPass()); 
+                // Clean up after IPCP 
+                Passes.add(createCFGSimplificationPass());    
+                // Inline small definitions (functions)
+                Passes.add(createFunctionInliningPass());
+                // Simplify cfg by copying code
+                Passes.add(createTailDuplicationPass());
+                if (optLevel > 2) {
+                    // Merge & remove BBs
+                    Passes.add(createCFGSimplificationPass());
+                    // Compile silly sequences
+                    Passes.add(createInstructionCombiningPass());
+                    // Reassociate expressions
+                    Passes.add(createReassociatePass());
+                    // Combine silly seq's
+                    Passes.add(createInstructionCombiningPass()); 
+                    // Eliminate tail calls
+                    Passes.add(createTailCallEliminationPass());  
+                    // Merge & remove BBs
+                    Passes.add(createCFGSimplificationPass());    
+                    // Hoist loop invariants
+                    Passes.add(createLICMPass());                 
+                    // Clean up after the unroller
+                    Passes.add(createInstructionCombiningPass()); 
+                    // Canonicalize indvars
+                    Passes.add(createIndVarSimplifyPass());       
+                    // Unroll small loops
+                    Passes.add(createLoopUnrollPass());           
+                    // Clean up after the unroller
+                    Passes.add(createInstructionCombiningPass()); 
+                    // GVN for load instructions
+                    Passes.add(createLoadValueNumberingPass());   
+                    // Remove common subexprs
+                    Passes.add(createGCSEPass());                 
+                    // Constant prop with SCCP
+                    Passes.add(createSCCPPass());
+                }
+                if (optLevel > 3) {
+                    // Run instcombine again after redundancy elimination
+                    Passes.add(createInstructionCombiningPass());
+                    // Delete dead stores
+                    Passes.add(createDeadStoreEliminationPass()); 
+                    // SSA based 'Aggressive DCE'
+                    Passes.add(createAggressiveDCEPass());        
+                    // Merge & remove BBs
+                    Passes.add(createCFGSimplificationPass());
+                    // Merge dup global constants
+                    Passes.add(createConstantMergePass());        
+                }
+            }
+
+            // Merge & remove BBs
+            Passes.add(createCFGSimplificationPass());
+            // Memory To Register
+            Passes.add(createPromoteMemoryToRegister());
+            // Compile silly sequences
+            Passes.add(createInstructionCombiningPass());
+            // Make sure everything is still good.
+            Passes.add(createVerifierPass());
+        }
+
+        // Run our queue of passes all at once now, efficiently.
+        Passes.run(*TheModule);
 
     } catch (...) {
 	if (F != stdin) fclose(F);      // Make sure to close file descriptor 


Index: llvm/projects/Stacker/lib/compiler/StackerCompiler.h
diff -u llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.4 llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.5
--- llvm/projects/Stacker/lib/compiler/StackerCompiler.h:1.4	Wed Sep  1 22:24:08 2004
+++ llvm/projects/Stacker/lib/compiler/StackerCompiler.h	Sat Sep  4 14:07:32 2004
@@ -69,6 +69,7 @@
 	Module* compile( 
 	    const std::string& filename, ///< File to compile
 	    bool echo, ///< Causes compiler to echo output
+            unsigned optLevel, ///< Level of optimization
 	    size_t stack_size ); ///< Size of generated stack
     /// @}
     /// @name Accessors





From llvm at cs.uiuc.edu  Sat Sep  4 14:46:37 2004
From: llvm at cs.uiuc.edu (LLVM)
Date: Sat, 4 Sep 2004 14:46:37 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/autoconf/
Message-ID: <200409041946.OAA21348@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/autoconf:

---
Log message:

Directory /var/cvs/llvm/llvm/projects/Stacker/autoconf added to the repository


---
Diffs of the changes:  (+0 -0)




From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/Makefile 
Message-ID: <200409041949.OAA21415@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools:

Makefile updated: 1.2 -> 1.3
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/Stacker/tools/Makefile
diff -u llvm/projects/Stacker/tools/Makefile:1.2 llvm/projects/Stacker/tools/Makefile:1.3
--- llvm/projects/Stacker/tools/Makefile:1.2	Sun Nov 23 11:59:43 2003
+++ llvm/projects/Stacker/tools/Makefile	Sat Sep  4 14:48:50 2004
@@ -7,7 +7,7 @@
 #
 # Indicates our relative path to the top of the project's root directory.
 #
-LEVEL = ../../..
+LEVEL = ..
 
 #
 # Directories that needs to be built.





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/autoconf/AutoRegen.sh
	LICENSE.TXT acinclude.m4 config.guess config.sub configure.ac
	install-sh ltmain.sh mkinstalldirs 
Message-ID: <200409041949.OAA21447@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/autoconf:

AutoRegen.sh added (r1.1)
LICENSE.TXT added (r1.1)
acinclude.m4 added (r1.1)
config.guess added (r1.1)
config.sub added (r1.1)
configure.ac added (r1.1)
install-sh added (r1.1)
ltmain.sh added (r1.1)
mkinstalldirs added (r1.1)
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+15932 -0)

Index: llvm/projects/Stacker/autoconf/AutoRegen.sh
diff -c /dev/null llvm/projects/Stacker/autoconf/AutoRegen.sh:1.1
*** /dev/null	Sat Sep  4 14:49:00 2004
--- llvm/projects/Stacker/autoconf/AutoRegen.sh	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,18 ----
+ #!/bin/sh
+ die () {
+ 	echo "$@" 1>&2
+ 	exit 1
+ }
+ test -d autoconf && test -f autoconf/configure.ac && cd autoconf
+ [ -f configure.ac ] || die "Can't find 'autoconf' dir; please cd into it first"
+ echo "Regenerating aclocal.m4 with aclocal"
+ aclocal || die "aclocal failed"
+ autoconf --version | egrep '2\.5[0-9]' > /dev/null
+ if test $? -ne 0
+ then
+ 	die "Your autoconf was not detected as being 2.5x"
+ fi
+ echo "Regenerating configure with autoconf 2.5x"
+ autoconf -o ../configure configure.ac || die "autoconf failed"
+ cd ..
+ exit 0


Index: llvm/projects/Stacker/autoconf/LICENSE.TXT
diff -c /dev/null llvm/projects/Stacker/autoconf/LICENSE.TXT:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/LICENSE.TXT	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,24 ----
+ ------------------------------------------------------------------------------
+ Autoconf Files
+ ------------------------------------------------------------------------------
+ All autoconf files are licensed under the LLVM license with the following
+ additions:
+ 
+ llvm/autoconf/install-sh:
+ 	This script is licensed under the LLVM license, with the following
+ 	additional copyrights and restrictions:
+ 
+ 	Copyright 1991 by the Massachusetts Institute of Technology
+ 
+ 	Permission to use, copy, modify, distribute, and sell this software and its
+ 	documentation for any purpose is hereby granted without fee, provided that
+ 	the above copyright notice appear in all copies and that both that
+ 	copyright notice and this permission notice appear in supporting 
+ 	documentation, and that the name of M.I.T. not be used in advertising or
+ 	publicity pertaining to distribution of the software without specific,
+ 	written prior permission.  M.I.T. makes no representations about the
+ 	suitability of this software for any purpose.  It is provided "as is"
+ 	without express or implied warranty.
+ 
+ Please see the source files for additional copyrights.
+ 


Index: llvm/projects/Stacker/autoconf/acinclude.m4
diff -c /dev/null llvm/projects/Stacker/autoconf/acinclude.m4:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/acinclude.m4	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,6306 ----
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ ## Copyright 1996, 1997, 1998, 1999, 2000, 2001
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+ ## the Free Software Foundation; either version 2 of the License, or
+ ## (at your option) any later version.
+ ##
+ ## This program is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ ## General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU General Public License
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ ##
+ ## As a special exception to the GNU General Public License, if you
+ ## distribute this file as part of a program that contains a
+ ## configuration script generated by Autoconf, you may include it under
+ ## the same distribution terms that you use for the rest of that program.
+ 
+ # serial 47 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+ # If this macro is not defined by Autoconf, define it here.
+ m4_ifdef([AC_PROVIDE_IFELSE],
+          [],
+          [m4_define([AC_PROVIDE_IFELSE],
+ 	         [m4_ifdef([AC_PROVIDE_$1],
+ 		           [$2], [$3])])])
+ 
+ 
+ # AC_PROG_LIBTOOL
+ # ---------------
+ AC_DEFUN([AC_PROG_LIBTOOL],
+ [AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+ dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+ dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+   AC_PROVIDE_IFELSE([AC_PROG_CXX],
+     [AC_LIBTOOL_CXX],
+     [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+   ])])
+ dnl And a similar setup for Fortran 77 support
+   AC_PROVIDE_IFELSE([AC_PROG_F77],
+     [AC_LIBTOOL_F77],
+     [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+ ])])
+ 
+ dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+ dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+ dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+   AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+     [AC_LIBTOOL_GCJ],
+     [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+       [AC_LIBTOOL_GCJ],
+       [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ 	[AC_LIBTOOL_GCJ],
+       [ifdef([AC_PROG_GCJ],
+ 	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+        ifdef([A][M_PROG_GCJ],
+ 	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+        ifdef([LT_AC_PROG_GCJ],
+ 	     [define([LT_AC_PROG_GCJ],
+ 		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+ ])])# AC_PROG_LIBTOOL
+ 
+ 
+ # _AC_PROG_LIBTOOL
+ # ----------------
+ AC_DEFUN([_AC_PROG_LIBTOOL],
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+ AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/mklib'
+ AC_SUBST(LIBTOOL)dnl
+ 
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+ ])# _AC_PROG_LIBTOOL
+ 
+ 
+ # AC_LIBTOOL_SETUP
+ # ----------------
+ AC_DEFUN([AC_LIBTOOL_SETUP],
+ [AC_PREREQ(2.50)dnl
+ AC_REQUIRE([AC_ENABLE_SHARED])dnl
+ AC_REQUIRE([AC_ENABLE_STATIC])dnl
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_LD])dnl
+ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+ 
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+ 
+ AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ _LT_AC_PROG_ECHO_BACKSLASH
+ 
+ case $host_os in
+ aix3*)
+   # AIX sometimes has problems with the GCC collect2 program.  For some
+   # reason, if we set the COLLECT_NAMES environment variable, the problems
+   # vanish in a puff of smoke.
+   if test "X${COLLECT_NAMES+set}" != Xset; then
+     COLLECT_NAMES=
+     export COLLECT_NAMES
+   fi
+   ;;
+ esac
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed='sed -e s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+ # Same as above, but do not quote variable references.
+ [double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+ 
+ # Sed substitution to delay expansion of an escaped shell variable in a
+ # double_quote_subst'ed string.
+ delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+ # Sed substitution to avoid accidental globbing in evaled expressions
+ no_glob_subst='s/\*/\\\*/g'
+ 
+ # Constants:
+ rm="rm -f"
+ 
+ # Global variables:
+ default_ofile=mklib
+ can_build_shared=yes
+ 
+ # All known linkers require a `.a' archive for static linking (except M$VC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+ ofile="$default_ofile"
+ with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+ AC_CHECK_TOOL(AR, ar, false)
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+ AC_CHECK_TOOL(STRIP, strip, :)
+ 
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ 
+ # Set sane defaults for various variables
+ test -z "$AR" && AR=ar
+ test -z "$AR_FLAGS" && AR_FLAGS=cru
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$SED" && SED=sed
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+ test -z "$RANLIB" && RANLIB=:
+ test -z "$STRIP" && STRIP=:
+ test -z "$ac_objext" && ac_objext=o
+ 
+ # Determine commands to create old-style static archives.
+ old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   case $host_os in
+   openbsd*)
+     old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+     ;;
+   *)
+     old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+     ;;
+   esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+ 
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     AC_PATH_MAGIC
+   fi
+   ;;
+ esac
+ 
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+ 
+ AC_ARG_ENABLE([libtool-lock],
+     [AC_HELP_STRING([--disable-libtool-lock],
+ 	[avoid locking (might break parallel builds)])])
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ AC_ARG_WITH([pic],
+     [AC_HELP_STRING([--with-pic],
+ 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+     [pic_mode="$withval"],
+     [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+ _LT_AC_TAGCONFIG
+ ])# AC_LIBTOOL_SETUP
+ 
+ 
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ 
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+ 
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+ 
+ 
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+ # for the system default hardcoded library path. In most cases,
+ # this is /usr/lib:/lib, but when the MPI compilers are used
+ # the location of the communication and MPI libs are included too.
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+ [AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`; fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+ 
+ 
+ # _LT_AC_SHELL_INIT(ARG)
+ # ----------------------
+ AC_DEFUN([_LT_AC_SHELL_INIT],
+ [ifdef([AC_DIVERSION_NOTICE],
+ 	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ 	 [AC_DIVERT_PUSH(NOTICE)])
+ $1
+ AC_DIVERT_POP
+ ])# _LT_AC_SHELL_INIT
+ 
+ 
+ # _LT_AC_PROG_ECHO_BACKSLASH
+ # --------------------------
+ # Add some code to the start of the generated configure script which
+ # will find an echo command which doesn't interpret backslashes.
+ AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+ [_LT_AC_SHELL_INIT([
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ case X$ECHO in
+ X*--fallback-echo)
+   # Remove one level of quotation (which was required for Make).
+   ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+   ;;
+ esac
+ 
+ echo=${ECHO-echo}
+ if test "X[$]1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X[$]1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+   # Yippee, $echo works!
+   :
+ else
+   # Restart under the correct shell.
+   exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ fi
+ 
+ if test "X[$]1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+   cat <<EOF
+ [$]*
+ EOF
+   exit 0
+ fi
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+     if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+        echo_test_string="`eval $cmd`" &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+     fi
+   done
+ fi
+ 
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+    echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+    test "X$echo_testing_string" = "X$echo_test_string"; then
+   :
+ else
+   # The Solaris, AIX, and Digital Unix default echo programs unquote
+   # backslashes.  This makes it impossible to quote backslashes using
+   #   echo "$something" | sed 's/\\/\\\\/g'
+   #
+   # So, first we look for a working echo in the user's PATH.
+ 
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for dir in $PATH /usr/ucb; do
+     IFS="$lt_save_ifs"
+     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+        test "X$echo_testing_string" = "X$echo_test_string"; then
+       echo="$dir/echo"
+       break
+     fi
+   done
+   IFS="$lt_save_ifs"
+ 
+   if test "X$echo" = Xecho; then
+     # We didn't find a better echo, so look for alternatives.
+     if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+        test "X$echo_testing_string" = "X$echo_test_string"; then
+       # This shell has a builtin print -r that does the trick.
+       echo='print -r'
+     elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+ 	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+       # If we have ksh, try running configure again with it.
+       ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+       export ORIGINAL_CONFIG_SHELL
+       CONFIG_SHELL=/bin/ksh
+       export CONFIG_SHELL
+       exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+     else
+       # Try using printf.
+       echo='printf %s\n'
+       if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ 	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ 	 test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	# Cool, printf works
+ 	:
+       elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = 'X\t' &&
+ 	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ 	export CONFIG_SHELL
+ 	SHELL="$CONFIG_SHELL"
+ 	export SHELL
+ 	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+       elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = 'X\t' &&
+ 	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ 	   test "X$echo_testing_string" = "X$echo_test_string"; then
+ 	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+       else
+ 	# maybe with a smaller string...
+ 	prev=:
+ 
+ 	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ 	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ 	  then
+ 	    break
+ 	  fi
+ 	  prev="$cmd"
+ 	done
+ 
+ 	if test "$prev" != 'sed 50q "[$]0"'; then
+ 	  echo_test_string=`eval $prev`
+ 	  export echo_test_string
+ 	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ 	else
+ 	  # Oops.  We lost completely, so just stick with echo.
+ 	  echo=echo
+ 	fi
+       fi
+     fi
+   fi
+ fi
+ fi
+ 
+ # Copy echo and quote the copy suitably for passing to libtool from
+ # the Makefile, instead of quoting the original, which is used later.
+ ECHO=$echo
+ if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+    ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+ fi
+ 
+ AC_SUBST(ECHO)
+ ])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
+ 
+ # _LT_AC_LOCK
+ # -----------
+ AC_DEFUN([_LT_AC_LOCK],
+ [AC_ARG_ENABLE([libtool-lock],
+     [AC_HELP_STRING([--disable-libtool-lock],
+ 	[avoid locking (might break parallel builds)])])
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case $host in
+ ia64-*-hpux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case `/usr/bin/file conftest.$ac_objext` in
+     *ELF-32*)
+       HPUX_IA64_MODE="32"
+       ;;
+     *ELF-64*)
+       HPUX_IA64_MODE="64"
+       ;;
+     esac
+   fi
+   rm -rf conftest*
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+     case `/usr/bin/file conftest.$ac_objext` in
+     *32-bit*)
+       LD="${LD-ld} -melf32bsmip"
+       ;;
+     *N32*)
+       LD="${LD-ld} -melf32bmipn32"
+       ;;
+     *64-bit*)
+       LD="${LD-ld} -melf64bmip"
+       ;;
+     esac
+    else
+     case `/usr/bin/file conftest.$ac_objext` in
+     *32-bit*)
+       LD="${LD-ld} -32"
+       ;;
+     *N32*)
+       LD="${LD-ld} -n32"
+       ;;
+     *64-bit*)
+       LD="${LD-ld} -64"
+       ;;
+     esac
+    fi
+   fi
+   rm -rf conftest*
+   ;;
+ 
+ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+   if AC_TRY_EVAL(ac_compile); then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+         ppc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+     *64-bit*)
+       case $host in
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+     esac
+   fi
+   rm -rf conftest*
+   ;;
+ 
+ *-*-sco3.2v5*)
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+     [AC_LANG_PUSH(C)
+      AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+      AC_LANG_POP])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+   fi
+   ;;
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+   ;;
+   ])
+ esac
+ 
+ need_locks="$enable_libtool_lock"
+ 
+ ])# _LT_AC_LOCK
+ 
+ 
+ # AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+ #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+ # ----------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+ [AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$3"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&AS_MESSAGE_LOG_FD
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test ! -s conftest.err; then
+        $2=yes
+      fi
+    fi
+    $rm conftest*
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+     ifelse([$5], , :, [$5])
+ else
+     ifelse([$6], , :, [$6])
+ fi
+ ])# AC_LIBTOOL_COMPILER_OPTION
+ 
+ 
+ # AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+ #                          [ACTION-SUCCESS], [ACTION-FAILURE])
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+ [AC_CACHE_CHECK([$1], [$2],
+   [$2=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $3"
+    printf "$lt_simple_link_test_code" > conftest.$ac_ext
+    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test -s conftest.err; then
+        # Append any errors to the config.log.
+        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+      else
+        $2=yes
+      fi
+    fi
+    $rm conftest*
+    LDFLAGS="$save_LDFLAGS"
+ ])
+ 
+ if test x"[$]$2" = xyes; then
+     ifelse([$4], , :, [$4])
+ else
+     ifelse([$5], , :, [$5])
+ fi
+ ])# AC_LIBTOOL_LINKER_OPTION
+ 
+ 
+ # AC_LIBTOOL_SYS_MAX_CMD_LEN
+ # --------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+ [# find the maximum length of command line arguments
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+   i=0
+   testring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+     # On DJGPP, this test can blow up pretty badly due to problems in libc
+     # (any single argument exceeding 2000 bytes causes a buffer overrun
+     # during glob expansion).  Even if it were fixed, the result of this
+     # check would be larger than it should be.
+     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+     ;;
+ 
+   gnu*)
+     # Under GNU Hurd, this test is not required because there is
+     # no limit to the length of command line arguments.
+     # Libtool will interpret -1 as no limit whatsoever
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+   cygwin* | mingw*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+     # you end up with a "frozen" computer, even though with patience
+     # the test eventually succeeds (with a max line length of 256k).
+     # Instead, let's just punt: use the minimum linelength reported by
+     # all of the supported platforms: 8192 (on NT/2K/XP).
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+  *)
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+     while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+ 	       = "XX$testring") >/dev/null 2>&1 &&
+ 	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+       testring=$testring$testring
+     done
+     testring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+     ;;
+   esac
+ ])
+ if test -n $lt_cv_sys_max_cmd_len ; then
+   AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+ else
+   AC_MSG_RESULT(none)
+ fi
+ ])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
+ 
+ # _LT_AC_CHECK_DLFCN
+ # --------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+ 
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+ # ------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+   [$4]
+ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+ [#line __oline__ "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+ 
+ #include <stdio.h>
+ 
+ #ifdef RTLD_GLOBAL
+ #  define LT_DLGLOBAL		RTLD_GLOBAL
+ #else
+ #  ifdef DL_GLOBAL
+ #    define LT_DLGLOBAL		DL_GLOBAL
+ #  else
+ #    define LT_DLGLOBAL		0
+ #  endif
+ #endif
+ 
+ /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+    find out it does not work in some platform. */
+ #ifndef LT_DLLAZY_OR_NOW
+ #  ifdef RTLD_LAZY
+ #    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+ #  else
+ #    ifdef DL_LAZY
+ #      define LT_DLLAZY_OR_NOW		DL_LAZY
+ #    else
+ #      ifdef RTLD_NOW
+ #        define LT_DLLAZY_OR_NOW	RTLD_NOW
+ #      else
+ #        ifdef DL_NOW
+ #          define LT_DLLAZY_OR_NOW	DL_NOW
+ #        else
+ #          define LT_DLLAZY_OR_NOW	0
+ #        endif
+ #      endif
+ #    endif
+ #  endif
+ #endif
+ 
+ #ifdef __cplusplus
+ extern "C" void exit (int);
+ #endif
+ 
+ void fnord() { int i=42;}
+ int main ()
+ {
+   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+   int status = $lt_dlunknown;
+ 
+   if (self)
+     {
+       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
+ 
+     exit (status);
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+     (./conftest; exit; ) 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+       x$lt_dlneed_uscore) $2 ;;
+       x$lt_unknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+     $3
+   fi
+ fi
+ rm -fr conftest*
+ ])# _LT_AC_TRY_DLOPEN_SELF
+ 
+ 
+ # AC_LIBTOOL_DLOPEN_SELF
+ # -------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+   enable_dlopen=unknown
+   enable_dlopen_self=unknown
+   enable_dlopen_self_static=unknown
+ else
+   lt_cv_dlopen=no
+   lt_cv_dlopen_libs=
+ 
+   case $host_os in
+   beos*)
+     lt_cv_dlopen="load_add_on"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+   mingw* | pw32*)
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+    ;;
+ 
+   cygwin*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+    ;;
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+     AC_CHECK_LIB([dl], [dlopen],
+ 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+     lt_cv_dlopen="dyld"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+     ])
+    ;;
+     
+   *)
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+ 	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+ 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+ 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+ 		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ 	      ])
+ 	    ])
+ 	  ])
+ 	])
+       ])
+     ;;
+   esac
+ 
+   if test "x$lt_cv_dlopen" != xno; then
+     enable_dlopen=yes
+   else
+     enable_dlopen=no
+   fi
+ 
+   case $lt_cv_dlopen in
+   dlopen)
+     save_CPPFLAGS="$CPPFLAGS"
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+     eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+     AC_CACHE_CHECK([whether a program can dlopen itself],
+ 	  lt_cv_dlopen_self, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+ 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+       LDFLAGS="$LDFLAGS $link_static_flag"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+ 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+       ])
+     fi
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+     LDFLAGS="$save_LDFLAGS"
+     LIBS="$save_LIBS"
+     ;;
+   esac
+ 
+   case $lt_cv_dlopen_self in
+   yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+   *) enable_dlopen_self=unknown ;;
+   esac
+ 
+   case $lt_cv_dlopen_self_static in
+   yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+   *) enable_dlopen_self_static=unknown ;;
+   esac
+ fi
+ ])# AC_LIBTOOL_DLOPEN_SELF
+ 
+ 
+ # AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+ [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+    $rm -r conftest 2>/dev/null
+    mkdir conftest
+    cd conftest
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+    # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+    # that will create temporary files in the current directory regardless of
+    # the output directory.  Thus, making CWD read-only will cause this test
+    # to fail, enabling locking or at least warning the user not to do parallel
+    # builds.
+    chmod -w .
+ 
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&AS_MESSAGE_LOG_FD
+    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+      if test ! -s out/conftest.err; then
+        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+      fi
+    fi
+    chmod u+w .
+    $rm conftest* out/*
+    rmdir out
+    cd ..
+    rmdir conftest
+    $rm conftest*
+ ])
+ ])# AC_LIBTOOL_PROG_CC_C_O
+ 
+ 
+ # AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+ # -----------------------------------------
+ # Check to see if we can do hard links to lock some files if needed
+ AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+ [AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+ hard_links="nottested"
+ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+   AC_MSG_CHECKING([if we can lock with hard links])
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   AC_MSG_RESULT([$hard_links])
+   if test "$hard_links" = no; then
+     AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+     need_locks=warn
+   fi
+ else
+   need_locks=no
+ fi
+ ])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+ 
+ # AC_LIBTOOL_OBJDIR
+ # -----------------
+ AC_DEFUN([AC_LIBTOOL_OBJDIR],
+ [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+ [rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+ if test -d .libs; then
+   lt_cv_objdir=.libs
+ else
+   # MS-DOS does not allow filenames that begin with a dot.
+   lt_cv_objdir=_libs
+ fi
+ rmdir .libs 2>/dev/null])
+ objdir=$lt_cv_objdir
+ ])# AC_LIBTOOL_OBJDIR
+ 
+ 
+ # AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+ # ----------------------------------------------
+ # Check hardcoding attributes.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+    test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+ 
+   # We can hardcode non-existant directories.
+   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+      # If the only mechanism to avoid hardcoding is shlibpath_var, we
+      # have to relink, otherwise we might link with an installed library
+      # when we should be linking with a yet-to-be-installed one
+      ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+      test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+     # Linking always hardcodes the temporary library directory.
+     _LT_AC_TAGVAR(hardcode_action, $1)=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+     _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+   fi
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
+   _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+ fi
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+ if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+   # Fast installation is not supported
+   enable_fast_install=no
+ elif test "$shlibpath_overrides_runpath" = yes ||
+      test "$enable_shared" = no; then
+   # Fast installation is not necessary
+   enable_fast_install=needless
+ fi
+ ])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+ 
+ 
+ # AC_LIBTOOL_SYS_LIB_STRIP
+ # ------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+ [striplib=
+ old_striplib=
+ AC_MSG_CHECKING([whether stripping libraries is possible])
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   AC_MSG_RESULT([yes])
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+    darwin*)
+        if test -n "$STRIP" ; then
+          striplib="$STRIP -x"
+          AC_MSG_RESULT([yes])
+        else
+   AC_MSG_RESULT([no])
+ fi
+        ;;
+    *)
+   AC_MSG_RESULT([no])
+     ;;
+   esac  
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+ 
+ # AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+ [AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+ shrext=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+ finish_eval=
+ shlibpath_var=
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ if test "$GCC" = yes; then
+   sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+   if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+     # if the path contains ";" then we assume it to be the separator
+     # otherwise default to the standard path separator (i.e. ":") - it is
+     # assumed that no part of a normal pathname contains ";" but that should
+     # okay in the real world where ";" in dirpaths is itself problematic.
+     sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+     sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+ need_version=unknown
+ 
+ case $host_os in
+ aix3*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+   # AIX 3 has no versioning support, so we append a major version to the name.
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+ aix4* | aix5*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
+     library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+     shlibpath_var=LD_LIBRARY_PATH
+   else
+     # With GCC up to 2.95.x, collect2 would create an import file
+     # for dependence libraries.  The import file would start with
+     # the line `#! .'.  This would cause the generated library to
+     # depend on `.', always an invalid library.  This was fixed in
+     # development snapshots of GCC prior to 3.0.
+     case $host_os in
+       aix4 | aix4.[[01]] | aix4.[[01]].*)
+       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ 	   echo ' yes '
+ 	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+       fi
+       ;;
+     esac
+     # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+     # soname into executable. Probably we can add versioning support to
+     # collect2, so additional links can be useful in future.
+     if test "$aix_use_runtimelinking" = yes; then
+       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
+       library_names_spec='${libname}${release}.a $libname.a'
+       soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+     shlibpath_var=LIBPATH
+   fi
+   ;;
+ 
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+   ;;
+ 
+ beos*)
+   library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+ bsdi4*)
+   version_type=linux
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+   # the default ld.so.conf also contains /usr/contrib/lib and
+   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+   # libtool to hard-code these into programs
+   ;;
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+   shrext=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+   yes,cygwin* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+       $install_prog $dir/$dlname \$dldir/$dlname'
+     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
+     shlibpath_overrides_runpath=yes
+ 
+     case $host_os in
+     cygwin*)
+       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
+       ;;
+     mingw*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+       if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+         # It is most probably a Windows format PATH printed by
+         # mingw gcc, but we are running on Cygwin. Gcc prints its search
+         # path with ; separators, and with drive letters. We can handle the
+         # drive letters (cygwin fileutils understands them), so leave them,
+         # especially as we might pass files found there to a mingw objdump,
+         # which wouldn't understand a cygwinified path. Ahh.
+         sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+       else
+         sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+     pw32*)
+       # pw32 DLLs use 'pw' prefix rather than 'lib'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+     ;;
+ 
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
+   dynamic_linker='Win32 ld.exe'
+   # FIXME: first we should search . and the directory the executable is in
+   shlibpath_var=PATH
+   ;;
+ 
+ darwin* | rhapsody*)
+   dynamic_linker="$host_os dyld"
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+   # FIXME: Relying on posixy $() will cause problems for
+   #        cross-compilation, but unfortunately the echo tests do not
+   #        yet detect zsh echo's removal of \ escapes.
+   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+   sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+   fi
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+   ;;
+ 
+ dgux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+ freebsd*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+       need_version=no
+       need_lib_prefix=no
+       ;;
+     freebsd-*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
+   *) # from 3.2 on
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+   esac
+   ;;
+ 
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+ 
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+     shrext='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     if test "X$HPUX_IA64_MODE" = X32; then
+       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+     else
+       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+      shrext='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+      shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
+      sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+     shrext='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
+   esac
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+     *)
+ 	if test "$lt_cv_prog_gnu_ld" = yes; then
+ 		version_type=linux
+ 	else
+ 		version_type=irix
+ 	fi ;;
+   esac
+   need_lib_prefix=no
+   need_version=no
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+   case $host_os in
+   irix5* | nonstopux*)
+     libsuff= shlibsuff=
+     ;;
+   *)
+     case $LD in # libtool.m4 will add one of these switches to LD
+     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+       libsuff= shlibsuff= libmagic=32-bit;;
+     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+       libsuff=32 shlibsuff=N32 libmagic=N32;;
+     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+       libsuff=64 shlibsuff=64 libmagic=64-bit;;
+     *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+     ;;
+   esac
+   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+   hardcode_into_libs=yes
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+ linux*oldld* | linux*aout* | linux*coff*)
+   dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+     soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   ;;
+ 
+ newsos6)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ nto-qnx)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ openbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     case $host_os in
+       openbsd2.[[89]] | openbsd2.[[89]].*)
+ 	shlibpath_overrides_runpath=no
+ 	;;
+       *)
+ 	shlibpath_overrides_runpath=yes
+ 	;;
+       esac
+   else
+     shlibpath_overrides_runpath=yes
+   fi
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
+   shrext=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   version_type=osf
+   need_lib_prefix=no
+   need_version=no
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+ sco3.2v5*)
+   version_type=osf
+   soname_spec='${libname}${release}${shared_ext}$major'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   # ldd complains unless libraries are executable
+   postinstall_cmds='chmod +x $lib'
+   ;;
+ 
+ sunos4*)
+   version_type=sunos
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   if test "$with_gnu_ld" = yes; then
+     need_lib_prefix=no
+   fi
+   need_version=yes
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+       export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+       need_lib_prefix=no
+       ;;
+     motorola)
+       need_lib_prefix=no
+       need_version=no
+       shlibpath_overrides_runpath=no
+       sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+       ;;
+   esac
+   ;;
+ 
+ sysv4*MP*)
+   if test -d /usr/nec ;then
+     version_type=linux
+     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+     soname_spec='$libname${shared_ext}.$major'
+     shlibpath_var=LD_LIBRARY_PATH
+   fi
+   ;;
+ 
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ *)
+   dynamic_linker=no
+   ;;
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+ 
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+ [AC_ARG_WITH([tags],
+     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+         [include additional configurations @<:@automatic@:>@])],
+     [tagnames="$withval"])
+ 
+ if test -f "$ltmain" && test -n "$tagnames"; then
+   if test ! -f "${ofile}"; then
+     AC_MSG_WARN([output file `$ofile' does not exist])
+   fi
+ 
+   if test -z "$LTCC"; then
+     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+     if test -z "$LTCC"; then
+       AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+     else
+       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+   fi
+ 
+   # Extract list of available tagged configurations in $ofile.
+   # Note that this assumes the entire list is on one line.
+   available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+ 
+   lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+   for tagname in $tagnames; do
+     IFS="$lt_save_ifs"
+     # Check whether tagname contains only valid characters
+     case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+     "") ;;
+     *)  AC_MSG_ERROR([invalid tag name: $tagname])
+ 	;;
+     esac
+ 
+     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+     then
+       AC_MSG_ERROR([tag name \"$tagname\" already exists])
+     fi
+ 
+     # Update the list of available tags.
+     if test -n "$tagname"; then
+       echo appending configuration tag \"$tagname\" to $ofile
+ 
+       case $tagname in
+       CXX)
+ 	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_CXX_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       F77)
+ 	if test -n "$F77" && test "X$F77" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_F77_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       GCJ)
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 	  AC_LIBTOOL_LANG_GCJ_CONFIG
+ 	else
+ 	  tagname=""
+ 	fi
+ 	;;
+ 
+       RC)
+ 	AC_LIBTOOL_LANG_RC_CONFIG
+ 	;;
+ 
+       *)
+ 	AC_MSG_ERROR([Unsupported tag name: $tagname])
+ 	;;
+       esac
+ 
+       # Append the new tag name to the list of available tags.
+       if test -n "$tagname" ; then
+       available_tags="$available_tags $tagname"
+     fi
+     fi
+   done
+   IFS="$lt_save_ifs"
+ 
+   # Now substitute the updated list of available tags.
+   if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+     mv "${ofile}T" "$ofile"
+     chmod +x "$ofile"
+   else
+     rm -f "${ofile}T"
+     AC_MSG_ERROR([unable to update list of available tagged configurations.])
+   fi
+ fi
+ ])# _LT_AC_TAGCONFIG
+ 
+ 
+ # AC_LIBTOOL_DLOPEN
+ # -----------------
+ # enable checks for dlopen support
+ AC_DEFUN([AC_LIBTOOL_DLOPEN],
+  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_DLOPEN
+ 
+ 
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+ # declare package support for building win32 dll's
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+ 
+ 
+ # AC_ENABLE_SHARED([DEFAULT])
+ # ---------------------------
+ # implement the --enable-shared flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_SHARED],
+ [define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([shared],
+     [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+ 	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+     *)
+       enable_shared=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_shared=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+ ])# AC_ENABLE_SHARED
+ 
+ 
+ # AC_DISABLE_SHARED
+ # -----------------
+ #- set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+ ])# AC_DISABLE_SHARED
+ 
+ 
+ # AC_ENABLE_STATIC([DEFAULT])
+ # ---------------------------
+ # implement the --enable-static flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_STATIC],
+ [define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([static],
+     [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+ 	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+     *)
+      enable_static=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_static=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+ ])# AC_ENABLE_STATIC
+ 
+ 
+ # AC_DISABLE_STATIC
+ # -----------------
+ # set the default static flag to --disable-static
+ AC_DEFUN([AC_DISABLE_STATIC],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_STATIC(no)
+ ])# AC_DISABLE_STATIC
+ 
+ 
+ # AC_ENABLE_FAST_INSTALL([DEFAULT])
+ # ---------------------------------
+ # implement the --enable-fast-install flag
+ # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+ AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+ [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE([fast-install],
+     [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+     [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+     [p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+     no) enable_fast_install=no ;;
+     *)
+       enable_fast_install=no
+       # Look at the argument we got.  We use all the common list separators.
+       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+       for pkg in $enableval; do
+ 	IFS="$lt_save_ifs"
+ 	if test "X$pkg" = "X$p"; then
+ 	  enable_fast_install=yes
+ 	fi
+       done
+       IFS="$lt_save_ifs"
+       ;;
+     esac],
+     [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+ ])# AC_ENABLE_FAST_INSTALL
+ 
+ 
+ # AC_DISABLE_FAST_INSTALL
+ # -----------------------
+ # set the default to --disable-fast-install
+ AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)
+ ])# AC_DISABLE_FAST_INSTALL
+ 
+ 
+ # AC_LIBTOOL_PICMODE([MODE])
+ # --------------------------
+ # implement the --with-pic flag
+ # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+ AC_DEFUN([AC_LIBTOOL_PICMODE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ pic_mode=ifelse($#,1,$1,default)
+ ])# AC_LIBTOOL_PICMODE
+ 
+ 
+ # AC_PROG_EGREP
+ # -------------
+ # This is predefined starting with Autoconf 2.54, so this conditional
+ # definition can be removed once we require Autoconf 2.54 or later.
+ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+ [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+    [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+     then ac_cv_prog_egrep='grep -E'
+     else ac_cv_prog_egrep='egrep'
+     fi])
+  EGREP=$ac_cv_prog_egrep
+  AC_SUBST([EGREP])
+ ])])
+ 
+ 
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+ # find a file program which can recognise shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ [case $MAGIC_CMD in
+ [[\\/*] |  ?:[\\/]*])
+   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
+ *)
+   lt_save_MAGIC_CMD="$MAGIC_CMD"
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ dnl $ac_dummy forces splitting on constant user-supplied paths.
+ dnl POSIX.2 word splitting is done only on the output of word expansions,
+ dnl not every word.  This closes a longstanding sh security hole.
+   ac_dummy="ifelse([$2], , $PATH, [$2])"
+   for ac_dir in $ac_dummy; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$1; then
+       lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+ 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    $EGREP "$file_magic_regex" > /dev/null; then
+ 	    :
+ 	  else
+ 	    cat <<EOF 1>&2
+ 
+ *** Warning: the command libtool uses to detect shared libraries,
+ *** $file_magic_cmd, produces output that libtool cannot recognize.
+ *** The result is that libtool may fail to recognize shared libraries
+ *** as such.  This will affect the creation of libtool libraries that
+ *** depend on shared libraries, but programs linked with such libtool
+ *** libraries will work regardless of this problem.  Nevertheless, you
+ *** may want to report the problem to your system manager and/or to
+ *** bug-libtool at gnu.org
+ 
+ EOF
+ 	  fi ;;
+ 	esac
+       fi
+       break
+     fi
+   done
+   IFS="$lt_save_ifs"
+   MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
+ esac])
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+   AC_MSG_RESULT($MAGIC_CMD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+ ])# AC_PATH_TOOL_PREFIX
+ 
+ 
+ # AC_PATH_MAGIC
+ # -------------
+ # find a file program which can recognise a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+     AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+   else
+     MAGIC_CMD=:
+   fi
+ fi
+ ])# AC_PATH_MAGIC
+ 
+ 
+ # AC_PROG_LD
+ # ----------
+ # find the path to the GNU or non-GNU linker
+ AC_DEFUN([AC_PROG_LD],
+ [AC_ARG_WITH([gnu-ld],
+     [AC_HELP_STRING([--with-gnu-ld],
+ 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+     [test "$withval" = no || with_gnu_ld=yes],
+     [with_gnu_ld=no])
+ AC_REQUIRE([LT_AC_PROG_SED])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by $CC])
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+   *)
+     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+   esac
+   case $ac_prog in
+     # Accept absolute paths.
+     [[\\/]]* | ?:[[\\/]]*)
+       re_direlt='/[[^/]][[^/]]*/\.\./'
+       # Canonicalize the path of ld
+       ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+   "")
+     # If it fails, then pretend we aren't using GCC.
+     ac_prog=ld
+     ;;
+   *)
+     # If it is relative, then search for the first ld in PATH.
+     with_gnu_ld=unknown
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+   AC_MSG_CHECKING([for GNU ld])
+ else
+   AC_MSG_CHECKING([for non-GNU ld])
+ fi
+ AC_CACHE_VAL(lt_cv_path_LD,
+ [if test -z "$LD"; then
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+       *GNU* | *'with BFD'*)
+ 	test "$with_gnu_ld" != no && break
+ 	;;
+       *)
+ 	test "$with_gnu_ld" != yes && break
+ 	;;
+       esac
+     fi
+   done
+   IFS="$lt_save_ifs"
+ else
+   lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+   AC_MSG_RESULT($LD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+ AC_PROG_LD_GNU
+ ])# AC_PROG_LD
+ 
+ 
+ # AC_PROG_LD_GNU
+ # --------------
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ case `"$LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+ *)
+   lt_cv_prog_gnu_ld=no
+   ;;
+ esac])
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ ])# AC_PROG_LD_GNU
+ 
+ 
+ # AC_PROG_LD_RELOAD_FLAG
+ # ----------------------
+ # find reload flag for linker
+ #   -- PORTME Some linkers may need a different reload flag.
+ AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+ [AC_CACHE_CHECK([for $LD option to reload object files],
+   lt_cv_ld_reload_flag,
+   [lt_cv_ld_reload_flag='-r'])
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+ "" | " "*) ;;
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ ])# AC_PROG_LD_RELOAD_FLAG
+ 
+ 
+ # AC_DEPLIBS_CHECK_METHOD
+ # -----------------------
+ # how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+ [AC_CACHE_CHECK([how to recognise dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+ lt_cv_deplibs_check_method='unknown'
+ # Need to set the preceding variable on all platforms that support
+ # interlibrary dependencies.
+ # 'none' -- dependencies not supported.
+ # `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+ # which responds to the $file_magic_cmd with a given extended regex.
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+ aix4* | aix5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ beos*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ bsdi4*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+ cygwin* | mingw* | pw32*)
+   # win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='win32_libid'
+   ;;
+ 
+ darwin* | rhapsody*)
+   # this will be overwritten by pass_all, but leave it in just in case
+   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   case "$host_os" in
+   rhapsody* | darwin1.[[012]])
+     lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+     ;;
+   *) # Darwin 1.3 on
+     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+     ;;
+   esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ freebsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+     esac
+   else
+     lt_cv_deplibs_check_method=pass_all
+   fi
+   ;;
+ 
+ gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   case "$host_cpu" in
+   ia64*)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+     ;;
+   hppa*64*)
+     [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+     lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+   ;;
+ 
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+   irix5* | nonstopux*)
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+     ;;
+   *)
+     case $LD in
+     *-32|*"-32 ") libmagic=32-bit;;
+     *-n32|*"-n32 ") libmagic=N32;;
+     *-64|*"-64 ") libmagic=64-bit;;
+     *) libmagic=never-match;;
+     esac
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+     ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux*)
+   case $host_cpu in
+   alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   fi
+   ;;
+ 
+ newos6*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
+ nto-qnx)
+   lt_cv_deplibs_check_method=unknown
+   ;;
+ 
+ openbsd*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+   else
+     lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sco3.2v5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   case $host_vendor in
+   motorola)
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+     ;;
+   ncr)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
+   sequent)
+     lt_cv_file_magic_cmd='/bin/file'
+     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+     ;;
+   sni)
+     lt_cv_file_magic_cmd='/bin/file'
+     lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+     lt_cv_file_magic_test_file=/lib/libc.so
+     ;;
+   siemens)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
+   esac
+   ;;
+ 
+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+ ])
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ ])# AC_DEPLIBS_CHECK_METHOD
+ 
+ 
+ # AC_PROG_NM
+ # ----------
+ # find the path to a BSD-compatible name lister
+ AC_DEFUN([AC_PROG_NM],
+ [AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+ [if test -n "$NM"; then
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+     if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+       */dev/null* | *'Invalid file or object type'*)
+ 	lt_cv_path_NM="$tmp_nm -B"
+ 	break
+         ;;
+       *)
+ 	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ 	*/dev/null*)
+ 	  lt_cv_path_NM="$tmp_nm -p"
+ 	  break
+ 	  ;;
+ 	*)
+ 	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ 	  continue # so that we can try to find one that supports BSD flags
+ 	  ;;
+ 	esac
+       esac
+     fi
+   done
+   IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+ ])# AC_PROG_NM
+ 
+ 
+ # AC_CHECK_LIBM
+ # -------------
+ # check for math library
+ AC_DEFUN([AC_CHECK_LIBM],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+ *-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+   AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+   ;;
+ *)
+   AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
+ esac
+ ])# AC_CHECK_LIBM
+ 
+ 
+ # AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+ # --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+ # and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+ # DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+ # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+ # '${top_srcdir}/' (note the single quotes!).  If your package is not
+ # flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   case $enable_ltdl_convenience in
+   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+   esac
+   LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+   LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
+ ])# AC_LIBLTDL_CONVENIENCE
+ 
+ 
+ # AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+ # --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+ # and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+ # DIRECTORY is not provided and an installed libltdl is not found, it is
+ # assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+ # and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+ # quotes!).  If your package is not flat and you're not using automake,
+ # define top_builddir and top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   AC_CHECK_LIB(ltdl, lt_dlinit,
+   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+   [if test x"$enable_ltdl_install" = xno; then
+      AC_MSG_WARN([libltdl not installed, but installation disabled])
+    else
+      enable_ltdl_install=yes
+    fi
+   ])
+   if test x"$enable_ltdl_install" = x"yes"; then
+     ac_configure_args="$ac_configure_args --enable-ltdl-install"
+     LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+     LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+   else
+     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+     LIBLTDL="-lltdl"
+     LTDLINCL=
+   fi
+   # For backwards non-gettext consistent compatibility...
+   INCLTDL="$LTDLINCL"
+ ])# AC_LIBLTDL_INSTALLABLE
+ 
+ 
+ # AC_LIBTOOL_CXX
+ # --------------
+ # enable support for C++ libraries
+ AC_DEFUN([AC_LIBTOOL_CXX],
+ [AC_REQUIRE([_LT_AC_LANG_CXX])
+ ])# AC_LIBTOOL_CXX
+ 
+ 
+ # _LT_AC_LANG_CXX
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_CXX
+ 
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+ # enable support for Fortran 77 libraries
+ AC_DEFUN([AC_LIBTOOL_F77],
+ [AC_REQUIRE([_LT_AC_LANG_F77])
+ ])# AC_LIBTOOL_F77
+ 
+ 
+ # _LT_AC_LANG_F77
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_F77],
+ [AC_REQUIRE([AC_PROG_F77])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_F77
+ 
+ 
+ # AC_LIBTOOL_GCJ
+ # --------------
+ # enable support for GCJ libraries
+ AC_DEFUN([AC_LIBTOOL_GCJ],
+ [AC_REQUIRE([_LT_AC_LANG_GCJ])
+ ])# AC_LIBTOOL_GCJ
+ 
+ 
+ # _LT_AC_LANG_GCJ
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_GCJ],
+ [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+   [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+     [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+       [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+ 	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+ 	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
+ ])# _LT_AC_LANG_GCJ
+ 
+ 
+ # AC_LIBTOOL_RC
+ # --------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+ _LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
+ ])# AC_LIBTOOL_RC
+ 
+ 
+ # AC_LIBTOOL_LANG_C_CONFIG
+ # ------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+ AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+ [lt_save_CC="$CC"
+ AC_LANG_PUSH(C)
+ 
+ # Source file extension for C test sources.
+ ac_ext=c
+ 
+ # Object file extension for compiled C test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(){return(0);}\n'
+ 
+ _LT_AC_SYS_COMPILER
+ 
+ #
+ # Check for any special shared library compilation flags.
+ #
+ _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+ if test "$GCC" = no; then
+   case $host_os in
+   sco3.2v5*)
+     _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+     ;;
+   esac
+ fi
+ if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+   if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ 	]]" >/dev/null; then :
+   else
+     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+   fi
+ fi
+ 
+ 
+ #
+ # Check to make sure the static flag actually works.
+ #
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+   _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+   $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+   [],
+   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ 
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ # Report which librarie types wil actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case "$host_os" in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+     archive_cmds="$archive_cmds~\$RANLIB \$lib"
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+ 
+ aix4*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+   ;;
+   darwin* | rhapsody*)
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case "$host_os" in
+     rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+       test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+       ;;
+     esac
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+     #	       `"' quotes if we put them in here... so don't!
+ 		output_verbose_link_cmd='echo'
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+     _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+ 		  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ 		  _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+     fi
+     ;;  
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_C_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_CXX_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+ # Dependencies to place before and after the object being linked:
+ _LT_AC_TAGVAR(predep_objects, $1)=
+ _LT_AC_TAGVAR(postdep_objects, $1)=
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cc
+ 
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+   lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+   unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+   lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+   unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test "$GXX" = yes; then
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+ 
+ if test "$GXX" = yes; then
+   # Set up default GNU C++ configuration
+ 
+   AC_PROG_LD
+ 
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+     #     investigate it a little bit more. (MM)
+     wlarc='${wl}'
+ 
+     # ancient GNU ld didn't support --whole-archive et. al.
+     if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+ 	grep 'no-whole-archive' > /dev/null; then
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+     else
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+   else
+     with_gnu_ld=no
+     wlarc=
+ 
+     # A generic and very simple default shared library creation
+     # command for GNU C++ for the case where it uses the native
+     # linker, instead of GNU ld.  If possible, this setting should
+     # overridden to take advantage of the native linker features on
+     # the platform it is being used on.
+     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+   # what "hidden" libraries, object files and flags are used when
+   # linking a shared library.
+   output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ else
+   GXX=no
+   with_gnu_ld=no
+   wlarc=
+ fi
+ 
+ # PORTME: fill in a description of your system's C++ link characteristics
+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ case $host_os in
+   aix3*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   aix4* | aix5*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=""
+     else
+       aix_use_runtimelinking=no
+ 
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+ 	    aix_use_runtimelinking=yes
+ 	    break
+ 	    ;;
+ 	  esac
+ 	done
+       esac
+ 
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+     fi
+ 
+     # When large executables or shared objects are built, AIX ld can
+     # have problems creating the table of contents.  If linking a library
+     # or program results in "error TOC overflow" add -mminimal-toc to
+     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+     # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+     _LT_AC_TAGVAR(archive_cmds, $1)=''
+     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+     if test "$GXX" = yes; then
+       case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+ 	collect2name=`${CC} -print-prog-name=collect2`
+ 	if test -f "$collect2name" && \
+ 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	then
+ 	  # We have reworked collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	else
+ 	  # We have old collect2
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ 	  # It fails to find uninstalled libraries when the uninstalled
+ 	  # path is not listed in the libpath.  Setting hardcode_minus_L
+ 	  # to unsupported forces relinking
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	fi
+       esac
+       shared_flag='-shared'
+     else
+       # not using gcc
+       if test "$host_cpu" = ia64; then
+ 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ 	# chokes on -Wl,-G. The following line is correct:
+ 	shared_flag='-G'
+       else
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag='${wl}-G'
+ 	else
+ 	  shared_flag='${wl}-bM:SRE'
+ 	fi
+       fi
+     fi
+ 
+     # It seems that -bexpall does not export symbols beginning with
+     # underscore (_), so it is better to generate a list of symbols to export.
+     _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+     if test "$aix_use_runtimelinking" = yes; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       # Determine the default libpath from the value encoded in an empty executable.
+       _LT_AC_SYS_LIBPATH_AIX
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+       if test "$host_cpu" = ia64; then
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+       else
+ 	# Determine the default libpath from the value encoded in an empty executable.
+ 	_LT_AC_SYS_LIBPATH_AIX
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	# Warning - without using the other run time loading flags,
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ 	# -bexpall does not export symbols beginning with underscore (_)
+ 	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	# Exported symbols can be pulled into shared objects from archives
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	# This is similar to how AIX traditionally builds it's shared libraries.
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+       fi
+     fi
+     ;;
+   chorus*)
+     case $cc_basename in
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+ 
+   cygwin* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+     _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+     _LT_AC_TAGVAR(always_export_symbols, $1)=no
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+       # If the export-symbols file already is a .def file (1st line
+       # is EXPORTS), use it as is; otherwise, prepend...
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ 	cp $export_symbols $output_objdir/$soname.def;
+       else
+ 	echo EXPORTS > $output_objdir/$soname.def;
+ 	cat $export_symbols >> $output_objdir/$soname.def;
+       fi~
+       $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+     else
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     fi
+   ;;
+ 
+   darwin* | rhapsody*)
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case "$host_os" in
+     rhapsody* | darwin1.[[012]])
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+       test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+       ;;
+     esac
+     	lt_int_apple_cc_single_mod=no
+     	output_verbose_link_cmd='echo'
+     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+     	  lt_int_apple_cc_single_mod=yes
+     	fi
+     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+     	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     	else
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+ 
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       fi
+         _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=no
+     _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    fi 
+     ;;
+ 
+   dgux*)
+     case $cc_basename in
+       ec++)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       ghcx)
+ 	# Green Hills C++ Compiler
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   freebsd[12]*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+   freebsd*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+     ;;
+   gnu*)
+     ;;
+   hpux9*)
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+     _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 				# but as the default
+ 				# location of the library.
+ 
+     case $cc_basename in
+     CC)
+       # FIXME: insert proper C++ library support
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     aCC)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       # Commands to make compiler produce verbose output that lists
+       # what "hidden" libraries, object files and flags are used when
+       # linking a shared library.
+       #
+       # There doesn't appear to be a way to prevent this compiler from
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+     ;;
+   hpux10*|hpux11*)
+     if test $with_gnu_ld = no; then
+       case "$host_cpu" in
+       hppa*64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+         ;;
+       ia64*)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         ;;
+       *)
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         ;;
+       esac
+     fi
+     case "$host_cpu" in
+     hppa*64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+     ia64*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 					      # but as the default
+ 					      # location of the library.
+       ;;
+     *)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ 					      # but as the default
+ 					      # location of the library.
+       ;;
+     esac
+ 
+     case $cc_basename in
+       CC)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       aCC)
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test $with_gnu_ld = no; then
+ 	    case "$host_cpu" in
+ 	    ia64*|hppa*64*)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ 	      ;;
+ 	    *)
+ 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   irix5* | irix6*)
+     case $cc_basename in
+       CC)
+ 	# SGI C++
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+ 	# necessary to make sure instantiated templates are included
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ 	;;
+       *)
+ 	if test "$GXX" = yes; then
+ 	  if test "$with_gnu_ld" = no; then
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 	  else
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ 	  fi
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 	;;
+     esac
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+   linux*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 	;;
+       icpc)
+ 	# Intel C++
+ 	with_gnu_ld=yes
+ 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+       cxx)
+ 	# Compaq C++
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+     esac
+     ;;
+   lynxos*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   m88k*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   mvs*)
+     case $cc_basename in
+       cxx)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   netbsd*)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+     fi
+     # Workaround some broken pre-1.5 toolchains
+     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+     ;;
+   osf3*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+ 	;;
+       RCC)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       cxx)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	  # Commands to make compiler produce verbose output that lists
+ 	  # what "hidden" libraries, object files and flags are used when
+ 	  # linking a shared library.
+ 	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   osf4* | osf5*)
+     case $cc_basename in
+       KCC)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# the KAI C++ compiler.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ 	;;
+       RCC)
+ 	# Rational C++ 2.4.1
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       cxx)
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ 	  echo "-hidden">> $lib.exp~
+ 	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+ 	  $rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 	;;
+       *)
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+ 	  # Commands to make compiler produce verbose output that lists
+ 	  # what "hidden" libraries, object files and flags are used when
+ 	  # linking a shared library.
+ 	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+ 	else
+ 	  # FIXME: insert proper C++ library support
+ 	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	fi
+ 	;;
+     esac
+     ;;
+   psos*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   sco*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     case $cc_basename in
+       CC)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   sunos4*)
+     case $cc_basename in
+       CC)
+ 	# Sun C++ 4.x
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       lcc)
+ 	# Lucid
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   solaris*)
+     case $cc_basename in
+       CC)
+ 	# Sun C++ 4.2, 5.x and Centerline C++
+ 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	case $host_os in
+ 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+ 	  *)
+ 	    # The C++ compiler is used as linker so we must use $wl
+ 	    # flag to pass the commands to the underlying system
+ 	    # linker.
+ 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ 	    ;;
+ 	esac
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+ 	#
+ 	# There doesn't appear to be a way to prevent this compiler from
+ 	# explicitly linking system object files so we need to strip them
+ 	# from the output so that they don't get included in the library
+ 	# dependencies.
+ 	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+ 	# Archives containing C++ object files must be created using
+ 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+ 	# necessary to make sure instantiated templates are included
+ 	# in the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ 	;;
+       gcx)
+ 	# Green Hills C++ Compiler
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+ 	# The C++ compiler must be used to create the archive.
+ 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ 	;;
+       *)
+ 	# GNU C++ compiler with Solaris linker
+ 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+ 	    # linking a shared library.
+ 	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+ 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+ 	    # linking a shared library.
+ 	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ 	  fi
+ 
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ 	fi
+ 	;;
+     esac
+     ;;
+   sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+   tandem*)
+     case $cc_basename in
+       NCC)
+ 	# NonStop-UX NCC 3.20
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+   vxworks*)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+   *)
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+ esac
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ _LT_AC_TAGVAR(GCC, $1)="$GXX"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_POSTDEP_PREDEP($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ldcxx=$with_gnu_ld
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+ # ------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+ AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library.  It's possible we should let each
+ dnl tag define a new lt_????_link_test_code variable,
+ dnl but it's only used here...
+ ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+ int a;
+ void foo (void) { a = 0; }
+ EOF
+ ],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+ public:
+   Foo (void) { a = 0; }
+ private:
+   int a;
+ };
+ EOF
+ ],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+       subroutine foo
+       implicit none
+       integer*4 a
+       a=0
+       return
+       end
+ EOF
+ ],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+ public class foo {
+   private int a;
+   public void bar (void) {
+     a = 0;
+   }
+ };
+ EOF
+ ])
+ dnl Parse the compiler output and extract the necessary
+ dnl objects, libraries and library flags.
+ if AC_TRY_EVAL(ac_compile); then
+   # Parse the compiler output and extract the necessary
+   # objects, libraries and library flags.
+ 
+   # Sentinel used to keep track of whether or not we are before
+   # the conftest object file.
+   pre_test_object_deps_done=no
+ 
+   # The `*' in the case matches for architectures that use `case' in
+   # $output_verbose_cmd can trigger glob expansion during the loop
+   # eval without this substitution.
+   output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ 
+   for p in `eval $output_verbose_link_cmd`; do
+     case $p in
+ 
+     -L* | -R* | -l*)
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test $p = "-L" \
+ 	  || test $p = "-R"; then
+ 	 prev=$p
+ 	 continue
+        else
+ 	 prev=
+        fi
+ 
+        if test "$pre_test_object_deps_done" = no; then
+ 	 case $p in
+ 	 -L* | -R*)
+ 	   # Internal compiler library paths should come after those
+ 	   # provided the user.  The postdeps already come after the
+ 	   # user supplied libs so there is no need to process them.
+ 	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+ 	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ 	   else
+ 	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ 	   fi
+ 	   ;;
+ 	 # The "-l" case would never come before the object being
+ 	 # linked, so don't bother handling this case.
+ 	 esac
+        else
+ 	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+ 	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+ 	 else
+ 	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+ 	 fi
+        fi
+        ;;
+ 
+     *.$objext)
+        # This assumes that the test object file only shows up
+        # once in the compiler output.
+        if test "$p" = "conftest.$objext"; then
+ 	 pre_test_object_deps_done=yes
+ 	 continue
+        fi
+ 
+        if test "$pre_test_object_deps_done" = no; then
+ 	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+ 	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+ 	 else
+ 	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+ 	 fi
+        else
+ 	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+ 	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+ 	 else
+ 	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+ 	 fi
+        fi
+        ;;
+ 
+     *) ;; # Ignore the rest.
+ 
+     esac
+   done
+ 
+   # Clean up.
+   rm -f a.out a.exe
+ else
+   echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+ 
+ $rm -f confest.$objext
+ 
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+ # AC_LIBTOOL_LANG_F77_CONFIG
+ # ------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+ AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+ [AC_REQUIRE([AC_PROG_F77])
+ AC_LANG_PUSH(Fortran 77)
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+ # Source file extension for f77 test sources.
+ ac_ext=f
+ 
+ # Object file extension for compiled f77 test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="      program t\n      end\n"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+ AC_MSG_CHECKING([whether to build shared libraries])
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case "$host_os" in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+     archive_cmds="$archive_cmds~\$RANLIB \$lib"
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+ aix4*)
+   test "$enable_shared" = yes && enable_static=no
+   ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+ AC_MSG_CHECKING([whether to build static libraries])
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_POP
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_F77_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_GCJ_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+ AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+ [AC_LANG_SAVE
+ 
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+ # Object file extension for compiled Java test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="class foo {}\n"
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ 
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+ AC_LIBTOOL_PROG_CC_C_O($1)
+ AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_RESTORE
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ 
+ 
+ # AC_LIBTOOL_LANG_RC_CONFIG
+ # --------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+ AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+ AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+ [AC_LANG_SAVE
+ 
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+ # Object file extension for compiled RC test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+ 
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+ AC_LIBTOOL_CONFIG($1)
+ 
+ AC_LANG_RESTORE
+ CC="$lt_save_CC"
+ ])# AC_LIBTOOL_LANG_RC_CONFIG
+ 
+ 
+ # AC_LIBTOOL_CONFIG([TAGNAME])
+ # ----------------------------
+ # If TAGNAME is not passed, then create an initial libtool script
+ # with a default configuration from the untagged config vars.  Otherwise
+ # add code to config.status for appending the configuration named by
+ # TAGNAME from the matching tagged config vars.
+ AC_DEFUN([AC_LIBTOOL_CONFIG],
+ [# The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+ # with your package, and you will get complaints that there are
+ # no rules to generate ltmain.sh.
+ if test -f "$ltmain"; then
+   # See if we are running on zsh, and set the options which allow our commands through
+   # without removal of \ escapes.
+   if test -n "${ZSH_VERSION+set}" ; then
+     setopt NO_GLOB_SUBST
+   fi  
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+   for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+     deplibs_check_method reload_flag reload_cmds need_locks \
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+     old_postinstall_cmds old_postuninstall_cmds \
+     _LT_AC_TAGVAR(compiler, $1) \
+     _LT_AC_TAGVAR(CC, $1) \
+     _LT_AC_TAGVAR(LD, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+     _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+     _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+     _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+     _LT_AC_TAGVAR(old_archive_cmds, $1) \
+     _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+     _LT_AC_TAGVAR(predep_objects, $1) \
+     _LT_AC_TAGVAR(postdep_objects, $1) \
+     _LT_AC_TAGVAR(predeps, $1) \
+     _LT_AC_TAGVAR(postdeps, $1) \
+     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+     _LT_AC_TAGVAR(archive_cmds, $1) \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(postinstall_cmds, $1) \
+     _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+     _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+     _LT_AC_TAGVAR(no_undefined_flag, $1) \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+     _LT_AC_TAGVAR(hardcode_automatic, $1) \
+     _LT_AC_TAGVAR(module_cmds, $1) \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+     _LT_AC_TAGVAR(exclude_expsyms, $1) \
+     _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+     case $var in
+     _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+     _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_cmds, $1) | \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+     _LT_AC_TAGVAR(module_cmds, $1) | \
+     _LT_AC_TAGVAR(module_expsym_cmds, $1) | \   
+     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+     extract_expsyms_cmds | reload_cmds | finish_cmds | \
+     postinstall_cmds | postuninstall_cmds | \
+     old_postinstall_cmds | old_postuninstall_cmds | \
+     sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+       # Double-quote double-evaled strings.
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+     *)
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+       ;;
+     esac
+   done
+ 
+   case $lt_echo in
+   *'\[$]0 --fallback-echo"')
+     lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+     ;;
+   esac
+ 
+ ifelse([$1], [],
+   [cfgfile="${ofile}T"
+   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+   $rm -f "$cfgfile"
+   AC_MSG_NOTICE([creating $ofile])],
+   [cfgfile="$ofile"])
+ 
+   cat <<__EOF__ >> "$cfgfile"
+ ifelse([$1], [],
+ [#! $SHELL
+ 
+ # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # A sed program that does not truncate output.
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="$SED -e s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+ 
+ # ### BEGIN LIBTOOL CONFIG],
+ [# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ 
+ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+ # Shell to use when invoking shell scripts.
+ SHELL=$lt_SHELL
+ 
+ # Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+ 
+ # Whether or not to build static libraries.
+ build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+ build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+ 
+ # Whether or not to disallow shared libs when runtime libs are static
+ allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ 
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+ 
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+ 
+ # The archiver.
+ AR=$lt_AR
+ AR_FLAGS=$lt_AR_FLAGS
+ 
+ # A C compiler.
+ LTCC=$lt_LTCC
+ 
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+ # Is the compiler the GNU C compiler?
+ with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ 
+ # An ERE matcher.
+ EGREP=$lt_EGREP
+ 
+ # The linker used to build libraries.
+ LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+ 
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+ 
+ # A BSD-compatible nm program.
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+ STRIP=$STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+ 
+ # Used on cygwin: DLL creation program.
+ DLLTOOL="$DLLTOOL"
+ 
+ # Used on cygwin: object dumper.
+ OBJDUMP="$OBJDUMP"
+ 
+ # Used on cygwin: assembler.
+ AS="$AS"
+ 
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+ 
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+ reload_cmds=$lt_reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+ wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ 
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+ shrext='$shrext'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+ pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ pic_mode=$pic_mode
+ 
+ # What is the maximum length of a command?
+ max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+ # Must we lock files when doing compilation ?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+ need_lib_prefix=$need_lib_prefix
+ 
+ # Do we need a version for libraries?
+ need_version=$need_version
+ 
+ # Whether dlopen is supported.
+ dlopen_support=$enable_dlopen
+ 
+ # Whether dlopen of programs is supported.
+ dlopen_self=$enable_dlopen_self
+ 
+ # Whether dlopen of statically linked programs is supported.
+ dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+ link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ 
+ # Compiler flag to turn off builtin functions.
+ no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ 
+ # Compiler flag to allow reflexive dlopens.
+ export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ 
+ # Compiler flag to generate shared objects directly from archives.
+ whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ 
+ # Compiler flag to generate thread-safe objects.
+ thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ 
+ # Library versioning type.
+ version_type=$version_type
+ 
+ # Format of library name prefix.
+ libname_spec=$lt_libname_spec
+ 
+ # List of archive names.  First name is the real one, the rest are links.
+ # The last name is the one that the linker finds with -lNAME.
+ library_names_spec=$lt_library_names_spec
+ 
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+ 
+ # Commands used to build and install an old-style archive.
+ RANLIB=$lt_RANLIB
+ old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+ # Create an old-style archive from a shared archive.
+ old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ 
+ # Create a temporary old-style archive to link instead of a shared archive.
+ old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ 
+ # Commands used to build and install a shared archive.
+ archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+ archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+ postinstall_cmds=$lt_postinstall_cmds
+ postuninstall_cmds=$lt_postuninstall_cmds
+ 
+ # Commands used to build a loadable module (assumed same as above if empty)
+ module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+ module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+ 
+ # Commands to strip libraries.
+ old_striplib=$lt_old_striplib
+ striplib=$lt_striplib
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+ predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+ 
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+ postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+ 
+ # Dependencies to place before the objects being linked to create a
+ # shared library.
+ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ 
+ # Dependencies to place after the objects being linked to create a
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ 
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+ 
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+ 
+ # Command to use when deplibs_check_method == file_magic.
+ file_magic_cmd=$lt_file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+ allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ 
+ # Flag that forces no undefined symbols.
+ no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+ 
+ # Same as above, but a single script fragment to be evaled but not shown.
+ finish_eval=$lt_finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+ # Transform the output of nm in a proper C declaration
+ global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+ # Transform the output of nm in a C name address pair
+ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+ 
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+ 
+ # Is shlibpath searched before the hard-coded library search path?
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+ # How to hardcode a shared library path into an executable.
+ hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+ 
+ # Whether we should hardcode library paths into libraries.
+ hardcode_into_libs=$hardcode_into_libs
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+ hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+ hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+ 
+ # Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+ # resulting binary.
+ hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+ 
+ # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+ # resulting binary.
+ hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+ 
+ # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+ # the resulting binary.
+ hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+ 
+ # Set to yes if building a shared library automatically hardcodes DIR into the library
+ # and all subsequent libraries and executables linked against it.
+ hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+ 
+ # Variables whose values should be saved in libtool wrapper scripts and
+ # restored at relink time.
+ variables_saved_for_relink="$variables_saved_for_relink"
+ 
+ # Whether libtool must link a program against all its dependency libraries.
+ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ 
+ # Compile-time system search path for libraries
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+ fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+ 
+ # The commands to list exported symbols.
+ export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+ 
+ # The commands to extract the exported symbol list from a shared archive.
+ extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+ # Symbols that should not be listed in the preloaded symbols.
+ exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+ 
+ # Symbols that must always be exported.
+ include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+ 
+ ifelse([$1],[],
+ [# ### END LIBTOOL CONFIG],
+ [# ### END LIBTOOL TAG CONFIG: $tagname])
+ 
+ __EOF__
+ 
+ ifelse([$1],[], [
+   case $host_os in
+   aix3*)
+     cat <<\EOF >> "$cfgfile"
+ 
+ # AIX sometimes has problems with the GCC collect2 program.  For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+   COLLECT_NAMES=
+   export COLLECT_NAMES
+ fi
+ EOF
+     ;;
+   esac
+ 
+   # We use sed instead of cat because bash on DJGPP gets confused if
+   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+   # text mode, it properly converts lines to CR/LF.  This bash problem
+   # is reportedly fixed, but why not run on old versions too?
+   sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+ 
+   mv -f "$cfgfile" "$ofile" || \
+     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+   chmod +x "$ofile"
+ ])
+ else
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+   test -f Makefile && make "$ltmain"
+ fi
+ ])# AC_LIBTOOL_CONFIG
+ 
+ 
+ # AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+ # -------------------------------------------
+ AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+ [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ 
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ 
+ if test "$GCC" = yes; then
+   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+   AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+     lt_cv_prog_compiler_rtti_exceptions,
+     [-fno-rtti -fno-exceptions], [],
+     [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+ fi
+ ])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+ 
+ 
+ # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+ AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+ [
+ # These are sane defaults that work on at least a few old systems.
+ # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+ 
+ # Character class describing NM global symbol codes.
+ symcode='[[BCDEGRST]]'
+ 
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+ # Transform the above into a raw symbol and a C symbol.
+ symxfrm='\1 \2\3 \3'
+ 
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+ # Transform an extracted symbol line into symbol name and symbol address
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+ 
+ # Define system-specific variables.
+ case $host_os in
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+ cygwin* | mingw* | pw32*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+   if test "$host_cpu" = ia64; then
+     symcode='[[ABCDEGRST]]'
+   fi
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+ irix* | nonstopux*)
+   symcode='[[BCDEGRST]]'
+   ;;
+ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris* | sysv5*)
+   symcode='[[BDT]]'
+   ;;
+ sysv4)
+   symcode='[[DFNSTU]]'
+   ;;
+ esac
+ 
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+ case $build_os in
+ mingw*)
+   opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+   ;;
+ esac
+ 
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+   symcode='[[ABCDGISTW]]' ;;
+ esac
+ 
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+ 
+   # Write the raw and C identifiers.
+   lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ 
+   # Check to see that the pipe works correctly.
+   pipe_works=no
+ 
+   rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ char nm_test_var;
+ void nm_test_func(){}
+ #ifdef __cplusplus
+ }
+ #endif
+ int main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
+ 
+   if AC_TRY_EVAL(ac_compile); then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+     if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+ 	mv -f "$nlist"T "$nlist"
+       else
+ 	rm -f "$nlist"T
+       fi
+ 
+       # Make sure that we snagged all the symbols we need.
+       if grep ' nm_test_var$' "$nlist" >/dev/null; then
+ 	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+ 	  cat <<EOF > conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+ EOF
+ 	  # Now generate the symbol file.
+ 	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+ 
+ 	  cat <<EOF >> conftest.$ac_ext
+ #if defined (__STDC__) && __STDC__
+ # define lt_ptr_t void *
+ #else
+ # define lt_ptr_t char *
+ # define const
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
+ const struct {
+   const char *name;
+   lt_ptr_t address;
+ }
+ lt_preloaded_symbols[[]] =
+ {
+ EOF
+ 	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+ 	  cat <<\EOF >> conftest.$ac_ext
+   {0, (lt_ptr_t) 0}
+ };
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ EOF
+ 	  # Now try linking the two files.
+ 	  mv conftest.$ac_objext conftstm.$ac_objext
+ 	  lt_save_LIBS="$LIBS"
+ 	  lt_save_CFLAGS="$CFLAGS"
+ 	  LIBS="conftstm.$ac_objext"
+ 	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ 	    pipe_works=yes
+ 	  fi
+ 	  LIBS="$lt_save_LIBS"
+ 	  CFLAGS="$lt_save_CFLAGS"
+ 	else
+ 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ 	fi
+       else
+ 	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+       fi
+     else
+       echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+     fi
+   else
+     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+     cat conftest.$ac_ext >&5
+   fi
+   rm -f conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+     break
+   else
+     lt_cv_sys_global_symbol_pipe=
+   fi
+ done
+ ])
+ if test -z "$lt_cv_sys_global_symbol_pipe"; then
+   lt_cv_sys_global_symbol_to_cdecl=
+ fi
+ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+   AC_MSG_RESULT(failed)
+ else
+   AC_MSG_RESULT(ok)
+ fi
+ ]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ 
+ 
+ # AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+ # ---------------------------------------
+ AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+ [_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+ 
+ AC_MSG_CHECKING([for $compiler option to produce PIC])
+  ifelse([$1],[CXX],[
+   # C++ specific cases for pic, static, wl, etc.
+   if test "$GXX" = yes; then
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+     case $host_os in
+     aix*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+     beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+     mingw* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+     *djgpp*)
+       # DJGPP does not support shared libraries at all
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       fi
+       ;;
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	;;
+       esac
+       ;;
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+   else
+     case $host_os in
+       aix4* | aix5*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+ 	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	else
+ 	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ 	fi
+ 	;;
+       chorus*)
+ 	case $cc_basename in
+ 	cxch68)
+ 	  # Green Hills C++ Compiler
+ 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
+ 	;;
+       dgux*)
+ 	case $cc_basename in
+ 	  ec++)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+ 	  ghcx)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       freebsd*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    if test "$host_cpu" != ia64; then
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	    fi
+ 	    ;;
+ 	  aCC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ 	    case "$host_cpu" in
+ 	    hppa*64*|ia64*)
+ 	      # +Z the default
+ 	      ;;
+ 	    *)
+ 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	      ;;
+ 	    esac
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       irix5* | irix6* | nonstopux*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    # CC pic flag -KPIC is the default.
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       linux*)
+ 	case $cc_basename in
+ 	  KCC)
+ 	    # KAI C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  icpc)
+ 	    # Intel C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 	    ;; 
+ 	  cxx)
+ 	    # Compaq C++
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       lynxos*)
+ 	;;
+       m88k*)
+ 	;;
+       mvs*)
+ 	case $cc_basename in
+ 	  cxx)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       netbsd*)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+ 	  KCC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ 	    ;;
+ 	  RCC)
+ 	    # Rational C++ 2.4.1
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  cxx)
+ 	    # Digital/Compaq C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    # Make sure the PIC flag is empty.  It appears that all Alpha
+ 	    # Linux and Compaq Tru64 Unix objects are PIC.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       psos*)
+ 	;;
+       sco*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       solaris*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    # Sun C++ 4.2, 5.x and Centerline C++
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ 	    ;;
+ 	  gcx)
+ 	    # Green Hills C++ Compiler
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       sunos4*)
+ 	case $cc_basename in
+ 	  CC)
+ 	    # Sun C++ 4.x
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ 	    ;;
+ 	  lcc)
+ 	    # Lucid
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       tandem*)
+ 	case $cc_basename in
+ 	  NCC)
+ 	    # NonStop-UX NCC 3.20
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    ;;
+ 	  *)
+ 	    ;;
+ 	esac
+ 	;;
+       unixware*)
+ 	;;
+       vxworks*)
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ 	;;
+     esac
+   fi
+ ],
+ [
+   if test "$GCC" = yes; then
+     _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+     _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
+     case $host_os in
+       aix*)
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+ 
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+ 
+     beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+       ;;
+ 
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       enable_shared=no
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       fi
+       ;;
+ 
+     hpux*)
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	;;
+       esac
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+   else
+     # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+     aix*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+ 
+     mingw* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+       # not for PA HP-UX.
+       case "$host_cpu" in
+       hppa*64*|ia64*)
+ 	# +Z the default
+ 	;;
+       *)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	;;
+       esac
+       # Is there a better lt_prog_compiler_static that works with the bundled CC?
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # PIC (with -KPIC) is the default.
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     newsos6)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     linux*)
+       case $CC in
+       icc|ecc)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
+       ccc)
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         # All Alpha code is PIC.
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+         ;;
+       esac
+       ;;
+ 
+     osf3* | osf4* | osf5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       # All OSF/1 code is PIC.
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+     sco3.2v5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+       ;;
+ 
+     solaris*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sunos4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec ;then
+ 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
+ 
+     uts4*)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+     esac
+   fi
+ ])
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+ 
+ #
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+     _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+      "" | " "*) ;;
+      *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+      esac],
+     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+ case "$host_os" in
+   # For platforms which do not support PIC, -DPIC is meaningless:
+   *djgpp*)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+     ;;
+   *)
+     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+     ;;
+ esac
+ ])
+ 
+ 
+ # AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+ [AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+   aix4* | aix5*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+     else
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+     fi
+     ;;
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
+ ],[
+   runpath_var=
+   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+   _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_AC_TAGVAR(archive_cmds, $1)=
+   _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+   _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+   _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+   _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+   _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+   _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+   _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+   _LT_AC_TAGVAR(hardcode_direct, $1)=no
+   _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+   _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+   _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+   _LT_AC_TAGVAR(module_cmds, $1)=
+   _LT_AC_TAGVAR(module_expsym_cmds, $1)=  
+   _LT_AC_TAGVAR(always_export_symbols, $1)=no
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   # include_expsyms should be a list of space-separated symbols to be *always*
+   # included in the symbol list
+   _LT_AC_TAGVAR(include_expsyms, $1)=
+   # exclude_expsyms can be an extended regexp of symbols to exclude
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+   _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
+   extract_expsyms_cmds=
+ 
+   case $host_os in
+   cygwin* | mingw* | pw32*)
+     # FIXME: the MSVC++ port hasn't been tested in a loooong time
+     # When not using gcc, we currently assume that we are using
+     # Microsoft Visual C++.
+     if test "$GCC" != yes; then
+       with_gnu_ld=no
+     fi
+     ;;
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+   esac
+ 
+   _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+   if test "$with_gnu_ld" = yes; then
+     # If archive_cmds runs LD, not CC, wlarc should be empty
+     wlarc='${wl}'
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+     aix3* | aix4* | aix5*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+ 
+ *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support.  If you
+ *** really care for shared libraries, you may want to modify your PATH
+ *** so that a non-GNU linker is found, and then restart.
+ 
+ EOF
+       fi
+       ;;
+ 
+     amigaos*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 
+       # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+       # that the semantics of dynamic libraries on AmigaOS, at least up
+       # to version 4, is to share data among multiple programs linked
+       # with the same dynamic library.  Since this doesn't match the
+       # behavior of shared libraries on other platforms, we can't use
+       # them.
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     beos*)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+     cygwin* | mingw* | pw32*)
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=no
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ 
+       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ 	# If the export-symbols file already is a .def file (1st line
+ 	# is EXPORTS), use it as is; otherwise, prepend...
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ 	  cp $export_symbols $output_objdir/$soname.def;
+ 	else
+ 	  echo EXPORTS > $output_objdir/$soname.def;
+ 	  cat $export_symbols >> $output_objdir/$soname.def;
+ 	fi~
+ 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+     netbsd*)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+ 
+     solaris* | sysv5*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	cat <<EOF 1>&2
+ 
+ *** Warning: The releases 2.8.* of the GNU linker cannot reliably
+ *** create shared libraries on Solaris systems.  Therefore, libtool
+ *** is disabling shared libraries support.  We urge you to upgrade GNU
+ *** binutils to release 2.9.1 or newer.  Another option is to modify
+ *** your PATH or compiler configuration so that the native linker is
+ *** used, and then restart.
+ 
+ EOF
+       elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+     sunos4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+     esac
+ 
+     if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+       runpath_var=LD_RUN_PATH
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+   	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+       fi
+     fi
+   else
+     # PORTME fill in a description of your system's linker (not GNU ld)
+     case $host_os in
+     aix3*)
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+       # Note: this linker hardcodes the directories in LIBPATH if there
+       # are no directories specified by -L.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       if test "$GCC" = yes && test -z "$link_static_flag"; then
+ 	# Neither direct hardcoding nor static linking is supported with a
+ 	# broken collect2.
+ 	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+       fi
+       ;;
+ 
+     aix4* | aix5*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+ 	aix_use_runtimelinking=no
+ 	exp_sym_flag='-Bexport'
+ 	no_entry_flag=""
+       else
+ 	# If we're using GNU nm, then we don't want the "-C" option.
+ 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+ 	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	else
+ 	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ 	fi
+ 	aix_use_runtimelinking=no
+ 
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+ 	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+   	    break
+   	  fi
+ 	  done
+ 	esac
+ 
+ 	exp_sym_flag='-bexport'
+ 	no_entry_flag='-bnoentry'
+       fi
+ 
+       # When large executables or shared objects are built, AIX ld can
+       # have problems creating the table of contents.  If linking a library
+       # or program results in "error TOC overflow" add -mminimal-toc to
+       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+       _LT_AC_TAGVAR(archive_cmds, $1)=''
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+       if test "$GCC" = yes; then
+ 	case $host_os in aix4.[012]|aix4.[012].*)
+ 	# We only want to do this on AIX 4.2 and lower, the check
+ 	# below for broken collect2 doesn't work under 4.3+
+ 	  collect2name=`${CC} -print-prog-name=collect2`
+ 	  if test -f "$collect2name" && \
+   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+ 	  then
+   	  # We have reworked collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  else
+   	  # We have old collect2
+   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+   	  # It fails to find uninstalled libraries when the uninstalled
+   	  # path is not listed in the libpath.  Setting hardcode_minus_L
+   	  # to unsupported forces relinking
+   	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+   	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+   	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ 	  fi
+ 	esac
+ 	shared_flag='-shared'
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+   	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+   	# chokes on -Wl,-G. The following line is correct:
+ 	  shared_flag='-G'
+ 	else
+   	if test "$aix_use_runtimelinking" = yes; then
+ 	    shared_flag='${wl}-G'
+ 	  else
+ 	    shared_flag='${wl}-bM:SRE'
+   	fi
+ 	fi
+       fi
+ 
+       # It seems that -bexpall does not export symbols beginning with
+       # underscore (_), so it is better to generate a list of symbols to export.
+       _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       if test "$aix_use_runtimelinking" = yes; then
+ 	# Warning - without using the other runtime loading flags (-brtl),
+ 	# -berok will link without error, but may produce a broken library.
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an empty executable.
+        _LT_AC_SYS_LIBPATH_AIX
+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+ 	if test "$host_cpu" = ia64; then
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ 	else
+ 	 # Determine the default libpath from the value encoded in an empty executable.
+ 	 _LT_AC_SYS_LIBPATH_AIX
+ 	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 	  # Warning - without using the other run time loading flags,
+ 	  # -berok will link without error, but may produce a broken library.
+ 	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ 	  # -bexpall does not export symbols beginning with underscore (_)
+ 	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ 	  # Exported symbols can be pulled into shared objects from archives
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 	  # This is similar to how AIX traditionally builds it's shared libraries.
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+       ;;
+ 
+     amigaos*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       # see comment about different semantics on the GNU ld section
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     bsdi4*)
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+     cygwin* | mingw* | pw32*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
+       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+     if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then 
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       case "$host_os" in
+       rhapsody* | darwin1.[[012]])
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+ 	;;
+       *) # Darwin 1.3 on
+ 	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ 	;;
+       esac
+       # FIXME: Relying on posixy $() will cause problems for
+       #        cross-compilation, but unfortunately the echo tests do not
+       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+       #	       `"' quotes if we put them in here... so don't!
+     	lt_int_apple_cc_single_mod=no
+     	output_verbose_link_cmd='echo'
+     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+     	  lt_int_apple_cc_single_mod=yes
+     	fi
+     	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+     	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     	else
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         else
+           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         fi
+           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+     fi  
+       ;;
+ 
+     dgux*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     freebsd1*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+     # support.  Future versions do this automatically, but an explicit c++rt0.o
+     # does not break anything, and helps significantly (at the cost of a little
+     # extra space).
+     freebsd2.2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+     freebsd2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+     hpux10* | hpux11*)
+       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ 	  ;;
+ 	esac
+       else
+ 	case "$host_cpu" in
+ 	hppa*64*|ia64*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ 	  ;;
+ 	esac
+       fi
+       if test "$with_gnu_ld" = no; then
+ 	case "$host_cpu" in
+ 	hppa*64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	  ;;
+ 	ia64*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ 	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 
+ 	  # hardcode_minus_L: Not really in the search PATH,
+ 	  # but as the default location of the library.
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ 	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+ 	  # hardcode_minus_L: Not really in the search PATH,
+ 	  # but as the default location of the library.
+ 	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 	  ;;
+ 	esac
+       fi
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+     netbsd*)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     newsos6)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     openbsd*)
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+        case $host_os in
+ 	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ 	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+ 	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+       fi
+       ;;
+ 
+     os2*)
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+     osf4* | osf5*)	# as osf3* with the addition of -msym flag
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       else
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ 	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+ 	# Both c and cxx compiler support -rpath directly
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+ 
+     sco3.2v5*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       ;;
+ 
+     solaris*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       case $host_os in
+       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+       esac
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+     sunos4*)
+       if test "x$host_vendor" = xsequent; then
+ 	# Use $CC to link under sequent, because it throws in some extra .o
+ 	# files that make .init and .fini sections work.
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv4)
+       case $host_vendor in
+ 	sni)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+ 	;;
+ 	siemens)
+ 	  ## LD is ld it makes a PLAMLIB
+ 	  ## CC just makes a GrossModule.
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+         ;;
+ 	motorola)
+ 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+ 	;;
+       esac
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv4.3*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ 	runpath_var=LD_RUN_PATH
+ 	hardcode_runpath_var=yes
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+       fi
+       ;;
+ 
+     sysv4.2uw2*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       hardcode_runpath_var=yes
+       runpath_var=LD_RUN_PATH
+       ;;
+ 
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
+       runpath_var='LD_RUN_PATH'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     sysv5*)
+       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+       # $CC -shared without GNU ld will not create a library from C++
+       # object files and a static libstdc++, better avoid it by now
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+   		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       runpath_var='LD_RUN_PATH'
+       ;;
+ 
+     uts4*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+     *)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+     esac
+   fi
+ ])
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+ 
+ #
+ # Do we need to explicitly link libc?
+ #
+ case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+ x|xyes)
+   # Assume -lc should be added
+   _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ 
+   if test "$enable_shared" = yes && test "$GCC" = yes; then
+     case $_LT_AC_TAGVAR(archive_cmds, $1) in
+     *'~'*)
+       # FIXME: we may have to deal with multi-command sequences.
+       ;;
+     '$CC '*)
+       # Test whether the compiler implicitly links with -lc since on some
+       # systems, -lgcc has to come before -lc. If gcc already passes -lc
+       # to ld, don't add -lc before -lgcc.
+       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+       $rm conftest*
+       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+         output_objdir=.
+         libname=conftest
+         lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+         if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+         then
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+         else
+ 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+         fi
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+         cat conftest.err 1>&5
+       fi
+       $rm conftest*
+       AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+       ;;
+     esac
+   fi
+   ;;
+ esac
+ ])# AC_LIBTOOL_PROG_LD_SHLIBS
+ 
+ 
+ # _LT_AC_FILE_LTDLL_C
+ # -------------------
+ # Be careful that the start marker always follows a newline.
+ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+ # /* ltdll.c starts here */
+ # #define WIN32_LEAN_AND_MEAN
+ # #include <windows.h>
+ # #undef WIN32_LEAN_AND_MEAN
+ # #include <stdio.h>
+ #
+ # #ifndef __CYGWIN__
+ # #  ifdef __CYGWIN32__
+ # #    define __CYGWIN__ __CYGWIN32__
+ # #  endif
+ # #endif
+ #
+ # #ifdef __cplusplus
+ # extern "C" {
+ # #endif
+ # BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+ # #ifdef __cplusplus
+ # }
+ # #endif
+ #
+ # #ifdef __CYGWIN__
+ # #include <cygwin/cygwin_dll.h>
+ # DECLARE_CYGWIN_DLL( DllMain );
+ # #endif
+ # HINSTANCE __hDllInstance_base;
+ #
+ # BOOL APIENTRY
+ # DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+ # {
+ #   __hDllInstance_base = hInst;
+ #   return TRUE;
+ # }
+ # /* ltdll.c ends here */
+ ])# _LT_AC_FILE_LTDLL_C
+ 
+ 
+ # _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+ # ---------------------------------
+ AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+ 
+ 
+ # old names
+ AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+ AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+ AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+ AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+ AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+ AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+ AC_DEFUN([LT_AC_PROG_GCJ],
+ [AC_CHECK_TOOL(GCJ, gcj, no)
+   test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+   AC_SUBST(GCJFLAGS)
+ ])
+ 
+ AC_DEFUN([LT_AC_PROG_RC],
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+ 
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+ #  macro and use it instead.                               #
+ ############################################################
+ # LT_AC_PROG_SED
+ # --------------
+ # Check for a fully-functional sed program, that truncates
+ # as few characters as possible.  Prefer GNU sed if found.
+ AC_DEFUN([LT_AC_PROG_SED],
+ [AC_MSG_CHECKING([for a sed that does not truncate output])
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+ # Then use that list of sed's as ones to test for truncation.
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+   test ! -f $lt_ac_sed && break
+   cat /dev/null > conftest.in
+   lt_ac_count=0
+   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+   # Check for GNU sed and select it if it is found.
+   if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+     lt_cv_path_SED=$lt_ac_sed
+     break
+   fi
+   while true; do
+     cat conftest.in conftest.in >conftest.tmp
+     mv conftest.tmp conftest.in
+     cp conftest.in conftest.nl
+     echo >>conftest.nl
+     $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+     cmp -s conftest.out conftest.nl || break
+     # 10000 chars as input seems more than enough
+     test $lt_ac_count -gt 10 && break
+     lt_ac_count=`expr $lt_ac_count + 1`
+     if test $lt_ac_count -gt $lt_ac_max; then
+       lt_ac_max=$lt_ac_count
+       lt_cv_path_SED=$lt_ac_sed
+     fi
+   done
+ done
+ SED=$lt_cv_path_SED
+ ])
+ AC_MSG_RESULT([$SED])
+ ])
+ #############################################################################
+ # Additional Macros
+ #############################################################################
+ 
+ #
+ # Check for C++ namespace support.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ AC_DEFUN([AC_CXX_NAMESPACES],
+ [AC_CACHE_CHECK(whether the compiler implements namespaces,
+ ac_cv_cxx_namespaces,
+ [AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
+                 [using namespace Outer::Inner; return i;],
+  ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
+  AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_namespaces" = yes; then
+   AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
+ fi
+ ])
+ 
+ # Check for hash_map extension.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html
+ AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP],
+ [AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class std::hash_map],
+  ac_cv_cxx_have_std_ext_hash_map,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_map>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[hash_map<int, int> t;],
+   [ac_cv_cxx_have_std_ext_hash_map=yes], [ac_cv_cxx_have_std_ext_hash_map=no])
+   AC_LANG_RESTORE])
+  HAVE_STD_EXT_HASH_MAP=0
+  if test "$ac_cv_cxx_have_std_ext_hash_map" = yes
+  then
+    HAVE_STD_EXT_HASH_MAP=1
+  fi
+  AC_SUBST(HAVE_STD_EXT_HASH_MAP)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP],
+ [AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map],
+  ac_cv_cxx_have_gnu_ext_hash_map,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_map>
+ #ifdef HAVE_NAMESPACES
+ using namespace __gnu_cxx;
+ #endif],[hash_map<int,int> t; ],
+   [ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
+   AC_LANG_RESTORE])
+  HAVE_GNU_EXT_HASH_MAP=0
+  if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes
+  then
+    HAVE_GNU_EXT_HASH_MAP=1
+  fi
+  AC_SUBST(HAVE_GNU_EXT_HASH_MAP)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP],
+ [AC_CACHE_CHECK([whether the compiler has <hash_map> defining template class ::hash_map],
+  ac_cv_cxx_have_global_hash_map,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <hash_map>],[hash_map<int,int> t; ],
+   [ac_cv_cxx_have_global_hash_map=yes], [ac_cv_cxx_have_global_hash_map=no])
+   AC_LANG_RESTORE])
+  HAVE_GLOBAL_HASH_MAP=0
+  if test "$ac_cv_cxx_have_global_hash_map" = yes
+  then
+    HAVE_GLOBAL_HASH_MAP=1
+  fi
+  AC_SUBST(HAVE_GLOBAL_HASH_MAP)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_HASH_MAP],
+ [AC_CXX_HAVE_STD_EXT_HASH_MAP
+  AC_CXX_HAVE_GNU_EXT_HASH_MAP
+  AC_CXX_HAVE_GLOBAL_HASH_MAP])
+ 
+ # Check for hash_set extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET],
+ [AC_CACHE_CHECK([whether the compiler has <ext/hash_set> defining template class std::hash_set],
+  ac_cv_cxx_have_std_ext_hash_set,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_set>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[hash_set<int> t; ],
+   [ac_cv_cxx_have_std_ext_hash_set=yes], [ac_cv_cxx_have_std_ext_hash_set=no])
+   AC_LANG_RESTORE])
+  HAVE_STD_EXT_HASH_SET=0
+  if test "$ac_cv_cxx_have_std_ext_hash_set" = yes
+  then
+    HAVE_STD_EXT_HASH_SET=1
+  fi
+  AC_SUBST(HAVE_STD_EXT_HASH_SET)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
+ [AC_CACHE_CHECK(
+  [whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set],
+  ac_cv_cxx_have_gnu_ext_hash_set,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <ext/hash_set>
+ #ifdef HAVE_NAMESPACES
+ using namespace __gnu_cxx;
+ #endif],[hash_set<int> t; ],
+   [ac_cv_cxx_have_gnu_ext_hash_set=yes], [ac_cv_cxx_have_gnu_ext_hash_set=no])
+   AC_LANG_RESTORE])
+  HAVE_GNU_EXT_HASH_SET=0
+  if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes
+  then
+    HAVE_GNU_EXT_HASH_SET=1
+  fi
+  AC_SUBST(HAVE_GNU_EXT_HASH_SET)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
+ [AC_CACHE_CHECK([whether the compiler has <hash_set> defining template class ::hash_set],
+  ac_cv_cxx_have_global_hash_set,
+  [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <hash_set>],[hash_set<int> t; return 0;],
+   [ac_cv_cxx_have_global_hash_set=yes], [ac_cv_cxx_have_global_hash_set=no])
+   AC_LANG_RESTORE])
+  HAVE_GLOBAL_HASH_SET=0
+  if test "$ac_cv_cxx_have_global_hash_set" = yes
+  then
+    HAVE_GLOBAL_HASH_SET=1
+  fi
+  AC_SUBST(HAVE_GLOBAL_HASH_SET)])
+ 
+ AC_DEFUN([AC_CXX_HAVE_HASH_SET],
+ [AC_CXX_HAVE_STD_EXT_HASH_SET
+  AC_CXX_HAVE_GNU_EXT_HASH_SET
+  AC_CXX_HAVE_GLOBAL_HASH_SET])
+ 
+ # Check for standard iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ AC_DEFUN([AC_CXX_HAVE_STD_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has the standard iterator,
+ ac_cv_cxx_have_std_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[iterator<int,int,int> t; return 0;],
+   ac_cv_cxx_have_std_iterator=yes, ac_cv_cxx_have_std_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ HAVE_STD_ITERATOR=0
+ if test "$ac_cv_cxx_have_std_iterator" = yes
+ then
+    HAVE_STD_ITERATOR=1
+ fi
+ AC_SUBST(HAVE_STD_ITERATOR)])
+ 
+ #
+ # Check for bidirectional iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ #
+ AC_DEFUN([AC_CXX_HAVE_BI_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has the bidirectional iterator,
+ ac_cv_cxx_have_bi_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[bidirectional_iterator<int,int> t; return 0;],
+   ac_cv_cxx_have_bi_iterator=yes, ac_cv_cxx_have_bi_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ HAVE_BI_ITERATOR=0
+ if test "$ac_cv_cxx_have_bi_iterator" = yes
+ then
+    HAVE_BI_ITERATOR=1
+ fi
+ AC_SUBST(HAVE_BI_ITERATOR)])
+ 
+ # Check for forward iterator extension.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
+ AC_DEFUN([AC_CXX_HAVE_FWD_ITERATOR],
+ [AC_CACHE_CHECK(whether the compiler has forward iterators,
+ ac_cv_cxx_have_fwd_iterator,
+ [AC_REQUIRE([AC_CXX_NAMESPACES])
+   AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_TRY_COMPILE([#include <iterator>
+ #ifdef HAVE_NAMESPACES
+ using namespace std;
+ #endif],[forward_iterator<int,int> t; return 0;],
+   ac_cv_cxx_have_fwd_iterator=yes, ac_cv_cxx_have_fwd_iterator=no)
+   AC_LANG_RESTORE
+ ])
+ HAVE_FWD_ITERATOR=0
+ if test "$ac_cv_cxx_have_fwd_iterator" = yes
+ then
+    HAVE_FWD_ITERATOR=1
+ fi
+ AC_SUBST(HAVE_FWD_ITERATOR)])
+ 
+ #
+ # Check for FLEX.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ AC_DEFUN([AC_PROG_FLEX],
+ [AC_CACHE_CHECK(,
+ ac_cv_has_flex,
+ [AC_PROG_LEX()
+ ])
+ if test "$LEX" != "flex"; then
+   AC_MSG_ERROR([flex not found but required])
+ fi
+ ])
+ 
+ #
+ # Check for Bison.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_namespaces.html
+ #
+ # This macro verifies that Bison is installed.  If successful, then
+ # 1) YACC is set to bison -y (to emulate YACC calls)
+ # 2) BISON is set to bison
+ #
+ AC_DEFUN([AC_PROG_BISON],
+ [AC_CACHE_CHECK(,
+ ac_cv_has_bison,
+ [AC_PROG_YACC()
+ ])
+ if test "$YACC" != "bison -y"; then
+   AC_MSG_ERROR([bison not found but required])
+ else
+   AC_SUBST(BISON,[bison],[location of bison])
+ fi
+ ])
+ 
+ #
+ # Check for GNU Make.  This is from
+ # http://www.gnu.org/software/ac-archive/htmldoc/check_gnu_make.html
+ #
+ AC_DEFUN(
+         [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+                 _cv_gnu_make_command='' ;
+ dnl Search all the common names for GNU make
+                 for a in "$MAKE" make gmake gnumake ; do
+                         if test -z "$a" ; then continue ; fi ;
+                         if  ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
+                                 _cv_gnu_make_command=$a ;
+                                 break;
+                         fi
+                 done ;
+         ) ;
+ dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
+         if test  "x$_cv_gnu_make_command" != "x"  ; then
+                 ifGNUmake='' ;
+         else
+                 ifGNUmake='#' ;
+                 AC_MSG_RESULT("Not found");
+         fi
+         AC_SUBST(ifGNUmake)
+ ] )
+ 
+ #
+ # Check for the ability to mmap a file.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_FUNC_MMAP_FILE],
+ [AC_CACHE_CHECK(for mmap of files,
+ ac_cv_func_mmap_file,
+ [AC_LANG_SAVE
+   AC_LANG_C
+   AC_TRY_RUN([
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ 
+ #ifdef HAVE_SYS_MMAN_H
+ #include <sys/mman.h>
+ #endif
+ 
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
+ 
+   int fd;
+   int main () {
+   fd = creat ("foo",0777); fd = (int) mmap (0, 1, PROT_READ, MAP_SHARED, fd, 0); unlink ("foo"); return (fd != (int) MAP_FAILED);}],
+   ac_cv_func_mmap_file=yes, ac_cv_func_mmap_file=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_func_mmap_file" = yes; then
+    AC_DEFINE([HAVE_MMAP_FILE],[],[Define if mmap() can map files into memory])
+    AC_SUBST(MMAP_FILE,[yes])
+ fi
+ ])
+ 
+ #
+ # Check for anonymous mmap macros.  This is modified from
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #
+ AC_DEFUN([AC_HEADER_MMAP_ANONYMOUS],
+ [AC_CACHE_CHECK(for MAP_ANONYMOUS vs. MAP_ANON,
+ ac_cv_header_mmap_anon,
+ [AC_LANG_SAVE
+   AC_LANG_C
+   AC_TRY_COMPILE([#include <sys/mman.h>
+   #include <unistd.h>
+   #include <fcntl.h>],
+   [mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0);],
+   ac_cv_header_mmap_anon=yes, ac_cv_header_mmap_anon=no)
+   AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_header_mmap_anon" = yes; then
+    AC_DEFINE([HAVE_MMAP_ANONYMOUS],[],[Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if it uses MAP_ANON])
+ fi
+ ])
+ 
+ #
+ # Configure a Makefile without clobbering it if it exists and is not out of
+ # date.  This is modified from:
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ #[AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1)
+ #
+ AC_DEFUN([AC_CONFIG_MAKEFILE],
+ [AC_CONFIG_COMMANDS($1,${SHELL} ${srcdir}/autoconf/install-sh -c ${srcdir}/$1 $1,${srcdir}/autoconf/mkinstalldirs `dirname $1`)
+ ])
+ 
+ #
+ # Determine if the printf() functions have the %a format character.
+ # This is modified from:
+ # http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_slist.html
+ AC_DEFUN([AC_C_PRINTF_A],
+ [
+         AC_MSG_CHECKING([for printf %a format specifier])
+ 	AC_LANG_SAVE
+ 	AC_LANG_C
+ 	AC_RUN_IFELSE(
+ 		AC_LANG_PROGRAM([#include <stdio.h>
+ 		                 #include <stdlib.h>],
+ 		                 [[[
+ 		                 volatile double A, B;
+ 		                 char Buffer[100];
+ 		                 A = 1;
+ 		                 A /= 10.0;
+ 		                 sprintf(Buffer, "%a", A);
+ 		                 B = atof(Buffer);
+ 		                 if (A != B)
+ 							 return (1);
+ 		                 if (A != 0x1.999999999999ap-4)
+ 							 return (1);
+ 		                 return (0);]]]),
+ 		ac_c_printf_a=yes,ac_c_printf_a=no)
+ 	AC_LANG_RESTORE
+         AC_MSG_RESULT($ac_c_printf_a)
+ 	if test "$ac_c_printf_a" = "yes"; then
+ 		AC_DEFINE([HAVE_PRINTF_A],[1],[Define to have the %a format string])
+ 	fi
+ ])
+ 
+ #
+ # Determine if the system can handle the -R option being passed to the linker.
+ #
+ AC_DEFUN([AC_LINK_USE_R],
+ [
+   AC_MSG_CHECKING([for compiler -Wl,-R<path> option])
+   AC_LANG_SAVE
+   AC_LANG_C
+   oldcflags="$CFLAGS"
+   CFLAGS="$CFLAGS -Wl,-R."
+   AC_LINK_IFELSE([int main() { return 0; }],[ac_cv_link_use_r=yes],[ac_cv_link_use_r=no])
+   CFLAGS="$oldcflags"
+   AC_LANG_RESTORE
+   AC_MSG_RESULT($ac_cv_link_use_r)
+   if test "$ac_cv_link_use_r" = yes
+   then
+     AC_DEFINE([HAVE_LINK_R],[1],[Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path.])
+   fi
+ ])
+ 
+ 
+ dnl AC_SINGLE_CXX_CHECK(DEFINEVAR, CACHEVAR, FUNCTION, HEADER, PROGRAM)
+ dnl                     $1,        $2,       $3,       $4,     $5
+ dnl 
+ AC_DEFUN([AC_SINGLE_CXX_CHECK],
+ [AC_CACHE_CHECK([for $3 in $4], [$2],
+  [AC_LANG_PUSH(C++)
+   AC_COMPILE_IFELSE(AC_LANG_SOURCE([$5]),[$2=yes],[$2=no])
+  AC_LANG_POP(C++)])
+  if test "$$2" = "yes"
+  then
+    AC_DEFINE($1, 1, [Define to 1 if your compiler defines $3 in the $4
+                      header file.])
+  fi])
+ 
+ AC_DEFUN([AC_FUNC_ISNAN],[
+ AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_MATH_H],    [ac_cv_func_isnan_in_math_h],   
+                     [isnan], [<math.h>],
+                     [#include <math.h>
+                      int foo(float f) {return isnan(f);}])
+ AC_SINGLE_CXX_CHECK([HAVE_ISNAN_IN_CMATH],     [ac_cv_func_isnan_in_cmath],    
+                     [isnan], [<cmath>],
+                     [#include <cmath>
+                      int foo(float f) {return isnan(f);}])
+ AC_SINGLE_CXX_CHECK([HAVE_STD_ISNAN_IN_CMATH], [ac_cv_func_std_isnan_in_cmath],
+                     [std::isnan], [<cmath>],
+                     [#include <cmath>
+                      using std::isnan; int foo(float f) {return isnan(f);}])
+ ])
+ 
+ AC_DEFUN([AC_FUNC_ISINF],[
+ AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_MATH_H],    [ac_cv_func_isinf_in_math_h],   
+                     [isinf], [<math.h>],
+                     [#include <math.h>
+                      int foo(float f) {return isinf(f);}])
+ AC_SINGLE_CXX_CHECK([HAVE_ISINF_IN_CMATH],     [ac_cv_func_isinf_in_cmath],    
+                     [isinf], [<cmath>],
+                     [#include <cmath>
+                      int foo(float f) {return isinf(f);}])
+ AC_SINGLE_CXX_CHECK([HAVE_STD_ISINF_IN_CMATH], [ac_cv_func_std_isinf_in_cmath],
+                     [std::isinf], [<cmath>],
+                     [#include <cmath>
+                      using std::isinf; int foo(float f) {return isinf(f);}])
+ AC_SINGLE_CXX_CHECK([HAVE_FINITE_IN_IEEEFP_H], [ac_cv_func_finite_in_ieeefp_h],
+                     [finite], [<ieeefp.h>],
+                     [#include <ieeefp.h>
+                      int foo(float f) {return finite(f);}])
+ ])


Index: llvm/projects/Stacker/autoconf/config.guess
diff -c /dev/null llvm/projects/Stacker/autoconf/config.guess:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/config.guess	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,1388 ----
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+ timestamp='2003-02-22'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Originally written by Per Bothner <per at bothner.com>.
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+ # don't specify an explicit build system type.
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION]
+ 
+ Output the configuration name of the system \`$me' is run on.
+ 
+ Operation modes:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches at gnu.org>."
+ 
+ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+        echo "$timestamp" ; exit 0 ;;
+     --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+        echo "$me: invalid option $1$help" >&2
+        exit 1 ;;
+     * )
+        break ;;
+   esac
+ done
+ 
+ if test $# != 0; then
+   echo "$me: too many arguments$help" >&2
+   exit 1
+ fi
+ 
+ trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+ # temporary files to be created and, as you can see below, it is a
+ # headache to deal with in a portable fashion.
+ 
+ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+ # use `HOST_CC' if defined, but it is deprecated.
+ 
+ # Portable tmp directory creation inspired by the Autoconf team.
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+ case $CC_FOR_BUILD,$HOST_CC,$CC in
+  ,,)    echo "int x;" > $dummy.c ;
+ 	for c in cc gcc c89 c99 ; do
+ 	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+ 	if test x"$CC_FOR_BUILD" = x ; then
+ 	  CC_FOR_BUILD=no_compiler_found ;
+ 	fi
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+ esac ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi at noc.rutgers.edu 1994-08-24)
+ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+ 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+ 	# compatibility and a consistent mechanism for selecting the
+ 	# object file format.
+ 	#
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+ 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+ 	# to ELF recently, or will in the future.
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep __ELF__ >/dev/null
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+ 		    os=netbsd
+ 		else
+ 		    os=netbsdelf
+ 		fi
+ 		;;
+ 	    *)
+ 	        os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+ 	# Debian GNU/NetBSD machines have a different userland, and
+ 	# thus, need a distinct triplet. However, they do not need
+ 	# kernel version information, so it can be replaced with a
+ 	# suitable tag, in the style of linux-gnu.
+ 	case "${UNAME_VERSION}" in
+ 	    Debian*)
+ 		release='-gnu'
+ 		;;
+ 	    *)
+ 		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     arc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     macppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvme88k:OpenBSD:*:*)
+ 	echo m88k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     mvmeppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     pmax:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sgi:OpenBSD:*:*)
+ 	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     wgrisc:OpenBSD:*:*)
+ 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 	fi
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+ 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+ 	# covers most systems running today.  This code pipes the CPU
+ 	# types through head -n 1, so we only detect the type of CPU 0.
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+ 	    "EV4 (21064)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "EV4.5 (21064)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "LCA4 (21066/21068)")
+ 		UNAME_MACHINE="alpha" ;;
+ 	    "EV5 (21164)")
+ 		UNAME_MACHINE="alphaev5" ;;
+ 	    "EV5.6 (21164A)")
+ 		UNAME_MACHINE="alphaev56" ;;
+ 	    "EV5.6 (21164PC)")
+ 		UNAME_MACHINE="alphapca56" ;;
+ 	    "EV5.7 (21164PC)")
+ 		UNAME_MACHINE="alphapca57" ;;
+ 	    "EV6 (21264)")
+ 		UNAME_MACHINE="alphaev6" ;;
+ 	    "EV6.7 (21264A)")
+ 		UNAME_MACHINE="alphaev67" ;;
+ 	    "EV6.8CB (21264C)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.8AL (21264B)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.8CX (21264D)")
+ 		UNAME_MACHINE="alphaev68" ;;
+ 	    "EV6.9A (21264/EV69A)")
+ 		UNAME_MACHINE="alphaev69" ;;
+ 	    "EV7 (21364)")
+ 		UNAME_MACHINE="alphaev7" ;;
+ 	    "EV7.9 (21364A)")
+ 		UNAME_MACHINE="alphaev79" ;;
+ 	esac
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	exit 0 ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+ 	exit 0 ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+ 	exit 0;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+ 	exit 0 ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+ 	exit 0 ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ 		echo pyramid-pyramid-sysv3
+ 	else
+ 		echo pyramid-pyramid-bsd
+ 	fi
+ 	exit 0 ;;
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
+     DRS?6000:UNIX_SV:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+ 	esac ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     i86pc:SunOS:5.*:*)
+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+ 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+ 		UNAME_RELEASE=`uname -v`
+ 		;;
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+ 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ 	exit 0 ;;
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+ 		echo m68k-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	    sun4)
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+ 	exit 0 ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+         exit 0 ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+         echo m68k-milan-mint${UNAME_RELEASE}
+         exit 0 ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+         echo m68k-hades-mint${UNAME_RELEASE}
+         exit 0 ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
+     RISC*:ULTRIX:*:*)
+ 	echo mips-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+ #endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+ 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_SVR4)
+ 	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ 	#endif
+ 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ 	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ 	#endif
+ 	#endif
+ 	  exit (-1);
+ 	}
+ EOF
+ 	$CC_FOR_BUILD -o $dummy $dummy.c \
+ 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ 	  && exit 0
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+ 	exit 0 ;;
+     Motorola:*:4.3:PL8-*)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+     m88k:CX/UX:7*:*)
+ 	echo m88k-harris-cxux7
+ 	exit 0 ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+ 	exit 0 ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+ 	exit 0 ;;
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+ 	    then
+ 		echo m88k-dg-dgux${UNAME_RELEASE}
+ 	    else
+ 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ 	    fi
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+  	exit 0 ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit 0 ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+ 	exit 0 ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ 	echo m88k-tektronix-sysv3
+ 	exit 0 ;;
+     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ 	echo m68k-tektronix-bsd
+ 	exit 0 ;;
+     *:IRIX*:*:*)
+ 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ 	exit 0 ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+     i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
+     ia64:AIX:*:*)
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
+ 		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+ 			{
+ 			if (!__power_pc())
+ 				exit(1);
+ 			puts("powerpc-ibm-aix3.2.5");
+ 			exit(0);
+ 			}
+ EOF
+ 		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+     *:AIX:*:[45])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+ 	exit 0 ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+ 	exit 0 ;;
+     DPX/2?00:B.O.S.:*:*)
+ 	echo m68k-bull-sysv3
+ 	exit 0 ;;
+     9000/[34]??:4.3bsd:1.*:*)
+ 	echo m68k-hp-bsd
+ 	exit 0 ;;
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+     9000/[34678]??:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                     case "${sc_cpu_version}" in
+                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                       532)                      # CPU_PA_RISC2_0
+                         case "${sc_kernel_bits}" in
+                           32) HP_ARCH="hppa2.0n" ;;
+                           64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                         esac ;;
+                     esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+ 		    sed 's/^              //' << EOF >$dummy.c
+ 
+               #define _HPUX_SOURCE
+               #include <stdlib.h>
+               #include <unistd.h>
+ 
+               int main ()
+               {
+               #if defined(_SC_KERNEL_BITS)
+                   long bits = sysconf(_SC_KERNEL_BITS);
+               #endif
+                   long cpu  = sysconf (_SC_CPU_VERSION);
+ 
+                   switch (cpu)
+               	{
+               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+               	case CPU_PA_RISC2_0:
+               #if defined(_SC_KERNEL_BITS)
+               	    switch (bits)
+               		{
+               		case 64: puts ("hppa2.0w"); break;
+               		case 32: puts ("hppa2.0n"); break;
+               		default: puts ("hppa2.0"); break;
+               		} break;
+               #else  /* !defined(_SC_KERNEL_BITS) */
+               	    puts ("hppa2.0"); break;
+               #endif
+               	default: puts ("hppa1.0"); break;
+               	}
+                   exit (0);
+               }
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+ 	    # avoid double evaluation of $set_cc_for_build
+ 	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+ 		HP_ARCH="hppa64"
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     ia64:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ia64-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+ 	{
+ 	  long cpu = sysconf (_SC_CPU_VERSION);
+ 	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ 	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+ 	     results, however.  */
+ 	  if (CPU_IS_PA_RISC (cpu))
+ 	    {
+ 	      switch (cpu)
+ 		{
+ 		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ 		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ 		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ 		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+ 		}
+ 	    }
+ 	  else if (CPU_IS_HP_MC68K (cpu))
+ 	    puts ("m68k-hitachi-hiuxwe2");
+ 	  else puts ("unknown-hitachi-hiuxwe2");
+ 	  exit (0);
+ 	}
+ EOF
+ 	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 	echo hppa1.1-hp-bsd
+ 	exit 0 ;;
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+ 	exit 0 ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+ 	exit 0 ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+         exit 0 ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+         exit 0 ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+         exit 0 ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+         exit 0 ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+         exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     *:UNICOS/mp:*:*)
+ 	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+ 	exit 0 ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+ 	# Determine whether the default compiler uses glibc.
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <features.h>
+ 	#if __GLIBC__ >= 2
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+     x86:Interix*:3*)
+ 	echo i586-pc-interix3
+ 	exit 0 ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+ 	echo i586-pc-interix
+ 	exit 0 ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+ 	exit 0 ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     mips:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+ 	#undef mips
+ 	#undef mipsel
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ 	CPU=mipsel
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+ 	#undef mips64
+ 	#undef mips64el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ 	CPU=mips64el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ 	CPU=mips64
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     ppc:Linux:*:*)
+ 	echo powerpc-unknown-linux-gnu
+ 	exit 0 ;;
+     ppc64:Linux:*:*)
+ 	echo powerpc64-unknown-linux-gnu
+ 	exit 0 ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+ 	  EV56)  UNAME_MACHINE=alphaev56 ;;
+ 	  PCA56) UNAME_MACHINE=alphapca56 ;;
+ 	  PCA57) UNAME_MACHINE=alphapca56 ;;
+ 	  EV6)   UNAME_MACHINE=alphaev6 ;;
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit 0 ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ 	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit 0 ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+ 	echo hppa64-unknown-linux-gnu
+ 	exit 0 ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit 0 ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+ 	exit 0 ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+ 	# Set LC_ALL=C to ensure ld outputs messages in English.
+ 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ 			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+ 				    s/.*supported targets: *//
+ 				    s/ .*//
+ 				    p'`
+         case "$ld_supported_targets" in
+ 	  elf32-i386)
+ 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+ 	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit 0 ;;
+ 	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0 ;;
+ 	  "")
+ 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit 0 ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <features.h>
+ 	#ifdef __ELF__
+ 	# ifdef __GLIBC__
+ 	#  if __GLIBC__ >= 2
+ 	LIBC=gnu
+ 	#  else
+ 	LIBC=gnulibc1
+ 	#  endif
+ 	# else
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+ 	#ifdef __INTEL_COMPILER
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+ 	#endif
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+ 	exit 0 ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+ 	exit 0 ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ 	exit 0 ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+     i*86:*:5:[78]*)
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit 0 ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ 		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
+ 		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+         exit 0 ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit 0 ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+ 	exit 0 ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+ 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+ 	exit 0 ;;
+     mini*:CTIX:SYS*5:*)
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+ 	echo m68k-convergent-sysv
+ 	exit 0 ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+     3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ 	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 		echo ${UNAME_MACHINE}-sni-sysv4
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes at openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+ 	exit 0 ;;
+     *:*:*:FTX*)
+ 	# From seanf at swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
+     *:VOS:*:*)
+ 	# From Paul.Green at stratus.com.
+ 	echo hppa1.1-stratus-vos
+ 	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit 0 ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+ 	exit 0 ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit 0 ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:*)
+ 	case `uname -p` in
+ 	    *86) UNAME_PROCESSOR=i686 ;;
+ 	    powerpc) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+     NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+ 	exit 0 ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+ 	exit 0 ;;
+     DS/*:UNIX_System_V:*:*)
+ 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+ 	# operating systems.
+ 	if test "$cputype" = "386"; then
+ 	    UNAME_MACHINE=i386
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+ 	exit 0 ;;
+     *:TENEX:*:*)
+ 	echo pdp10-unknown-tenex
+ 	exit 0 ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+ 	exit 0 ;;
+     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ 	echo pdp10-xkl-tops20
+ 	exit 0 ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+ 	exit 0 ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+ #endif
+ main ()
+ {
+ #if defined (sony)
+ #if defined (MIPSEB)
+   /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+      I don't know....  */
+   printf ("mips-sony-bsd\n"); exit (0);
+ #else
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+           "4"
+ #else
+ 	  ""
+ #endif
+          ); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+   printf ("arm-acorn-riscix"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+   printf ("m68k-hp-bsd\n"); exit (0);
+ #endif
+ 
+ #if defined (NeXT)
+ #if !defined (__ARCHITECTURE__)
+ #define __ARCHITECTURE__ "m68k"
+ #endif
+   int version;
+   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+   if (version < 4)
+     printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+   else
+     printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+   exit (0);
+ #endif
+ 
+ #if defined (MULTIMAX) || defined (n16)
+ #if defined (UMAXV)
+   printf ("ns32k-encore-sysv\n"); exit (0);
+ #else
+ #if defined (CMU)
+   printf ("ns32k-encore-mach\n"); exit (0);
+ #else
+   printf ("ns32k-encore-bsd\n"); exit (0);
+ #endif
+ #endif
+ #endif
+ 
+ #if defined (__386BSD__)
+   printf ("i386-pc-bsd\n"); exit (0);
+ #endif
+ 
+ #if defined (sequent)
+ #if defined (i386)
+   printf ("i386-sequent-dynix\n"); exit (0);
+ #endif
+ #if defined (ns32000)
+   printf ("ns32k-sequent-dynix\n"); exit (0);
+ #endif
+ #endif
+ 
+ #if defined (_SEQUENT_)
+     struct utsname un;
+ 
+     uname(&un);
+ 
+     if (strncmp(un.version, "V2", 2) == 0) {
+ 	printf ("i386-sequent-ptx2\n"); exit (0);
+     }
+     if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ 	printf ("i386-sequent-ptx1\n"); exit (0);
+     }
+     printf ("i386-sequent-ptx\n"); exit (0);
+ 
+ #endif
+ 
+ #if defined (vax)
+ # if !defined (ultrix)
+ #  include <sys/param.h>
+ #  if defined (BSD)
+ #   if BSD == 43
+       printf ("vax-dec-bsd4.3\n"); exit (0);
+ #   else
+ #    if BSD == 199006
+       printf ("vax-dec-bsd4.3reno\n"); exit (0);
+ #    else
+       printf ("vax-dec-bsd\n"); exit (0);
+ #    endif
+ #   endif
+ #  else
+     printf ("vax-dec-bsd\n"); exit (0);
+ #  endif
+ # else
+     printf ("vax-dec-ultrix\n"); exit (0);
+ # endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+   printf ("i860-alliant-bsd\n"); exit (0);
+ #endif
+ 
+   exit (1);
+ }
+ EOF
+ 
+ $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+ 
+ # Apollos put the system type in the environment.
+ 
+ test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+ if [ -x /usr/convex/getsysinfo ]
+ then
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+ 	exit 0 ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+ 	exit 0 ;;
+     c34*)
+ 	echo c34-convex-bsd
+ 	exit 0 ;;
+     c38*)
+ 	echo c38-convex-bsd
+ 	exit 0 ;;
+     c4*)
+ 	echo c4-convex-bsd
+ 	exit 0 ;;
+     esac
+ fi
+ 
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
+ This script, last modified $timestamp, has failed to recognize
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+     ftp://ftp.gnu.org/pub/gnu/config/
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+ pertinent to <config-patches at gnu.org> in order to provide the needed
+ information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+ 
+ hostinfo               = `(hostinfo) 2>/dev/null`
+ /bin/universe          = `(/bin/universe) 2>/dev/null`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+ /bin/arch              = `(/bin/arch) 2>/dev/null`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+ 
+ UNAME_MACHINE = ${UNAME_MACHINE}
+ UNAME_RELEASE = ${UNAME_RELEASE}
+ UNAME_SYSTEM  = ${UNAME_SYSTEM}
+ UNAME_VERSION = ${UNAME_VERSION}
+ EOF
+ 
+ exit 1
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:


Index: llvm/projects/Stacker/autoconf/config.sub
diff -c /dev/null llvm/projects/Stacker/autoconf/config.sub:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/config.sub	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,1489 ----
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+ timestamp='2003-02-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+ #
+ # This file is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+ # Each package is responsible for reporting which valid configurations
+ # it does not support.  The user should be able to distinguish
+ # a failure to support a valid configuration from a meaningless
+ # configuration.
+ 
+ # The goal of this file is to map all the various variations of a given
+ # machine specification into a single specification in the form:
+ #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+ # or in some cases, the newer four-part form:
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION] CPU-MFR-OPSYS
+        $0 [OPTION] ALIAS
+ 
+ Canonicalize a configuration name.
+ 
+ Operation modes:
+   -h, --help         print this help, then exit
+   -t, --time-stamp   print date of last modification, then exit
+   -v, --version      print version number, then exit
+ 
+ Report bugs and patches to <config-patches at gnu.org>."
+ 
+ version="\
+ GNU config.sub ($timestamp)
+ 
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+        echo "$timestamp" ; exit 0 ;;
+     --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+        echo "$me: invalid option $1$help"
+        exit 1 ;;
+ 
+     *local*)
+        # First pass through any local machine types.
+        echo $1
+        exit 0;;
+ 
+     * )
+        break ;;
+   esac
+ done
+ 
+ case $# in
+  0) echo "$me: missing argument$help" >&2
+     exit 1;;
+  1) ;;
+  *) echo "$me: too many arguments$help" >&2
+     exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+   nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+     then os=`echo $1 | sed 's/.*-/-/'`
+     else os=; fi
+     ;;
+ esac
+ 
+ ### Let's recognize common machines as not being operating systems so
+ ### that things like config.sub decstation-3100 work.  We also
+ ### recognize some manufacturers as not being operating systems, so we
+ ### can provide default operating systems below.
+ case $os in
+ 	-sun*os*)
+ 		# Prevent following clause from handling this invalid input.
+ 		;;
+ 	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ 	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ 	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ 	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+ 	-scout)
+ 		;;
+ 	-wrs)
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
+ 	-chorusos*)
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+  	-chorusrdb)
+  		os=-chorusrdb
+ 		basic_machine=$1
+  		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+ 		os=-sco3.2v4
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2.[4-9]*)
+ 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco3.2v[4-9]*)
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-udk*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-isc)
+ 		os=-isc2.2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-clix*)
+ 		basic_machine=clipper-intergraph
+ 		;;
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+ 	-ptx*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ 		;;
+ 	-windowsnt*)
+ 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ 		;;
+ 	-psos*)
+ 		os=-psos
+ 		;;
+ 	-mint | -mint[0-9]*)
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+ esac
+ 
+ # Decode aliases for certain CPU-COMPANY combinations.
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ 	| clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k \
+ 	| m32r | m68000 | m68k | m88k | mcore \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+ 	| mips64vr | mips64vrel \
+ 	| mips64orion | mips64orionel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
+ 	| msp430 \
+ 	| ns16k | ns32k \
+ 	| openrisc | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+ 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ 	| strongarm \
+ 	| tahoe | thumb | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xscale | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+ 	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* \
+ 	| bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* \
+ 	| m32r-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+ 	| mips64vr-* | mips64vrel-* \
+ 	| mips64orion-* | mips64orionel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| msp430-* \
+ 	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+ 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ 	| xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+ 		basic_machine=i386-unknown
+ 		os=-bsd
+ 		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ 		basic_machine=m68000-att
+ 		;;
+ 	3b*)
+ 		basic_machine=we32k-att
+ 		;;
+ 	a29khif)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+ 		;;
+ 	alliant | fx80)
+ 		basic_machine=fx80-alliant
+ 		;;
+ 	altos | altos3068)
+ 		basic_machine=m68k-altos
+ 		;;
+ 	am29k)
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+ 		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+ 		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+ 		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+ 		basic_machine=m68k-apollo
+ 		os=-sysv
+ 		;;
+ 	apollo68bsd)
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+ 		;;
+ 	balance)
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c2)
+ 		basic_machine=c2-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c32)
+ 		basic_machine=c32-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c34)
+ 		basic_machine=c34-convex
+ 		os=-bsd
+ 		;;
+ 	convex-c38)
+ 		basic_machine=c38-convex
+ 		os=-bsd
+ 		;;
+ 	cray | j90)
+ 		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+ 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ 		basic_machine=mips-dec
+ 		;;
+ 	decsystem10* | dec10*)
+ 		basic_machine=pdp10-dec
+ 		os=-tops10
+ 		;;
+ 	decsystem20* | dec20*)
+ 		basic_machine=pdp10-dec
+ 		os=-tops20
+ 		;;
+ 	delta | 3300 | motorola-3300 | motorola-delta \
+ 	      | 3300-motorola | delta-motorola)
+ 		basic_machine=m68k-motorola
+ 		;;
+ 	delta88)
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+ 		;;
+ 	dpx2* | dpx2*-bull)
+ 		basic_machine=m68k-bull
+ 		os=-sysv3
+ 		;;
+ 	ebmon29k)
+ 		basic_machine=a29k-amd
+ 		os=-ebmon
+ 		;;
+ 	elxsi)
+ 		basic_machine=elxsi-elxsi
+ 		os=-bsd
+ 		;;
+ 	encore | umax | mmax)
+ 		basic_machine=ns32k-encore
+ 		;;
+ 	es1800 | OSE68k | ose68k | ose | OSE)
+ 		basic_machine=m68k-ericsson
+ 		os=-ose
+ 		;;
+ 	fx2800)
+ 		basic_machine=i860-alliant
+ 		;;
+ 	genix)
+ 		basic_machine=ns32k-ns
+ 		;;
+ 	gmicro)
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
+ 	go32)
+ 		basic_machine=i386-pc
+ 		os=-go32
+ 		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+ 		;;
+ 	h8300hms)
+ 		basic_machine=h8300-hitachi
+ 		os=-hms
+ 		;;
+ 	h8300xray)
+ 		basic_machine=h8300-hitachi
+ 		os=-xray
+ 		;;
+ 	h8500hms)
+ 		basic_machine=h8500-hitachi
+ 		os=-hms
+ 		;;
+ 	harris)
+ 		basic_machine=m88k-harris
+ 		os=-sysv3
+ 		;;
+ 	hp300-*)
+ 		basic_machine=m68k-hp
+ 		;;
+ 	hp300bsd)
+ 		basic_machine=m68k-hp
+ 		os=-bsd
+ 		;;
+ 	hp300hpux)
+ 		basic_machine=m68k-hp
+ 		os=-hpux
+ 		;;
+ 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hp9k2[0-9][0-9] | hp9k31[0-9])
+ 		basic_machine=m68000-hp
+ 		;;
+ 	hp9k3[2-9][0-9])
+ 		basic_machine=m68k-hp
+ 		;;
+ 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k78[0-9] | hp78[0-9])
+ 		# FIXME: really hppa2.0-hp
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ 		# FIXME: really hppa2.0-hp
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][13679] | hp8[0-9][13679])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ 		basic_machine=hppa1.0-hp
+ 		;;
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
+ 	hppaosf)
+ 		basic_machine=hppa1.1-hp
+ 		os=-osf
+ 		;;
+ 	hppro)
+ 		basic_machine=hppa1.1-hp
+ 		os=-proelf
+ 		;;
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+ 	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+ 	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+ 	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+ 	i386mach)
+ 		basic_machine=i386-mach
+ 		os=-mach
+ 		;;
+ 	i386-vsta | vsta)
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+ 		    -irix*)
+ 			;;
+ 		    *)
+ 			os=-irix4
+ 			;;
+ 		esac
+ 		;;
+ 	isi68 | isi)
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+ 	magnum | m3230)
+ 		basic_machine=mips-mips
+ 		os=-sysv
+ 		;;
+ 	merlin)
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+ 	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ 		basic_machine=m68k-atari
+ 		os=-mint
+ 		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ 		;;
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+ 	mmix*)
+ 		basic_machine=mmix-knuth
+ 		os=-mmixware
+ 		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	morphos)
+ 		basic_machine=powerpc-unknown
+ 		os=-morphos
+ 		;;
+ 	msdos)
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+ 		;;
+ 	netbsd386)
+ 		basic_machine=i386-unknown
+ 		os=-netbsd
+ 		;;
+ 	netwinder)
+ 		basic_machine=armv4l-rebel
+ 		os=-linux
+ 		;;
+ 	news | news700 | news800 | news900)
+ 		basic_machine=m68k-sony
+ 		os=-newsos
+ 		;;
+ 	news1000)
+ 		basic_machine=m68030-sony
+ 		os=-newsos
+ 		;;
+ 	news-3600 | risc-news)
+ 		basic_machine=mips-sony
+ 		os=-newsos
+ 		;;
+ 	necv70)
+ 		basic_machine=v70-nec
+ 		os=-sysv
+ 		;;
+ 	next | m*-next )
+ 		basic_machine=m68k-next
+ 		case $os in
+ 		    -nextstep* )
+ 			;;
+ 		    -ns2*)
+ 		      os=-nextstep2
+ 			;;
+ 		    *)
+ 		      os=-nextstep3
+ 			;;
+ 		esac
+ 		;;
+ 	nh3000)
+ 		basic_machine=m68k-harris
+ 		os=-cxux
+ 		;;
+ 	nh[45]000)
+ 		basic_machine=m88k-harris
+ 		os=-cxux
+ 		;;
+ 	nindy960)
+ 		basic_machine=i960-intel
+ 		os=-nindy
+ 		;;
+ 	mon960)
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
+ 	nonstopux)
+ 		basic_machine=mips-compaq
+ 		os=-nonstopux
+ 		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
+ 	nv1)
+ 		basic_machine=nv1-cray
+ 		os=-unicosmp
+ 		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+ 	or32 | or32-*)
+ 		basic_machine=or32-unknown
+ 		os=-coff
+ 		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+ 		;;
+ 	os68k)
+ 		basic_machine=m68k-none
+ 		os=-os68k
+ 		;;
+ 	pa-hitachi)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+ 		;;
+ 	paragon)
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+ 	pbb)
+ 		basic_machine=m68k-tti
+ 		;;
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+ 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 		;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+ 		;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+ 		;;
+ 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+ 		;;
+ 	ppc64le-* | powerpc64little-*)
+ 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
+ 	pw32)
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
+ 	s390 | s390-*)
+ 		basic_machine=s390-ibm
+ 		;;
+ 	s390x | s390x-*)
+ 		basic_machine=s390x-ibm
+ 		;;
+ 	sa29200)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	sb1)
+ 		basic_machine=mipsisa64sb1-unknown
+ 		;;
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+ 	sh)
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
+ 	sparclite-wrs | simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+ 		;;
+ 	sps7)
+ 		basic_machine=m68k-bull
+ 		os=-sysv2
+ 		;;
+ 	spur)
+ 		basic_machine=spur-unknown
+ 		;;
+ 	st2000)
+ 		basic_machine=m68k-tandem
+ 		;;
+ 	stratus)
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+ 	sun2os3)
+ 		basic_machine=m68000-sun
+ 		os=-sunos3
+ 		;;
+ 	sun2os4)
+ 		basic_machine=m68000-sun
+ 		os=-sunos4
+ 		;;
+ 	sun3os3)
+ 		basic_machine=m68k-sun
+ 		os=-sunos3
+ 		;;
+ 	sun3os4)
+ 		basic_machine=m68k-sun
+ 		os=-sunos4
+ 		;;
+ 	sun4os3)
+ 		basic_machine=sparc-sun
+ 		os=-sunos3
+ 		;;
+ 	sun4os4)
+ 		basic_machine=sparc-sun
+ 		os=-sunos4
+ 		;;
+ 	sun4sol2)
+ 		basic_machine=sparc-sun
+ 		os=-solaris2
+ 		;;
+ 	sun3 | sun3-*)
+ 		basic_machine=m68k-sun
+ 		;;
+ 	sun4)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
+ 	sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
+ 	t3e)
+ 		basic_machine=alphaev5-cray
+ 		os=-unicos
+ 		;;
+ 	t90)
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+         tic4x | c4x*)
+ 		basic_machine=tic4x-unknown
+ 		os=-coff
+ 		;;
+ 	tic54x | c54x*)
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
+ 	tic55x | c55x*)
+ 		basic_machine=tic55x-unknown
+ 		os=-coff
+ 		;;
+ 	tic6x | c6x*)
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
+ 	toad1)
+ 		basic_machine=pdp10-xkl
+ 		os=-tops20
+ 		;;
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+ 	ultra3)
+ 		basic_machine=a29k-nyu
+ 		os=-sym1
+ 		;;
+ 	v810 | necv810)
+ 		basic_machine=v810-nec
+ 		os=-none
+ 		;;
+ 	vaxv)
+ 		basic_machine=vax-dec
+ 		os=-sysv
+ 		;;
+ 	vms)
+ 		basic_machine=vax-dec
+ 		os=-vms
+ 		;;
+ 	vpp*|vx|vx-*)
+ 		basic_machine=f301-fujitsu
+ 		;;
+ 	vxworks960)
+ 		basic_machine=i960-wrs
+ 		os=-vxworks
+ 		;;
+ 	vxworks68)
+ 		basic_machine=m68k-wrs
+ 		os=-vxworks
+ 		;;
+ 	vxworks29k)
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
+ 	w65*)
+ 		basic_machine=w65-wdc
+ 		os=-none
+ 		;;
+ 	w89k-*)
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+ 		;;
+ 	z8k-*-coff)
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+ 		;;
+ 
+ # Here we handle the default manufacturer of certain CPU types.  It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+ 	w89k)
+ 		basic_machine=hppa1.1-winbond
+ 		;;
+ 	op50n)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	op60c)
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	romp)
+ 		basic_machine=romp-ibm
+ 		;;
+ 	rs6000)
+ 		basic_machine=rs6000-ibm
+ 		;;
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
+ 	pdp10)
+ 		# there are many clones, so DEC is not a safe bet
+ 		basic_machine=pdp10-unknown
+ 		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+ 	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+ 	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+ 	orion)
+ 		basic_machine=orion-highlevel
+ 		;;
+ 	orion105)
+ 		basic_machine=clipper-highlevel
+ 		;;
+ 	mac | mpw | mac-mpw)
+ 		basic_machine=m68k-apple
+ 		;;
+ 	pmac | pmac-mpw)
+ 		basic_machine=powerpc-apple
+ 		;;
+ 	*-unknown)
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+ 
+ # Here we canonicalize certain aliases for manufacturers.
+ case $basic_machine in
+ 	*-digital*)
+ 		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ 		;;
+ 	*-commodore*)
+ 		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ 		;;
+ 	*)
+ 		;;
+ esac
+ 
+ # Decode manufacturer-specific aliases for certain operating systems.
+ 
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+ 	-solaris)
+ 		os=-solaris2
+ 		;;
+ 	-svr4*)
+ 		os=-sysv4
+ 		;;
+ 	-unixware*)
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+ 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+ 	# First accept the basic system types.
+ 	# The portable systems comes first.
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+ 		case $basic_machine in
+ 		    x86-* | i*86-*)
+ 			;;
+ 		    *)
+ 			os=-nto$os
+ 			;;
+ 		esac
+ 		;;
+ 	-nto-qnx*)
+ 		;;
+ 	-nto*)
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux*)
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ 		;;
+ 	-sunos6*)
+ 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ 		;;
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+ 	-osf*)
+ 		os=-osf
+ 		;;
+ 	-utek*)
+ 		os=-bsd
+ 		;;
+ 	-dynix*)
+ 		os=-bsd
+ 		;;
+ 	-acis*)
+ 		os=-aos
+ 		;;
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
+ 	-ctix* | -uts*)
+ 		os=-sysv
+ 		;;
+ 	-nova*)
+ 		os=-rtmk-nova
+ 		;;
+ 	-ns2 )
+ 		os=-nextstep2
+ 		;;
+ 	-nsk*)
+ 		os=-nsk
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+ 		;;
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+ 	-svr4)
+ 		os=-sysv4
+ 		;;
+ 	-svr3)
+ 		os=-sysv3
+ 		;;
+ 	-sysvr4)
+ 		os=-sysv4
+ 		;;
+ 	# This must come after -sysvr4.
+ 	-sysv*)
+ 		;;
+ 	-ose*)
+ 		os=-ose
+ 		;;
+ 	-es1800*)
+ 		os=-ose
+ 		;;
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+ 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 		os=-mint
+ 		;;
+ 	-aros*)
+ 		os=-aros
+ 		;;
+ 	-kaos*)
+ 		os=-kaos
+ 		;;
+ 	-none)
+ 		;;
+ 	*)
+ 		# Get rid of the `-' at the beginning of $os.
+ 		os=`echo $os | sed 's/[^-]*-//'`
+ 		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ 		exit 1
+ 		;;
+ esac
+ else
+ 
+ # Here we handle the default operating systems that come with various machines.
+ # The value should be what the vendor currently ships out the door with their
+ # machine or put another way, the most popular os provided with the machine.
+ 
+ # Note that if you're going to try to match "-MANUFACTURER" here (say,
+ # "-sun"), then you have to tell the case statement up towards the top
+ # that MANUFACTURER isn't an operating system.  Otherwise, code above
+ # will signal an error saying that MANUFACTURER isn't an operating
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+ 	arm*-rebel)
+ 		os=-linux
+ 		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
+ 	pdp11-*)
+ 		os=-none
+ 		;;
+ 	*-dec | vax-*)
+ 		os=-ultrix4.2
+ 		;;
+ 	m68*-apollo)
+ 		os=-domain
+ 		;;
+ 	i386-sun)
+ 		os=-sunos4.0.2
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+ 		# This also exists in the configure program, but was not the
+ 		# default.
+ 		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+ 	mips*-*)
+ 		os=-elf
+ 		;;
+ 	or32-*)
+ 		os=-coff
+ 		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
+ 	*-be)
+ 		os=-beos
+ 		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+ 	*-wec)
+ 		os=-proelf
+ 		;;
+ 	*-winbond)
+ 		os=-proelf
+ 		;;
+ 	*-oki)
+ 		os=-proelf
+ 		;;
+ 	*-hp)
+ 		os=-hpux
+ 		;;
+ 	*-hitachi)
+ 		os=-hiux
+ 		;;
+ 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ 		os=-sysv
+ 		;;
+ 	*-cbm)
+ 		os=-amigaos
+ 		;;
+ 	*-dg)
+ 		os=-dgux
+ 		;;
+ 	*-dolphin)
+ 		os=-sysv3
+ 		;;
+ 	m68k-ccur)
+ 		os=-rtu
+ 		;;
+ 	m88k-omron*)
+ 		os=-luna
+ 		;;
+ 	*-next )
+ 		os=-nextstep
+ 		;;
+ 	*-sequent)
+ 		os=-ptx
+ 		;;
+ 	*-crds)
+ 		os=-unos
+ 		;;
+ 	*-ns)
+ 		os=-genix
+ 		;;
+ 	i370-*)
+ 		os=-mvs
+ 		;;
+ 	*-next)
+ 		os=-nextstep3
+ 		;;
+ 	*-gould)
+ 		os=-sysv
+ 		;;
+ 	*-highlevel)
+ 		os=-bsd
+ 		;;
+ 	*-encore)
+ 		os=-bsd
+ 		;;
+ 	*-sgi)
+ 		os=-irix
+ 		;;
+ 	*-siemens)
+ 		os=-sysv4
+ 		;;
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+ 	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+ 		os=-coff
+ 		;;
+ 	*-*bug)
+ 		os=-coff
+ 		;;
+ 	*-apple)
+ 		os=-macos
+ 		;;
+ 	*-atari*)
+ 		os=-mint
+ 		;;
+ 	*)
+ 		os=-none
+ 		;;
+ esac
+ fi
+ 
+ # Here we handle the case where we know the os, and the CPU type, but not the
+ # manufacturer.  We pick the logical manufacturer.
+ vendor=unknown
+ case $basic_machine in
+ 	*-unknown)
+ 		case $os in
+ 			-riscix*)
+ 				vendor=acorn
+ 				;;
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+ 			-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+ 				vendor=be
+ 				;;
+ 			-hpux*)
+ 				vendor=hp
+ 				;;
+ 			-mpeix*)
+ 				vendor=hp
+ 				;;
+ 			-hiux*)
+ 				vendor=hitachi
+ 				;;
+ 			-unos*)
+ 				vendor=crds
+ 				;;
+ 			-dgux*)
+ 				vendor=dg
+ 				;;
+ 			-luna*)
+ 				vendor=omron
+ 				;;
+ 			-genix*)
+ 				vendor=ns
+ 				;;
+ 			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
+ 			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+ 				vendor=apple
+ 				;;
+ 			-hms*)
+ 				vendor=hitachi
+ 				;;
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+ 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
+ 			-vos*)
+ 				vendor=stratus
+ 				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
+ exit 0
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:


Index: llvm/projects/Stacker/autoconf/configure.ac
diff -c /dev/null llvm/projects/Stacker/autoconf/configure.ac:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/configure.ac	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,65 ----
+ dnl **************************************************************************
+ dnl * Initialize
+ dnl **************************************************************************
+ AC_INIT([[[Stacker]]],[[[1.0]]],[rspencer at x10sys.com])
+ 
+ dnl Place all of the extra autoconf files into the config subdirectory
+ AC_CONFIG_AUX_DIR([autoconf])
+ 
+ dnl Configure a header file
+ 
+ dnl Configure Makefiles
+ dnl List every Makefile that ecists within your source tree
+ 
+ AC_CONFIG_MAKEFILE(Makefile)
+ AC_CONFIG_MAKEFILE(lib/Makefile)
+ AC_CONFIG_MAKEFILE(lib/compiler/Makefile)
+ AC_CONFIG_MAKEFILE(lib/runtime/Makefile)
+ AC_CONFIG_MAKEFILE(tools/Makefile)
+ AC_CONFIG_MAKEFILE(tools/stkrc/Makefile)
+ 
+ dnl **************************************************************************
+ dnl * Determine which system we are building on
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Check for programs.
+ dnl **************************************************************************
+ 
+ dnl Verify that the source directory is valid
+ AC_CONFIG_SRCDIR([Makefile.common.in])
+ 
+ dnl **************************************************************************
+ dnl * Check for libraries.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for header files.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for typedefs, structures, and compiler characteristics.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Checks for library functions.
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Enable various compile-time options
+ dnl **************************************************************************
+ 
+ dnl **************************************************************************
+ dnl * Set the location of various third-party software packages
+ dnl **************************************************************************
+ 
+ dnl Location of LLVM source code
+ AC_ARG_WITH(llvmsrc,AC_HELP_STRING([--with-llvmsrc],[Location of LLVM Source Code]),AC_SUBST(LLVM_SRC,[$withval]),AC_SUBST(LLVM_SRC,[`cd ${srcdir}/../..; pwd`]))
+ 
+ dnl Location of LLVM object code
+ AC_ARG_WITH(llvmobj,AC_HELP_STRING([--with-llvmobj],[Location of LLVM Object Code]),AC_SUBST(LLVM_OBJ,[$withval]),AC_SUBST(LLVM_OBJ,[`cd ../..; pwd`]))
+ 
+ dnl **************************************************************************
+ dnl * Create the output files
+ dnl **************************************************************************
+ AC_OUTPUT(Makefile.common)


Index: llvm/projects/Stacker/autoconf/install-sh
diff -c /dev/null llvm/projects/Stacker/autoconf/install-sh:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/install-sh	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,251 ----
+ #!/bin/sh
+ #
+ # install - install a program, script, or datafile
+ # This comes from X11R5 (mit/util/scripts/install.sh).
+ #
+ # Copyright 1991 by the Massachusetts Institute of Technology
+ #
+ # Permission to use, copy, modify, distribute, and sell this software and its
+ # documentation for any purpose is hereby granted without fee, provided that
+ # the above copyright notice appear in all copies and that both that
+ # copyright notice and this permission notice appear in supporting
+ # documentation, and that the name of M.I.T. not be used in advertising or
+ # publicity pertaining to distribution of the software without specific,
+ # written prior permission.  M.I.T. makes no representations about the
+ # suitability of this software for any purpose.  It is provided "as is"
+ # without express or implied warranty.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+ 
+ 
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+ 
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+ chmodprog="${CHMODPROG-chmod}"
+ chownprog="${CHOWNPROG-chown}"
+ chgrpprog="${CHGRPPROG-chgrp}"
+ stripprog="${STRIPPROG-strip}"
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+ transformbasename=""
+ transform_arg=""
+ instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+ chowncmd=""
+ chgrpcmd=""
+ stripcmd=""
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+ src=""
+ dst=""
+ dir_arg=""
+ 
+ while [ x"$1" != x ]; do
+     case $1 in
+ 	-c) instcmd="$cpprog"
+ 	    shift
+ 	    continue;;
+ 
+ 	-d) dir_arg=true
+ 	    shift
+ 	    continue;;
+ 
+ 	-m) chmodcmd="$chmodprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-o) chowncmd="$chownprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-g) chgrpcmd="$chgrpprog $2"
+ 	    shift
+ 	    shift
+ 	    continue;;
+ 
+ 	-s) stripcmd="$stripprog"
+ 	    shift
+ 	    continue;;
+ 
+ 	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+ 	    shift
+ 	    continue;;
+ 
+ 	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+ 	    shift
+ 	    continue;;
+ 
+ 	*)  if [ x"$src" = x ]
+ 	    then
+ 		src=$1
+ 	    else
+ 		# this colon is to work around a 386BSD /bin/sh bug
+ 		:
+ 		dst=$1
+ 	    fi
+ 	    shift
+ 	    continue;;
+     esac
+ done
+ 
+ if [ x"$src" = x ]
+ then
+ 	echo "install:	no input file specified"
+ 	exit 1
+ else
+ 	:
+ fi
+ 
+ if [ x"$dir_arg" != x ]; then
+ 	dst=$src
+ 	src=""
+ 	
+ 	if [ -d $dst ]; then
+ 		instcmd=:
+ 		chmodcmd=""
+ 	else
+ 		instcmd=$mkdirprog
+ 	fi
+ else
+ 
+ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad 
+ # if $src (and thus $dsttmp) contains '*'.
+ 
+ 	if [ -f $src -o -d $src ]
+ 	then
+ 		:
+ 	else
+ 		echo "install:  $src does not exist"
+ 		exit 1
+ 	fi
+ 	
+ 	if [ x"$dst" = x ]
+ 	then
+ 		echo "install:	no destination specified"
+ 		exit 1
+ 	else
+ 		:
+ 	fi
+ 
+ # If destination is a directory, append the input filename; if your system
+ # does not like double slashes in filenames, you may need to add some logic
+ 
+ 	if [ -d $dst ]
+ 	then
+ 		dst="$dst"/`basename $src`
+ 	else
+ 		:
+ 	fi
+ fi
+ 
+ ## this sed command emulates the dirname command
+ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ 
+ # Make sure that the destination directory exists.
+ #  this part is taken from Noah Friedman's mkinstalldirs script
+ 
+ # Skip lots of stat calls in the usual case.
+ if [ ! -d "$dstdir" ]; then
+ defaultIFS='
+ 	'
+ IFS="${IFS-${defaultIFS}}"
+ 
+ oIFS="${IFS}"
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS="${oIFS}"
+ 
+ pathcomp=''
+ 
+ while [ $# -ne 0 ] ; do
+ 	pathcomp="${pathcomp}${1}"
+ 	shift
+ 
+ 	if [ ! -d "${pathcomp}" ] ;
+         then
+ 		$mkdirprog "${pathcomp}"
+ 	else
+ 		:
+ 	fi
+ 
+ 	pathcomp="${pathcomp}/"
+ done
+ fi
+ 
+ if [ x"$dir_arg" != x ]
+ then
+ 	$doit $instcmd $dst &&
+ 
+ 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+ 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+ 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+ 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
+ else
+ 
+ # If we're going to rename the final executable, determine the name now.
+ 
+ 	if [ x"$transformarg" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		dstfile=`basename $dst $transformbasename | 
+ 			sed $transformarg`$transformbasename
+ 	fi
+ 
+ # don't allow the sed command to completely eliminate the filename
+ 
+ 	if [ x"$dstfile" = x ] 
+ 	then
+ 		dstfile=`basename $dst`
+ 	else
+ 		:
+ 	fi
+ 
+ # Make a temp file name in the proper directory.
+ 
+ 	dsttmp=$dstdir/#inst.$$#
+ 
+ # Move or copy the file name to the temp name
+ 
+ 	$doit $instcmd $src $dsttmp &&
+ 
+ 	trap "rm -f ${dsttmp}" 0 &&
+ 
+ # and set any options; do chmod last to preserve setuid bits
+ 
+ # If any of these fail, we abort the whole thing.  If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $instcmd $src $dsttmp" command.
+ 
+ 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+ 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+ 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+ 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+ 
+ # Now rename the file to the real destination.
+ 
+ 	$doit $rmcmd -f $dstdir/$dstfile &&
+ 	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+ 
+ fi &&
+ 
+ 
+ exit 0


Index: llvm/projects/Stacker/autoconf/ltmain.sh
diff -c /dev/null llvm/projects/Stacker/autoconf/ltmain.sh:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/ltmain.sh	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,6290 ----
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+   shift
+ elif test "X$1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+   # Yippee, $echo works!
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+   exec $SHELL "$0" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+   # used as fallback echo
+   shift
+   cat <<EOF
+ $*
+ EOF
+   exit 0
+ fi
+ 
+ # The name of this program.
+ progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+ modename="$progname"
+ 
+ # Constants.
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+ VERSION=1.5
+ TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
+ 
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+ mkdir="mkdir"
+ mv="mv -f"
+ rm="rm -f"
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+ case `echo A|od -x` in
+  *[Cc]1*) # EBCDIC based system
+   SP2NL="tr '\100' '\n'"
+   NL2SP="tr '\r\n' '\100\100'"
+   ;;
+  *) # Assume ASCII based system
+   SP2NL="tr '\040' '\012'"
+   NL2SP="tr '\015\012' '\040\040'"
+   ;;
+ esac
+ 
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+ if test "${LC_ALL+set}" = set; then
+   save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+ fi
+ if test "${LANG+set}" = set; then
+   save_LANG="$LANG"; LANG=C; export LANG
+ fi
+ 
+ # Make sure IFS has a sensible default
+ : ${IFS=" 	"}
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+   exit 1
+ fi
+ 
+ # Global variables.
+ mode=$default_mode
+ nonopt=
+ prev=
+ prevopt=
+ run=
+ show="$echo"
+ show_help=
+ execute_dlfiles=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+ win32_libid () {
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+   *ar\ archive\ import\ library*) # definitely import
+     win32_libid_type="x86 archive import"
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+       grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+ 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+       if test "X$win32_nmres" = "Ximport" ; then
+         win32_libid_type="x86 archive import"
+       else
+         win32_libid_type="x86 archive static"
+       fi
+     fi
+     ;;
+   *DLL*) 
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+     case $win32_fileres in
+     *MS\ Windows\ PE\ Intel*)
+       win32_libid_type="x86 DLL"
+       ;;
+     esac
+     ;;
+   esac
+   $echo $win32_libid_type
+ }
+ 
+ # End of Shell function definitions
+ #####################################
+ 
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+   arg="$1"
+   shift
+ 
+   case $arg in
+   -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+   *) optarg= ;;
+   esac
+ 
+   # If the previous option needs an argument, assign it.
+   if test -n "$prev"; then
+     case $prev in
+     execute_dlfiles)
+       execute_dlfiles="$execute_dlfiles $arg"
+       ;;
+     tag)
+       tagname="$arg"
+ 
+       # Check whether tagname contains only valid characters
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+ 	exit 1
+ 	;;
+       esac
+ 
+       case $tagname in
+       CC)
+ 	# Don't test for the "default" C tag, as we know, it's there, but
+ 	# not specially marked.
+ 	;;
+       *)
+ 	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+ 	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+ 	;;
+       esac
+       ;;
+     *)
+       eval "$prev=\$arg"
+       ;;
+     esac
+ 
+     prev=
+     prevopt=
+     continue
+   fi
+ 
+   # Have we seen a non-optional argument yet?
+   case $arg in
+   --help)
+     show_help=yes
+     ;;
+ 
+   --version)
+     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+     $echo
+     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+     exit 0
+     ;;
+ 
+   --config)
+     ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+       ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+     done
+     exit 0
+     ;;
+ 
+   --debug)
+     $echo "$progname: enabling shell trace mode"
+     set -x
+     ;;
+ 
+   --dry-run | -n)
+     run=:
+     ;;
+ 
+   --features)
+     $echo "host: $host"
+     if test "$build_libtool_libs" = yes; then
+       $echo "enable shared libraries"
+     else
+       $echo "disable shared libraries"
+     fi
+     if test "$build_old_libs" = yes; then
+       $echo "enable static libraries"
+     else
+       $echo "disable static libraries"
+     fi
+     exit 0
+     ;;
+ 
+   --finish) mode="finish" ;;
+ 
+   --mode) prevopt="--mode" prev=mode ;;
+   --mode=*) mode="$optarg" ;;
+ 
+   --preserve-dup-deps) duplicate_deps="yes" ;;
+ 
+   --quiet | --silent)
+     show=:
+     ;;
+ 
+   --tag) prevopt="--tag" prev=tag ;;
+   --tag=*)
+     set tag "$optarg" ${1+"$@"}
+     shift
+     prev=tag
+     ;;
+ 
+   -dlopen)
+     prevopt="-dlopen"
+     prev=execute_dlfiles
+     ;;
+ 
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+     exit 1
+     ;;
+ 
+   *)
+     nonopt="$arg"
+     break
+     ;;
+   esac
+ done
+ 
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+   exit 1
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+ exec_cmd=
+ 
+ if test -z "$show_help"; then
+ 
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+     $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+     case $nonopt in
+     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+       for arg
+       do
+ 	case $arg in
+ 	-c)
+ 	   mode=compile
+ 	   break
+ 	   ;;
+ 	esac
+       done
+       ;;
+     *db | *dbx | *strace | *truss)
+       mode=execute
+       ;;
+     *install*|cp|mv)
+       mode=install
+       ;;
+     *rm)
+       mode=uninstall
+       ;;
+     *)
+       # If we have no mode, but dlfiles were specified, then do execute mode.
+       test -n "$execute_dlfiles" && mode=execute
+ 
+       # Just use the default operation mode.
+       if test -z "$mode"; then
+ 	if test -n "$nonopt"; then
+ 	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+ 	else
+ 	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+ 	fi
+       fi
+       ;;
+     esac
+   fi
+ 
+   # Only execute mode is allowed to have -dlopen flags.
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+     exit 1
+   fi
+ 
+   # Change the help message to a mode-specific one.
+   generic_help="$help"
+   help="Try \`$modename --help --mode=$mode' for more information."
+ 
+   # These modes are in order of execution frequency so that they run quickly.
+   case $mode in
+   # libtool compile mode
+   compile)
+     modename="$modename: compile"
+     # Get the compilation command and the source file.
+     base_compile=
+     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+     suppress_output=
+     arg_mode=normal
+     libobj=
+ 
+     for arg
+     do
+       case "$arg_mode" in
+       arg  )
+ 	# do not "continue".  Instead, add this to base_compile
+ 	lastarg="$arg"
+ 	arg_mode=normal
+ 	;;
+ 
+       target )
+ 	libobj="$arg"
+ 	arg_mode=normal
+ 	continue
+ 	;;
+ 
+       normal )
+ 	# Accept any command-line options.
+ 	case $arg in
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+ 	  ;;
+ 
+ 	-static)
+ 	  build_old_libs=yes
+ 	  continue
+ 	  ;;
+ 
+ 	-prefer-pic)
+ 	  pic_mode=yes
+ 	  continue
+ 	  ;;
+ 
+ 	-prefer-non-pic)
+ 	  pic_mode=no
+ 	  continue
+ 	  ;;
+ 
+ 	-Xcompiler)
+ 	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+ 	  continue      #  The current "srcfile" will either be retained or
+ 	  ;;            #  replaced later.  I would guess that would be a bug.
+ 
+ 	-Wc,*)
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+ 	    # Many Bourne shells cannot handle close brackets correctly
+ 	    # in scan sets, so we specify it separately.
+ 	    case $arg in
+ 	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	      arg="\"$arg\""
+ 	      ;;
+ 	    esac
+ 	    lastarg="$lastarg $arg"
+ 	  done
+ 	  IFS="$save_ifs"
+ 	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ 
+ 	  # Add the arguments to base_compile.
+ 	  base_compile="$base_compile $lastarg"
+ 	  continue
+ 	  ;;
+ 
+ 	* )
+ 	  # Accept the current argument as the source file.
+ 	  # The previous "srcfile" becomes the current argument.
+ 	  #
+ 	  lastarg="$srcfile"
+ 	  srcfile="$arg"
+ 	  ;;
+ 	esac  #  case $arg
+ 	;;
+       esac    #  case $arg_mode
+ 
+       # Aesthetically quote the previous argument.
+       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+ 
+       case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+       # in scan sets, so we specify it separately.
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+       esac
+ 
+       base_compile="$base_compile $lastarg"
+     done # for arg
+ 
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+       exit 1
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+       exit 1
+       ;;
+     *)
+       # Get the name of the library object.
+       [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+       ;;
+     esac
+ 
+     # Recognize several different file suffixes.
+     # If the user specifies -o file.o, it is replaced with file.lo
+     xform='[cCFSifmso]'
+     case $libobj in
+     *.ada) xform=ada ;;
+     *.adb) xform=adb ;;
+     *.ads) xform=ads ;;
+     *.asm) xform=asm ;;
+     *.c++) xform=c++ ;;
+     *.cc) xform=cc ;;
+     *.ii) xform=ii ;;
+     *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+     *.f90) xform=f90 ;;
+     *.for) xform=for ;;
+     *.java) xform=java ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+ 
+     case $libobj in
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+       exit 1
+       ;;
+     esac
+ 
+     # Infer tagged configuration to use if any are available and
+     # if one wasn't chosen via the "--tag" command line option.
+     # Only attempt this if the compiler in the base compile
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+       # Blanks in the command may have been stripped by the calling shell,
+       # but not from the CC environment variable when configure was run.
+       " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+       # Blanks at the start of $base_compile will cause this to fail
+       # if we don't check for them as well.
+       *)
+ 	for z in $available_tags; do
+ 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    case "$base_compile " in
+ 	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+ 	      # The compiler in the base compile command matches
+ 	      # the one in the tagged configuration.
+ 	      # Assume this is the tagged configuration we want.
+ 	      tagname=$z
+ 	      break
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	done
+ 	# If $tagname still isn't set, then no tagged configuration
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+ 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+ 	  exit 1
+ #        else
+ #          $echo "$modename: using $tagname tagged configuration"
+ 	fi
+ 	;;
+       esac
+     fi
+ 
+     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$xdir" = "X$obj"; then
+       xdir=
+     else
+       xdir=$xdir/
+     fi
+     lobj=${xdir}$objdir/$objname
+ 
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+       removelist="$obj $lobj $libobj ${libobj}T"
+     else
+       removelist="$lobj $libobj ${libobj}T"
+     fi
+ 
+     $run $rm $removelist
+     trap "$run $rm $removelist; exit 1" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+     cygwin* | mingw* | pw32* | os2*)
+       pic_mode=default
+       ;;
+     esac
+     if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+ 
+     # Calculate the filename of the output object if compiler does
+     # not support -o with -c
+     if test "$compiler_c_o" = no; then
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+       trap "$run $rm $removelist; exit 1" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+       lockfile=
+     fi
+ 
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+       until $run ln "$0" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+     elif test "$need_locks" = warn; then
+       if test -f "$lockfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+       $echo $srcfile > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
+ 
+     $run $rm "$libobj" "${libobj}T"
+ 
+     # Create a libtool object file (analogous to a ".la" file),
+     # but don't create it if we're doing a dry run.
+     test -z "$run" && cat > ${libobj}T <<EOF
+ # $libobj - a libtool object file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+ 
+ # Name of the PIC object.
+ EOF
+ 
+     # Only build a PIC object if we are building libtool libraries.
+     if test "$build_libtool_libs" = yes; then
+       # Without this assignment, base_compile gets emptied.
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+ 	command="$base_compile $srcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       fi
+ 
+       if test ! -d "${xdir}$objdir"; then
+ 	$show "$mkdir ${xdir}$objdir"
+ 	$run $mkdir ${xdir}$objdir
+ 	status=$?
+ 	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ 	  exit $status
+ 	fi
+       fi
+ 
+       if test -z "$output_obj"; then
+ 	# Place PIC objects in $objdir
+ 	command="$command -o $lobj"
+       fi
+ 
+       $run $rm "$lobj" "$output_obj"
+ 
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+ 	exit 1
+       fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ but it should contain:
+ $srcfile
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+ 	$show "$mv $output_obj $lobj"
+ 	if $run $mv $output_obj $lobj; then :
+ 	else
+ 	  error=$?
+ 	  $run $rm $removelist
+ 	  exit $error
+ 	fi
+       fi
+ 
+       # Append the name of the PIC object to the libtool object file.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ pic_object='$objdir/$objname'
+ 
+ EOF
+ 
+       # Allow error messages only from the first compilation.
+       suppress_output=' >/dev/null 2>&1'
+     else
+       # No PIC object so indicate it doesn't exist in the libtool
+       # object file.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ pic_object=none
+ 
+ EOF
+     fi
+ 
+     # Only build a position-dependent object if we build old libraries.
+     if test "$build_old_libs" = yes; then
+       if test "$pic_mode" != yes; then
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       else
+ 	command="$base_compile $srcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+       fi
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+       command="$command$suppress_output"
+       $run $rm "$obj" "$output_obj"
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       if test "$need_locks" = warn &&
+ 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ 	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+ but it should contain:
+ $srcfile
+ 
+ This indicates that another process is trying to use the same
+ temporary object file, and libtool could not work around it because
+ your compiler does not support \`-c' and \`-o' together.  If you
+ repeat this compilation, it may succeed, by chance, but you had better
+ avoid parallel builds (make -j) in this platform, or get a better
+ compiler."
+ 
+ 	$run $rm $removelist
+ 	exit 1
+       fi
+ 
+       # Just move the object if needed
+       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ 	$show "$mv $output_obj $obj"
+ 	if $run $mv $output_obj $obj; then :
+ 	else
+ 	  error=$?
+ 	  $run $rm $removelist
+ 	  exit $error
+ 	fi
+       fi
+ 
+       # Append the name of the non-PIC object the libtool object file.
+       # Only append if the libtool object file exists.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ # Name of the non-PIC object.
+ non_pic_object='$objname'
+ 
+ EOF
+     else
+       # Append the name of the non-PIC object the libtool object file.
+       # Only append if the libtool object file exists.
+       test -z "$run" && cat >> ${libobj}T <<EOF
+ # Name of the non-PIC object.
+ non_pic_object=none
+ 
+ EOF
+     fi
+ 
+     $run $mv "${libobj}T" "${libobj}"
+ 
+     # Unlock the critical section if it was locked
+     if test "$need_locks" != no; then
+       $run $rm "$lockfile"
+     fi
+ 
+     exit 0
+     ;;
+ 
+   # libtool link mode
+   link | relink)
+     modename="$modename: link"
+     case $host in
+     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+       # It is impossible to link a dll without this setting, and
+       # we shouldn't force the makefile maintainer to figure out
+       # which system we are compiling for in order to pass an extra
+       # flag for every libtool invocation.
+       # allow_undefined=no
+ 
+       # FIXME: Unfortunately, there are problems with the above when trying
+       # to make a dll which has undefined symbols, in which case not
+       # even a static library is built.  For now, we need to specify
+       # -no-undefined on the libtool link line when we can be certain
+       # that all symbols are satisfied, otherwise we get a static library.
+       allow_undefined=yes
+       ;;
+     *)
+       allow_undefined=yes
+       ;;
+     esac
+     libtool_args="$nonopt"
+     base_compile="$nonopt"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+     compile_rpath=
+     finalize_rpath=
+     compile_shlibpath=
+     finalize_shlibpath=
+     convenience=
+     old_convenience=
+     deplibs=
+     old_deplibs=
+     compiler_flags=
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
+     inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+     dlprefiles=
+     dlself=no
+     export_dynamic=no
+     export_symbols=
+     export_symbols_regex=
+     generated=
+     libobjs=
+     ltlibs=
+     module=no
+     no_install=no
+     objs=
+     non_pic_objects=
+     prefer_static_libs=no
+     preload=no
+     prev=
+     prevarg=
+     release=
+     rpath=
+     xrpath=
+     perm_rpath=
+     temp_rpath=
+     thread_safe=no
+     vinfo=
+     vinfo_number=no
+ 
+     # We need to know -static, to get the right output filenames.
+     for arg
+     do
+       case $arg in
+       -all-static | -static)
+ 	if test "X$arg" = "X-all-static"; then
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
+ 	  if test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	else
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+ 	  fi
+ 	fi
+ 	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	prefer_static_libs=yes
+ 	break
+ 	;;
+       esac
+     done
+ 
+     # See if our shared archives depend on static archives.
+     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+     # Go through the arguments, transforming them on the way.
+     while test "$#" -gt 0; do
+       arg="$1"
+       base_compile="$base_compile $arg"
+       shift
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+ 	;;
+       *) qarg=$arg ;;
+       esac
+       libtool_args="$libtool_args $qarg"
+ 
+       # If the previous option needs an argument, assign it.
+       if test -n "$prev"; then
+ 	case $prev in
+ 	output)
+ 	  compile_command="$compile_command @OUTPUT@"
+ 	  finalize_command="$finalize_command @OUTPUT@"
+ 	  ;;
+ 	esac
+ 
+ 	case $prev in
+ 	dlfiles|dlprefiles)
+ 	  if test "$preload" = no; then
+ 	    # Add the symbol object into the linking commands.
+ 	    compile_command="$compile_command @SYMFILE@"
+ 	    finalize_command="$finalize_command @SYMFILE@"
+ 	    preload=yes
+ 	  fi
+ 	  case $arg in
+ 	  *.la | *.lo) ;;  # We handle these cases below.
+ 	  force)
+ 	    if test "$dlself" = no; then
+ 	      dlself=needless
+ 	      export_dynamic=yes
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  self)
+ 	    if test "$prev" = dlprefiles; then
+ 	      dlself=yes
+ 	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ 	      dlself=yes
+ 	    else
+ 	      dlself=needless
+ 	      export_dynamic=yes
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  *)
+ 	    if test "$prev" = dlfiles; then
+ 	      dlfiles="$dlfiles $arg"
+ 	    else
+ 	      dlprefiles="$dlprefiles $arg"
+ 	    fi
+ 	    prev=
+ 	    continue
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	expsyms)
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+ 	    exit 1
+ 	  fi
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	expsyms_regex)
+ 	  export_symbols_regex="$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	inst_prefix)
+ 	  inst_prefix_dir="$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	objectlist)
+ 	  if test -f "$arg"; then
+ 	    save_arg=$arg
+ 	    moreargs=
+ 	    for fil in `cat $save_arg`
+ 	    do
+ #	      moreargs="$moreargs $fil"
+ 	      arg=$fil
+ 	      # A libtool-controlled object.
+ 
+ 	      # Check to see that this really is a libtool object.
+ 	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 		pic_object=
+ 		non_pic_object=
+ 
+ 		# Read the .lo file
+ 		# If there is no directory component, then add one.
+ 		case $arg in
+ 		*/* | *\\*) . $arg ;;
+ 		*) . ./$arg ;;
+ 		esac
+ 
+ 		if test -z "$pic_object" || \
+ 		   test -z "$non_pic_object" ||
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ 		  exit 1
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+ 		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 		if test "X$xdir" = "X$arg"; then
+ 		  xdir=
+ 		else
+ 		  xdir="$xdir/"
+ 		fi
+ 
+ 		if test "$pic_object" != none; then
+ 		  # Prepend the subdirectory the object is found in.
+ 		  pic_object="$xdir$pic_object"
+ 
+ 		  if test "$prev" = dlfiles; then
+ 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ 		      dlfiles="$dlfiles $pic_object"
+ 		      prev=
+ 		      continue
+ 		    else
+ 		      # If libtool objects are unsupported, then we need to preload.
+ 		      prev=dlprefiles
+ 		    fi
+ 		  fi
+ 
+ 		  # CHECK ME:  I think I busted this.  -Ossama
+ 		  if test "$prev" = dlprefiles; then
+ 		    # Preload the old-style object.
+ 		    dlprefiles="$dlprefiles $pic_object"
+ 		    prev=
+ 		  fi
+ 
+ 		  # A PIC object.
+ 		  libobjs="$libobjs $pic_object"
+ 		  arg="$pic_object"
+ 		fi
+ 
+ 		# Non-PIC object.
+ 		if test "$non_pic_object" != none; then
+ 		  # Prepend the subdirectory the object is found in.
+ 		  non_pic_object="$xdir$non_pic_object"
+ 
+ 		  # A standard non-PIC object
+ 		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		  if test -z "$pic_object" || test "$pic_object" = none ; then
+ 		    arg="$non_pic_object"
+ 		  fi
+ 		fi
+ 	      else
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ 		  exit 1
+ 		else
+ 		  # Dry-run case.
+ 
+ 		  # Extract subdirectory from the argument.
+ 		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 		  if test "X$xdir" = "X$arg"; then
+ 		    xdir=
+ 		  else
+ 		    xdir="$xdir/"
+ 		  fi
+ 
+ 		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ 		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ 		  libobjs="$libobjs $pic_object"
+ 		  non_pic_objects="$non_pic_objects $non_pic_object"
+ 		fi
+ 	      fi
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+ 	    exit 1
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	rpath | xrpath)
+ 	  # We need an absolute path.
+ 	  case $arg in
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+ 	    exit 1
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+ 	    case "$rpath " in
+ 	    *" $arg "*) ;;
+ 	    *) rpath="$rpath $arg" ;;
+ 	    esac
+ 	  else
+ 	    case "$xrpath " in
+ 	    *" $arg "*) ;;
+ 	    *) xrpath="$xrpath $arg" ;;
+ 	    esac
+ 	  fi
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	xcompiler)
+ 	  compiler_flags="$compiler_flags $qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $qarg"
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+ 	xlinker)
+ 	  linker_flags="$linker_flags $qarg"
+ 	  compiler_flags="$compiler_flags $wl$qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $wl$qarg"
+ 	  finalize_command="$finalize_command $wl$qarg"
+ 	  continue
+ 	  ;;
+ 	xcclinker)
+ 	  linker_flags="$linker_flags $qarg"
+ 	  compiler_flags="$compiler_flags $qarg"
+ 	  prev=
+ 	  compile_command="$compile_command $qarg"
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
+ 	*)
+ 	  eval "$prev=\"\$arg\""
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	esac
+       fi # test -n "$prev"
+ 
+       prevarg="$arg"
+ 
+       case $arg in
+       -all-static)
+ 	if test -n "$link_static_flag"; then
+ 	  compile_command="$compile_command $link_static_flag"
+ 	  finalize_command="$finalize_command $link_static_flag"
+ 	fi
+ 	continue
+ 	;;
+ 
+       -allow-undefined)
+ 	# FIXME: remove this flag sometime in the future.
+ 	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+ 	continue
+ 	;;
+ 
+       -avoid-version)
+ 	avoid_version=yes
+ 	continue
+ 	;;
+ 
+       -dlopen)
+ 	prev=dlfiles
+ 	continue
+ 	;;
+ 
+       -dlpreopen)
+ 	prev=dlprefiles
+ 	continue
+ 	;;
+ 
+       -export-dynamic)
+ 	export_dynamic=yes
+ 	continue
+ 	;;
+ 
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+ 	  exit 1
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+ 	else
+ 	  prev=expsyms_regex
+ 	fi
+ 	continue
+ 	;;
+ 
+       -inst-prefix-dir)
+ 	prev=inst_prefix
+ 	continue
+ 	;;
+ 
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+ 	case $with_gcc/$host in
+ 	no/*-*-irix* | /*-*-irix*)
+ 	  compile_command="$compile_command $arg"
+ 	  finalize_command="$finalize_command $arg"
+ 	  ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -L*)
+ 	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ 	# We need an absolute path.
+ 	case $dir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+ 	esac
+ 	case "$deplibs " in
+ 	*" -L$dir "*) ;;
+ 	*)
+ 	  deplibs="$deplibs -L$dir"
+ 	  lib_search_path="$lib_search_path $dir"
+ 	  ;;
+ 	esac
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$dir";;
+ 	  esac
+ 	  ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+ 	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+ 	  *-*-mingw* | *-*-os2*)
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    continue
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+ 	 *-*-openbsd* | *-*-freebsd*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+ 	 esac
+ 	fi
+ 	deplibs="$deplibs $arg"
+ 	continue
+ 	;;
+ 
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
+       # gcc -m* arguments should be passed to the linker via $compiler_flags
+       # in order to pass architecture information to the linker
+       # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
+       # but this is not reliable with gcc because gcc may use -mfoo to
+       # select a different linker, different libraries, etc, while
+       # -Wl,-mfoo simply passes -mfoo to the linker.
+       -m*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
+         if test "$with_gcc" = "yes" ; then
+           compiler_flags="$compiler_flags $arg"
+         fi
+         continue
+         ;;
+ 
+       -shrext)
+ 	prev=shrext
+ 	continue
+ 	;;
+ 
+       -no-fast-install)
+ 	fast_install=no
+ 	continue
+ 	;;
+ 
+       -no-install)
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+ 	  # in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+ 	  ;;
+ 	*) no_install=yes ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -no-undefined)
+ 	allow_undefined=no
+ 	continue
+ 	;;
+ 
+       -objectlist)
+ 	prev=objectlist
+ 	continue
+ 	;;
+ 
+       -o) prev=output ;;
+ 
+       -release)
+ 	prev=release
+ 	continue
+ 	;;
+ 
+       -rpath)
+ 	prev=rpath
+ 	continue
+ 	;;
+ 
+       -R)
+ 	prev=xrpath
+ 	continue
+ 	;;
+ 
+       -R*)
+ 	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ 	# We need an absolute path.
+ 	case $dir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+ 	*" $dir "*) ;;
+ 	*) xrpath="$xrpath $dir" ;;
+ 	esac
+ 	continue
+ 	;;
+ 
+       -static)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+ 	# would be equivalent was wrong.  It would break on at least
+ 	# Digital Unix and AIX.
+ 	continue
+ 	;;
+ 
+       -thread-safe)
+ 	thread_safe=yes
+ 	continue
+ 	;;
+ 
+       -version-info)
+ 	prev=vinfo
+ 	continue
+ 	;;
+       -version-number)
+ 	prev=vinfo
+ 	vinfo_number=yes
+ 	continue
+ 	;;
+ 
+       -Wc,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ 	arg=
+ 	save_ifs="$IFS"; IFS=','
+ 	for flag in $args; do
+ 	  IFS="$save_ifs"
+ 	  case $flag in
+ 	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	    flag="\"$flag\""
+ 	    ;;
+ 	  esac
+ 	  arg="$arg $wl$flag"
+ 	  compiler_flags="$compiler_flags $flag"
+ 	done
+ 	IFS="$save_ifs"
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+ 	save_ifs="$IFS"; IFS=','
+ 	for flag in $args; do
+ 	  IFS="$save_ifs"
+ 	  case $flag in
+ 	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	    flag="\"$flag\""
+ 	    ;;
+ 	  esac
+ 	  arg="$arg $wl$flag"
+ 	  compiler_flags="$compiler_flags $wl$flag"
+ 	  linker_flags="$linker_flags $flag"
+ 	done
+ 	IFS="$save_ifs"
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
+       -Xcompiler)
+ 	prev=xcompiler
+ 	continue
+ 	;;
+ 
+       -Xlinker)
+ 	prev=xlinker
+ 	continue
+ 	;;
+ 
+       -XCClinker)
+ 	prev=xcclinker
+ 	continue
+ 	;;
+ 
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+ 	;;
+ 
+       *.$objext)
+ 	# A standard object.
+ 	objs="$objs $arg"
+ 	;;
+ 
+       *.lo)
+ 	# A libtool-controlled object.
+ 
+ 	# Check to see that this really is a libtool object.
+ 	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  pic_object=
+ 	  non_pic_object=
+ 
+ 	  # Read the .lo file
+ 	  # If there is no directory component, then add one.
+ 	  case $arg in
+ 	  */* | *\\*) . $arg ;;
+ 	  *) . ./$arg ;;
+ 	  esac
+ 
+ 	  if test -z "$pic_object" || \
+ 	     test -z "$non_pic_object" ||
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+ 	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 	  if test "X$xdir" = "X$arg"; then
+ 	    xdir=
+  	  else
+ 	    xdir="$xdir/"
+ 	  fi
+ 
+ 	  if test "$pic_object" != none; then
+ 	    # Prepend the subdirectory the object is found in.
+ 	    pic_object="$xdir$pic_object"
+ 
+ 	    if test "$prev" = dlfiles; then
+ 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ 		dlfiles="$dlfiles $pic_object"
+ 		prev=
+ 		continue
+ 	      else
+ 		# If libtool objects are unsupported, then we need to preload.
+ 		prev=dlprefiles
+ 	      fi
+ 	    fi
+ 
+ 	    # CHECK ME:  I think I busted this.  -Ossama
+ 	    if test "$prev" = dlprefiles; then
+ 	      # Preload the old-style object.
+ 	      dlprefiles="$dlprefiles $pic_object"
+ 	      prev=
+ 	    fi
+ 
+ 	    # A PIC object.
+ 	    libobjs="$libobjs $pic_object"
+ 	    arg="$pic_object"
+ 	  fi
+ 
+ 	  # Non-PIC object.
+ 	  if test "$non_pic_object" != none; then
+ 	    # Prepend the subdirectory the object is found in.
+ 	    non_pic_object="$xdir$non_pic_object"
+ 
+ 	    # A standard non-PIC object
+ 	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	    if test -z "$pic_object" || test "$pic_object" = none ; then
+ 	      arg="$non_pic_object"
+ 	    fi
+ 	  fi
+ 	else
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ 	    exit 1
+ 	  else
+ 	    # Dry-run case.
+ 
+ 	    # Extract subdirectory from the argument.
+ 	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ 	    if test "X$xdir" = "X$arg"; then
+ 	      xdir=
+ 	    else
+ 	      xdir="$xdir/"
+ 	    fi
+ 
+ 	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ 	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ 	    libobjs="$libobjs $pic_object"
+ 	    non_pic_objects="$non_pic_objects $non_pic_object"
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *.$libext)
+ 	# An archive.
+ 	deplibs="$deplibs $arg"
+ 	old_deplibs="$old_deplibs $arg"
+ 	continue
+ 	;;
+ 
+       *.la)
+ 	# A libtool-controlled library.
+ 
+ 	if test "$prev" = dlfiles; then
+ 	  # This library was specified with -dlopen.
+ 	  dlfiles="$dlfiles $arg"
+ 	  prev=
+ 	elif test "$prev" = dlprefiles; then
+ 	  # The library was specified with -dlpreopen.
+ 	  dlprefiles="$dlprefiles $arg"
+ 	  prev=
+ 	else
+ 	  deplibs="$deplibs $arg"
+ 	fi
+ 	continue
+ 	;;
+ 
+       # Some other compiler argument.
+       *)
+ 	# Unknown arguments in both finalize_command and compile_command need
+ 	# to be aesthetically quoted because they are evaled later.
+ 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ 	case $arg in
+ 	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+ 	;;
+       esac # arg
+ 
+       # Now actually substitute the argument into the commands.
+       if test -n "$arg"; then
+ 	compile_command="$compile_command $arg"
+ 	finalize_command="$finalize_command $arg"
+       fi
+     done # argument parsing loop
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Infer tagged configuration to use if any are available and
+     # if one wasn't chosen via the "--tag" command line option.
+     # Only attempt this if the compiler in the base link
+     # command doesn't match the default compiler.
+     if test -n "$available_tags" && test -z "$tagname"; then
+       case $base_compile in
+       # Blanks in the command may have been stripped by the calling shell,
+       # but not from the CC environment variable when configure was run.
+       "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+       # Blanks at the start of $base_compile will cause this to fail
+       # if we don't check for them as well.
+       *)
+ 	for z in $available_tags; do
+ 	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ 	    # Evaluate the configuration.
+ 	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ 	    case $base_compile in
+ 	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+ 	      # The compiler in $compile_command matches
+ 	      # the one in the tagged configuration.
+ 	      # Assume this is the tagged configuration we want.
+ 	      tagname=$z
+ 	      break
+ 	      ;;
+ 	    esac
+ 	  fi
+ 	done
+ 	# If $tagname still isn't set, then no tagged configuration
+ 	# was found and let the user know that the "--tag" command
+ 	# line option must be used.
+ 	if test -z "$tagname"; then
+ 	  $echo "$modename: unable to infer tagged configuration"
+ 	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+ 	  exit 1
+ #       else
+ #         $echo "$modename: using $tagname tagged configuration"
+ 	fi
+ 	;;
+       esac
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+       eval arg=\"$export_dynamic_flag_spec\"
+       compile_command="$compile_command $arg"
+       finalize_command="$finalize_command $arg"
+     fi
+ 
+     oldlibs=
+     # calculate the name of the file, without its directory
+     outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+     libobjs_save="$libobjs"
+ 
+     if test -n "$shlibpath_var"; then
+       # get the directories listed in $shlibpath_var
+       eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+     else
+       shlib_search_path=
+     fi
+     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ 
+     output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+     if test "X$output_objdir" = "X$output"; then
+       output_objdir="$objdir"
+     else
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+     if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+       if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+ 
+     # Determine the type of output
+     case $output in
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+     *.la) linkmode=lib ;;
+     *) linkmode=prog ;; # Anything else should be a program.
+     esac
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+       # don't eliminate duplcations in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+       duplicate_compiler_generated_deps=$duplicate_deps
+       ;;
+     esac
+     specialdeplibs=
+ 
+     libs=
+     # Find all interdependent deplibs by searching for libraries
+     # that are linked more than once (e.g. -la -lb -la)
+     for deplib in $deplibs; do
+       if test "X$duplicate_deps" = "Xyes" ; then
+ 	case "$libs " in
+ 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	esac
+       fi
+       libs="$libs $deplib"
+     done
+ 
+     if test "$linkmode" = lib; then
+       libs="$predeps $libs $compiler_lib_search_path $postdeps"
+ 
+       # Compute libraries that are listed more than once in $predeps
+       # $postdeps and mark them as special (i.e., whose duplicates are
+       # not to be eliminated).
+       pre_post_deps=
+       if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+ 	for pre_post_dep in $predeps $postdeps; do
+ 	  case "$pre_post_deps " in
+ 	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ 	  esac
+ 	  pre_post_deps="$pre_post_deps $pre_post_dep"
+ 	done
+       fi
+       pre_post_deps=
+     fi
+ 
+     deplibs=
+     newdependency_libs=
+     newlib_search_path=
+     need_relink=no # whether we're linking any uninstalled libtool libraries
+     notinst_deplibs= # not-installed libtool libraries
+     notinst_path= # paths that contain not-installed libtool libraries
+     case $linkmode in
+     lib)
+ 	passes="conv link"
+ 	for file in $dlfiles $dlprefiles; do
+ 	  case $file in
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+ 	    exit 1
+ 	    ;;
+ 	  esac
+ 	done
+ 	;;
+     prog)
+ 	compile_deplibs=
+ 	finalize_deplibs=
+ 	alldeplibs=no
+ 	newdlfiles=
+ 	newdlprefiles=
+ 	passes="conv scan dlopen dlpreopen link"
+ 	;;
+     *)  passes="conv"
+ 	;;
+     esac
+     for pass in $passes; do
+       if test "$linkmode,$pass" = "lib,link" ||
+ 	 test "$linkmode,$pass" = "prog,scan"; then
+ 	libs="$deplibs"
+ 	deplibs=
+       fi
+       if test "$linkmode" = prog; then
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+ 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+ 	# Collect dlpreopened libraries
+ 	save_deplibs="$deplibs"
+ 	deplibs=
+       fi
+       for deplib in $libs; do
+ 	lib=
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+ 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 	    # Search the libtool library
+ 	    lib="$searchdir/lib${name}.la"
+ 	    if test -f "$lib"; then
+ 	      found=yes
+ 	      break
+ 	    fi
+ 	  done
+ 	  if test "$found" != yes; then
+ 	    # deplib doesn't seem to be a libtool library
+ 	    if test "$linkmode,$pass" = "prog,link"; then
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+ 	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  else # deplib is a libtool library
+ 	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ 	    # We need to do some special things here, and not later.
+ 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 	      case " $predeps $postdeps " in
+ 	      *" $deplib "*)
+ 		if (${SED} -e '2q' $lib |
+                     grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 		  library_names=
+ 		  old_library=
+ 		  case $lib in
+ 		  */* | *\\*) . $lib ;;
+ 		  *) . ./$lib ;;
+ 		  esac
+ 		  for l in $old_library $library_names; do
+ 		    ll="$l"
+ 		  done
+ 		  if test "X$ll" = "X$old_library" ; then # only static version available
+ 		    found=no
+ 		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ 		    test "X$ladir" = "X$lib" && ladir="."
+ 		    lib=$ladir/$old_library
+ 		    if test "$linkmode,$pass" = "prog,link"; then
+ 		      compile_deplibs="$deplib $compile_deplibs"
+ 		      finalize_deplibs="$deplib $finalize_deplibs"
+ 		    else
+ 		      deplibs="$deplib $deplibs"
+ 		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 		    fi
+ 		    continue
+ 		  fi
+ 		fi
+ 	        ;;
+ 	      *) ;;
+ 	      esac
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+ 	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+ 	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    ;;
+ 	  esac # linkmode
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+ 	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+ 	    *" $dir "*) ;;
+ 	    *) xrpath="$xrpath $dir" ;;
+ 	    esac
+ 	  fi
+ 	  deplibs="$deplib $deplibs"
+ 	  continue
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+ 	    if test "$deplibs_check_method" != pass_all; then
+ 	      $echo
+ 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+ 	      $echo "*** I have the capability to make that library automatically link in when"
+ 	      $echo "*** you link to this library.  But I can only do this if you have a"
+ 	      $echo "*** shared version of the library, which you do not appear to have"
+ 	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+ 	      $echo "*** that it is just a static archive that I should not used here."
+ 	    else
+ 	      $echo
+ 	      $echo "*** Warning: Linking the shared library $output against the"
+ 	      $echo "*** static library $deplib is not portable!"
+ 	      deplibs="$deplib $deplibs"
+ 	    fi
+ 	    continue
+ 	    ;;
+ 	  prog)
+ 	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
+ 	    continue
+ 	    ;;
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+ 	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	  elif test "$linkmode" = prog; then
+ 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	      # If there is no dlopen support or we're linking statically,
+ 	      # we need to preload.
+ 	      newdlprefiles="$newdlprefiles $deplib"
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      newdlfiles="$newdlfiles $deplib"
+ 	    fi
+ 	  fi
+ 	  continue
+ 	  ;;
+ 	%DEPLIBS%)
+ 	  alldeplibs=yes
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$ladir" = "X$lib" && ladir="."
+ 
+ 	dlname=
+ 	dlopen=
+ 	dlpreopen=
+ 	libdir=
+ 	library_names=
+ 	old_library=
+ 	# If the library was installed with an old release of libtool,
+ 	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
+ 	shouldnotlink=no
+ 
+ 	# Read the .la file
+ 	case $lib in
+ 	*/* | *\\*) . $lib ;;
+ 	*) . ./$lib ;;
+ 	esac
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+ 	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ 	      exit 1
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+               if test "X$duplicate_deps" = "Xyes" ; then
+ 	        case "$tmp_libs " in
+ 	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	        esac
+               fi
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+     
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+ 	  linklib="$l"
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+ 	    # bomb out in the load deplibs phase.
+ 	    dlprefiles="$dlprefiles $lib $dependency_libs"
+ 	  else
+ 	    newdlfiles="$newdlfiles $lib"
+ 	  fi
+ 	  continue
+ 	fi # $pass = dlopen
+ 
+ 	# We need an absolute path.
+ 	case $ladir in
+ 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ 	*)
+ 	  abs_ladir=`cd "$ladir" && pwd`
+ 	  if test -z "$abs_ladir"; then
+ 	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+ 	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ 	    abs_ladir="$ladir"
+ 	  fi
+ 	  ;;
+ 	esac
+ 	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 
+ 	# Find the relevant object directory and library name.
+ 	if test "X$installed" = Xyes; then
+ 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ 	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+ 	    dir="$ladir"
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi
+ 	else
+ 	  dir="$ladir/$objdir"
+ 	  absdir="$abs_ladir/$objdir"
+ 	  # Remove this search path later
+ 	  notinst_path="$notinst_path $abs_ladir"
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+ 	  if test -n "$old_library"; then
+ 	    newdlprefiles="$newdlprefiles $dir/$old_library"
+ 	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+ 	  elif test -n "$dlname"; then
+ 	    newdlprefiles="$newdlprefiles $dir/$dlname"
+ 	  else
+ 	    newdlprefiles="$newdlprefiles $dir/$linklib"
+ 	  fi
+ 	fi # $pass = dlpreopen
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+ 	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+ 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ 	  else
+ 	    deplibs="$lib $deplibs" # used for prog,scan pass
+ 	  fi
+ 	  continue
+ 	fi
+ 
+     
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+ 	  linkalldeplibs=no
+ 	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+ 	     test "$build_libtool_libs" = no; then
+ 	    linkalldeplibs=yes
+ 	  fi
+ 
+ 	  tmp_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+ 	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+ 	      # or/and link against static libraries
+ 	      newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    if test "X$duplicate_deps" = "Xyes" ; then
+ 	      case "$tmp_libs " in
+ 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	      esac
+ 	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done # for deplib
+ 	  continue
+ 	fi # $linkmode = prog...
+ 
+ 	if test "$linkmode,$pass" = "prog,link"; then
+ 	  if test -n "$library_names" &&
+ 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	    # We need to hardcode the library path
+ 	    if test -n "$shlibpath_var"; then
+ 	      # Make sure the rpath contains only unique directories.
+ 	      case "$temp_rpath " in
+ 	      *" $dir "*) ;;
+ 	      *" $absdir "*) ;;
+ 	      *) temp_rpath="$temp_rpath $dir" ;;
+ 	      esac
+ 	    fi
+ 
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $absdir "*) ;;
+ 	    *)
+ 	      case "$compile_rpath " in
+ 	      *" $absdir "*) ;;
+ 	      *) compile_rpath="$compile_rpath $absdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $libdir "*) ;;
+ 	    *)
+ 	      case "$finalize_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) finalize_rpath="$finalize_rpath $libdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+ 		 test -n "$library_names"; }; }; then
+ 	    # We only need to search for static libraries
+ 	    continue
+ 	  fi
+ 	fi
+ 
+ 	link_static=no # Whether the deplib will be linked statically
+ 	if test -n "$library_names" &&
+ 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+ 	
+       # Warn about portability, can't link against -module's on some systems (darwin)
+       if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+ 	    $echo "*** $linklib is not portable!"    
+       fi	  
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $absdir "*) ;;
+ 	    *)
+ 	      case "$compile_rpath " in
+ 	      *" $absdir "*) ;;
+ 	      *) compile_rpath="$compile_rpath $absdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	    case " $sys_lib_dlsearch_path " in
+ 	    *" $libdir "*) ;;
+ 	    *)
+ 	      case "$finalize_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) finalize_rpath="$finalize_rpath $libdir"
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  fi
+ 
+ 	  if test -n "$old_archive_from_expsyms_cmds"; then
+ 	    # figure out the soname
+ 	    set dummy $library_names
+ 	    realname="$2"
+ 	    shift; shift
+ 	    libname=`eval \\$echo \"$libname_spec\"`
+ 	    # use dlname if we got it. it's perfectly good, no?
+ 	    if test -n "$dlname"; then
+ 	      soname="$dlname"
+ 	    elif test -n "$soname_spec"; then
+ 	      # bleh windows
+ 	      case $host in
+ 	      *cygwin* | mingw*)
+ 		major=`expr $current - $age`
+ 		versuffix="-$major"
+ 		;;
+ 	      esac
+ 	      eval soname=\"$soname_spec\"
+ 	    else
+ 	      soname="$realname"
+ 	    fi
+ 
+ 	    # Make a new name for the extract_expsyms_cmds to use
+ 	    soroot="$soname"
+ 	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+ 	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ 
+ 	    # If the library has no export list, then create one now
+ 	    if test -f "$output_objdir/$soname-def"; then :
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      eval cmds=\"$extract_expsyms_cmds\"
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 
+ 	    # Create $newlib
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      eval cmds=\"$old_archive_from_expsyms_cmds\"
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+ 	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+ 	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+ 	    lib_linked=yes
+ 	    case $hardcode_action in
+ 	    immediate | unsupported)
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
+ 		case $host in
+ 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+ 		    # if the lib is a module then we can not link against it, someone
+ 		    # is ignoring the new warnings I added
+ 		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+ 		        $echo "** And there doesn't seem to be a static archive available"
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+ 		      fi 
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+ 		case $host in
+ 		*-*-sunos*) add_shlibpath="$dir" ;;
+ 		esac
+ 		add_dir="-L$dir"
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = no; then
+ 		add_shlibpath="$dir"
+ 		add="-l$name"
+ 	      else
+ 		lib_linked=no
+ 	      fi
+ 	      ;;
+ 	    relink)
+ 	      if test "$hardcode_direct" = yes; then
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
+ 		add_dir="-L$dir"
+ 		# Try looking first in the location we're being installed to.
+ 		if test -n "$inst_prefix_dir"; then
+ 		  case "$libdir" in
+ 		    [\\/]*)
+ 		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		      ;;
+ 		  esac
+ 		fi
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = yes; then
+ 		add_shlibpath="$dir"
+ 		add="-l$name"
+ 	      else
+ 		lib_linked=no
+ 	      fi
+ 	      ;;
+ 	    *) lib_linked=no ;;
+ 	    esac
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+ 	      exit 1
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+ 	      case :$compile_shlibpath: in
+ 	      *":$add_shlibpath:"*) ;;
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+ 	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	      if test "$hardcode_direct" != yes && \
+ 		 test "$hardcode_minus_L" != yes && \
+ 		 test "$hardcode_shlibpath_var" = yes; then
+ 		case :$finalize_shlibpath: in
+ 		*":$libdir:"*) ;;
+ 		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ 		esac
+ 	      fi
+ 	    fi
+ 	  fi
+ 
+ 	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+ 	      add_dir="-L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+ 	      *":$libdir:"*) ;;
+ 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+ 	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+ 	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      add_dir="-L$libdir"
+ 	      # Try looking first in the location we're being installed to.
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case "$libdir" in
+ 		  [\\/]*)
+ 		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ 		    ;;
+ 		esac
+ 	      fi
+ 	      add="-l$name"
+ 	    fi
+ 
+ 	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+ 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+ 	elif test "$linkmode" = prog; then
+ 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+ 	  # is not unsupported.  This is valid on all known static and
+ 	  # shared platforms.
+ 	  if test "$hardcode_direct" != unsupported; then
+ 	    test -n "$old_library" && linklib="$old_library"
+ 	    compile_deplibs="$dir/$linklib $compile_deplibs"
+ 	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ 	  else
+ 	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+ 	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ 	  fi
+ 	elif test "$build_libtool_libs" = yes; then
+ 	  # Not a shared library
+ 	  if test "$deplibs_check_method" != pass_all; then
+ 	    # We're trying link a shared library against a static one
+ 	    # but the system doesn't support it.
+ 
+ 	    # Just print a warning and add the library to dependency_libs so
+ 	    # that the program can be linked against the static library.
+ 	    $echo
+ 	    $echo "*** Warning: This system can not link to static lib archive $lib."
+ 	    $echo "*** I have the capability to make that library automatically link in when"
+ 	    $echo "*** you link to this library.  But I can only do this if you have a"
+ 	    $echo "*** shared version of the library, which you do not appear to have."
+ 	    if test "$module" = yes; then
+ 	      $echo "*** But as you try to build a module library, libtool will still create "
+ 	      $echo "*** a static module, that should work as long as the dlopening application"
+ 	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ 	      if test -z "$global_symbol_pipe"; then
+ 		$echo
+ 		$echo "*** However, this would only work if libtool was able to extract symbol"
+ 		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ 		$echo "*** not find such a program.  So, this module is probably useless."
+ 		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	      fi
+ 	      if test "$build_old_libs" = no; then
+ 		build_libtool_libs=module
+ 		build_old_libs=yes
+ 	      else
+ 		build_libtool_libs=no
+ 	      fi
+ 	    fi
+ 	  else
+ 	    convenience="$convenience $dir/$old_library"
+ 	    old_convenience="$old_convenience $dir/$old_library"
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	    link_static=yes
+ 	  fi
+ 	fi # link shared/static library?
+ 
+ 	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+ 	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+ 	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+ 	      case $libdir in
+ 	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+ 		   case " $xrpath " in
+ 		   *" $temp_xrpath "*) ;;
+ 		   *) xrpath="$xrpath $temp_xrpath";;
+ 		   esac;;
+ 	      *) temp_deplibs="$temp_deplibs $libdir";;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$temp_deplibs"
+ 	  fi
+ 
+ 	  newlib_search_path="$newlib_search_path $absdir"
+ 	  # Link against this library
+ 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ 	  # ... and its dependency_libs
+ 	  tmp_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    if test "X$duplicate_deps" = "Xyes" ; then
+ 	      case "$tmp_libs " in
+ 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ 	      esac
+ 	    fi
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+ 	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+ 	      -L*) path="$deplib" ;;
+ 	      *.la)
+ 		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+ 		test "X$dir" = "X$deplib" && dir="."
+ 		# We need an absolute path.
+ 		case $dir in
+ 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ 		*)
+ 		  absdir=`cd "$dir" && pwd`
+ 		  if test -z "$absdir"; then
+ 		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ 		    absdir="$dir"
+ 		  fi
+ 		  ;;
+ 		esac
+ 		if grep "^installed=no" $deplib > /dev/null; then
+ 		  path="$absdir/$objdir"
+ 		else
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		    exit 1
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+ 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+ 		  path="$absdir"
+ 		fi
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+ 		  # we do not want to link against static libs, but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+ 		      depdepl=$tmp
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+ 		   fi
+ 		    newlib_search_path="$newlib_search_path $path"
+ 		    path=""
+ 		  fi
+ 		  ;;
+ 		*)
+ 		path="-L$path"
+ 		;;
+ 		esac 
+ 		
+ 		;;
+ 		  -l*)
+ 		case $host in
+ 		*-*-darwin*)
+ 		 # Again, we only want to link against shared libraries
+ 		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+ 		 for tmp in $newlib_search_path ; do
+ 		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+ 		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+ 		       break
+ 		     fi  
+          done
+          path=""
+ 		  ;;
+ 		*) continue ;;
+ 		esac  		  
+ 		;;
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+ 	      *" $depdepl "*) ;;
+ 	      *) deplibs="$deplibs $depdepl" ;;
+ 	      esac	      
+ 	      case " $deplibs " in
+ 	      *" $path "*) ;;
+ 	      *) deplibs="$deplibs $path" ;;
+ 	      esac
+ 	    done
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+       dependency_libs="$newdependency_libs"
+       if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+       if test "$pass" != dlopen; then
+ 	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+ 	    case "$lib_search_path " in
+ 	    *" $dir "*) ;;
+ 	    *) lib_search_path="$lib_search_path $dir" ;;
+ 	    esac
+ 	  done
+ 	  newlib_search_path=
+ 	fi
+ 
+ 	if test "$linkmode,$pass" != "prog,link"; then
+ 	  vars="deplibs"
+ 	else
+ 	  vars="compile_deplibs finalize_deplibs"
+ 	fi
+ 	for var in $vars dependency_libs; do
+ 	  # Add libraries to $var in reverse order
+ 	  eval tmp_libs=\"\$$var\"
+ 	  new_libs=
+ 	  for deplib in $tmp_libs; do
+ 	    # FIXME: Pedantically, this is the right thing to do, so
+ 	    #        that some nasty dependency loop isn't accidentally
+ 	    #        broken:
+ 	    #new_libs="$deplib $new_libs"
+ 	    # Pragmatically, this seems to cause very few problems in
+ 	    # practice:
+ 	    case $deplib in
+ 	    -L*) new_libs="$deplib $new_libs" ;;
+ 	    -R*) ;;
+ 	    *)
+ 	      # And here is the reason: when a library appears more
+ 	      # than once as an explicit dependence of a library, or
+ 	      # is implicitly linked in more than once by the
+ 	      # compiler, it is considered special, and multiple
+ 	      # occurrences thereof are not removed.  Compare this
+ 	      # with having the same library being listed as a
+ 	      # dependency of multiple other libraries: in this case,
+ 	      # we know (pedantically, we assume) the library does not
+ 	      # need to be listed more than once, so we keep only the
+ 	      # last copy.  This is not always right, but it is rare
+ 	      # enough that we require users that really mean to play
+ 	      # such unportable linking tricks to link the library
+ 	      # using -Wl,-lname, so that libtool does not consider it
+ 	      # for duplicate removal.
+ 	      case " $specialdeplibs " in
+ 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ 	      *)
+ 		case " $new_libs " in
+ 		*" $deplib "*) ;;
+ 		*) new_libs="$deplib $new_libs" ;;
+ 		esac
+ 		;;
+ 	      esac
+ 	      ;;
+ 	    esac
+ 	  done
+ 	  tmp_libs=
+ 	  for deplib in $new_libs; do
+ 	    case $deplib in
+ 	    -L*)
+ 	      case " $tmp_libs " in
+ 	      *" $deplib "*) ;;
+ 	      *) tmp_libs="$tmp_libs $deplib" ;;
+ 	      esac
+ 	      ;;
+ 	    *) tmp_libs="$tmp_libs $deplib" ;;
+ 	    esac
+ 	  done
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+       # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+ 	*" $i "*)
+ 	  i=""
+ 	  ;;
+ 	esac
+ 	if test -n "$i" ; then
+ 	  tmp_libs="$tmp_libs $i"
+ 	fi
+       done
+       dependency_libs=$tmp_libs
+     done # for pass
+     if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+ 
+     case $linkmode in
+     oldlib)
+       if test -n "$deplibs"; then
+ 	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$rpath"; then
+ 	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$xrpath"; then
+ 	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+       fi
+ 
+       # Now set the variables for building old libraries.
+       build_libtool_libs=no
+       oldlibs="$output"
+       objs="$objs$old_deplibs"
+       ;;
+ 
+     lib)
+       # Make sure we only generate libraries of the form `libNAME.la'.
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 	eval shared_ext=\"$shrext\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ 	  eval shared_ext=\"$shrext\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ 	fi
+ 	;;
+       esac
+ 
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+ 	  exit 1
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+ 	  $echo "*** objects $objs is not portable!"
+ 	  libobjs="$libobjs $objs"
+ 	fi
+       fi
+ 
+       if test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+       fi
+ 
+       set dummy $rpath
+       if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+ 
+       oldlibs=
+       if test -z "$rpath"; then
+ 	if test "$build_libtool_libs" = yes; then
+ 	  # Building a libtool convenience library.
+ 	  # Some compilers have problems with a `.al' extension so
+ 	  # convenience libraries should have the same extension an
+ 	  # archive normally would.
+ 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ 	  build_libtool_libs=convenience
+ 	  build_old_libs=yes
+ 	fi
+ 
+ 	if test -n "$vinfo"; then
+ 	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ 	fi
+ 
+ 	if test -n "$release"; then
+ 	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ 	fi
+       else
+ 
+ 	# Parse the version information argument.
+ 	save_ifs="$IFS"; IFS=':'
+ 	set dummy $vinfo 0 0 0
+ 	IFS="$save_ifs"
+ 
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+ 	
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+ 	  number_minor="$3"
+ 	  number_revision="$4"
+ 	  #
+ 	  # There are really only two kinds -- those that
+ 	  # use the current revision as the major version
+ 	  # and those that subtract age and use age as
+ 	  # a minor version.  But, then there is irix
+ 	  # which has an extra 1 added just for fun
+ 	  #
+ 	  case $version_type in
+ 	  darwin|linux|osf|windows)
+ 	    current=`expr $number_major + $number_minor`
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+ 	    ;;
+ 	  freebsd-aout|freebsd-elf|sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+ 	    ;;
+ 	  irix|nonstopux)
+ 	    current=`expr $number_major + $number_minor - 1`
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+ 	  current="$2"
+ 	  revision="$3"
+ 	  age="$4"
+ 	  ;;
+ 	esac
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	case $revision in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	case $age in
+ 	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Calculate the version variables.
+ 	major=
+ 	versuffix=
+ 	verstring=
+ 	case $version_type in
+ 	none) ;;
+ 
+ 	darwin)
+ 	  # Like Linux, but with the current version available in
+ 	  # verstring for coding it into the library header
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+ 	  major=".$current"
+ 	  versuffix=".$current.$revision";
+ 	  ;;
+ 
+ 	freebsd-elf)
+ 	  major=".$current"
+ 	  versuffix=".$current";
+ 	  ;;
+ 
+ 	irix | nonstopux)
+ 	  major=`expr $current - $age + 1`
+ 
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+ 	  esac
+ 	  verstring="$verstring_prefix$major.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+ 	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring_prefix$major.$iface:$verstring"
+ 	  done
+ 
+ 	  # Before this point, $major must not contain `.'.
+ 	  major=.$major
+ 	  versuffix="$major.$revision"
+ 	  ;;
+ 
+ 	linux)
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
+ 	  ;;
+ 
+ 	osf)
+ 	  major=.`expr $current - $age`
+ 	  versuffix=".$current.$age.$revision"
+ 	  verstring="$current.$age.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+ 	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+ 	  done
+ 
+ 	  # Make executables depend on our current version.
+ 	  verstring="$verstring:${current}.0"
+ 	  ;;
+ 
+ 	sunos)
+ 	  major=".$current"
+ 	  versuffix=".$current.$revision"
+ 	  ;;
+ 
+ 	windows)
+ 	  # Use '-' rather than '.', since we only want one
+ 	  # extension on DOS 8.3 filesystems.
+ 	  major=`expr $current - $age`
+ 	  versuffix="-$major"
+ 	  ;;
+ 
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	# Clear the version info if we defaulted, and they specified a release.
+ 	if test -z "$vinfo" && test -n "$release"; then
+ 	  major=
+ 	  case $version_type in
+ 	  darwin)
+ 	    # we can't check for "0.0" in archive_cmds due to quoting
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+ 	  esac
+ 	  if test "$need_version" = no; then
+ 	    versuffix=
+ 	  else
+ 	    versuffix=".0.0"
+ 	  fi
+ 	fi
+ 
+ 	# Remove version info from name if versioning should be avoided
+ 	if test "$avoid_version" = yes && test "$need_version" = no; then
+ 	  major=
+ 	  versuffix=
+ 	  verstring=""
+ 	fi
+ 
+ 	# Check to see if the archive will have undefined symbols.
+ 	if test "$allow_undefined" = yes; then
+ 	  if test "$allow_undefined_flag" = unsupported; then
+ 	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ 	    build_libtool_libs=no
+ 	    build_old_libs=yes
+ 	  fi
+ 	else
+ 	  # Don't allow undefined symbols.
+ 	  allow_undefined_flag="$no_undefined_flag"
+ 	fi
+       fi
+ 
+       if test "$mode" != relink; then
+ 	# Remove our outputs, but don't remove object files since they
+ 	# may have been created when compiling PIC objects.
+ 	removelist=
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+ 	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ 	       removelist="$removelist $p"
+ 	       ;;
+ 	    *) ;;
+ 	  esac
+ 	done
+ 	if test -n "$removelist"; then
+ 	  $show "${rm}r $removelist"
+ 	  $run ${rm}r $removelist
+ 	fi
+       fi
+ 
+       # Now set the variables for building old libraries.
+       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+ 
+ 	# Transform .lo files to .o files.
+ 	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+       fi
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+ 	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+ 	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ 	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+       done
+ 
+       if test -n "$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+ 	temp_xrpath=
+ 	for libdir in $xrpath; do
+ 	  temp_xrpath="$temp_xrpath -R$libdir"
+ 	  case "$finalize_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+ 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+ 
+       # Make sure dlfiles contains only unique files that won't be dlpreopened
+       old_dlfiles="$dlfiles"
+       dlfiles=
+       for lib in $old_dlfiles; do
+ 	case " $dlprefiles $dlfiles " in
+ 	*" $lib "*) ;;
+ 	*) dlfiles="$dlfiles $lib" ;;
+ 	esac
+       done
+ 
+       # Make sure dlprefiles contains only unique files
+       old_dlprefiles="$dlprefiles"
+       dlprefiles=
+       for lib in $old_dlprefiles; do
+ 	case "$dlprefiles " in
+ 	*" $lib "*) ;;
+ 	*) dlprefiles="$dlprefiles $lib" ;;
+ 	esac
+       done
+ 
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+ 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+ 	    deplibs="$deplibs -framework System"
+ 	    ;;
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+  	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+ 	  esac
+ 	fi
+ 
+ 	# Transform deplibs into only deplibs that can be linked in shared.
+ 	name_save=$name
+ 	libname_save=$libname
+ 	release_save=$release
+ 	versuffix_save=$versuffix
+ 	major_save=$major
+ 	# I'm not sure if I'm treating the release correctly.  I think
+ 	# release should show up in the -l (ie -lgmp5) so we don't want to
+ 	# add it in twice.  Is that correct?
+ 	release=""
+ 	versuffix=""
+ 	major=""
+ 	newdeplibs=
+ 	droppeddeps=no
+ 	case $deplibs_check_method in
+ 	pass_all)
+ 	  # Don't check for shared/static.  Everything works.
+ 	  # This might be a little naive.  We might want to check
+ 	  # whether the library exists or not.  But this is on
+ 	  # osf3 & osf4 and I'm not really sure... Just
+ 	  # implementing what was already the behavior.
+ 	  newdeplibs=$deplibs
+ 	  ;;
+ 	test_compile)
+ 	  # This code stresses the "libraries are programs" paradigm to its
+ 	  # limits. Maybe even breaks it.  We compile a program, linking it
+ 	  # against the deplibs as a proxy for the library.  Then we can check
+ 	  # whether they linked in statically or dynamically with ldd.
+ 	  $rm conftest.c
+ 	  cat > conftest.c <<EOF
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+ 	  $LTCC -o conftest conftest.c $deplibs
+ 	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" -ne "0"; then
+ 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		  case " $predeps $postdeps " in
+ 		  *" $i "*)
+ 		    newdeplibs="$newdeplibs $i"
+ 		    i=""
+ 		    ;;
+ 		  esac
+ 	        fi
+ 		if test -n "$i" ; then
+ 		  libname=`eval \\$echo \"$libname_spec\"`
+ 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ 		  set dummy $deplib_matches
+ 		  deplib_match=$2
+ 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ 		    newdeplibs="$newdeplibs $i"
+ 		  else
+ 		    droppeddeps=yes
+ 		    $echo
+ 		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+ 		    $echo "*** I have the capability to make that library automatically link in when"
+ 		    $echo "*** you link to this library.  But I can only do this if you have a"
+ 		    $echo "*** shared version of the library, which I believe you do not have"
+ 		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+ 		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ 		  fi
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  else
+ 	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+               if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+ 		$LTCC -o conftest conftest.c $i
+ 		# Did it work?
+ 		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+ 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		    case " $predeps $postdeps " in
+ 		    *" $i "*)
+ 		      newdeplibs="$newdeplibs $i"
+ 		      i=""
+ 		      ;;
+ 		    esac
+ 		  fi
+ 		  if test -n "$i" ; then
+ 		    libname=`eval \\$echo \"$libname_spec\"`
+ 		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ 		    set dummy $deplib_matches
+ 		    deplib_match=$2
+ 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ 		      newdeplibs="$newdeplibs $i"
+ 		    else
+ 		      droppeddeps=yes
+ 		      $echo
+ 		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+ 		      $echo "*** I have the capability to make that library automatically link in when"
+ 		      $echo "*** you link to this library.  But I can only do this if you have a"
+ 		      $echo "*** shared version of the library, which you do not appear to have"
+ 		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+ 		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ 		    fi
+ 		  fi
+ 		else
+ 		  droppeddeps=yes
+ 		  $echo
+ 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+ 		  $echo "***  make it link in!  You will probably need to install it or some"
+ 		  $echo "*** library that it depends on before this library will be fully"
+ 		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  fi
+ 	  ;;
+ 	file_magic*)
+ 	  set dummy $deplibs_check_method
+ 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+             if test "$name" != "" && test  "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		case " $predeps $postdeps " in
+ 		*" $a_deplib "*)
+ 		  newdeplibs="$newdeplibs $a_deplib"
+ 		  a_deplib=""
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		libname=`eval \\$echo \"$libname_spec\"`
+ 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ 		  for potent_lib in $potential_libs; do
+ 		      # Follow soft links.
+ 		      if ls -lLd "$potent_lib" 2>/dev/null \
+ 			 | grep " -> " >/dev/null; then
+ 			continue
+ 		      fi
+ 		      # The statement above tries to avoid entering an
+ 		      # endless loop below, in case of cyclic links.
+ 		      # We might still enter an endless loop, since a link
+ 		      # loop can be closed while we follow links,
+ 		      # but so what?
+ 		      potlib="$potent_lib"
+ 		      while test -h "$potlib" 2>/dev/null; do
+ 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ 			case $potliblink in
+ 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | ${SED} 10q \
+ 			 | $EGREP "$file_magic_regex" > /dev/null; then
+ 			newdeplibs="$newdeplibs $a_deplib"
+ 			a_deplib=""
+ 			break 2
+ 		      fi
+ 		  done
+ 		done
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		$echo
+ 		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+ 		$echo "*** I have the capability to make that library automatically link in when"
+ 		$echo "*** you link to this library.  But I can only do this if you have a"
+ 		$echo "*** shared version of the library, which you do not appear to have"
+ 		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+ 		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ 		else
+ 		  $echo "*** with $libname and none of the candidates passed a file format test"
+ 		  $echo "*** using a file magic. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+ 	      newdeplibs="$newdeplibs $a_deplib"
+ 	    fi
+ 	  done # Gone through all deplibs.
+ 	  ;;
+ 	match_pattern*)
+ 	  set dummy $deplibs_check_method
+ 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ 	  for a_deplib in $deplibs; do
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+ 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 		case " $predeps $postdeps " in
+ 		*" $a_deplib "*)
+ 		  newdeplibs="$newdeplibs $a_deplib"
+ 		  a_deplib=""
+ 		  ;;
+ 		esac
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		libname=`eval \\$echo \"$libname_spec\"`
+ 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ 		  for potent_lib in $potential_libs; do
+ 		    potlib="$potent_lib" # see symlink-check above in file_magic test
+ 		    if eval $echo \"$potent_lib\" 2>/dev/null \
+ 		        | ${SED} 10q \
+ 		        | $EGREP "$match_pattern_regex" > /dev/null; then
+ 		      newdeplibs="$newdeplibs $a_deplib"
+ 		      a_deplib=""
+ 		      break 2
+ 		    fi
+ 		  done
+ 		done
+ 	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		$echo
+ 		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+ 		$echo "*** I have the capability to make that library automatically link in when"
+ 		$echo "*** you link to this library.  But I can only do this if you have a"
+ 		$echo "*** shared version of the library, which you do not appear to have"
+ 		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+ 		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ 		else
+ 		  $echo "*** with $libname and none of the candidates passed a file format test"
+ 		  $echo "*** using a regex pattern. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+ 	      newdeplibs="$newdeplibs $a_deplib"
+ 	    fi
+ 	  done # Gone through all deplibs.
+ 	  ;;
+ 	none | unknown | *)
+ 	  newdeplibs=""
+ 	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+ 	    -e 's/ -[LR][^ ]*//g'`
+ 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ 	    for i in $predeps $postdeps ; do
+ 	      # can't use Xsed below, because $i might contain '/'
+ 	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+ 	    done
+ 	  fi
+ 	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+ 	    | grep . >/dev/null; then
+ 	    $echo
+ 	    if test "X$deplibs_check_method" = "Xnone"; then
+ 	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ 	    else
+ 	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+ 	    fi
+ 	    $echo "*** All declared inter-library dependencies are being dropped."
+ 	    droppeddeps=yes
+ 	  fi
+ 	  ;;
+ 	esac
+ 	versuffix=$versuffix_save
+ 	major=$major_save
+ 	release=$release_save
+ 	libname=$libname_save
+ 	name=$name_save
+ 
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+ 	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+ 	if test "$droppeddeps" = yes; then
+ 	  if test "$module" = yes; then
+ 	    $echo
+ 	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+ 	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+ 	    $echo "*** a static module, that should work as long as the dlopening"
+ 	    $echo "*** application is linked with the -dlopen flag."
+ 	    if test -z "$global_symbol_pipe"; then
+ 	      $echo
+ 	      $echo "*** However, this would only work if libtool was able to extract symbol"
+ 	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ 	      $echo "*** not find such a program.  So, this module is probably useless."
+ 	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	    fi
+ 	    if test "$build_old_libs" = no; then
+ 	      oldlibs="$output_objdir/$libname.$libext"
+ 	      build_libtool_libs=module
+ 	      build_old_libs=yes
+ 	    else
+ 	      build_libtool_libs=no
+ 	    fi
+ 	  else
+ 	    $echo "*** The inter-library dependencies that have been dropped here will be"
+ 	    $echo "*** automatically added whenever a program is linked with this library"
+ 	    $echo "*** or is declared to -dlopen it."
+ 
+ 	    if test "$allow_undefined" = no; then
+ 	      $echo
+ 	      $echo "*** Since this library must not contain undefined symbols,"
+ 	      $echo "*** because either the platform does not support them or"
+ 	      $echo "*** it was explicitly requested with -no-undefined,"
+ 	      $echo "*** libtool will only create a static version of it."
+ 	      if test "$build_old_libs" = no; then
+ 		oldlibs="$output_objdir/$libname.$libext"
+ 		build_libtool_libs=module
+ 		build_old_libs=yes
+ 	      else
+ 		build_libtool_libs=no
+ 	      fi
+ 	    fi
+ 	  fi
+ 	fi
+ 	# Done checking deplibs!
+ 	deplibs=$newdeplibs
+       fi
+ 
+       # All the library-specific variables (install_libdir is set above).
+       library_names=
+       old_library=
+       dlname=
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+ 	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+ 	  rpath="$finalize_rpath"
+ 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
+ 	      if test -n "$hardcode_libdir_separator"; then
+ 		if test -z "$hardcode_libdirs"; then
+ 		  hardcode_libdirs="$libdir"
+ 		else
+ 		  # Just accumulate the unique libdirs.
+ 		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		    ;;
+ 		  *)
+ 		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		    ;;
+ 		  esac
+ 		fi
+ 	      else
+ 		eval flag=\"$hardcode_libdir_flag_spec\"
+ 		dep_rpath="$dep_rpath $flag"
+ 	      fi
+ 	    elif test -n "$runpath_var"; then
+ 	      case "$perm_rpath " in
+ 	      *" $libdir "*) ;;
+ 	      *) perm_rpath="$perm_rpath $libdir" ;;
+ 	      esac
+ 	    fi
+ 	  done
+ 	  # Substitute the hardcoded libdirs into the rpath.
+ 	  if test -n "$hardcode_libdir_separator" &&
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+ 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ 	    else
+ 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	    fi
+ 	  fi
+ 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ 	    # We should set the runpath_var.
+ 	    rpath=
+ 	    for dir in $perm_rpath; do
+ 	      rpath="$rpath$dir:"
+ 	    done
+ 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ 	  fi
+ 	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ 	fi
+ 
+ 	shlibpath="$finalize_shlibpath"
+ 	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ 	if test -n "$shlibpath"; then
+ 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+ 	eval shared_ext=\"$shrext\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+ 	shift; shift
+ 
+ 	if test -n "$soname_spec"; then
+ 	  eval soname=\"$soname_spec\"
+ 	else
+ 	  soname="$realname"
+ 	fi
+ 	if test -z "$dlname"; then
+ 	  dlname=$soname
+ 	fi
+ 
+ 	lib="$output_objdir/$realname"
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+ 	done
+ 
+ 	# Use standard objects if they are pic
+ 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 
+ 	# Prepare the list of exported symbols
+ 	if test -z "$export_symbols"; then
+ 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+ 	    eval cmds=\"$export_symbols_cmds\"
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
+ 	      if len=`expr "X$cmd" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	        $show "$cmd"
+ 	        $run eval "$cmd" || exit $?
+ 	        skipped_export=false
+ 	      else
+ 	        # The command line is too long to execute in one step.
+ 	        $show "using reloadable object file for export list..."
+ 	        skipped_export=:
+ 	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+ 	    if test -n "$export_symbols_regex"; then
+ 	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+ 	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ 	    fi
+ 	  fi
+ 	fi
+ 
+ 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ 	fi
+ 
+ 	tmp_deplibs=
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+ 		*) 
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+ 	deplibs="$tmp_deplibs" 
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+ 	    save_libobjs=$libobjs
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+ 	    $show "${rm}r $gentop"
+ 	    $run ${rm}r "$gentop"
+ 	    $show "$mkdir $gentop"
+ 	    $run $mkdir "$gentop"
+ 	    status=$?
+ 	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	      exit $status
+ 	    fi
+ 	    generated="$generated $gentop"
+ 
+ 	    for xlib in $convenience; do
+ 	      # Extract the objects.
+ 	      case $xlib in
+ 	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	      *) xabs=`pwd`"/$xlib" ;;
+ 	      esac
+ 	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	      xdir="$gentop/$xlib"
+ 
+ 	      $show "${rm}r $xdir"
+ 	      $run ${rm}r "$xdir"
+ 	      $show "$mkdir $xdir"
+ 	      $run $mkdir "$xdir"
+ 	      status=$?
+ 	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 		exit $status
+ 	      fi
+ 	      # We will extract separately just the conflicting names and we will no
+ 	      # longer touch any unique names. It is faster to leave these extract
+ 	      # automatically by $AR in one run.
+ 	      $show "(cd $xdir && $AR x $xabs)"
+ 	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 		:
+ 	      else
+ 		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 		$AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 		do
+ 		  i=1
+ 		  while test "$i" -le "$count"
+ 		  do
+ 		   # Put our $i before any first dot (extension)
+ 		   # Never overwrite any file
+ 		   name_to="$name"
+ 		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 		   do
+ 		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 		   done
+ 		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 		   i=`expr $i + 1`
+ 		  done
+ 		done
+ 	      fi
+ 
+ 	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ 	    done
+ 	  fi
+ 	fi
+ 
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+ 	fi
+ 
+ 	# Make a backup of the uninstalled library when relinking
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ 	    eval cmds=\"$module_expsym_cmds\"
+ 	  else
+ 	    eval cmds=\"$module_cmds\"
+ 	  fi
+ 	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ 	  eval cmds=\"$archive_expsym_cmds\"
+ 	else
+ 	  eval cmds=\"$archive_cmds\"
+ 	  fi
+ 	fi
+ 
+ 	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+ 	  # The command line is too long to link in one step, link piecewise.
+ 	  $echo "creating reloadable object files..."
+ 
+ 	  # Save the value of $output and $libobjs because we want to
+ 	  # use them later.  If we have whole_archive_flag_spec, we
+ 	  # want to use save_libobjs as it was before
+ 	  # whole_archive_flag_spec was expanded, because we can't
+ 	  # assume the linker understands whole_archive_flag_spec.
+ 	  # This may have to be revisited, in case too many
+ 	  # convenience libraries get linked in and end up exceeding
+ 	  # the spec.
+ 	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+ 	    save_libobjs=$libobjs
+ 	  fi
+ 	  save_output=$output
+ 
+ 	  # Clear the reloadable object creation command queue and
+ 	  # initialize k to one.
+ 	  test_cmds=
+ 	  concat_cmds=
+ 	  objlist=
+ 	  delfiles=
+ 	  last_robj=
+ 	  k=1
+ 	  output=$output_objdir/$save_output-${k}.$objext
+ 	  # Loop over the list of objects to be linked.
+ 	  for obj in $save_libobjs
+ 	  do
+ 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	    if test "X$objlist" = X ||
+ 	       { len=`expr "X$test_cmds" : ".*"` &&
+ 		 test "$len" -le "$max_cmd_len"; }; then
+ 	      objlist="$objlist $obj"
+ 	    else
+ 	      # The command $test_cmds is almost too long, add a
+ 	      # command to the queue.
+ 	      if test "$k" -eq 1 ; then
+ 		# The first file doesn't have a previous command to add.
+ 		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ 	      else
+ 		# All subsequent reloadable object files will link in
+ 		# the last one created.
+ 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ 	      fi
+ 	      last_robj=$output_objdir/$save_output-${k}.$objext
+ 	      k=`expr $k + 1`
+ 	      output=$output_objdir/$save_output-${k}.$objext
+ 	      objlist=$obj
+ 	      len=1
+ 	    fi
+ 	  done
+ 	  # Handle the remaining objects by creating one last
+ 	  # reloadable object file.  All subsequent reloadable object
+ 	  # files will link in the last one created.
+ 	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ 
+ 	  if ${skipped_export-false}; then
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+ 	    libobjs=$output
+ 	    # Append the command to create the export file.
+ 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+           fi
+ 
+ 	  # Set up a command to remove the reloadale object files
+ 	  # after they are used.
+ 	  i=0
+ 	  while test "$i" -lt "$k"
+ 	  do
+ 	    i=`expr $i + 1`
+ 	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+ 	  done
+ 
+ 	  $echo "creating a temporary reloadable object file: $output"
+ 
+ 	  # Loop through the commands generated above and execute them.
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $concat_cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+ 	  IFS="$save_ifs"
+ 
+ 	  libobjs=$output
+ 	  # Restore the value of output.
+ 	  output=$save_output
+ 
+ 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  fi
+ 	  # Expand the library linking commands again to reset the
+ 	  # value of $libobjs for piecewise linking.
+ 
+ 	  # Do each of the archive commands.
+ 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ 	    eval cmds=\"$archive_expsym_cmds\"
+ 	  else
+ 	    eval cmds=\"$archive_cmds\"
+ 	  fi
+ 
+ 	  # Append the command to remove the reloadable object files
+ 	  # to the just-reset $cmds.
+ 	  eval cmds=\"\$cmds~$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+ 	IFS="$save_ifs"
+ 
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ 	  exit 0
+ 	fi
+ 
+ 	# Create links to the real library.
+ 	for linkname in $linknames; do
+ 	  if test "$realname" != "$linkname"; then
+ 	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+ 	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ 	  fi
+ 	done
+ 
+ 	# If -module or -export-dynamic was specified, set the dlname.
+ 	if test "$module" = yes || test "$export_dynamic" = yes; then
+ 	  # On all known operating systems, these are identical.
+ 	  dlname="$soname"
+ 	fi
+       fi
+       ;;
+ 
+     obj)
+       if test -n "$deplibs"; then
+ 	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$rpath"; then
+ 	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$xrpath"; then
+ 	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+       fi
+ 
+       case $output in
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+ 	  exit 1
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ 	;;
+       *)
+ 	libobj=
+ 	obj="$output"
+ 	;;
+       esac
+ 
+       # Delete the old objects.
+       $run $rm $obj $libobj
+ 
+       # Objects from convenience libraries.  This assumes
+       # single-version convenience libraries.  Whenever we create
+       # different ones for PIC/non-PIC, this we'll have to duplicate
+       # the extraction.
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+       # -Wl from whole_archive_flag_spec
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r "$gentop"
+ 	  $show "$mkdir $gentop"
+ 	  $run $mkdir "$gentop"
+ 	  status=$?
+ 	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	    exit $status
+ 	  fi
+ 	  generated="$generated $gentop"
+ 
+ 	  for xlib in $convenience; do
+ 	    # Extract the objects.
+ 	    case $xlib in
+ 	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	    *) xabs=`pwd`"/$xlib" ;;
+ 	    esac
+ 	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	    xdir="$gentop/$xlib"
+ 
+ 	    $show "${rm}r $xdir"
+ 	    $run ${rm}r "$xdir"
+ 	    $show "$mkdir $xdir"
+ 	    $run $mkdir "$xdir"
+ 	    status=$?
+ 	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	      exit $status
+ 	    fi
+ 	    # We will extract separately just the conflicting names and we will no
+ 	    # longer touch any unique names. It is faster to leave these extract
+ 	    # automatically by $AR in one run.
+ 	    $show "(cd $xdir && $AR x $xabs)"
+ 	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 	      :
+ 	    else
+ 	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 	      do
+ 		i=1
+ 		while test "$i" -le "$count"
+ 		do
+ 		 # Put our $i before any first dot (extension)
+ 		 # Never overwrite any file
+ 		 name_to="$name"
+ 		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 		 do
+ 		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 		 done
+ 		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 		 i=`expr $i + 1`
+ 		done
+ 	      done
+ 	    fi
+ 
+ 	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ 	  done
+ 	fi
+       fi
+ 
+       # Create the old-style object.
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+       eval cmds=\"$reload_cmds\"
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+ 
+       # Exit if we aren't doing a library object file.
+       if test -z "$libobj"; then
+ 	if test -n "$gentop"; then
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+ 	exit 0
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+ 	if test -n "$gentop"; then
+ 	  $show "${rm}r $gentop"
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+ 	# Create an invalid libtool object if no PIC, so that we don't
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+ 	exit 0
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+ 	eval cmds=\"$reload_cmds\"
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+ 	IFS="$save_ifs"
+       fi
+ 
+       if test -n "$gentop"; then
+ 	$show "${rm}r $gentop"
+ 	$run ${rm}r $gentop
+       fi
+ 
+       exit 0
+       ;;
+ 
+     prog)
+       case $host in
+ 	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+       esac
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+ 	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+       fi
+ 
+       if test "$preload" = yes; then
+ 	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+ 	   test "$dlopen_self_static" = unknown; then
+ 	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+ 	fi
+       fi
+ 
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+ 	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+       *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+         ;;
+       esac
+ 
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+       if test -n "$rpath$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+ 	for libdir in $rpath $xrpath; do
+ 	  # This is the magic to use -rpath.
+ 	  case "$finalize_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+       fi
+ 
+       # Now hardcode the library paths
+       rpath=
+       hardcode_libdirs=
+       for libdir in $compile_rpath $finalize_rpath; do
+ 	if test -n "$hardcode_libdir_flag_spec"; then
+ 	  if test -n "$hardcode_libdir_separator"; then
+ 	    if test -z "$hardcode_libdirs"; then
+ 	      hardcode_libdirs="$libdir"
+ 	    else
+ 	      # Just accumulate the unique libdirs.
+ 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		;;
+ 	      *)
+ 		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		;;
+ 	      esac
+ 	    fi
+ 	  else
+ 	    eval flag=\"$hardcode_libdir_flag_spec\"
+ 	    rpath="$rpath $flag"
+ 	  fi
+ 	elif test -n "$runpath_var"; then
+ 	  case "$perm_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) perm_rpath="$perm_rpath $libdir" ;;
+ 	  esac
+ 	fi
+ 	case $host in
+ 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+ 	  *) dllsearchpath="$dllsearchpath:$libdir";;
+ 	  esac
+ 	  ;;
+ 	esac
+       done
+       # Substitute the hardcoded libdirs into the rpath.
+       if test -n "$hardcode_libdir_separator" &&
+ 	 test -n "$hardcode_libdirs"; then
+ 	libdir="$hardcode_libdirs"
+ 	eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       compile_rpath="$rpath"
+ 
+       rpath=
+       hardcode_libdirs=
+       for libdir in $finalize_rpath; do
+ 	if test -n "$hardcode_libdir_flag_spec"; then
+ 	  if test -n "$hardcode_libdir_separator"; then
+ 	    if test -z "$hardcode_libdirs"; then
+ 	      hardcode_libdirs="$libdir"
+ 	    else
+ 	      # Just accumulate the unique libdirs.
+ 	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ 		;;
+ 	      *)
+ 		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ 		;;
+ 	      esac
+ 	    fi
+ 	  else
+ 	    eval flag=\"$hardcode_libdir_flag_spec\"
+ 	    rpath="$rpath $flag"
+ 	  fi
+ 	elif test -n "$runpath_var"; then
+ 	  case "$finalize_perm_rpath " in
+ 	  *" $libdir "*) ;;
+ 	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ 	  esac
+ 	fi
+       done
+       # Substitute the hardcoded libdirs into the rpath.
+       if test -n "$hardcode_libdir_separator" &&
+ 	 test -n "$hardcode_libdirs"; then
+ 	libdir="$hardcode_libdirs"
+ 	eval rpath=\" $hardcode_libdir_flag_spec\"
+       fi
+       finalize_rpath="$rpath"
+ 
+       if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ 	# Transform all the library objects into standard objects.
+ 	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       fi
+ 
+       dlsyms=
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ 	  dlsyms="${outputname}S.c"
+ 	else
+ 	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ 	fi
+       fi
+ 
+       if test -n "$dlsyms"; then
+ 	case $dlsyms in
+ 	"") ;;
+ 	*.c)
+ 	  # Discover the nlist of each of the dlfiles.
+ 	  nlist="$output_objdir/${outputname}.nm"
+ 
+ 	  $show "$rm $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Parse the name list into a source file.
+ 	  $show "creating $output_objdir/$dlsyms"
+ 
+ 	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+ /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+ /* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+ 
+ #ifdef __cplusplus
+ extern \"C\" {
+ #endif
+ 
+ /* Prevent the only kind of declaration conflicts we can make. */
+ #define lt_preloaded_symbols some_other_symbol
+ 
+ /* External symbol declarations for the compiler. */\
+ "
+ 
+ 	  if test "$dlself" = yes; then
+ 	    $show "generating symbol list for \`$output'"
+ 
+ 	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+ 
+ 	    # Add our own program objects to the symbol list.
+ 	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 	    for arg in $progfiles; do
+ 	      $show "extracting global C symbols from \`$arg'"
+ 	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	    done
+ 
+ 	    if test -n "$exclude_expsyms"; then
+ 	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+ 	    if test -n "$export_symbols_regex"; then
+ 	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+ 	    # Prepare the list of exported symbols
+ 	    if test -z "$export_symbols"; then
+ 	      export_symbols="$output_objdir/$output.exp"
+ 	      $run $rm $export_symbols
+ 	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+ 	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+ 	  fi
+ 
+ 	  for arg in $dlprefiles; do
+ 	    $show "extracting global C symbols from \`$arg'"
+ 	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+ 	    $run eval '$echo ": $name " >> "$nlist"'
+ 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	  done
+ 
+ 	  if test -z "$run"; then
+ 	    # Make sure we have at least an empty file.
+ 	    test -f "$nlist" || : > "$nlist"
+ 
+ 	    if test -n "$exclude_expsyms"; then
+ 	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ 	      $mv "$nlist"T "$nlist"
+ 	    fi
+ 
+ 	    # Try sorting and uniquifying the output.
+ 	    if grep -v "^: " < "$nlist" |
+ 		if sort -k 3 </dev/null >/dev/null 2>&1; then
+ 		  sort -k 3
+ 		else
+ 		  sort +2
+ 		fi |
+ 		uniq > "$nlist"S; then
+ 	      :
+ 	    else
+ 	      grep -v "^: " < "$nlist" > "$nlist"S
+ 	    fi
+ 
+ 	    if test -f "$nlist"S; then
+ 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ 	    else
+ 	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ 	    fi
+ 
+ 	    $echo >> "$output_objdir/$dlsyms" "\
+ 
+ #undef lt_preloaded_symbols
+ 
+ #if defined (__STDC__) && __STDC__
+ # define lt_ptr void *
+ #else
+ # define lt_ptr char *
+ # define const
+ #endif
+ 
+ /* The mapping between symbol names and symbols. */
+ const struct {
+   const char *name;
+   lt_ptr address;
+ }
+ lt_preloaded_symbols[] =
+ {\
+ "
+ 
+ 	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+ 
+ 	    $echo >> "$output_objdir/$dlsyms" "\
+   {0, (lt_ptr) 0}
+ };
+ 
+ /* This works around a problem in FreeBSD linker */
+ #ifdef FREEBSD_WORKAROUND
+ static const void *lt_preloaded_setup() {
+   return lt_preloaded_symbols;
+ }
+ #endif
+ 
+ #ifdef __cplusplus
+ }
+ #endif\
+ "
+ 	  fi
+ 
+ 	  pic_flag_for_symtable=
+ 	  case $host in
+ 	  # compiling the symbol table file with pic_flag works around
+ 	  # a FreeBSD bug that causes programs to crash when -lm is
+ 	  # linked before any other PIC object.  But we must not use
+ 	  # pic_flag when linking with -static.  The problem exists in
+ 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ 	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ 	    esac;;
+ 	  *-*-hpux*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+ 	    *) pic_flag_for_symtable=" $pic_flag";;
+ 	    esac
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+ 	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ 	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ 	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+ 
+ 	  # Transform the symbol file into the correct name.
+ 	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ 	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+       else
+ 	# We keep going just in case the user didn't refer to
+ 	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+ 
+ 	# We have no uninstalled library dependencies, so finalize right now.
+ 	$show "$link_command"
+ 	$run eval "$link_command"
+ 	status=$?
+ 
+ 	# Delete the generated files.
+ 	if test -n "$dlsyms"; then
+ 	  $show "$rm $output_objdir/${outputname}S.${objext}"
+ 	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
+ 
+ 	exit $status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+ 	# We should set the shlibpath_var
+ 	rpath=
+ 	for dir in $temp_rpath; do
+ 	  case $dir in
+ 	  [\\/]* | [A-Za-z]:[\\/]*)
+ 	    # Absolute path.
+ 	    rpath="$rpath$dir:"
+ 	    ;;
+ 	  *)
+ 	    # Relative path: add a thisdir entry.
+ 	    rpath="$rpath\$thisdir/$dir:"
+ 	    ;;
+ 	  esac
+ 	done
+ 	temp_rpath="$rpath"
+       fi
+ 
+       if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+       fi
+       if test -n "$finalize_shlibpath"; then
+ 	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+       fi
+ 
+       compile_var=
+       finalize_var=
+       if test -n "$runpath_var"; then
+ 	if test -n "$perm_rpath"; then
+ 	  # We should set the runpath_var.
+ 	  rpath=
+ 	  for dir in $perm_rpath; do
+ 	    rpath="$rpath$dir:"
+ 	  done
+ 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
+ 	if test -n "$finalize_perm_rpath"; then
+ 	  # We should set the runpath_var.
+ 	  rpath=
+ 	  for dir in $finalize_perm_rpath; do
+ 	    rpath="$rpath$dir:"
+ 	  done
+ 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ 	fi
+       fi
+ 
+       if test "$no_install" = yes; then
+ 	# We don't need to create a wrapper script.
+ 	link_command="$compile_var$compile_command$compile_rpath"
+ 	# Replace the output file specification.
+ 	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	# Delete the old output file.
+ 	$run $rm $output
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+ 	exit 0
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+ 	# Fast installation is not supported
+ 	link_command="$compile_var$compile_command$compile_rpath"
+ 	relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 
+ 	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+ 	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+       else
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+ 	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+ 	  fi
+ 	else
+ 	  link_command="$compile_var$compile_command$compile_rpath"
+ 	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+ 	fi
+       fi
+ 
+       # Replace the output file specification.
+       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ 
+       # Delete the old output files.
+       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 
+       $show "$link_command"
+       $run eval "$link_command" || exit $?
+ 
+       # Now create the wrapper script.
+       $show "creating $output"
+ 
+       # Quote the relink command for shipping.
+       if test -n "$relink_command"; then
+ 	# Preserve any variables that may affect compiler behavior
+ 	for var in $variables_saved_for_relink; do
+ 	  if eval test -z \"\${$var+set}\"; then
+ 	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ 	  elif eval var_value=\$$var; test -z "$var_value"; then
+ 	    relink_command="$var=; export $var; $relink_command"
+ 	  else
+ 	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	  fi
+ 	done
+ 	relink_command="(cd `pwd`; $relink_command)"
+ 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+       # Quote $echo for shipping.
+       if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+ 	case $0 in
+ 	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+ 	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+ 	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+       fi
+ 
+       # Only actually do things if our run command is non-null.
+       if test -z "$run"; then
+ 	# win32 will think the script is a binary if it has
+ 	# a .exe suffix, so we strip it off here.
+ 	case $output in
+ 	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ 	esac
+ 	# test for cygwin because mv fails w/o .exe extensions
+ 	case $host in
+ 	  *cygwin*)
+ 	    exeext=.exe
+ 	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+ 	  *cygwin* | *mingw* )
+ 	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ 	    cwrapper=`$echo ${output}.exe`
+ 	    $rm $cwrappersource $cwrapper
+ 	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+ /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+    Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+    
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+    Currently, it simply execs the wrapper *script* "/bin/sh $output",
+    but could eventually absorb all of the scripts functionality and
+    exec $objdir/$outputname directly.
+ */
+ EOF
+ 	    cat >> $cwrappersource<<"EOF"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
+ 
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+ #elif defined(MAXPATHLEN)
+ # define LT_PATHMAX MAXPATHLEN
+ #else
+ # define LT_PATHMAX 1024
+ #endif
+ 
+ #ifndef DIR_SEPARATOR
+ #define DIR_SEPARATOR '/'
+ #endif
+ 
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+ #ifndef DIR_SEPARATOR_2 
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+ 
+ #ifndef DIR_SEPARATOR_2
+ # define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+ #else /* DIR_SEPARATOR_2 */
+ # define IS_DIR_SEPARATOR(ch) \
+         (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+ 
+ #define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+   if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+ 
+ const char *program_name = NULL;
+ 
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+ char * basename (const char *name);
+ char * fnqualify(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+ 
+ int
+ main (int argc, char *argv[])
+ {
+   char **newargz;
+   int i;
+   
+   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+ 
+ 	    cat >> $cwrappersource <<EOF
+   newargz[0] = "$SHELL";
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
+   newargz[1] = fnqualify(argv[0]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+   strendzap(newargz[1],".exe"); 
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
+ EOF
+ 
+ 	    cat >> $cwrappersource <<EOF
+   execv("$SHELL",newargz);
+ EOF
+ 
+ 	    cat >> $cwrappersource <<"EOF"
+ }
+ 
+ void *
+ xmalloc (size_t num)
+ {
+   void * p = (void *) malloc (num);
+   if (!p)
+     lt_fatal ("Memory exhausted");
+ 
+   return p;
+ }
+ 
+ char * 
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+ 
+ char *
+ basename (const char *name)
+ {
+   const char *base;
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+   if (isalpha (name[0]) && name[1] == ':') 
+     name += 2;
+ #endif
+ 
+   for (base = name; *name; name++)
+     if (IS_DIR_SEPARATOR (*name))
+       base = name + 1;
+   return (char *) base;
+ }
+ 
+ char * 
+ fnqualify(const char *path)
+ {
+   size_t size;
+   char *p;
+   char tmp[LT_PATHMAX + 1];
+ 
+   assert(path != NULL);
+ 
+   /* Is it qualified already? */
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   if (isalpha (path[0]) && path[1] == ':')
+     return xstrdup (path);
+ #endif
+   if (IS_DIR_SEPARATOR (path[0]))
+     return xstrdup (path);
+ 
+   /* prepend the current directory */
+   /* doesn't handle '~' */
+   if (getcwd (tmp, LT_PATHMAX) == NULL)
+     lt_fatal ("getcwd failed");
+   size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+   p = XMALLOC(char, size);
+   sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+   return p;
+ }
+ 
+ char *
+ strendzap(char *str, const char *pat) 
+ {
+   size_t len, patlen;
+ 
+   assert(str != NULL);
+   assert(pat != NULL);
+ 
+   len = strlen(str);
+   patlen = strlen(pat);
+ 
+   if (patlen <= len)
+   {
+     str += len - patlen;
+     if (strcmp(str, pat) == 0)
+       *str = '\0';
+   }
+   return str;
+ }
+ 
+ static void
+ lt_error_core (int exit_status, const char * mode, 
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+   vfprintf (stderr, message, ap);
+   fprintf (stderr, ".\n");
+ 
+   if (exit_status >= 0)
+     exit (exit_status);
+ }
+ 
+ void
+ lt_fatal (const char *message, ...)
+ {
+   va_list ap;
+   va_start (ap, message);
+   lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+   va_end (ap);
+ }
+ EOF
+ 	  # we should really use a build-platform specific compiler
+ 	  # here, but OTOH, the wrappers (shell script and this C one)
+ 	  # are only useful if you want to execute the "real" binary.
+ 	  # Since the "real" binary is built for $host, then this
+ 	  # wrapper might as well be built for $host, too.
+ 	  $run $LTCC -s -o $cwrapper $cwrappersource
+ 	  ;;
+ 	esac
+ 	$rm $output
+ 	trap "$rm $output; exit 1" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+ 
+ # $output - temporary wrapper script for $objdir/$outputname
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # The $output program cannot be directly executed until all the libtool
+ # libraries that it depends on are installed.
+ #
+ # This wrapper script should never be moved out of the build directory.
+ # If it is, it will not operate correctly.
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+ 
+ relink_command=\"$relink_command\"
+ 
+ # This environment variable determines our operation mode.
+ if test \"\$libtool_install_magic\" = \"$magic\"; then
+   # install mode needs the following variable:
+   notinst_deplibs='$notinst_deplibs'
+ else
+   # When we are sourced in execute mode, \$file and \$echo are already set.
+   if test \"\$libtool_execute_magic\" != \"$magic\"; then
+     echo=\"$qecho\"
+     file=\"\$0\"
+     # Make sure echo works.
+     if test \"X\$1\" = X--no-reexec; then
+       # Discard the --no-reexec flag, and continue.
+       shift
+     elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+       # Yippee, \$echo works!
+       :
+     else
+       # Restart under the correct shell, and then maybe \$echo will work.
+       exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+     fi
+   fi\
+ "
+ 	$echo >> $output "\
+ 
+   # Find the directory that this script lives in.
+   thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+   # Follow symbolic links until we get to the real thisdir.
+   file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+   while test -n \"\$file\"; do
+     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+     # If there was a directory component, then change thisdir.
+     if test \"x\$destdir\" != \"x\$file\"; then
+       case \"\$destdir\" in
+       [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+       *) thisdir=\"\$thisdir/\$destdir\" ;;
+       esac
+     fi
+ 
+     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+   done
+ 
+   # Try to get the absolute directory name.
+   absdir=\`cd \"\$thisdir\" && pwd\`
+   test -n \"\$absdir\" && thisdir=\"\$absdir\"
+ "
+ 
+ 	if test "$fast_install" = yes; then
+ 	  $echo >> $output "\
+   program=lt-'$outputname'$exeext
+   progdir=\"\$thisdir/$objdir\"
+ 
+   if test ! -f \"\$progdir/\$program\" || \\
+      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+     file=\"\$\$-\$program\"
+ 
+     if test ! -d \"\$progdir\"; then
+       $mkdir \"\$progdir\"
+     else
+       $rm \"\$progdir/\$file\"
+     fi"
+ 
+ 	  $echo >> $output "\
+ 
+     # relink executable if necessary
+     if test -n \"\$relink_command\"; then
+       if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+ 	exit 1
+       fi
+     fi
+ 
+     $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+     { $rm \"\$progdir/\$program\";
+       $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+     $rm \"\$progdir/\$file\"
+   fi"
+ 	else
+ 	  $echo >> $output "\
+   program='$outputname'
+   progdir=\"\$thisdir/$objdir\"
+ "
+ 	fi
+ 
+ 	$echo >> $output "\
+ 
+   if test -f \"\$progdir/\$program\"; then"
+ 
+ 	# Export our shlibpath_var if we have one.
+ 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ 	  $echo >> $output "\
+     # Add our own library path to $shlibpath_var
+     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ 
+     # Some systems cannot cope with colon-terminated $shlibpath_var
+     # The second colon is a workaround for a bug in BeOS R4 sed
+     $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ 
+     export $shlibpath_var
+ "
+ 	fi
+ 
+ 	# fixup the dll searchpath if we need to.
+ 	if test -n "$dllsearchpath"; then
+ 	  $echo >> $output "\
+     # Add the dll search path components to the executable PATH
+     PATH=$dllsearchpath:\$PATH
+ "
+ 	fi
+ 
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+       exec \$progdir\\\\\$program \${1+\"\$@\"}
+ "
+ 	  ;;
+ 
+ 	*)
+ 	  $echo >> $output "\
+       exec \$progdir/\$program \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+       exit 1
+     fi
+   else
+     # The program doesn't exist.
+     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+     exit 1
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+       exit 0
+       ;;
+     esac
+ 
+     # See if we need to build an old-fashioned archive.
+     for oldlib in $oldlibs; do
+ 
+       if test "$build_libtool_libs" = convenience; then
+ 	oldobjs="$libobjs_save"
+ 	addlibs="$convenience"
+ 	build_libtool_libs=no
+       else
+ 	if test "$build_libtool_libs" = module; then
+ 	  oldobjs="$libobjs_save"
+ 	  build_libtool_libs=no
+ 	else
+ 	  oldobjs="$old_deplibs $non_pic_objects"
+ 	fi
+ 	addlibs="$old_convenience"
+       fi
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+ 	$show "${rm}r $gentop"
+ 	$run ${rm}r "$gentop"
+ 	$show "$mkdir $gentop"
+ 	$run $mkdir "$gentop"
+ 	status=$?
+ 	if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	  exit $status
+ 	fi
+ 	generated="$generated $gentop"
+ 
+ 	# Add in members from convenience archives.
+ 	for xlib in $addlibs; do
+ 	  # Extract the objects.
+ 	  case $xlib in
+ 	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ 	  *) xabs=`pwd`"/$xlib" ;;
+ 	  esac
+ 	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ 	  xdir="$gentop/$xlib"
+ 
+ 	  $show "${rm}r $xdir"
+ 	  $run ${rm}r "$xdir"
+ 	  $show "$mkdir $xdir"
+ 	  $run $mkdir "$xdir"
+ 	  status=$?
+ 	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	    exit $status
+ 	  fi
+ 	  # We will extract separately just the conflicting names and we will no
+ 	  # longer touch any unique names. It is faster to leave these extract
+ 	  # automatically by $AR in one run.
+ 	  $show "(cd $xdir && $AR x $xabs)"
+ 	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ 	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ 	    :
+ 	  else
+ 	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ 	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ 	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ 	    do
+ 	      i=1
+ 	      while test "$i" -le "$count"
+ 	      do
+ 	       # Put our $i before any first dot (extension)
+ 	       # Never overwrite any file
+ 	       name_to="$name"
+ 	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ 	       do
+ 		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ 	       done
+ 	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ 	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ 	       i=`expr $i + 1`
+ 	      done
+ 	    done
+ 	  fi
+ 
+ 	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ 	done
+       fi
+ 
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ 	eval cmds=\"$old_archive_from_new_cmds\"
+       else
+ 	eval cmds=\"$old_archive_cmds\"
+ 
+ 	if len=`expr "X$cmds" : ".*"` &&
+ 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ 	  :
+ 	else
+ 	  # the command line is too long to link in one step, link in parts
+ 	  $echo "using piecewise archive linking..."
+ 	  save_RANLIB=$RANLIB
+ 	  RANLIB=:
+ 	  objlist=
+ 	  concat_cmds=
+ 	  save_oldobjs=$oldobjs
+ 	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+ 	  # encoded into archives.  This makes 'ar r' malfunction in
+ 	  # this piecewise linking case whenever conflicting object
+ 	  # names appear in distinct ar calls; check, warn and compensate.
+ 	    if (for obj in $save_oldobjs
+ 	    do
+ 	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+ 	    done | sort | sort -uc >/dev/null 2>&1); then
+ 	    :
+ 	  else
+ 	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+ 	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+ 	    AR_FLAGS=cq
+ 	  fi
+ 	  # Is there a better way of finding the last object in the list?
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+ 	  done  
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+ 	    objlist="$objlist $obj"
+ 	    eval test_cmds=\"$old_archive_cmds\"
+ 	    if len=`expr "X$test_cmds" : ".*"` &&
+ 	       test "$len" -le "$max_cmd_len"; then
+ 	      :
+ 	    else
+ 	      # the above command should be used before it gets too long
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+ 	      fi  
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+ 	    fi
+ 	  done
+ 	  RANLIB=$save_RANLIB
+ 	  oldobjs=$objlist
+ 	  if test "X$oldobjs" = "X" ; then
+ 	    eval cmds=\"\$concat_cmds\"
+ 	  else
+ 	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
+ 	  fi
+ 	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+     done
+ 
+     if test -n "$generated"; then
+       $show "${rm}r$generated"
+       $run ${rm}r$generated
+     fi
+ 
+     # Now create the libtool archive.
+     case $output in
+     *.la)
+       old_library=
+       test "$build_old_libs" = yes && old_library="$libname.$libext"
+       $show "creating $output"
+ 
+       # Preserve any variables that may affect compiler behavior
+       for var in $variables_saved_for_relink; do
+ 	if eval test -z \"\${$var+set}\"; then
+ 	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ 	elif eval var_value=\$$var; test -z "$var_value"; then
+ 	  relink_command="$var=; export $var; $relink_command"
+ 	else
+ 	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ 	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ 	fi
+       done
+       # Quote the link command for shipping.
+       relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+ 	  if test "$installed" = yes; then
+ 	    if test -z "$install_libdir"; then
+ 	      break
+ 	    fi
+ 	    output="$output_objdir/$outputname"i
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+ 	      *.la)
+ 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+ 	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+ 	    newdlfiles=
+ 	    for lib in $dlfiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+ 	    dlfiles="$newdlfiles"
+ 	    newdlprefiles=
+ 	    for lib in $dlprefiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+ 	  tdlname=$dlname
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # Please DO NOT delete this file!
+ # It is necessary for linking the library.
+ 
+ # The name that we can dlopen(3).
+ dlname='$tdlname'
+ 
+ # Names of this library.
+ library_names='$library_names'
+ 
+ # The name of the static archive.
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+ dependency_libs='$dependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
+ age=$age
+ revision=$revision
+ 
+ # Is this an already installed library?
+ installed=$installed
+ 
+ # Should we warn about portability when linking against -modules?
+ shouldnotlink=$module
+ 
+ # Files to dlopen/dlpreopen
+ dlopen='$dlfiles'
+ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+ 	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+ 	done
+       fi
+ 
+       # Do a symbolic link so that the libtool archive can be found in
+       # LD_LIBRARY_PATH before the program is installed.
+       $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+     exit 0
+     ;;
+ 
+   # libtool install mode
+   install)
+     modename="$modename: install"
+ 
+     # There may be an optional sh(1) argument at the beginning of
+     # install_prog (especially on Windows NT).
+     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+        # Allow the use of GNU shtool's install command.
+        $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+ 	arg="\"$arg\""
+ 	;;
+       esac
+       install_prog="$arg "
+       arg="$1"
+       shift
+     else
+       install_prog=
+       arg="$nonopt"
+     fi
+ 
+     # The real first argument should be the name of the installation program.
+     # Aesthetically quote it.
+     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+     case $arg in
+     *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+       arg="\"$arg\""
+       ;;
+     esac
+     install_prog="$install_prog$arg"
+ 
+     # We need to accept at least all the BSD install flags.
+     dest=
+     files=
+     opts=
+     prev=
+     install_type=
+     isdir=no
+     stripme=
+     for arg
+     do
+       if test -n "$dest"; then
+ 	files="$files $dest"
+ 	dest="$arg"
+ 	continue
+       fi
+ 
+       case $arg in
+       -d) isdir=yes ;;
+       -f) prev="-f" ;;
+       -g) prev="-g" ;;
+       -m) prev="-m" ;;
+       -o) prev="-o" ;;
+       -s)
+ 	stripme=" -s"
+ 	continue
+ 	;;
+       -*) ;;
+ 
+       *)
+ 	# If the previous option needed an argument, then skip it.
+ 	if test -n "$prev"; then
+ 	  prev=
+ 	else
+ 	  dest="$arg"
+ 	  continue
+ 	fi
+ 	;;
+       esac
+ 
+       # Aesthetically quote the argument.
+       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+       case $arg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+ 	arg="\"$arg\""
+ 	;;
+       esac
+       install_prog="$install_prog $arg"
+     done
+ 
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     if test -z "$files"; then
+       if test -z "$dest"; then
+ 	$echo "$modename: no file or destination specified" 1>&2
+       else
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     # Strip any trailing slash from the destination.
+     dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+ 
+     # Check to see that the destination is a directory.
+     test -d "$dest" && isdir=yes
+     if test "$isdir" = yes; then
+       destdir="$dest"
+       destname=
+     else
+       destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+       test "X$destdir" = "X$dest" && destdir=.
+       destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+       fi
+     fi
+     case $destdir in
+     [\\/]* | [A-Za-z]:[\\/]*) ;;
+     *)
+       for file in $files; do
+ 	case $file in
+ 	*.lo) ;;
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+       done
+       ;;
+     esac
+ 
+     # This variable tells wrapper scripts just to set variables rather
+     # than running their programs.
+     libtool_install_magic="$magic"
+ 
+     staticlibs=
+     future_libdirs=
+     current_libdirs=
+     for file in $files; do
+ 
+       # Do each installation.
+       case $file in
+       *.$libext)
+ 	# Do the static libraries later.
+ 	staticlibs="$staticlibs $file"
+ 	;;
+ 
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	library_names=
+ 	old_library=
+ 	relink_command=
+ 	# If there is no directory component, then add one.
+ 	case $file in
+ 	*/* | *\\*) . $file ;;
+ 	*) . ./$file ;;
+ 	esac
+ 
+ 	# Add the libdir to current_libdirs if it is the destination.
+ 	if test "X$destdir" = "X$libdir"; then
+ 	  case "$current_libdirs " in
+ 	  *" $libdir "*) ;;
+ 	  *) current_libdirs="$current_libdirs $libdir" ;;
+ 	  esac
+ 	else
+ 	  # Note the libdir as a future libdir.
+ 	  case "$future_libdirs " in
+ 	  *" $libdir "*) ;;
+ 	  *) future_libdirs="$future_libdirs $libdir" ;;
+ 	  esac
+ 	fi
+ 
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+ 	test "X$dir" = "X$file/" && dir=
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
+ 	  # Determine the prefix the user has applied to our future dir.
+ 	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+ 
+ 	  # Don't allow the user to place us outside of our expected
+ 	  # location b/c this prevents finding dependent libraries that
+ 	  # are installed to the same prefix.
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+ 	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ 	  else
+ 	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ 	  fi
+ 
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ 	    exit 1
+ 	  fi
+ 	fi
+ 
+ 	# See the names of the shared library.
+ 	set dummy $library_names
+ 	if test -n "$2"; then
+ 	  realname="$2"
+ 	  shift
+ 	  shift
+ 
+ 	  srcname="$realname"
+ 	  test -n "$relink_command" && srcname="$realname"T
+ 
+ 	  # Install the shared library and build the symlinks.
+ 	  $show "$install_prog $dir/$srcname $destdir/$realname"
+ 	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ 	  if test -n "$stripme" && test -n "$striplib"; then
+ 	    $show "$striplib $destdir/$realname"
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+ 	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+ 	      if test "$linkname" != "$realname"; then
+ 		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ 		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ 	      fi
+ 	    done
+ 	  fi
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+ 	  eval cmds=\"$postinstall_cmds\"
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ 	;;
+ 
+       *.lo)
+ 	# Install (i.e. copy) a libtool object.
+ 
+ 	# Figure out destination file name, if it wasn't already specified.
+ 	if test -n "$destname"; then
+ 	  destfile="$destdir/$destname"
+ 	else
+ 	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	  destfile="$destdir/$destfile"
+ 	fi
+ 
+ 	# Deduce the name of the destination old-style object file.
+ 	case $destfile in
+ 	*.lo)
+ 	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+ 	  ;;
+ 	*.$objext)
+ 	  staticdest="$destfile"
+ 	  destfile=
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	  ;;
+ 	esac
+ 
+ 	# Install the libtool object if requested.
+ 	if test -n "$destfile"; then
+ 	  $show "$install_prog $file $destfile"
+ 	  $run eval "$install_prog $file $destfile" || exit $?
+ 	fi
+ 
+ 	# Install the old object if enabled.
+ 	if test "$build_old_libs" = yes; then
+ 	  # Deduce the name of the old-style object file.
+ 	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+ 
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+ 	exit 0
+ 	;;
+ 
+       *)
+ 	# Figure out destination file name, if it wasn't already specified.
+ 	if test -n "$destname"; then
+ 	  destfile="$destdir/$destname"
+ 	else
+ 	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	  destfile="$destdir/$destfile"
+ 	fi
+ 
+ 	# If the file is missing, and there is a .exe on the end, strip it
+ 	# because it is most likely a libtool script we actually want to
+ 	# install
+ 	stripped_ext=""
+ 	case $file in
+ 	  *.exe)
+ 	    if test ! -f "$file"; then
+ 	      file=`$echo $file|${SED} 's,.exe$,,'`
+ 	      stripped_ext=".exe"
+ 	    fi
+ 	    ;;
+ 	esac
+ 
+ 	# Do a test to see if this is really a libtool program.
+ 	case $host in
+ 	*cygwin*|*mingw*)
+ 	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	*)
+ 	    wrapper=$file
+ 	    ;;
+ 	esac
+ 	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+ 	  # To insure that "foo" is sourced, and not "foo.exe",
+ 	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ 	  # which disallows the automatic-append-.exe behavior.
+ 	  case $build in
+ 	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ 	  *) wrapperdot=${wrapper} ;;
+ 	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . ${wrapperdot} ;;
+ 	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+ 	  finalize=yes
+ 	  for lib in $notinst_deplibs; do
+ 	    # Check to see that each library is installed.
+ 	    libdir=
+ 	    if test -f "$lib"; then
+ 	      # If there is no directory component, then add one.
+ 	      case $lib in
+ 	      */* | *\\*) . $lib ;;
+ 	      *) . ./$lib ;;
+ 	      esac
+ 	    fi
+ 	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ 	    if test -n "$libdir" && test ! -f "$libfile"; then
+ 	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ 	      finalize=no
+ 	    fi
+ 	  done
+ 
+ 	  relink_command=
+ 	  # To insure that "foo" is sourced, and not "foo.exe",
+ 	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ 	  # which disallows the automatic-append-.exe behavior.
+ 	  case $build in
+ 	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ 	  *) wrapperdot=${wrapper} ;;
+ 	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . ${wrapperdot} ;;
+ 	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  outputname=
+ 	  if test "$fast_install" = no && test -n "$relink_command"; then
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+ 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+ 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+ 	      else
+ 		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ 		${rm}r "$tmpdir"
+ 		continue
+ 	      fi
+ 	      file="$outputname"
+ 	    else
+ 	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+ 	    fi
+ 	  else
+ 	    # Install the binary that we compiled earlier.
+ 	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ 	  fi
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+ 	# one anyways
+ 	case $install_prog,$host in
+ 	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+ 	  *.exe:*.exe)
+ 	    # this is ok
+ 	    ;;
+ 	  *.exe:*)
+ 	    destfile=$destfile.exe
+ 	    ;;
+ 	  *:*.exe)
+ 	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	  esac
+ 	  ;;
+ 	esac
+ 	$show "$install_prog$stripme $file $destfile"
+ 	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+ 	test -n "$outputname" && ${rm}r "$tmpdir"
+ 	;;
+       esac
+     done
+ 
+     for file in $staticlibs; do
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 
+       # Set up the ranlib parameters.
+       oldlib="$destdir/$name"
+ 
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+       if test -n "$stripme" && test -n "$striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+       eval cmds=\"$old_postinstall_cmds\"
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+     done
+ 
+     if test -n "$future_libdirs"; then
+       $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+     fi
+ 
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+       exec_cmd='$SHELL $0 --finish$current_libdirs'
+     else
+       exit 0
+     fi
+     ;;
+ 
+   # libtool finish mode
+   finish)
+     modename="$modename: finish"
+     libdirs="$nonopt"
+     admincmds=
+ 
+     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+       for dir
+       do
+ 	libdirs="$libdirs $dir"
+       done
+ 
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+ 	  eval cmds=\"$finish_cmds\"
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+ 	  done
+ 	  IFS="$save_ifs"
+ 	fi
+ 	if test -n "$finish_eval"; then
+ 	  # Do the single finish_eval.
+ 	  eval cmds=\"$finish_eval\"
+ 	  $run eval "$cmds" || admincmds="$admincmds
+        $cmds"
+ 	fi
+       done
+     fi
+ 
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+     $echo "----------------------------------------------------------------------"
+     $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       $echo "   $libdir"
+     done
+     $echo
+     $echo "If you ever happen to want to link against installed libraries"
+     $echo "in a given directory, LIBDIR, you must either use libtool, and"
+     $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+     $echo "flag during linking and do at least one of the following:"
+     if test -n "$shlibpath_var"; then
+       $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+       $echo "     during execution"
+     fi
+     if test -n "$runpath_var"; then
+       $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+       $echo "     during linking"
+     fi
+     if test -n "$hardcode_libdir_flag_spec"; then
+       libdir=LIBDIR
+       eval flag=\"$hardcode_libdir_flag_spec\"
+ 
+       $echo "   - use the \`$flag' linker flag"
+     fi
+     if test -n "$admincmds"; then
+       $echo "   - have your system administrator run these commands:$admincmds"
+     fi
+     if test -f /etc/ld.so.conf; then
+       $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+     fi
+     $echo
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+     $echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
+   # libtool execute mode
+   execute)
+     modename="$modename: execute"
+ 
+     # The first argument is the command name.
+     cmd="$nonopt"
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+       exit 1
+     fi
+ 
+     # Handle -dlopen flags immediately.
+     for file in $execute_dlfiles; do
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+       fi
+ 
+       dir=
+       case $file in
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Read the libtool library.
+ 	dlname=
+ 	library_names=
+ 
+ 	# If there is no directory component, then add one.
+ 	case $file in
+ 	*/* | *\\*) . $file ;;
+ 	*) . ./$file ;;
+ 	esac
+ 
+ 	# Skip this library if it cannot be dlopened.
+ 	if test -z "$dlname"; then
+ 	  # Warn if it was a shared library.
+ 	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+ 	  continue
+ 	fi
+ 
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$dir" = "X$file" && dir=.
+ 
+ 	if test -f "$dir/$objdir/$dlname"; then
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ 	  exit 1
+ 	fi
+ 	;;
+ 
+       *.lo)
+ 	# Just add the directory containing the .lo file.
+ 	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ 	test "X$dir" = "X$file" && dir=.
+ 	;;
+ 
+       *)
+ 	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+ 	continue
+ 	;;
+       esac
+ 
+       # Get the absolute pathname.
+       absdir=`cd "$dir" && pwd`
+       test -n "$absdir" && dir="$absdir"
+ 
+       # Now add the directory to shlibpath_var.
+       if eval "test -z \"\$$shlibpath_var\""; then
+ 	eval "$shlibpath_var=\"\$dir\""
+       else
+ 	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+       fi
+     done
+ 
+     # This variable tells wrapper scripts just to set shlibpath_var
+     # rather than running their programs.
+     libtool_execute_magic="$magic"
+ 
+     # Check if any of the arguments is a wrapper script.
+     args=
+     for file
+     do
+       case $file in
+       -*) ;;
+       *)
+ 	# Do a test to see if this is really a libtool program.
+ 	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . $file ;;
+ 	  *) . ./$file ;;
+ 	  esac
+ 
+ 	  # Transform arg to wrapped name.
+ 	  file="$progdir/$program"
+ 	fi
+ 	;;
+       esac
+       # Quote arguments (to preserve shell metacharacters).
+       file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+       args="$args \"$file\""
+     done
+ 
+     if test -z "$run"; then
+       if test -n "$shlibpath_var"; then
+ 	# Export the shlibpath_var.
+ 	eval "export $shlibpath_var"
+       fi
+ 
+       # Restore saved environment variables
+       if test "${save_LC_ALL+set}" = set; then
+ 	LC_ALL="$save_LC_ALL"; export LC_ALL
+       fi
+       if test "${save_LANG+set}" = set; then
+ 	LANG="$save_LANG"; export LANG
+       fi
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+     else
+       # Display what would be done.
+       if test -n "$shlibpath_var"; then
+ 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+       exit 0
+     fi
+     ;;
+ 
+   # libtool clean and uninstall mode
+   clean | uninstall)
+     modename="$modename: $mode"
+     rm="$nonopt"
+     files=
+     rmforce=
+     exit_status=0
+ 
+     # This variable tells wrapper scripts just to set variables rather
+     # than running their programs.
+     libtool_install_magic="$magic"
+ 
+     for arg
+     do
+       case $arg in
+       -f) rm="$rm $arg"; rmforce=yes ;;
+       -*) rm="$rm $arg" ;;
+       *) files="$files $arg" ;;
+       esac
+     done
+ 
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+       exit 1
+     fi
+ 
+     rmdirs=
+ 
+     origobjdir="$objdir"
+     for file in $files; do
+       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+       if test "X$dir" = "X$file"; then
+ 	dir=.
+ 	objdir="$origobjdir"
+       else
+ 	objdir="$dir/$origobjdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+       test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+       if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+ 	esac
+       fi
+ 
+       # Don't error if the file doesn't exist and rm -f was used.
+       if (test -L "$file") >/dev/null 2>&1 \
+ 	|| (test -h "$file") >/dev/null 2>&1 \
+ 	|| test -f "$file"; then
+ 	:
+       elif test -d "$file"; then
+ 	exit_status=1
+ 	continue
+       elif test "$rmforce" = yes; then
+ 	continue
+       fi
+ 
+       rmfiles="$file"
+ 
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  . $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+ 	  for n in $library_names; do
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ 	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+ 	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+ 	      eval cmds=\"$postuninstall_cmds\"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+ 	      eval cmds=\"$old_postuninstall_cmds\"
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+ 		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+ 	      IFS="$save_ifs"
+ 	    fi
+ 	    # FIXME: should reinstall the best remaining shared library.
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *.lo)
+ 	# Possibly a libtool object, so verify it.
+ 	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 
+ 	  # Read the .lo file
+ 	  . $dir/$name
+ 
+ 	  # Add PIC object to the list of files to remove.
+ 	  if test -n "$pic_object" \
+ 	     && test "$pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$pic_object"
+ 	  fi
+ 
+ 	  # Add non-PIC object to the list of files to remove.
+ 	  if test -n "$non_pic_object" \
+ 	     && test "$non_pic_object" != none; then
+ 	    rmfiles="$rmfiles $dir/$non_pic_object"
+ 	  fi
+ 	fi
+ 	;;
+ 
+       *)
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+ 	  *.exe) 
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+ 	    # add $file without .exe
+ 	    rmfiles="$rmfiles $file"
+ 	    ;;
+ 	  esac
+ 	  # Do a test to see if this is a libtool program.
+ 	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	    relink_command=
+ 	    . $dir/$noexename
+ 
+ 	    # note $name still contains .exe if it was in $file originally
+ 	    # as does the version of $file that was added into $rmfiles
+ 	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ 	    if test "$fast_install" = yes && test -n "$relink_command"; then
+ 	      rmfiles="$rmfiles $objdir/lt-$name"
+ 	    fi
+ 	    if test "X$noexename" != "X$name" ; then
+ 	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ 	    fi
+ 	  fi
+ 	fi
+ 	;;
+       esac
+       $show "$rm $rmfiles"
+       $run $rm $rmfiles || exit_status=1
+     done
+     objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+       if test -d "$dir"; then
+ 	$show "rmdir $dir"
+ 	$run rmdir $dir >/dev/null 2>&1
+       fi
+     done
+ 
+     exit $exit_status
+     ;;
+ 
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+     exit 1
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+     exit 1
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+   exit 1
+ fi
+ 
+ # We need to display help for each of the modes.
+ case $mode in
+ "") $echo \
+ "Usage: $modename [OPTION]... [MODE-ARG]...
+ 
+ Provide generalized library-building support services.
+ 
+     --config          show all configuration variables
+     --debug           enable verbose shell tracing
+ -n, --dry-run         display commands without modifying any files
+     --features        display basic configuration information and exit
+     --finish          same as \`--mode=finish'
+     --help            display this help message and exit
+     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+     --quiet           same as \`--silent'
+     --silent          don't print informational messages
+     --tag=TAG         use configuration variables from tag TAG
+     --version         print version information
+ 
+ MODE must be one of the following:
+ 
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+ 
+ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool at gnu.org>."
+   exit 0
+   ;;
+ 
+ clean)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+ 
+ Remove files from the build directory.
+ 
+ RM is the name of the program to use to delete files associated with each FILE
+ (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+ 
+ If FILE is a libtool library, object or program, all the files associated
+ with it are deleted. Otherwise, only FILE itself is deleted using RM."
+   ;;
+ 
+ compile)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+ 
+ Compile a source file into a libtool library object.
+ 
+ This mode accepts the following additional options:
+ 
+   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+   -prefer-pic       try to building PIC objects only
+   -prefer-non-pic   try to building non-PIC objects only
+   -static           always build a \`.o' file suitable for static linking
+ 
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+ 
+ The output file name is determined by removing the directory component from
+ SOURCEFILE, then substituting the C source code suffix \`.c' with the
+ library object suffix, \`.lo'."
+   ;;
+ 
+ execute)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+ 
+ Automatically set library path, then run a program.
+ 
+ This mode accepts the following additional options:
+ 
+   -dlopen FILE      add the directory containing FILE to the library path
+ 
+ This mode sets the library path environment variable according to \`-dlopen'
+ flags.
+ 
+ If any of the ARGS are libtool executable wrappers, then they are translated
+ into their corresponding uninstalled binary, and any of their required library
+ directories are added to the library path.
+ 
+ Then, COMMAND is executed, with ARGS as arguments."
+   ;;
+ 
+ finish)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+ 
+ Complete the installation of libtool libraries.
+ 
+ Each LIBDIR is a directory that contains libtool libraries.
+ 
+ The commands that this mode executes may require superuser privileges.  Use
+ the \`--dry-run' option if you just want to see what would be executed."
+   ;;
+ 
+ install)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+ 
+ Install executables or libraries.
+ 
+ INSTALL-COMMAND is the installation command.  The first component should be
+ either the \`install' or \`cp' program.
+ 
+ The rest of the components are interpreted as arguments to that command (only
+ BSD-compatible install options are recognized)."
+   ;;
+ 
+ link)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+ 
+ Link object files or libraries together to form another library, or to
+ create an executable program.
+ 
+ LINK-COMMAND is a command using the C compiler that you would use to create
+ a program from several object files.
+ 
+ The following components of LINK-COMMAND are treated specially:
+ 
+   -all-static       do not do any dynamic linking at all
+   -avoid-version    do not add a version suffix if possible
+   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+ 		    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+ 		    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+   -no-fast-install  disable the fast-install mode
+   -no-install       link a not-installable executable
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -objectlist FILE  Use a list of object files found in FILE to specify objects
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+   -static           do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+ 		    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+ Every other argument is treated as a filename.  Files ending in \`.la' are
+ treated as uninstalled libtool libraries, other files are standard or library
+ object files.
+ 
+ If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+ only library objects (\`.lo' files) may be specified, and \`-rpath' is
+ required, except when creating a convenience library.
+ 
+ If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+ using \`ar' and \`ranlib', or on Windows using \`lib'.
+ 
+ If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+ is created, otherwise an executable program is created."
+   ;;
+ 
+ uninstall)
+   $echo \
+ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+ 
+ Remove libraries from an installation directory.
+ 
+ RM is the name of the program to use to delete files associated with each FILE
+ (typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+ to RM.
+ 
+ If FILE is a libtool library, all the files associated with it are deleted.
+ Otherwise, only FILE itself is deleted using RM."
+   ;;
+ 
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+   exit 1
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+ exit 0
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+ # choices, we go for a static library, that is the most portable,
+ # since we can't tell whether shared libraries were disabled because
+ # the user asked for that or because the platform doesn't support
+ # them.  This is particularly important on AIX, because we don't
+ # support having both static and shared libraries enabled at the same
+ # time on that platform, so we default to a shared-only configuration.
+ # If a disable-shared tag is given, we'll fallback to a static-only
+ # configuration.  But we'll never go from static-only to shared-only.
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+ build_libtool_libs=no
+ build_old_libs=yes
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+ 
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+ # ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
+ # mode:shell-script
+ # sh-indentation:2
+ # End:


Index: llvm/projects/Stacker/autoconf/mkinstalldirs
diff -c /dev/null llvm/projects/Stacker/autoconf/mkinstalldirs:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/autoconf/mkinstalldirs	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,101 ----
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+ # Author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+ # Public domain
+ 
+ # $Id: mkinstalldirs,v 1.1 2004/09/04 19:48:50 reid Exp $
+ 
+ errstatus=0
+ dirmode=""
+ 
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+ 
+ # process command line arguments
+ while test $# -gt 0 ; do
+    case "${1}" in
+      -h | --help | --h* )			# -h for help
+ 	echo "${usage}" 1>&2; exit 0 ;;
+      -m )					# -m PERM arg
+ 	shift
+ 	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ 	dirmode="${1}"
+ 	shift ;;
+      -- ) shift; break ;;			# stop option processing
+      -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+      * )  break ;;				# first non-opt arg
+    esac
+ done
+ 
+ for file
+ do
+   if test -d "$file"; then
+     shift
+   else
+     break
+   fi
+ done
+ 
+ case $# in
+ 0) exit 0 ;;
+ esac
+ 
+ case $dirmode in
+ '')
+   if mkdir -p -- . 2>/dev/null; then
+     echo "mkdir -p -- $*"
+     exec mkdir -p -- "$@"
+   fi ;;
+ *)
+   if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+     echo "mkdir -m $dirmode -p -- $*"
+     exec mkdir -m "$dirmode" -p -- "$@"
+   fi ;;
+ esac
+ 
+ for file
+ do
+    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+    shift
+ 
+    pathcomp=
+    for d
+    do
+      pathcomp="$pathcomp$d"
+      case "$pathcomp" in
+        -* ) pathcomp=./$pathcomp ;;
+      esac
+ 
+      if test ! -d "$pathcomp"; then
+ 	echo "mkdir $pathcomp"
+ 
+ 	mkdir "$pathcomp" || lasterr=$?
+ 
+ 	if test ! -d "$pathcomp"; then
+ 	  errstatus=$lasterr
+ 	else
+ 	  if test ! -z "$dirmode"; then
+ 	     echo "chmod $dirmode $pathcomp"
+ 
+ 	     lasterr=""
+ 	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+ 
+ 	     if test ! -z "$lasterr"; then
+ 	       errstatus=$lasterr
+ 	     fi
+ 	  fi
+ 	fi
+      fi
+ 
+      pathcomp="$pathcomp/"
+    done
+ done
+ 
+ exit $errstatus
+ 
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 3
+ # End:
+ # mkinstalldirs ends here





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/runtime/Makefile 
Message-ID: <200409041949.OAA21416@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/runtime:

Makefile updated: 1.2 -> 1.3
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+2 -2)

Index: llvm/projects/Stacker/lib/runtime/Makefile
diff -u llvm/projects/Stacker/lib/runtime/Makefile:1.2 llvm/projects/Stacker/lib/runtime/Makefile:1.3
--- llvm/projects/Stacker/lib/runtime/Makefile:1.2	Wed Sep  1 17:55:37 2004
+++ llvm/projects/Stacker/lib/runtime/Makefile	Sat Sep  4 14:48:50 2004
@@ -1,9 +1,9 @@
-##===- projects/sample/lib/sample/Makefile -----------------*- Makefile -*-===##
+##===- projects/Stacker/lib/runtime/Makefile ---------------*- Makefile -*-===##
 
 #
 # Indicate where we are relative to the top of the source tree.
 #
-LEVEL=../../../..
+LEVEL=../../
 
 #
 # Give the name of a library.  This will build a dynamic version.





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/compiler/Makefile 
Message-ID: <200409041949.OAA21434@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib/compiler:

Makefile updated: 1.1 -> 1.2
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+2 -2)

Index: llvm/projects/Stacker/lib/compiler/Makefile
diff -u llvm/projects/Stacker/lib/compiler/Makefile:1.1 llvm/projects/Stacker/lib/compiler/Makefile:1.2
--- llvm/projects/Stacker/lib/compiler/Makefile:1.1	Sun Nov 23 11:52:55 2003
+++ llvm/projects/Stacker/lib/compiler/Makefile	Sat Sep  4 14:48:50 2004
@@ -1,9 +1,9 @@
-##===- projects/sample/lib/sample/Makefile -----------------*- Makefile -*-===##
+##===- projects/Stacker/lib/compiler/Makefile --------------*- Makefile -*-===##
 
 #
 # Indicate where we are relative to the top of the source tree.
 #
-LEVEL=../../../..
+LEVEL=../..
 
 #
 # Give the name of a library.  This will build a dynamic version.





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/lib/Makefile 
Message-ID: <200409041949.OAA21435@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/lib:

Makefile updated: 1.1 -> 1.2
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+1 -1)

Index: llvm/projects/Stacker/lib/Makefile
diff -u llvm/projects/Stacker/lib/Makefile:1.1 llvm/projects/Stacker/lib/Makefile:1.2
--- llvm/projects/Stacker/lib/Makefile:1.1	Sun Nov 23 12:06:29 2003
+++ llvm/projects/Stacker/lib/Makefile	Sat Sep  4 14:48:50 2004
@@ -7,7 +7,7 @@
 #
 # Indicates our relative path to the top of the project's root directory.
 #
-LEVEL = ../../..
+LEVEL = ..
 
 #
 # Directories that needs to be built.





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/tools/stkrc/Makefile 
Message-ID: <200409041949.OAA21442@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker/tools/stkrc:

Makefile updated: 1.3 -> 1.4
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+4 -3)

Index: llvm/projects/Stacker/tools/stkrc/Makefile
diff -u llvm/projects/Stacker/tools/stkrc/Makefile:1.3 llvm/projects/Stacker/tools/stkrc/Makefile:1.4
--- llvm/projects/Stacker/tools/stkrc/Makefile:1.3	Sat Sep  4 14:05:53 2004
+++ llvm/projects/Stacker/tools/stkrc/Makefile	Sat Sep  4 14:48:50 2004
@@ -1,17 +1,18 @@
-##===- projects/sample/lib/sample/Makefile -----------------*- Makefile -*-===##
+##===- projects/Stacker/lib/stkrc/Makefile -----------------*- Makefile -*-===##
 
 #
 # Indicate where we are relative to the top of the source tree.
 #
-LEVEL=../../../..
+LEVEL=../..
 
 #
 # Give the name of a library.  This will build a dynamic version.
 #
 TOOLNAME=stkrc
-USEDLIBS=stkr_compiler asmparser bcwriter transforms ipo.a ipa.a \
+LLVMLIBS= asmparser bcwriter transforms ipo.a ipa.a \
 	 scalaropts analysis.a target.a transformutils \
 	 vmcore support.a LLVMsystem.a 
+USEDLIBS=stkr_compiler 
 
 
 ifdef PARSE_DEBUG





From reid at x10sys.com  Sat Sep  4 14:49:01 2004
From: reid at x10sys.com (Reid Spencer)
Date: Sat, 4 Sep 2004 14:49:01 -0500
Subject: [llvm-commits] CVS: llvm/projects/Stacker/Makefile.common.in
	configure Makefile 
Message-ID: <200409041949.OAA21437@zion.cs.uiuc.edu>



Changes in directory llvm/projects/Stacker:

Makefile.common.in added (r1.1)
configure added (r1.1)
Makefile updated: 1.4 -> 1.5
---
Log message:

Make Stacker into a complete project with its own configuration.


---
Diffs of the changes:  (+2394 -3)

Index: llvm/projects/Stacker/Makefile.common.in
diff -c /dev/null llvm/projects/Stacker/Makefile.common.in:1.1
*** /dev/null	Sat Sep  4 14:49:00 2004
--- llvm/projects/Stacker/Makefile.common.in	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,28 ----
+ #
+ # Set this variable to the top of the LLVM source tree.
+ #
+ LLVM_SRC_ROOT = @LLVM_SRC@
+ 
+ #
+ # Set this variable to the top level directory where LLVM was built
+ # (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
+ #
+ LLVM_OBJ_ROOT = @LLVM_OBJ@
+ 
+ #
+ # Include LLVM's Master Makefile.
+ #
+ include $(LLVM_OBJ_ROOT)/Makefile.config
+ 
+ #
+ # Set the source root and source directory pathnames
+ #
+ BUILD_SRC_DIR := $(subst //,/, at abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+ 
+ BUILD_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+ 
+ #
+ # Include LLVM's Master Makefile.
+ #
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 


Index: llvm/projects/Stacker/configure
diff -c /dev/null llvm/projects/Stacker/configure:1.1
*** /dev/null	Sat Sep  4 14:49:01 2004
--- llvm/projects/Stacker/configure	Sat Sep  4 14:48:50 2004
***************
*** 0 ****
--- 1,2365 ----
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.59 for [Stacker] [1.0].
+ #
+ # Report bugs to <rspencer at x10sys.com>.
+ #
+ # Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+ 
+ # Work around bugs in pre-3.0 UWIN ksh.
+ $as_unset ENV MAIL MAILPATH
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+ for as_var in \
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+   LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+     $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
+ 
+ # Name of the executable.
+ as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
+ 
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
+ 
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+    { (exit 1); exit 1; }; }
+   fi
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+ 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
+   else
+     as_ln_s='ln -s'
+   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+ fi
+ 
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+ $as_unset CDPATH
+ 
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+ exec 6>&1
+ 
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
+ ac_config_libobj_dir=.
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Maximum number of lines to put in a shell here document.
+ # This variable seems obsolete.  It should probably be removed, and
+ # only ac_max_sed_lines should be used.
+ : ${ac_max_here_lines=38}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='[Stacker]'
+ PACKAGE_TARNAME='--stacker--'
+ PACKAGE_VERSION='[1.0]'
+ PACKAGE_STRING='[Stacker] [1.0]'
+ PACKAGE_BUGREPORT='rspencer at x10sys.com'
+ 
+ ac_unique_file="Makefile.common.in"
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_SRC LLVM_OBJ LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+ exec_prefix=NONE
+ no_create=
+ no_recursion=
+ prefix=NONE
+ program_prefix=NONE
+ program_suffix=NONE
+ program_transform_name=s,x,x,
+ silent=
+ site=
+ srcdir=
+ verbose=
+ x_includes=NONE
+ x_libraries=NONE
+ 
+ # Installation directory options.
+ # These are left unexpanded so users can "make install exec_prefix=/foo"
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
+ 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'
+ 
+ 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
+ 
+   ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ 
+   # 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_alias ;;
+   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+     build_alias=$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 ;;
+ 
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+     ac_prev=datadir ;;
+   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+   | --da=*)
+     datadir=$ac_optarg ;;
+ 
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     eval "enable_$ac_feature=no" ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    { (exit 1); exit 1; }; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) 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 | -h)
+     ac_init_help=long ;;
+   -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+     ac_init_help=recursive ;;
+   -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+     ac_init_help=short ;;
+ 
+   -host | --host | --hos | --ho)
+     ac_prev=host_alias ;;
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$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 | -n)
+     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_alias ;;
+   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+     target_alias=$ac_optarg ;;
+ 
+   -v | -verbose | --verbose | --verbos | --verbo | --verb)
+     verbose=yes ;;
+ 
+   -version | --version | --versio | --versi | --vers | -V)
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+       *) ac_optarg=yes ;;
+     esac
+     eval "with_$ac_package='$ac_optarg'" ;;
+ 
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid package name: $ac_package" >&2
+    { (exit 1); exit 1; }; }
+     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 "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+     eval "$ac_envvar='$ac_optarg'"
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+     echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+   esac
+ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+   { echo "$as_me: error: missing argument to $ac_option" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ # Be sure to have absolute paths.
+ for ac_var in exec_prefix prefix
+ do
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ 	      localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* ) ;;
+     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+ # used to hold the argument of --host etc.
+ # FIXME: To remove some day.
+ build=$build_alias
+ host=$host_alias
+ target=$target_alias
+ 
+ # FIXME: To remove some day.
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+     echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+ fi
+ 
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+ 
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
+ # 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_confdir=`(dirname "$0") 2>/dev/null ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$0" : 'X\(//\)[^/]' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+    { (exit 1); exit 1; }; }
+   else
+     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
+   fi
+ fi
+ (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+    { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+ ac_cv_env_build_alias_set=${build_alias+set}
+ ac_cv_env_build_alias_value=$build_alias
+ ac_env_host_alias_set=${host_alias+set}
+ ac_env_host_alias_value=$host_alias
+ ac_cv_env_host_alias_set=${host_alias+set}
+ ac_cv_env_host_alias_value=$host_alias
+ ac_env_target_alias_set=${target_alias+set}
+ ac_env_target_alias_value=$target_alias
+ ac_cv_env_target_alias_set=${target_alias+set}
+ ac_cv_env_target_alias_value=$target_alias
+ 
+ #
+ # Report the --help message.
+ #
+ if test "$ac_init_help" = "long"; then
+   # 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 <<_ACEOF
+ \`configure' configures [Stacker] [1.0] to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+ VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+ Configuration:
+   -h, --help              display this help and exit
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+   -q, --quiet, --silent   do not print \`checking...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+ _ACEOF
+ 
+   cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+ 			  [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+ 			  [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+ an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+ for instance \`--prefix=\$HOME'.
+ 
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+   --infodir=DIR          info documentation [PREFIX/info]
+   --mandir=DIR           man documentation [PREFIX/man]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+ _ACEOF
+ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+      short | recursive ) echo "Configuration of [Stacker] [1.0]:";;
+    esac
+   cat <<\_ACEOF
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-llvmsrc          Location of LLVM Source Code
+   --with-llvmobj          Location of LLVM Object Code
+ 
+ Report bugs to <rspencer at x10sys.com>.
+ _ACEOF
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+     test -d $ac_dir || continue
+     ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ 
+ # Do not use `cd foo && pwd` to compute absolute paths, because
+ # the directories may not exist.
+ case `pwd` in
+ .) ac_abs_builddir="$ac_dir";;
+ *)
+   case "$ac_dir" in
+   .) ac_abs_builddir=`pwd`;;
+   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+   *) ac_abs_builddir=`pwd`/"$ac_dir";;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *)
+   case ${ac_top_builddir}. in
+   .) ac_abs_top_builddir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_srcdir=$ac_srcdir;;
+ *)
+   case $ac_srcdir in
+   .) ac_abs_srcdir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *)
+   case $ac_top_srcdir in
+   .) ac_abs_top_srcdir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+   esac;;
+ esac
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+     if test -f $ac_srcdir/configure.gnu; then
+       echo
+       $SHELL $ac_srcdir/configure.gnu  --help=recursive
+     elif test -f $ac_srcdir/configure; then
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+ 	   test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+     cd $ac_popdir
+   done
+ fi
+ 
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ [Stacker] configure [1.0]
+ generated by GNU Autoconf 2.59
+ 
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit 0
+ fi
+ exec 5>config.log
+ cat >&5 <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by [Stacker] $as_me [1.0], which was
+ generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+ ## Platform. ##
+ ## --------- ##
+ 
+ hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+ 
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+ hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
+ 
+ } >&5
+ 
+ cat >&5 <<_ACEOF
+ 
+ 
+ ## ----------- ##
+ ## Core tests. ##
+ ## ----------- ##
+ 
+ _ACEOF
+ 
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
+ # Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
+ # Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+ ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+   for ac_arg
+   do
+     case $ac_arg in
+     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+     2)
+       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+ 	ac_must_keep_next=false # Got value, back to normal.
+       else
+ 	case $ac_arg in
+ 	  *=* | --config-cache | -C | -disable-* | --disable-* \
+ 	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ 	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ 	  | -with-* | --with-* | -without-* | --without-* | --x)
+ 	    case "$ac_configure_args0 " in
+ 	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ 	    esac
+ 	    ;;
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+       # Get rid of the leading space.
+       ac_sep=" "
+       ;;
+     esac
+   done
+ done
+ $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+ # WARNING: Be sure not to use single quotes in there, as some shells,
+ # such as our DU 5.0 friend, will then `close' the trap.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
+ 
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+ ## ---------------- ##
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ {
+   (set) 2>&1 |
+     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       sed -n \
+ 	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       ;;
+     *)
+       sed -n \
+ 	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ }
+     echo
+ 
+     cat <<\_ASBOX
+ ## ----------------- ##
+ ## Output variables. ##
+ ## ----------------- ##
+ _ASBOX
+     echo
+     for ac_var in $ac_subst_vars
+     do
+       eval ac_val=$`echo $ac_var`
+       echo "$ac_var='"'"'$ac_val'"'"'"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+ ## ------------- ##
+ ## Output files. ##
+ ## ------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+ 	eval ac_val=$`echo $ac_var`
+ 	echo "$ac_var='"'"'$ac_val'"'"'"
+       done | sort
+       echo
+     fi
+ 
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+ ## confdefs.h. ##
+ ## ----------- ##
+ _ASBOX
+       echo
+       sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core *.core &&
+   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # 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
+ 
+ # Predefined preprocessor variables.
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # 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 "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+ done
+ 
+ if test -r "$cache_file"; then
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+       *)                      . ./$cache_file;;
+     esac
+   fi
+ else
+   { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+ for ac_var in `(set) 2>&1 |
+ 	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+       { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+ 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+ echo "$as_me:   former value:  $ac_old_val" >&2;}
+ 	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+ 	ac_cache_corrupted=:
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+       ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+       *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+     esac
+   fi
+ done
+ if $ac_cache_corrupted; then
+   { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ ac_aux_dir=
+ for ac_dir in autoconf $srcdir/autoconf; do
+   if test -f $ac_dir/install-sh; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+   elif test -f $ac_dir/install.sh; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+   elif test -f $ac_dir/shtool; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in autoconf $srcdir/autoconf" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+ 
+ 
+ 
+ 
+           ac_config_commands="$ac_config_commands Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands lib/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands lib/compiler/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands lib/runtime/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands tools/Makefile"
+ 
+ 
+           ac_config_commands="$ac_config_commands tools/stkrc/Makefile"
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ # Check whether --with-llvmsrc or --without-llvmsrc was given.
+ if test "${with_llvmsrc+set}" = set; then
+   withval="$with_llvmsrc"
+   LLVM_SRC=$withval
+ 
+ else
+   LLVM_SRC=`cd ${srcdir}/../..; pwd`
+ 
+ fi;
+ 
+ 
+ # Check whether --with-llvmobj or --without-llvmobj was given.
+ if test "${with_llvmobj+set}" = set; then
+   withval="$with_llvmobj"
+   LLVM_OBJ=$withval
+ 
+ else
+   LLVM_OBJ=`cd ../..; pwd`
+ 
+ fi;
+ 
+           ac_config_files="$ac_config_files Makefile.common"
+ cat >confcache <<\_ACEOF
+ # 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, see configure's option --config-cache.
+ # It is not useful on other systems.  If it contains results you don't
+ # want to keep, you may remove or edit it.
+ #
+ # config.status only pays attention to the cache file if you give it
+ # the --recheck option to rerun configure.
+ #
+ # `ac_cv_env_foo' variables (set or unset) will be overridden when
+ # loading this file, other *unset* `ac_cv_foo' will be assigned the
+ # following values.
+ 
+ _ACEOF
+ 
+ # 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 \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       ;;
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+       sed -n \
+ 	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ } |
+   sed '
+      t clear
+      : clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
+ if diff $cache_file confcache >/dev/null 2>&1; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
+   else
+     echo "not updating unwritable cache $cache_file"
+   fi
+ fi
+ rm -f confcache
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+ s/^\([^=]*=[	 ]*\):*/\1/;
+ s/:*$//;
+ s/^[^=]*=[	 ]*$//;
+ }'
+ fi
+ 
+ # Transform confdefs.h into DEFS.
+ # Protect against shell expansion while executing Makefile rules.
+ # Protect against Makefile macro expansion.
+ #
+ # If the first sed substitution is executed (which looks for macros that
+ # take arguments), then we branch to the quote section.  Otherwise,
+ # look for a macro that doesn't take arguments.
+ cat >confdef2opt.sed <<\_ACEOF
+ t clear
+ : clear
+ s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
+ t quote
+ s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
+ t quote
+ d
+ : quote
+ s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
+ s,\[,\\&,g
+ s,\],\\&,g
+ s,\$,$$,g
+ p
+ _ACEOF
+ # We use echo to avoid assuming a particular line-breaking character.
+ # The extra dot is to prevent the shell from consuming trailing
+ # line-breaks from the sub-command output.  A line-break within
+ # single-quotes doesn't work because, if this script is created in a
+ # platform that uses two characters for line-breaks (e.g., DOS), tr
+ # would break.
+ ac_LF_and_DOT=`echo; echo .`
+ DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+ rm -f confdef2opt.sed
+ 
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_i=`echo "$ac_i" |
+ 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+   # 2. Add them.
+   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
+ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+ { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in config.log if it exists.
+ 
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+ 
+ # Work around bugs in pre-3.0 UWIN ksh.
+ $as_unset ENV MAIL MAILPATH
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+ for as_var in \
+   LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+   LC_TELEPHONE LC_TIME
+ do
+   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+     eval $as_var=C; export $as_var
+   else
+     $as_unset $as_var
+   fi
+ done
+ 
+ # Required to use basename.
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+ fi
+ 
+ 
+ # Name of the executable.
+ as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
+ 
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
+ 
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+ 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
+   else
+     as_ln_s='ln -s'
+   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+ fi
+ 
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+ $as_unset CDPATH
+ 
+ exec 6>&1
+ 
+ # Open the log real soon, to keep \$[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.  Logging --version etc. is OK.
+ exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+ } >&5
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by [Stacker] $as_me [1.0], which was
+ generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+ _CSEOF
+ echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+ echo >&5
+ _ACEOF
+ 
+ # Files that config.status was made for.
+ if test -n "$ac_config_files"; then
+   echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_headers"; then
+   echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_links"; then
+   echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_commands"; then
+   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+ fi
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+   --file=FILE[:TEMPLATE]
+ 		   instantiate the configuration file FILE
+ 
+ Configuration files:
+ $config_files
+ 
+ Configuration commands:
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ [Stacker] config.status [1.0]
+ configured by $0, generated by GNU Autoconf 2.59,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ srcdir=$srcdir
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ # If no file are specified by the user, then we need to provide default
+ # value.  By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+   --*=*)
+     ac_option=`expr "x$1" : 'x\([^=]*\)='`
+     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+   -*)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+   *) # This is not an option, so the user has probably given explicit
+      # arguments.
+      ac_option=$1
+      ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+     { { echo "$as_me:$LINENO: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; };;
+   --help | --hel | -h )
+     echo "$ac_cs_usage"; exit 0 ;;
+   --debug | --d* | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ 
+   *) ac_config_targets="$ac_config_targets $1" ;;
+ 
+   esac
+   shift
+ done
+ 
+ ac_configure_extra_args=
+ 
+ if $ac_cs_silent; then
+   exec 6>/dev/null
+   ac_configure_extra_args="$ac_configure_extra_args --silent"
+ fi
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ if \$ac_cs_recheck; then
+   echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+   exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS section.
+ #
+ 
+ ${srcdir}/autoconf/mkinstalldirs `dirname Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname lib/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname lib/compiler/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname lib/runtime/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname tools/Makefile`
+ ${srcdir}/autoconf/mkinstalldirs `dirname tools/stkrc/Makefile`
+ 
+ _ACEOF
+ 
+ 
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_config_target in $ac_config_targets
+ do
+   case "$ac_config_target" in
+   # Handling of arguments.
+   "Makefile.common" ) CONFIG_FILES="$CONFIG_FILES Makefile.common" ;;
+   "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
+   "lib/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
+   "lib/compiler/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/compiler/Makefile" ;;
+   "lib/runtime/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS lib/runtime/Makefile" ;;
+   "tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
+   "tools/stkrc/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/stkrc/Makefile" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+ # bizarre bug on SunOS 4.1.3.
+ if $ac_need_defaults; then
+   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+ # simply because there is no reason to put it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+ 
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+   tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ 
+ #
+ # CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+ if test -n "\$CONFIG_FILES"; then
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+ s, at SHELL@,$SHELL,;t t
+ s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+ s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+ s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+ s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+ s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+ s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s, at exec_prefix@,$exec_prefix,;t t
+ s, at prefix@,$prefix,;t t
+ s, at program_transform_name@,$program_transform_name,;t t
+ s, at bindir@,$bindir,;t t
+ s, at sbindir@,$sbindir,;t t
+ s, at libexecdir@,$libexecdir,;t t
+ s, at datadir@,$datadir,;t t
+ s, at sysconfdir@,$sysconfdir,;t t
+ s, at sharedstatedir@,$sharedstatedir,;t t
+ s, at localstatedir@,$localstatedir,;t t
+ s, at libdir@,$libdir,;t t
+ s, at includedir@,$includedir,;t t
+ s, at oldincludedir@,$oldincludedir,;t t
+ s, at infodir@,$infodir,;t t
+ s, at mandir@,$mandir,;t t
+ s, at build_alias@,$build_alias,;t t
+ s, at host_alias@,$host_alias,;t t
+ s, at target_alias@,$target_alias,;t t
+ s, at DEFS@,$DEFS,;t t
+ s, at ECHO_C@,$ECHO_C,;t t
+ s, at ECHO_N@,$ECHO_N,;t t
+ s, at ECHO_T@,$ECHO_T,;t t
+ s, at LIBS@,$LIBS,;t t
+ s, at LLVM_SRC@,$LLVM_SRC,;t t
+ s, at LLVM_OBJ@,$LLVM_OBJ,;t t
+ s, at LIBOBJS@,$LIBOBJS,;t t
+ s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+ _ACEOF
+ 
+   cat >>$CONFIG_STATUS <<\_ACEOF
+   # 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_lines=48
+   ac_sed_frag=1 # Number of current file.
+   ac_beg=1 # First line for current file.
+   ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
+     else
+       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+     fi
+     if test ! -s $tmp/subs.frag; then
+       ac_more_lines=false
+     else
+       # The purpose of the label and of the branching condition is to
+       # speed up the sed processing (if there are no `@' at all, there
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+       if test -z "$ac_sed_cmds"; then
+ 	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       else
+ 	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+       fi
+       ac_sed_frag=`expr $ac_sed_frag + 1`
+       ac_beg=$ac_end
+       ac_end=`expr $ac_end + $ac_max_sed_lines`
+     fi
+   done
+   if test -z "$ac_sed_cmds"; then
+     ac_sed_cmds=cat
+   fi
+ fi # test -n "$CONFIG_FILES"
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case $ac_file in
+   - | *:- | *:-:* ) # input from stdin
+ 	cat >$tmp/stdin
+ 	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+ 	 X"$ac_file" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   { if $as_mkdir_p; then
+     mkdir -p "$ac_dir"
+   else
+     as_dir="$ac_dir"
+     as_dirs=
+     while test ! -d "$as_dir"; do
+       as_dirs="$as_dir $as_dirs"
+       as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+ 	 X"$as_dir" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+     done
+     test ! -n "$as_dirs" || mkdir $as_dirs
+   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ 
+ # Do not use `cd foo && pwd` to compute absolute paths, because
+ # the directories may not exist.
+ case `pwd` in
+ .) ac_abs_builddir="$ac_dir";;
+ *)
+   case "$ac_dir" in
+   .) ac_abs_builddir=`pwd`;;
+   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+   *) ac_abs_builddir=`pwd`/"$ac_dir";;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *)
+   case ${ac_top_builddir}. in
+   .) ac_abs_top_builddir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_srcdir=$ac_srcdir;;
+ *)
+   case $ac_srcdir in
+   .) ac_abs_srcdir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+   esac;;
+ esac
+ case $ac_abs_builddir in
+ .) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *)
+   case $ac_top_srcdir in
+   .) ac_abs_top_srcdir=$ac_abs_builddir;;
+   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+   esac;;
+ esac
+ 
+ 
+ 
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+   if test x"$ac_file" = x-; then
+     configure_input=
+   else
+     configure_input="$ac_file.  "
+   fi
+   configure_input=$configure_input"Generated from `echo $ac_file_in |
+ 				     sed 's,.*/,,'` by configure."
+ 
+   # First look for the input files in the build tree, otherwise in the
+   # src tree.
+   ac_file_inputs=`IFS=:
+     for f in $ac_file_in; do
+       case $f in
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+ 	 # Absolute (can't be DOS-style, as IFS=:)
+ 	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+ 	 echo "$f";;
+       *) # Relative
+ 	 if test -f "$f"; then
+ 	   # Build tree
+ 	   echo "$f"
+ 	 elif test -f "$srcdir/$f"; then
+ 	   # Source tree
+ 	   echo "$srcdir/$f"
+ 	 else
+ 	   # /dev/null tree
+ 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ s, at configure_input@,$configure_input,;t t
+ s, at srcdir@,$ac_srcdir,;t t
+ s, at abs_srcdir@,$ac_abs_srcdir,;t t
+ s, at top_srcdir@,$ac_top_srcdir,;t t
+ s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+ s, at builddir@,$ac_builddir,;t t
+ s, at abs_builddir@,$ac_abs_builddir,;t t
+ s, at top_builddir@,$ac_top_builddir,;t t
+ s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+ " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+   rm -f $tmp/stdin
+   if test x"$ac_file" != x-; then
+     mv $tmp/out $ac_file
+   else
+     cat $tmp/out
+     rm -f $tmp/out
+   fi
+ 
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_dest" : 'X\(//\)$' \| \
+ 	 X"$ac_dest" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   { if $as_mkdir_p; then
+     mkdir -p "$ac_dir"
+   else
+     as_dir="$ac_dir"
+     as_dirs=
+     while test ! -d "$as_dir"; do
+       as_dirs="$as_dir $as_dirs"
+       as_dir=`(dirname "$as_dir") 2>/dev/null ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+ 	 X"$as_dir" : 'X\(/\)' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$as_dir" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+     done
+     test ! -n "$as_dirs" || mkdir $as_dirs
+   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+    { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ 
+ # Do not use `cd foo && pwd` to compute absolute paths, because
+ # the directories may not exist.
+ case `pwd` in
+ .) ac_abs_builddir="$ac_dir";;
+ *)
+   case "$ac_dir" in
+   .) ac_abs_builddir=`pwd`;;
+   [\\/]* | ?:[