AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.5],[https://issues.shibboleth.net/],[shibboleth])
+AC_INIT([shibboleth],[2.5.1],[https://issues.shibboleth.net/],[shibboleth-sp])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
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>]])
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
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
[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
# 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,
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
# 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,
# 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,
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"