https://issues.shibboleth.net/jira/browse/SSPCPP-605

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

diff --git a/configure.ac b/configure.ac
index f066474..6c71412 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.2],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.5.3],[https://issues.shibboleth.net/],[shibboleth-sp])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -81,6 +81,18 @@ AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcas
 AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
 AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include <sys/socket.h>]])
 
+AC_CACHE_CHECK([for SOCK_CLOEXEC support], [shib_cv_sock_cloexec],
+[AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/socket.h>
+int main()
+{
+return socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0) == -1;
+}], [shib_cv_sock_cloexec=yes], [shib_cv_sock_cloexec=no], [shib_cv_sock_cloexec=no])])
+
+if test "$shib_cv_sock_cloexec" = "yes"; then
+       AC_DEFINE([HAVE_SOCK_CLOEXEC], 1, [Define if the SOCK_CLOEXEC flag is supported])
+fi
 
 # checks for pthreads
 ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
@@ -346,7 +358,7 @@ AC_SUBST(XMLTOOLINGXMLDIR)
 AC_ARG_WITH(saml,
     AS_HELP_STRING([--with-saml=PATH],[where opensaml is installed]),,
     [with_saml=/usr])
-if test x_$with_xmltooling != x_/usr; then
+if test x_$with_saml != x_/usr; then
     CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
     DX_INCLUDE="$DX_INCLUDE ${with_saml}/include"
     XMLSEC_LIBS="-L${with_saml}/lib -lsaml $XMLSEC_LIBS"
@@ -473,14 +485,23 @@ AC_ARG_WITH(fastcgi,
 AC_MSG_RESULT($WANT_FASTCGI)
 
 if test "$WANT_FASTCGI" != "no"; then
+
     if test "$WANT_FASTCGI" != "yes"; then
         if test x_$WANT_FASTCGI != x_/usr; then
             FASTCGI_INCLUDE="-I$WANT_FASTCGI/include"
             FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
         fi
     fi
+
+    # save and append master flags
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$FASTCGI_INCLUDE $CPPFLAGS"
+
     AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files]))
     FASTCGI_LIBS="-lfcgi -lfcgi++"
+
+    # restore standard flags
+    CPPFLAGS="$save_CPPFLAGS"
 fi
 
 AC_SUBST(FASTCGI_INCLUDE)
@@ -505,18 +526,27 @@ AC_ARG_WITH(memcached,
 AC_MSG_RESULT($WANT_MEMCACHED)
 
 if test "$WANT_MEMCACHED" != "no"; then
+
     if test "$WANT_MEMCACHED" != "yes"; then
         if test x_$WANT_MEMCACHED != x_/usr; then
             MEMCACHED_INCLUDE="-I$WANT_MEMCACHED/include"
             MEMCACHED_LDFLAGS="-L$WANT_MEMCACHED/lib"
         fi
     fi
+
+    # save and append master flags
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$MEMCACHED_INCLUDE $CPPFLAGS"    
+
     AC_CHECK_HEADER([libmemcached/memcached.h],,
         AC_MSG_ERROR([unable to find Memcached header files]))
     AC_CHECK_DECL([memcached_last_error_message],
         [AC_DEFINE([HAVE_MEMCACHED_LAST_ERROR_MESSAGE],[1],[Define to 1 if libmemcached supports error handling function.])],,
         [#include <libmemcached/memcached.h>])
     MEMCACHED_LIBS="-lmemcached"
+
+    # restore standard flags
+    CPPFLAGS="$save_CPPFLAGS"
 fi
 
 AC_SUBST(MEMCACHED_INCLUDE)