X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=blobdiff_plain;f=configure.ac;h=d9b563e9e0c17df78acfaccb3ad1b8cb939c3ab2;hp=51a8678148513eff629421fd61c4234ffbc968f8;hb=HEAD;hpb=1c9c727c1f4e0d29f7190d337362a8d1fc5140c6 diff --git a/configure.ac b/configure.ac index 51a8678..d9b563e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.50]) -AC_INIT([shibboleth],[2.5],[https://issues.shibboleth.net/],[shibboleth]) +AC_INIT([shibboleth],[2.5.6],[https://issues.shibboleth.net/],[shibboleth-sp]) AC_CONFIG_SRCDIR(shibsp) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_MACRO_DIR(m4) @@ -77,8 +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 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 initgroups]) 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"]) @@ -121,6 +135,16 @@ AC_LANG([C++]) AC_CXX_NAMESPACES AC_CXX_REQUIRE_STL +# Boost +BOOST_REQUIRE +BOOST_BIND +BOOST_LAMBDA +BOOST_POINTER_CONTAINER +BOOST_SMART_PTR +BOOST_STRING_ALGO +BOOST_TUPLE +CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" + # Thank you Solaris, really. AC_MSG_CHECKING(for ctime_r) if test -z "$ac_cv_ctime_args"; then @@ -334,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" @@ -406,6 +430,31 @@ else WANT_SUBDIRS="$WANT_SUBDIRS adfs" fi +## systemd +dnl Systemd will be disabled by default and requires you to run configure with +dnl --enable-systemd to look for and enable systemd. +AC_ARG_ENABLE(systemd, + AS_HELP_STRING([--enable-systemd],[Build with systemd (Default = no)]), + [if test "x$enableval" = "x" ; then + WANT_SYSTEMD=no + else + WANT_SYSTEMD="$enableval" + fi + ],[ WANT_SYSTEMD=no ]) +AC_MSG_CHECKING(whether to build with systemd) + +AC_MSG_RESULT($WANT_SYSTEMD) +if test "$WANT_SYSTEMD" = "yes" ; then + AC_CHECK_HEADER([systemd/sd-daemon.h], [ + AC_CHECK_LIB([systemd-daemon], [sd_notify], [hassdnotify="y"])]) + AS_IF([test "x$hassdnotify=" = x], [ + AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) + ]) + AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) + AC_SUBST([SYSTEMD_CFLAGS]) + AC_SUBST([SYSTEMD_LIBS]) +fi # # Build NSAPI module? @@ -461,14 +510,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) @@ -493,15 +551,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 ]) MEMCACHED_LIBS="-lmemcached" + + # restore standard flags + CPPFLAGS="$save_CPPFLAGS" fi AC_SUBST(MEMCACHED_INCLUDE) @@ -535,6 +605,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 @@ -543,9 +614,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 @@ -566,10 +638,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 @@ -635,7 +711,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, @@ -656,7 +732,7 @@ if test "$WANT_APACHE_20" = "yes" ; then AC_ARG_WITH(apxs2, AS_HELP_STRING([--with-apxs2=FILE],[Specifies where to find the Apache 2.0 apxs script.]), [ - AC_MSG_CHECKING(for user-specified Apache2 apxs name/location) + AC_MSG_CHECKING(for user-specified Apache 2.0 apxs name/location) if test "$withval" != "no" ; then if test "$withval" != "yes"; then APXS2=$withval @@ -685,10 +761,10 @@ if test "$WANT_APACHE_20" = "yes" ; then fi ]) - AC_MSG_CHECKING([to see if Apache2 apxs was located]) + AC_MSG_CHECKING([to see if Apache 2.0 apxs was located]) if test ! -f "$APXS2" ; then AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate Apache2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs2 option.]) + AC_MSG_ERROR([Unable to locate Apache 2.0 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs2 option.]) fi AC_MSG_RESULT($APXS2) AC_SUBST(APXS2) @@ -721,7 +797,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 @@ -748,7 +824,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, @@ -769,7 +845,7 @@ if test "$WANT_APACHE_22" = "yes" ; then AC_ARG_WITH(apxs22, AS_HELP_STRING([--with-apxs22=FILE],[Specifies where to find the Apache 2.2 apxs script.]), [ - AC_MSG_CHECKING(for user-specified Apache2.2 apxs name/location) + AC_MSG_CHECKING(for user-specified Apache 2.2 apxs name/location) if test "$withval" != "no" ; then if test "$withval" != "yes"; then APXS22=$withval @@ -798,10 +874,10 @@ if test "$WANT_APACHE_22" = "yes" ; then fi ]) - AC_MSG_CHECKING([to see if Apache2.2 apxs was located]) + AC_MSG_CHECKING([to see if Apache 2.2 apxs was located]) if test ! -f "$APXS22" ; then AC_MSG_RESULT(no) - AC_MSG_ERROR([Unable to locate Apache2.2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs22 option.]) + AC_MSG_ERROR([Unable to locate Apache 2.2 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs22 option.]) fi AC_MSG_RESULT($APXS22) AC_SUBST(APXS22) @@ -857,14 +933,130 @@ fi AC_SUBST(APXS22_CFLAGS) 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-apu1 (DSO build, APR-UTIL development package installed separately) + +AC_ARG_ENABLE(apache-24, + AS_HELP_STRING([--enable-apache-24],[enable the Apache 2.4 module]), + [if test "x$enableval" = "x" ; then + WANT_APACHE_24=yes + else + WANT_APACHE_24="$enableval" + fi + ],[ WANT_APACHE_24=no ]) +AC_MSG_CHECKING(whether to build Apache 2.4 module) +if test "$WANT_APACHE_24" != yes && test "$WANT_APACHE_24" != no ; then + WANT_APACHE_24=yes +fi +AC_MSG_RESULT($WANT_APACHE_24) + +if test "$WANT_APACHE_24" = "yes" ; then + AC_ARG_WITH(apxs24, + AS_HELP_STRING([--with-apxs24=FILE],[Specifies where to find the Apache 2.4 apxs script.]), + [ + AC_MSG_CHECKING(for user-specified Apache 2.4 apxs name/location) + if test "$withval" != "no" ; then + if test "$withval" != "yes"; then + APXS24=$withval + AC_MSG_RESULT("$withval") + fi + fi + ], + [ + AC_PATH_PROG(APXS24, apxs2, no) + if test "$APXS24" = "no" ; then + AC_PATH_PROG(APXS24, apxs, no) + fi + if test "$APXS24" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS24" = "no" && test -f "$i/apxs2" ; then + APXS24="$i/apxs2" + fi + done + if test "$APXS24" = "no" ; then + for i in /usr/sbin /usr/local/apache2/bin /usr/local/apache/bin ; do + if test "$APXS24" = "no" && test -f "$i/apxs" ; then + APXS24="$i/apxs" + fi + done + fi + fi + ]) + + AC_MSG_CHECKING([to see if Apache 2.4 apxs was located]) + if test ! -f "$APXS24" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([Unable to locate Apache 2.4 apxs script. An Apache development package may be missing from your server, or you may need to use the --with-apxs24 option.]) + fi + 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" + APXS24_INCLUDE="`$APXS24 -q INCLUDEDIR`" +fi + +AC_SUBST(APXS24_CFLAGS) +AC_SUBST(APXS24_INCLUDE) + # always output the Makefile, even if you don't use it AC_CONFIG_FILES([apache/Makefile]) AM_CONDITIONAL(BUILD_AP13,test "$WANT_APACHE_13" = "yes") AM_CONDITIONAL(BUILD_AP20,test "$WANT_APACHE_20" = "yes") AM_CONDITIONAL(BUILD_AP22,test "$WANT_APACHE_22" = "yes") +AM_CONDITIONAL(BUILD_AP24,test "$WANT_APACHE_24" = "yes") # add the apache module to the list of wanted subdirs.. -if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" || test "$WANT_APACHE_22" = "yes" ; then +if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" || test "$WANT_APACHE_22" = "yes" || test "$WANT_APACHE_24" = "yes" ; then WANT_SUBDIRS="$WANT_SUBDIRS apache" fi @@ -1172,6 +1364,18 @@ if test -n "$APXS22_CC" && test "$APXS22_CC" != "$CC" ; then echo "==================================================================" fi +if test -n "$APXS24_CC" && test "$APXS24_CC" != "$CC" ; then + echo "==================================================================" + echo "WARNING: You have chosen to compile Apache-2.4 modules with a different" + echo " compiler than the one used to compile Apache." + echo "" + echo " Current compiler: $CC" + echo " Apache's compiler: $APXS24_CC" + echo "" + echo "This could cause problems." + echo "==================================================================" +fi + LIBTOOL="$LIBTOOL --silent" AC_OUTPUT