X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d119faf16ac47a9bfc9893952d851e644889525d;hb=ad64936f0c5cda33143275fe70487cef077cc830;hp=0eeb4a9a58e0fb82f6913dc6f47d22ac5218b4c7;hpb=2e9e900320a844b96641abde35e6c6e35a6f925e;p=shibboleth%2Fcpp-sp.git

diff --git a/configure.ac b/configure.ac
index 0eeb4a9..d119faf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5.0],[https://issues.shibboleth.net/],[shibboleth-sp])
+AC_INIT([shibboleth],[2.5.4],[https://issues.shibboleth.net/],[shibboleth-sp])
 AC_CONFIG_SRCDIR(shibsp)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
@@ -77,10 +77,22 @@ AC_FUNC_STRFTIME
 AC_FUNC_STRERROR_R
 AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h])
 AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the <sys/socket> header file.])], [])
-AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r strtok_r strcasecmp getpwnam getgrnam])
+AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r localtime_r strtok_r strcasecmp getpwnam getgrnam])
 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)
@@ -550,6 +580,7 @@ need_default=yes
 Peek(enable,apache_13,need_default=no)
 Peek(enable,apache_20,need_default=no)
 Peek(enable,apache_22,need_default=no)
+Peek(enable,apache_24,need_default=no)
 AC_MSG_RESULT($need_default)
 
 if test "$need_default" = "yes"; then
@@ -558,9 +589,10 @@ if test "$need_default" = "yes"; then
   Peek(with,apxs,xs="$peekval")
   Peek(with,apxs2,xs="$peekval")
   Peek(with,apxs22,xs="$peekval")
+  Peek(with,apxs24,xs="$peekval")
   if test "x$xs" = "x"; then
      AC_PATH_PROGS(xs, apxs2 apxs,
-        AC_MSG_ERROR(No apxs, no apache found.  Try --with-apxs),
+        AC_MSG_ERROR(No apxs, no Apache found. Try --with-apxs, --with-apxs2, etc.),
         [/usr/local/apache2/bin:/usr/local/apache/bin:/usr/sbin:$PATH])
   fi
   # ask the daemon for the version and set parameters
@@ -581,10 +613,14 @@ if test "$need_default" = "yes"; then
                [with_apxs22]=$xs
                AC_MSG_RESULT(2.2)
                ;;
-       *)      AC_MSG_ERROR(unusable apache versions: $v. Try setting --with-apxs)
+       2.4*)   [enable_apache_24]=yes
+               [with_apxs24]=$xs
+               AC_MSG_RESULT(2.4)
+               ;;
+       *)      AC_MSG_ERROR(unusable Apache versions: $v. Try setting --with-apxs, --with=apxs2, etc.)
      esac
   else 
-     AC_MSG_RESULT(cannot determine version.  Try setting --with-apxs)
+     AC_MSG_RESULT(cannot determine Apache version. Try setting --with-apxs, --with-apxs2, etc.)
   fi
 fi
 
@@ -650,7 +686,7 @@ AC_SUBST(APXS_INCLUDE)
 # Apache 2.0 (mod_shib_20)
 #   --enable-apache-20
 #   --with-apxs2      (DSO build, the normal way, uses apxs to derive build flags)
-#	--with-apr        (DSO build, APR development package installed separately)
+#   --with-apr        (DSO build, APR development package installed separately)
 #   --with-apu        (DSO build, APR-UTIL development package installed separately)
 
 AC_ARG_ENABLE(apache-20,
@@ -736,7 +772,7 @@ if test "$WANT_APACHE_20" = "yes" ; then
         AC_MSG_CHECKING(for user-specified apu-config name/location)
         if test "$withval" != "no" ; then
             if test "$withval" != "yes"; then
-                APR_CONFIG=$withval
+                APU_CONFIG=$withval
                 AC_MSG_RESULT("$withval")
             fi
         fi
@@ -763,7 +799,7 @@ AC_SUBST(APXS2_INCLUDE)
 # Apache 2.2 (mod_shib_22)
 #   --enable-apache-22
 #   --with-apxs22     (DSO build, the normal way, uses apxs to derive build flags)
-#	--with-apr1       (DSO build, APR development package installed separately)
+#   --with-apr1       (DSO build, APR development package installed separately)
 #   --with-apu1       (DSO build, APR-UTIL development package installed separately)
 
 AC_ARG_ENABLE(apache-22,
@@ -875,7 +911,7 @@ AC_SUBST(APXS22_INCLUDE)
 # Apache 2.4 (mod_shib_24)
 #   --enable-apache-24
 #   --with-apxs24     (DSO build, the normal way, uses apxs to derive build flags)
-#	--with-apr1       (DSO build, APR development package installed separately)
+#   --with-apr1       (DSO build, APR development package installed separately)
 #   --with-apu1       (DSO build, APR-UTIL development package installed separately)
 
 AC_ARG_ENABLE(apache-24,
@@ -933,6 +969,51 @@ if test "$WANT_APACHE_24" = "yes" ; then
     AC_MSG_RESULT($APXS24)
     AC_SUBST(APXS24)
 
+    # If we haven't done this work already for Apache 2.2
+    if test "$WANT_APACHE_22" != "yes" ; then
+        # APR1 settings
+        AC_ARG_WITH(apr1,
+            AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]),
+            [
+            AC_MSG_CHECKING(for user-specified apr-1-config name/location)
+            if test "$withval" != "no" ; then
+                if test "$withval" != "yes"; then
+                    APR1_CONFIG=$withval
+                    AC_MSG_RESULT("$withval")
+                fi
+            fi
+            ],
+            [
+            AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH])
+            ])
+        if test -f "${APR1_CONFIG}"; then
+            APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`"
+        else
+            AC_MSG_ERROR([Unable to locate apr-1-config, may need --with-apr1 option.])
+        fi
+
+        # APU1 settings
+        AC_ARG_WITH(apu1,
+            AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]),
+            [
+            AC_MSG_CHECKING(for user-specified apu-1-config name/location)
+            if test "$withval" != "no" ; then
+                if test "$withval" != "yes"; then
+                    APU1_CONFIG=$withval
+                    AC_MSG_RESULT("$withval")
+                fi
+            fi
+            ],
+            [
+            AC_PATH_PROG(APU1_CONFIG, apu-1-config,,[`$APXS24 -q SBINDIR`]:[$PATH])
+            ])
+        if test -f "${APU1_CONFIG}"; then
+            APU1_CFLAGS="`${APU1_CONFIG} --includes`"
+        else
+            AC_MSG_ERROR([Unable to locate apu-1-config, may need --with-apu1 option.])
+        fi
+    fi
+    
     # extract settings we need from APXS24 -q
     APXS24_CC="`$APXS24 -q CC`"
     APXS24_CFLAGS="`$APXS24 -q CPPFLAGS` `$APXS24 -q CFLAGS` $APR1_CFLAGS $APU1_CFLAGS"