Index: Source/CMakeLists.txt
===================================================================
--- Source/CMakeLists.txt.orig	2011-05-06 15:15:37.000000000 +0000
+++ Source/CMakeLists.txt	2011-05-06 17:13:35.138047707 +0000
@@ -10,8 +10,13 @@
 # See the License for more information.
 #=============================================================================
 INCLUDE(CheckIncludeFile)
+INCLUDE(CMakeDetermineSystem)
+
 # Check if we can build support for ELF parsing.
-CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
+IF ((CMAKE_SYSTEM_NAME MATCHES "SunOS") OR (CMAKE_SYSTEM_NAME MATCHES "Linux"))
+  CHECK_INCLUDE_FILE("elf.h" HAVE_ELF_H)
+ENDIF()
+
 IF(HAVE_ELF_H)
   SET(CMAKE_USE_ELF_PARSER 1)
 ELSE(HAVE_ELF_H)
Index: Source/cmComputeLinkInformation.cxx
===================================================================
--- Source/cmComputeLinkInformation.cxx.orig	2011-05-07 17:36:29.000000000 +0000
+++ Source/cmComputeLinkInformation.cxx	2011-05-07 17:43:56.098857956 +0000
@@ -333,6 +333,8 @@
   this->NoSONameUsesPath =
     this->Makefile->IsOn("CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME");
 
+  this->UsedashLanddashl =
+    this->Makefile->IsOn("CMAKE_PLATFORM_USES_DASH_L_AND_DASH_L");
   // Get link type information.
   this->ComputeLinkTypeInfo();
 
@@ -918,6 +920,36 @@
 #endif
     this->ExtractSharedLibraryName.compile(reg_shared.c_str());
     }
+
+  // Create a regex to match shared library names.
+  if(!this->SharedLinkExtensions.empty())
+    { 
+    std::string libext = "(";
+    std::string reg_sover = reg;
+    std::string sep = "";
+  for(std::vector<std::string>::const_iterator
+	i = this->SharedLinkExtensions.begin();
+	i != this->SharedLinkExtensions.end(); ++i)
+    {
+    // Separate this choice from the previous one.
+    libext += sep;
+    sep = "|";
+    // Store this extension choice with the "." escaped.
+    libext += "\\";
+#if defined(_WIN32) && !defined(__CYGWIN__)
+    libext += this->NoCaseExpression(i->c_str());
+#else
+    libext += *i;
+#endif
+    }
+
+    reg_sover += libext ;
+    reg_sover += ")([0-9\\.]*)$";
+#ifdef CM_COMPUTE_LINK_INFO_DEBUG
+  fprintf(stderr, "shared soversion [%s]\n", reg_sover.c_str());
+#endif
+    this->ExtractSharedLibrarySoVersion.compile(reg_sover.c_str());
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -1046,8 +1078,8 @@
     }
 
   // Handle case of an imported shared library with no soname.
-  if(this->NoSONameUsesPath &&
-     target->IsImportedSharedLibWithoutSOName(this->Config))
+  if(this->UsedashLanddashl || (this->NoSONameUsesPath &&
+     target->IsImportedSharedLibWithoutSOName(this->Config)))
     {
     this->AddSharedLibNoSOName(item);
     return;
@@ -1082,7 +1114,8 @@
     }
 
   // Check for case of shared library with no builtin soname.
-  if(this->NoSONameUsesPath && this->CheckSharedLibNoSOName(item))
+  if(this->NoSONameUsesPath && this->CheckSharedLibNoSOName(item)
+      && !this->UsedashLanddashl)
     {
     return;
     }
@@ -1131,6 +1164,12 @@
     this->OldLinkDirItems.push_back(item);
     }
 
+  if(this->UsedashLanddashl)
+    {
+    this->AddSharedLibNoSOName(item);
+    return;
+    }
+
   // If this platform wants a flag before the full path, add it.
   if(!this->LibLinkFileFlag.empty())
     {
@@ -1228,20 +1267,20 @@
   // libraries.  On AIX a library with the name libfoo.a can be
   // shared!
   std::string lib;
-  if(this->ExtractSharedLibraryName.find(item))
+  if(this->ExtractSharedLibrarySoVersion.find(item))
     {
     // This matches a shared library file name.
 #ifdef CM_COMPUTE_LINK_INFO_DEBUG
     fprintf(stderr, "shared regex matched [%s] [%s] [%s]\n",
-            this->ExtractSharedLibraryName.match(1).c_str(),
-            this->ExtractSharedLibraryName.match(2).c_str(),
-            this->ExtractSharedLibraryName.match(3).c_str());
+            this->ExtractSharedLibrarySoVersion.match(1).c_str(),
+            this->ExtractSharedLibrarySoVersion.match(2).c_str(),
+            this->ExtractSharedLibrarySoVersion.match(3).c_str());
 #endif
     // Set the link type to shared.
     this->SetCurrentLinkType(LinkShared);
 
     // Use just the library name so the linker will search.
-    lib = this->ExtractSharedLibraryName.match(2);
+    lib = this->ExtractSharedLibrarySoVersion.match(2);
     }
   else if(this->ExtractStaticLibraryName.find(item))
     {
Index: Source/cmComputeLinkInformation.h
===================================================================
--- Source/cmComputeLinkInformation.h.orig	2011-05-07 17:36:29.000000000 +0000
+++ Source/cmComputeLinkInformation.h	2011-05-07 17:37:47.117595869 +0000
@@ -103,6 +103,7 @@
   std::string RuntimeAlways;
   bool RuntimeUseChrpath;
   bool NoSONameUsesPath;
+  bool UsedashLanddashl; 
   bool LinkWithRuntimePath;
   std::string RPathLinkFlag;
   SharedDepMode SharedDependencyMode;
@@ -127,6 +128,7 @@
   cmsys::RegularExpression ExtractStaticLibraryName;
   cmsys::RegularExpression ExtractSharedLibraryName;
   cmsys::RegularExpression ExtractAnyLibraryName;
+  cmsys::RegularExpression ExtractSharedLibrarySoVersion;
   std::string SharedRegexString;
   void AddLinkPrefix(const char* p);
   void AddLinkExtension(const char* e, LinkType type);
Index: Source/cmLocalGenerator.cxx
===================================================================
--- Source/cmLocalGenerator.cxx.orig	2011-02-15 17:47:31.000000000 +0000
+++ Source/cmLocalGenerator.cxx	2011-05-09 19:23:02.912450227 +0000
@@ -1651,6 +1651,30 @@
     linkLibs += " ";
     }
 
+  // Get the RPATH entries.
+  if(relink)
+    {
+    std::vector<std::string> runtimeDirs;
+    cli.GetRPath(runtimeDirs, relink);
+
+    std::string rpath;
+    // This is only going to be correct for opt style installs, adding
+    // -L${INSTALL_LIB_DIR} before installing the new lib will link to
+    // an old installed copy of the library for systems where they
+    // install everything in the same prefix. I would like to do
+    // for x in libs; do relink $lib; install $lib; done, which would
+    // work as long as libs is in dependency order, but I can not
+    // follow the code well enough to do that. 
+    for(std::vector<std::string>::iterator ri = runtimeDirs.begin();
+        ri != runtimeDirs.end(); ++ri)
+      {
+      rpath += "-L"; 
+      rpath += this->Convert(ri->c_str(), NONE, SHELL, false);
+      rpath += " ";
+      }
+    fout << rpath;
+    }
+
   // Append the library search path flags.
   std::vector<std::string> const& libDirs = cli.GetDirectories();
   for(std::vector<std::string>::const_iterator libDir = libDirs.begin();