From: Tobias Brunner Date: Tue, 15 Jun 2010 17:10:23 +0000 (+0200) Subject: Explicitly refer to LIBCAP in Makefiles. X-Git-Tag: 4.4.1~160 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b77e493bea02ab675241c9f1a31456c21259c3ce;p=thirdparty%2Fstrongswan.git Explicitly refer to LIBCAP in Makefiles. --- diff --git a/configure.in b/configure.in index b164b06862..7589c30b39 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am index 2616b8b35e..108609f616 100644 --- a/src/libcharon/Makefile.am +++ b/src/libcharon/Makefile.am @@ -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 diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am index 098f09c579..9f631ca28b 100644 --- a/src/pluto/Makefile.am +++ b/src/pluto/Makefile.am @@ -121,7 +121,7 @@ if USE_SMARTCARD AM_CFLAGS += -DSMARTCARD endif -if USE_CAPABILITIES +if USE_LIBCAP pluto_LDADD += -lcap endif