Explicitly refer to LIBCAP in Makefiles.

This commit is contained in:
Tobias Brunner 2010-06-15 19:10:23 +02:00
parent 404960e522
commit b77e493bea
3 changed files with 3 additions and 3 deletions

View File

@ -859,7 +859,6 @@ AM_CONDITIONAL(USE_FAST, test x$fast = xtrue)
AM_CONDITIONAL(USE_MANAGER, test x$manager = xtrue)
AM_CONDITIONAL(USE_ME, test x$mediation = xtrue)
AM_CONDITIONAL(USE_INTEGRITY_TEST, test x$integrity_test = xtrue)
AM_CONDITIONAL(USE_CAPABILITIES, test x$capabilities = xlibcap)
AM_CONDITIONAL(USE_PLUTO, test x$pluto = xtrue)
AM_CONDITIONAL(USE_THREADS, test x$threads = xtrue)
AM_CONDITIONAL(USE_CHARON, test x$charon = xtrue)
@ -868,6 +867,7 @@ AM_CONDITIONAL(USE_SCRIPTS, test x$scripts = xtrue)
AM_CONDITIONAL(USE_LIBSTRONGSWAN, test x$charon = xtrue -o x$pluto = xtrue -o x$tools = xtrue)
AM_CONDITIONAL(USE_LIBHYDRA, test x$charon = xtrue -o x$pluto = xtrue)
AM_CONDITIONAL(USE_FILE_CONFIG, test x$pluto = xtrue -o x$stroke = xtrue)
AM_CONDITIONAL(USE_LIBCAP, test x$capabilities = xlibcap)
AM_CONDITIONAL(USE_VSTR, test x$vstr = xtrue)
AM_CONDITIONAL(USE_SIMAKA, test x$simaka = xtrue)
AM_CONDITIONAL(MONOLITHIC, test x$monolithic = xtrue)

View File

@ -128,7 +128,7 @@ if USE_ME
sa/tasks/ike_me.c sa/tasks/ike_me.h
endif
if USE_CAPABILITIES
if USE_LIBCAP
libcharon_la_LIBADD += -lcap
endif

View File

@ -121,7 +121,7 @@ if USE_SMARTCARD
AM_CFLAGS += -DSMARTCARD
endif
if USE_CAPABILITIES
if USE_LIBCAP
pluto_LDADD += -lcap
endif