https://bugs.internet2.edu/jira/browse/SSPCPP-287

[shibboleth/sp.git] / config_win32.h

diff --git a/config_win32.h b/config_win32.h
index 4157a34..471adc0 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -28,8 +28,11 @@
 /* Define to 1 if you have the `dmallocxx' library (-ldmallocxx). */
 /* #undef HAVE_LIBDMALLOCXX */
 
-/* Define if log4cpp library was found */
-#define HAVE_LIBLOG4CPP 1
+/* Define if log4shib library is used. */
+#define SHIBSP_LOG4SHIB 1
+
+/* Define if log4cpp library is used. */
+/* #undef SHIBSP_LOG4CPP */
 
 /* Define to 1 if you have the `ssl' library (-lssl). */
 #define HAVE_LIBSSL 1
@@ -37,6 +40,13 @@
 /* Define if Xerces-C library was found */
 #define HAVE_LIBXERCESC 1
 
+#include <xercesc/util/XercesVersion.hpp>
+
+#if (XERCES_VERSION_MAJOR < 3)
+# define SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE 1
+# define SHIBSP_XERCESC_SHORT_ACCEPTNODE 1
+#endif
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
@@ -46,8 +56,12 @@
 /* Define if you have POSIX threads libraries and header files. */
 /* #undef HAVE_PTHREAD */
 
-/* Define if saml library was found */
-#define HAVE_SAML 1
+#ifndef SHIBSP_LITE
+# include <xsec/framework/XSECDefs.hpp>
+# if (_XSEC_VERSION_FULL >= 10600)
+#  define SHIBSP_XMLSEC_WHITELISTING 1
+# endif
+#endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
 /* #undef HAVE_STDINT_H */
@@ -91,6 +105,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if you have the `timegm' function. */
+/* #undef HAVE_TIMEGM */
+
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
@@ -104,13 +121,13 @@
 #define PACKAGE_NAME "shibboleth"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.0"
+#define PACKAGE_STRING "shibboleth 2.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "shibboleth"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0"
+#define PACKAGE_VERSION "2.4"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -123,7 +140,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "2.0"
+#define VERSION "2.4"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */