zlib conf fix, header case fix

diff --git a/configure.ac b/configure.ac
index acb864a..965037e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -90,10 +90,8 @@ AC_ARG_WITH(zlib,
                fi
        ]
 )
-AC_CHECK_HEADER(zlib.h,
-       AC_CHECK_LIB(z, deflateInit2, ,
-               AC_MSG_ERROR([zlib library not found, may need to use --with-zlib option])),
-       AC_MSG_ERROR([zlib headers not found, may need to use --with-zlib option]))
+AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR([unable to find zlib header files]))
+AC_CHECK_LIB([z],[deflateInit2_],,AC_MSG_ERROR([unable to link with zlib library]))
 
 AC_LANG(C++)
 

diff --git a/saml/binding/impl/MessageDecoder.cpp b/saml/binding/impl/MessageDecoder.cpp
index 7145b59..90819f0 100644 (file)
--- a/saml/binding/impl/MessageDecoder.cpp
+++ b/saml/binding/impl/MessageDecoder.cpp
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 #include "binding/MessageDecoder.h"
-#include "util/samlconstants.h"
+#include "util/SAMLConstants.h"
 
 using namespace opensaml;
 using namespace xmltooling;

diff --git a/saml/binding/impl/MessageEncoder.cpp b/saml/binding/impl/MessageEncoder.cpp
index 6da2d37..74e9a8a 100644 (file)
--- a/saml/binding/impl/MessageEncoder.cpp
+++ b/saml/binding/impl/MessageEncoder.cpp
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 #include "binding/MessageEncoder.h"
-#include "util/samlconstants.h"
+#include "util/SAMLConstants.h"
 
 #include <xmltooling/signature/KeyInfo.h>
 #include <xmltooling/signature/Signature.h>

diff --git a/saml/util/SAMLConstants.cpp b/saml/util/SAMLConstants.cpp
index e18580e..8bf84ce 100644 (file)
--- a/saml/util/SAMLConstants.cpp
+++ b/saml/util/SAMLConstants.cpp
@@ -15,14 +15,14 @@
  */
 
 /**
- * samlconstants.cpp
+ * SAMLConstants.cpp
  * 
  * SAML XML namespace constants 
  */
 
 
 #include "internal.h"
-#include "util/samlconstants.h"
+#include "util/SAMLConstants.h"
 #include <xercesc/util/XMLUniDefs.hpp>
 
 using namespace xercesc;
@@ -189,4 +189,4 @@ const char samlconstants::SAML20_BINDING_HTTP_POST_SIMPLESIGN[] = "urn:oasis:nam
 
 const char samlconstants::SAML20_BINDING_HTTP_REDIRECT[] = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect";
 
-const char samlconstants::SAML20_BINDING_URL_ENCODING_DEFLATE[] = "urn:oasis:names:tc:SAML:2.0:bindings:URL-Encoding:DEFLATE";
\ No newline at end of file
+const char samlconstants::SAML20_BINDING_URL_ENCODING_DEFLATE[] = "urn:oasis:names:tc:SAML:2.0:bindings:URL-Encoding:DEFLATE";