X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=482acb7cdccece67168fcec976515b0aa517c28b;hb=ba12481c21765dfc136defe1e835e21103228685;hp=9c2eda10a60daae56d7d49a63c43cc56fd8d4ee2;hpb=75299eb4bc6c76b1be38b01ec697831b9652f762;p=shibboleth%2Fcpp-sp.git diff --git a/configure.ac b/configure.ac index 9c2eda1..482acb7 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.2],[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 ]]) AC_CHECK_MEMBERS([struct sockaddr.sa_len], [], [], [[#include ]]) +AC_CACHE_CHECK([for SOCK_CLOEXEC support], [shib_cv_sock_cloexec], +[AC_TRY_RUN([ +#include +#include +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"]) @@ -550,6 +562,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 +571,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 +595,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 +668,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 +754,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 +781,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 +893,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 +951,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"