Make use of pkg-config to retrieve gcc and ld options for liblasso
parent
a9b521c8be
commit
bc2b003676
|
@ -37,7 +37,8 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAS_LIBRARY_lasso), yes)
|
ifeq ($(HAS_LIBRARY_lasso), yes)
|
||||||
SOGo_LIBRARIES_DEPEND_UPON += -llasso
|
ADDITIONAL_CPPFLAGS += $(LASSO_CFLAGS)
|
||||||
|
SOGo_LIBRARIES_DEPEND_UPON += $(LASSO_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
|
||||||
|
|
|
@ -377,6 +377,12 @@ EOF
|
||||||
checkDependencies() {
|
checkDependencies() {
|
||||||
if test "x$ARG_ENABLE_SAML2" = "x1"; then
|
if test "x$ARG_ENABLE_SAML2" = "x1"; then
|
||||||
checkLinking "lasso" required;
|
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
|
fi
|
||||||
if test "x$ARG_CFGSSL" = "xauto"; then
|
if test "x$ARG_CFGSSL" = "xauto"; then
|
||||||
checkLinking "ssl" optional;
|
checkLinking "ssl" optional;
|
||||||
|
|
Loading…
Reference in New Issue