Adjust VC build for parallel make, fixes for SSPCPP-344.

[shibboleth/sp.git] / shibsp / SPConfig.cpp

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 097704c..955ad56 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -1,12 +1,12 @@
-
 /*
- *  Copyright 2001-2010 Internet2
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to UCAID under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may not use this
+ * file except in compliance with the License.  You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -192,8 +192,8 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
 
 #ifndef SHIBSP_LITE
     XMLToolingConfig::getConfig().user_agent = string(PACKAGE_NAME) + '/' + PACKAGE_VERSION +
-        " OpenSAML/" + OPENSAML_FULLVERSIONDOT +
-        " XMLTooling/" + XMLTOOLING_FULLVERSIONDOT +
+        " OpenSAML/" + gOpenSAMLDotVersionStr +
+        " XMLTooling/" + gXMLToolingDotVersionStr +
         " XML-Security-C/" + XSEC_FULLVERSIONDOT +
         " Xerces-C/" + XERCES_FULLVERSIONDOT +
 #if defined(LOG4SHIB_VERSION)
@@ -207,7 +207,7 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
     }
 #else
     XMLToolingConfig::getConfig().user_agent = string(PACKAGE_NAME) + '/' + PACKAGE_VERSION +
-        " XMLTooling/" + XMLTOOLING_FULLVERSIONDOT +
+        " XMLTooling/" + gXMLToolingDotVersionStr +
         " Xerces-C/" + XERCES_FULLVERSIONDOT +
 #if defined(LOG4SHIB_VERSION)
         " log4shib/" + LOG4SHIB_VERSION;