maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

signon: fix compilation with nothing enabled

Browse source 
When neither gSSO nor UOA were enabled, the provideruoa.so was
still enabled and failed to link because its LDFLAGS were not
set. It shouldn't have been enabled at all.

While we are at it, allow both to be enabled in the build rules,
even though the code doesn't support it (symbol clashes).
This commit is contained in:
Patrick Ohly 2013-12-04 04:44:06 -08:00
parent 80f1deb5e9
commit 48499d3cfd
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backends/signon/signon.am
View file

@ -24,12 +24,14 @@ dist_accounts_service_types_DATA = \
src/backends/signon/accounts/carddav.service-type \
$(NONE)
src_backends_signon_libs =
if USE_GSSO
src_backends_signon_lib = src/backends/signon/providergsso.la
else
src_backends_signon_lib = src/backends/signon/provideruoa.la
src_backends_signon_libs += src/backends/signon/providergsso.la
endif
MOSTLYCLEANFILES += $(src_backends_signon_lib)
if USE_UOA
src_backends_signon_libs += src/backends/signon/provideruoa.la
endif
MOSTLYCLEANFILES += $(src_backends_signon_libs)
src_backends_signon_common_sources = \
src/backends/signon/signon.h \
@ -38,11 +40,11 @@ src_backends_signon_common_sources = \
if ENABLE_MODULES
src_backends_signon_backenddir = $(BACKENDS_DIRECTORY)
src_backends_signon_backend_LTLIBRARIES = $(src_backends_signon_lib)
src_backends_signon_backend_LTLIBRARIES = $(src_backends_signon_libs)
src_backends_signon_common_sources += \
src/backends/signon/signonRegister.cpp
else
noinst_LTLIBRARIES += $(src_backends_signon_lib)
noinst_LTLIBRARIES += $(src_backends_signon_libs)
endif
src_backends_signon_common_libadd = $(SYNCEVOLUTION_LIBS)