added "--enable-saml2" configuration option and dependency on liblasso
parent
39c2d43cef
commit
157e66ad4f
|
@ -53,7 +53,6 @@ SOGo_HEADER_FILES = \
|
||||||
SOGoAuthenticator.h \
|
SOGoAuthenticator.h \
|
||||||
SOGoSession.h \
|
SOGoSession.h \
|
||||||
SOGoCASSession.h \
|
SOGoCASSession.h \
|
||||||
SOGoSAML2Session.h \
|
|
||||||
SOGoDAVAuthenticator.h \
|
SOGoDAVAuthenticator.h \
|
||||||
SOGoProxyAuthenticator.h \
|
SOGoProxyAuthenticator.h \
|
||||||
SOGoWebAuthenticator.h \
|
SOGoWebAuthenticator.h \
|
||||||
|
@ -123,7 +122,6 @@ SOGo_OBJC_FILES = \
|
||||||
\
|
\
|
||||||
SOGoSession.m \
|
SOGoSession.m \
|
||||||
SOGoCASSession.m \
|
SOGoCASSession.m \
|
||||||
SOGoSAML2Session.m \
|
|
||||||
SOGoDAVAuthenticator.m \
|
SOGoDAVAuthenticator.m \
|
||||||
SOGoProxyAuthenticator.m \
|
SOGoProxyAuthenticator.m \
|
||||||
SOGoWebAuthenticator.m \
|
SOGoWebAuthenticator.m \
|
||||||
|
@ -142,8 +140,13 @@ SOGo_OBJC_FILES = \
|
||||||
|
|
||||||
SOGo_RESOURCE_FILES = \
|
SOGo_RESOURCE_FILES = \
|
||||||
SOGoDefaults.plist \
|
SOGoDefaults.plist \
|
||||||
DAVReportMap.plist \
|
DAVReportMap.plist
|
||||||
SOGoSAML2Metadata.xml
|
|
||||||
|
ifeq ($(saml2_config), yes)
|
||||||
|
SOGo_HEADER_FILES += SOGoSAML2Session.h
|
||||||
|
SOGo_OBJC_FILES += SOGoSAML2Session.m
|
||||||
|
SOGo_RESOURCE_FILES += SOGoSAML2Metadata.xml
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(ldap_config),yes)
|
ifeq ($(ldap_config),yes)
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,10 @@ SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(HAS_LIBRARY_lasso), yes)
|
||||||
|
SOGo_LIBRARIES_DEPEND_UPON += -llasso
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
||||||
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
|
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
|
||||||
else
|
else
|
||||||
|
|
|
@ -13,9 +13,12 @@ MainUI_OBJC_FILES += \
|
||||||
SOGoRootPage.m \
|
SOGoRootPage.m \
|
||||||
SOGoUserHomePage.m \
|
SOGoUserHomePage.m \
|
||||||
SOGoBrowsersPanel.m \
|
SOGoBrowsersPanel.m \
|
||||||
SOGoSAML2Actions.m \
|
|
||||||
UIxLoading.m \
|
UIxLoading.m \
|
||||||
|
|
||||||
|
ifeq ($(saml2_config), yes)
|
||||||
|
MainUI_OBJC_FILES += SOGoSAML2Actions.m
|
||||||
|
endif
|
||||||
|
|
||||||
MainUI_RESOURCE_FILES += \
|
MainUI_RESOURCE_FILES += \
|
||||||
product.plist \
|
product.plist \
|
||||||
SOGoProfile.sql \
|
SOGoProfile.sql \
|
||||||
|
|
|
@ -24,6 +24,7 @@ ARG_CFGMAKE="$PWD/config.make"
|
||||||
ARG_CFGSSL="auto"
|
ARG_CFGSSL="auto"
|
||||||
ARG_WITH_DEBUG=1
|
ARG_WITH_DEBUG=1
|
||||||
ARG_WITH_STRIP=0
|
ARG_WITH_STRIP=0
|
||||||
|
ARG_ENABLE_SAML2=0
|
||||||
ARG_WITH_LDAP_CONFIG=0
|
ARG_WITH_LDAP_CONFIG=0
|
||||||
|
|
||||||
GNUSTEP_INSTALLATION_DOMAIN="LOCAL"
|
GNUSTEP_INSTALLATION_DOMAIN="LOCAL"
|
||||||
|
@ -74,6 +75,7 @@ Installation directories:
|
||||||
--enable-debug turn on debugging and compile time warnings
|
--enable-debug turn on debugging and compile time warnings
|
||||||
--enable-strip turn on stripping of debug symbols
|
--enable-strip turn on stripping of debug symbols
|
||||||
--with-ssl=SSL specify ssl library (none, libssl, gnutls, auto) [auto]
|
--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
|
--enable-ldap-config enable LDAP based configuration of SOGo
|
||||||
|
|
||||||
|
@ -99,6 +101,11 @@ printParas() {
|
||||||
else
|
else
|
||||||
echo " strip: no";
|
echo " strip: no";
|
||||||
fi
|
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
|
if test $ARG_WITH_LDAP_CONFIG = 1; then
|
||||||
echo " ldap-based configuration: yes";
|
echo " ldap-based configuration: yes";
|
||||||
else
|
else
|
||||||
|
@ -296,6 +303,11 @@ genConfigMake() {
|
||||||
cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
|
cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
|
||||||
cfgwrite ""
|
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
|
if test $ARG_WITH_LDAP_CONFIG = 1; then
|
||||||
cfgwrite "ADDITIONAL_CPPFLAGS += -DLDAP_CONFIG=1"
|
cfgwrite "ADDITIONAL_CPPFLAGS += -DLDAP_CONFIG=1"
|
||||||
cfgwrite "ldap_config:=yes"
|
cfgwrite "ldap_config:=yes"
|
||||||
|
@ -363,6 +375,9 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
checkDependencies() {
|
checkDependencies() {
|
||||||
|
if test "x$ARG_ENABLE_SAML2" = "x1"; then
|
||||||
|
checkLinking "lasso" required;
|
||||||
|
fi
|
||||||
if test "x$ARG_CFGSSL" = "xauto"; then
|
if test "x$ARG_CFGSSL" = "xauto"; then
|
||||||
checkLinking "ssl" optional;
|
checkLinking "ssl" optional;
|
||||||
if test $? != 0; then
|
if test $? != 0; then
|
||||||
|
@ -451,6 +466,9 @@ processOption() {
|
||||||
extractFuncValue $1;
|
extractFuncValue $1;
|
||||||
ARG_CFGSSL="$VALUE"
|
ARG_CFGSSL="$VALUE"
|
||||||
;;
|
;;
|
||||||
|
"x--enable-saml2")
|
||||||
|
ARG_ENABLE_SAML2=1
|
||||||
|
;;
|
||||||
|
|
||||||
"x--enable-ldap-config")
|
"x--enable-ldap-config")
|
||||||
ARG_WITH_LDAP_CONFIG=1
|
ARG_WITH_LDAP_CONFIG=1
|
||||||
|
|
Loading…
Reference in New Issue