Add --with-libcap option

* configure.ac: Add --with-libcap option.
* Makefile.am (libelogind_shared_la_LDFLAGS): Add CAP_LDFLAGS.

diff --git a/Makefile.am b/Makefile.am
index bb4885d478b7d48b672651d3f413190760696b09..84e15e9e520a58f4f94b34f3d389f25ff4e86362 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -503,6 +503,9 @@ libelogind_shared_la_LIBADD = \
        $(CAP_LIBS) \
        -lm
 
        $(CAP_LIBS) \
        -lm
 

+libelogind_shared_la_LDFLAGS = \
+       $(CAP_LDFLAGS)
+

 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \

diff --git a/configure.ac b/configure.ac
index 54b533004fe73055dc56775f79b878912e775296..16e03437027730dbd3a1a263e110380172315440 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -234,11 +234,18 @@ AC_CHECK_HEADERS([linux/memfd.h], [], [])
 # unconditionally pull-in librt with old glibc versions
 AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
 
 # unconditionally pull-in librt with old glibc versions
 AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
 

+AC_ARG_WITH([libcap],
+            AS_HELP_STRING([--with-libcap=DIR], [Prefix for libcap]),
+            [CAP_LDFLAGS="-L$with_libcap/lib"],
+            [CAP_LDFLAGS=""])

 save_LIBS="$LIBS"
 LIBS=
 save_LIBS="$LIBS"
 LIBS=

+LDFLAGS="$LDFLAGS $CAP_LDFLAGS"

 AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
 CAP_LIBS="$LIBS"
 AC_SUBST(CAP_LIBS)
 AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
 CAP_LIBS="$LIBS"
 AC_SUBST(CAP_LIBS)

+AC_SUBST(CAP_LDFLAGS)
+LDFLAGS="$save_LDFLAGS"

 
 AC_CHECK_FUNCS([memfd_create])
 AC_CHECK_FUNCS([__secure_getenv secure_getenv])
 
 AC_CHECK_FUNCS([memfd_create])
 AC_CHECK_FUNCS([__secure_getenv secure_getenv])