Fix backslashes in SHIBSP_PREFIX variable by manually creating it during the script...

[shibboleth/sp.git] / shibsp / base.h

diff --git a/shibsp/base.h b/shibsp/base.h
index 95ee5bc..9eb4cf3 100644 (file)
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -24,7 +24,12 @@
 #ifndef __shibsp_base_h__
 #define __shibsp_base_h__
 
-#include <saml/base.h>
+#ifdef SHIBSP_LITE
+# define XMLTOOLING_LITE
+# include <xmltooling/base.h>
+#else
+# include <saml/base.h>
+#endif
 
 // Windows and GCC4 Symbol Visibility Macros
 #ifdef WIN32
@@ -66,12 +71,23 @@
 /**
  * Default catalog path on Windows.
  */
-# define SHIBSP_SCHEMAS "c:\\opt\\shibboleth-sp\\share\\xml\\xmltooling\\catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\opensaml\\saml20-catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\opensaml\\saml11-catalog.xml;c:\\opt\\shibboleth-sp\\share\\xml\\shibboleth\\catalog.xml"
+# define SHIBSP_SCHEMAS "c:/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml;c:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml;c:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml;c:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
+
+/**
+ * Default name of configuration file on Windows.
+ */
+# define SHIBSP_CONFIG "shibboleth2.xml"
 
 /**
- * Default path to configuration file on Windows.
+ * Controls default logging level of console tools and other situations
+ * where fully-configured logging isn't used.
  */
-# define SHIBSP_CONFIG "c:\\opt\\shibboleth-sp\\etc\\shibboleth\\shibboleth.xml"
+#define SHIBSP_LOGGING "console.logger"
+
+/**
+ * Default prefix for installation (used to resolve relative paths).
+ */
+#define SHIBSP_PREFIX  "c:/opt/shibboleth-sp"
 
 #else
 # include <shibsp/paths.h>
@@ -80,17 +96,11 @@
 /**
  * Logging category for Service Provider functions.
  */
-#define SHIBSP_LOGCAT "Shibboleth.SP"
+#define SHIBSP_LOGCAT "Shibboleth"
 
 /**
  * Logging category for Service Provider auditing.
  */
 #define SHIBSP_TX_LOGCAT "Shibboleth-TRANSACTION"
 
-/**
- * Controls default logging level of console tools and other situations
- * where fully-configured logging isn't used.
- */
-#define SHIBSP_LOGGING "WARN"
-
 #endif /* __shibsp_base_h__ */