keyutils: handle non-linux platform

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/configure.ac b/configure.ac
index dc345f5cf970d96e61dcaa1422bab6d9d55a4fab..95156d467f5db3738fe94ba813c58619f6cea707 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -168,10 +168,14 @@ if test x"$resolv_libs" != "xok"; then
 fi
 AC_SUBST([RESOLV_LIBS])
 
+dnl check for libkeyutils on linux
+KEYUTILS_LIB=""
+AS_IF([test x"$linux" = x"yes"], [
+  AC_CHECK_LIB([keyutils], [add_key], [KEYUTILS_LIB="-lkeyutils"], [
+    AC_MSG_FAILURE([libkeyutils not found])])])
+AC_SUBST(KEYUTILS_LIB)
+
 AC_CHECK_LIB([m], [pow], [true], AC_MSG_FAILURE([libm not found]))
-if test x"$linux" = x"yes"; then
-       AC_CHECK_LIB([keyutils], [add_key], [true], AC_MSG_FAILURE([libkeyutils not found]))
-fi
 AC_CHECK_FUNCS([syncfs], AC_DEFINE([HAVE_SYS_SYNCFS], [1], [we have syncfs]), [])
 
 # Find some crypto library for us to use, while letting user to decide which one to use.

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 5e914f403e93fe1799bf4196133fdf9913e27486..f637efff767ee1d85ab23bc02042641f1cc40f2b 100644 (file)
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -116,7 +116,7 @@ AM_CCASFLAGS = -f elf64
 #####################
 ## library definitions and dependencies
 
-EXTRALIBS = -luuid -lm -lkeyutils
+EXTRALIBS = -luuid -lm $(KEYUTILS_LIB)
 if FREEBSD
 EXTRALIBS += -lexecinfo
 endif # FREEBSD

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index b8efc84ac9f2ed8eee0f25c6e6e652c4eae5eb6f..ec1f31e24ae41f928ecb34aa568d9669d1a9c091 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -112,7 +112,7 @@ noinst_HEADERS += \
 LIBCOMMON_DEPS += \
        $(LIBMSG) $(LIBAUTH) \
        $(LIBCRUSH) $(LIBJSON_SPIRIT) $(LIBLOG) $(LIBARCH) \
-       -lkeyutils
+       $(KEYUTILS_LIB)
 
 if LINUX
 LIBCOMMON_DEPS += -lrt