added "--enable-saml2" configuration option and dependency on liblasso

This commit is contained in:
Wolfgang Sourdeau
2012-11-01 11:28:45 -04:00
parent 39c2d43cef
commit 157e66ad4f
4 changed files with 34 additions and 6 deletions

20
configure vendored
View File

@@ -24,6 +24,7 @@ ARG_CFGMAKE="$PWD/config.make"
ARG_CFGSSL="auto"
ARG_WITH_DEBUG=1
ARG_WITH_STRIP=0
ARG_ENABLE_SAML2=0
ARG_WITH_LDAP_CONFIG=0
GNUSTEP_INSTALLATION_DOMAIN="LOCAL"
@@ -74,6 +75,7 @@ Installation directories:
--enable-debug turn on debugging and compile time warnings
--enable-strip turn on stripping of debug symbols
--with-ssl=SSL specify ssl library (none, libssl, gnutls, auto) [auto]
--enable-saml2 enable support for SAML2 authentication (requires liblasso)
--enable-ldap-config enable LDAP based configuration of SOGo
@@ -99,6 +101,11 @@ printParas() {
else
echo " strip: no";
fi
if test $ARG_ENABLE_SAML2 = 1; then
echo " saml2 support: yes";
else
echo " saml2 support: no";
fi
if test $ARG_WITH_LDAP_CONFIG = 1; then
echo " ldap-based configuration: yes";
else
@@ -296,10 +303,15 @@ genConfigMake() {
cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
cfgwrite ""
if test $ARG_ENABLE_SAML2 = 1; then
cfgwrite "ADDITIONAL_CPPFLAGS += -DSAML2_CONFIG=1"
cfgwrite "saml2_config:=yes"
fi
if test $ARG_WITH_LDAP_CONFIG = 1; then
cfgwrite "ADDITIONAL_CPPFLAGS += -DLDAP_CONFIG=1"
cfgwrite "ldap_config:=yes"
fi
fi
cfgwrite "include \$(TOPDIR)/general.make"
}
@@ -363,6 +375,9 @@ EOF
}
checkDependencies() {
if test "x$ARG_ENABLE_SAML2" = "x1"; then
checkLinking "lasso" required;
fi
if test "x$ARG_CFGSSL" = "xauto"; then
checkLinking "ssl" optional;
if test $? != 0; then
@@ -451,6 +466,9 @@ processOption() {
extractFuncValue $1;
ARG_CFGSSL="$VALUE"
;;
"x--enable-saml2")
ARG_ENABLE_SAML2=1
;;
"x--enable-ldap-config")
ARG_WITH_LDAP_CONFIG=1