Fix Win lib version strings

[shibboleth/cpp-xmltooling.git] / config_win32.h

diff --git a/config_win32.h b/config_win32.h
index 63a1a56..f1b1d0f 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -1,8 +1,33 @@
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
 /* config_win32.h.  Copied from a ./configure on Unix */
 
 /* Define if C++ compiler supports covariant virtual methods. */
 #define HAVE_COVARIANT_RETURNS 1
 
+/* Define to 1 if C++ compiler supports nullptr keyword. */
+#if _MSC_VER >= 1600
+# define HAVE_NULLPTR 1
+#endif
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
@@ -13,6 +38,10 @@
    specialization. */
 #define HAVE_GOOD_STL 1
 
+/* Define to 1 if you have an STL implementation that supports
+   std::iterator_traits. */
+#define HAVE_ITERATOR_TRAITS 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 /* #undef HAVE_INTTYPES_H */
 
@@ -22,9 +51,6 @@
 /* Define if log4cpp library is used. */
 /* #undef XMLTOOLING_LOG4CPP */
 
-/* Define if Xerces-C library was found */
-#define HAVE_LIBXERCESC 1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -61,23 +87,40 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
+#include <xercesc/util/XercesVersion.hpp>
+
+#if (XERCES_VERSION_MAJOR >= 3)
+# define XMLTOOLING_XERCESC_COMPLIANT_DOMLS     1
+# define XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE  1
+# define XMLTOOLING_XERCESC_64BITSAFE           1
+# define XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE 1
+#else
+# define XMLTOOLING_XERCESC_HAS_XMLBYTE_RELEASE 1
+#endif
+
+/* Define to 1 if you have the `xsecsize_t' type. */
+#define HAVE_XSECSIZE_T 1
+
+/* Define to 1 if you have the `curl_off_t' type. */
+#define HAVE_CURL_OFF_T 1
+
 /* Name of package */
 #define PACKAGE "xmltooling"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "mace-opensaml-users@internet2.edu"
+#define PACKAGE_BUGREPORT "https://issues.shibboleth.net/"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "xmltooling"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xmltooling 1.0"
+#define PACKAGE_STRING "xmltooling 1.5.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xmltooling"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0"
+#define PACKAGE_VERSION "1.5.4"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -90,7 +133,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "1.0"
+#define VERSION "1.5.4"
 
 /* Define if you wish to disable XML-Security-dependent features. */
 /* #undef XMLTOOLING_NO_XMLSEC */
@@ -98,6 +141,19 @@
 /* Define if you wish to disable Xalan-dependent features. */
 #define XSEC_NO_XALAN
 
+#ifndef XMLTOOLING_NO_XMLSEC
+# include <xsec/framework/XSECDefs.hpp>
+# if (_XSEC_VERSION_FULL >= 10500)
+#  define XMLTOOLING_XMLSEC_C14N11 1
+# endif
+# if (_XSEC_VERSION_FULL >= 10600)
+#  define XMLTOOLING_XMLSEC_MULTIPLECRL 1
+#  define XMLTOOLING_XMLSEC_SIGALGORITHM 1
+#  define XMLTOOLING_XMLSEC_ECC 1
+#  define XMLTOOLING_XMLSEC_DEBUGLOGGING 1
+# endif
+#endif
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */