fix for hp x11 and gl

Source/cmUnixMakefileGenerator.cxx

@@ -278,9 +278,10 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
       linkLibs += cmSystemTools::EscapeSpaces(dir.c_str());
       linkLibs += " ";
       librariesLinked += "-l";
-      if(reg.find(file))
+      cmRegularExpression libname("lib(.*)\\.(.*)");
+      if(libname.find(file))
         {
-        file = reg.match(1);
+        file = libname.match(1);
         }
       librariesLinked += file;
       librariesLinked += " ";
@@ -826,6 +827,12 @@ void cmUnixMakefileGenerator::OutputMakeRules(std::ostream& fout)
                        "${CMAKE_BINARY_DIR}/CMakeCache.txt",
                        "${CMAKE_COMMAND} "
                        "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}");
+  this->OutputMakeRule(fout, 
+                       "Rebuild the cache",
+                       "${CMAKE_BINARY_DIR}/CMakeCache.txt",
+		       0,
+                       "${CMAKE_COMMAND} "
+                       "-H${CMAKE_SOURCE_DIR} -B${CMAKE_BINARY_DIR}");
   this->OutputMakeRule(fout, 
                        "Rebuild cmake dummy rule",
                        "${CMAKE_COMMAND}",

Templates/CMakeSystemConfig.cmake.in

@@ -23,7 +23,7 @@ SET (CMAKE_SHLIB_LINK_FLAGS   "@CMAKE_SHLIB_LINK_FLAGS@" CACHE_NO_REPLACE )
 SET (CMAKE_SHLIB_LD_LIBS      "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE )
 SET (CMAKE_SHLIB_LD_LIBS      "@CMAKE_SHLIB_LD_LIBS@" CACHE_NO_REPLACE_NO_REPLACE )
 # support for X11
-SET (CMAKE_X_LIBS             "@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@" CACHE_NO_REPLACE )
+SET (CMAKE_X_LIBS             "@X_PRE_LIBS@ @X_LIBS@ -lX11 -lXext @X_EXTRA_LIBS@" CACHE_NO_REPLACE )
 SET (CMAKE_X_CFLAGS           "@X_CFLAGS@" CACHE_NO_REPLACE)
 SET (CMAKE_HAS_X              "@CMAKE_HAS_X@" CACHE_NO_REPLACE BOOL)