diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble index 85d69a994..fba77f3e2 100644 --- a/SoObjects/SOGo/GNUmakefile.preamble +++ b/SoObjects/SOGo/GNUmakefile.preamble @@ -37,7 +37,8 @@ endif endif ifeq ($(HAS_LIBRARY_lasso), yes) -SOGo_LIBRARIES_DEPEND_UPON += -llasso +ADDITIONAL_CPPFLAGS += $(LASSO_CFLAGS) +SOGo_LIBRARIES_DEPEND_UPON += $(LASSO_LIBS) endif ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd) diff --git a/configure b/configure index 9d0e8b801..f5cfdab12 100755 --- a/configure +++ b/configure @@ -377,6 +377,12 @@ EOF checkDependencies() { if test "x$ARG_ENABLE_SAML2" = "x1"; then checkLinking "lasso" required; + if test $? = 0; then + lasso_cflags="`pkg-config lasso --cflags`" + cfgwrite "LASSO_CFLAGS := $lasso_cflags" + lasso_libs="`pkg-config lasso --libs`" + cfgwrite "LASSO_LIBS := $lasso_libs" + fi; fi if test "x$ARG_CFGSSL" = "xauto"; then checkLinking "ssl" optional;