3 files changed, 17 insertions, 3 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index 871049b..0a816e2 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -848,6 +848,12 @@ ENDIF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
 # line to configure the namespace in the C and C++ source files.
 ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
 
+IF(KWSYS_USE_String)
+  # Activate code in "String.c".  See the comment in the source.
+  SET_SOURCE_FILES_PROPERTIES(String.c PROPERTIES
+    COMPILE_FLAGS "-DKWSYS_STRING_C")
+ENDIF(KWSYS_USE_String)
+
 #-----------------------------------------------------------------------------
 # Process execution on windows needs to build a forwarding executable
 # that works around a Win9x bug.  We encode the executable into a C
diff --git a/Source/kwsys/String.c b/Source/kwsys/String.c
index 1aade12..9d2afc6 100644
--- a/Source/kwsys/String.c
+++ b/Source/kwsys/String.c
@@ -11,6 +11,14 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifdef KWSYS_STRING_C
+/*
+All code in this source file is conditionally compiled to work-around
+template definition auto-search on VMS.  Other source files in this
+directory that use the stl string cause the compiler to load this
+source to try to get the definition of the string template.  This
+condition blocks the compiler from seeing the symbols defined here.
+*/
 #include "kwsysPrivate.h"
 #include KWSYS_HEADER(String.h)
 
@@ -105,3 +113,5 @@ int kwsysString_strncasecmp(const char* lhs, const char* rhs, size_t n)
   return result;
 #endif
 }
+
+#endif /* KWSYS_STRING_C */
diff --git a/Source/kwsys/kwsysPrivate.h b/Source/kwsys/kwsysPrivate.h
index 822ea53..200acc1 100644
--- a/Source/kwsys/kwsysPrivate.h
+++ b/Source/kwsys/kwsysPrivate.h
@@ -39,7 +39,5 @@
 #define KWSYS_NAMESPACE_STRING1(x) #x
 
 #else
-# ifndef __VMS /* Avoid strange false positive on VMS compiler.  */
-#  error "kwsysPrivate.h included multiple times."
-# endif
+# error "kwsysPrivate.h included multiple times."
 #endif