zlib conf fix, header case fix

[shibboleth/cpp-opensaml.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ecee958..965037e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_INIT([opensaml], [2.0], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
-AM_CONFIG_HEADER(saml/config_pub.h)
+#AM_CONFIG_HEADER(saml/config_pub.h)
 AM_INIT_AUTOMAKE([opensaml], [2.0])
 
 sinclude(doxygen.m4)
@@ -16,6 +16,7 @@ DX_XML_FEATURE(OFF)
 DX_PDF_FEATURE(OFF)
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(opensaml, doxygen.cfg, doc/api)
+DX_INCLUDE=
 
 AC_ARG_ENABLE(debug,
     AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]),
@@ -54,6 +55,8 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_CHECK_FUNCS([strchr strdup strstr])
 
+AC_CHECK_SIZEOF(time_t)
+
 # libcurl settings
 AC_PATH_PROG(CURL_CONFIG,curl-config)
 AC_ARG_WITH(curl,
@@ -77,6 +80,19 @@ AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
                [AC_MSG_RESULT(yes)],
                [AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
 
+# zlib settings
+AC_ARG_WITH(zlib,
+       AC_HELP_STRING([--with-zlib=PATH], [where zlib is installed]),
+       [
+               if test -d "$withval"; then
+                       CPPFLAGS="${CPPFLAGS} -I$withval/include"
+                       LDFLAGS="${LDFLAGS} -L$withval/lib"
+               fi
+       ]
+)
+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++)
 
 # C++ requirements
@@ -156,12 +172,13 @@ AC_ARG_WITH(xmltooling,
     [if test x_$with_xmltooling != x_/usr; then
         LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
         CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+        DX_INCLUDE="${with_xmltooling}/include"
     fi])
 LIBS="-lxmltooling $LIBS"
 AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
 AC_TRY_LINK(
     [#include <xmltooling/XMLToolingConfig.h>],
-    [XMLToolingConfig::getConfig().init()],
+    [xmltooling::XMLToolingConfig::getConfig().init()],
     [AC_DEFINE(HAVE_LIBXMLTOOLING,1,[Define if XML-Tooling library was found])],
     [AC_MSG_ERROR([unable to link with xmltooling library])]
     )
@@ -191,6 +208,7 @@ AC_SUBST(CXXTEST)
 AC_SUBST(CXXTESTFLAGS)
 AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
+AC_SUBST(DX_INCLUDE)
 LIBTOOL="$LIBTOOL --silent"
 
 # output makefiles