diff options
| author | Lars Wendler <polynomial-c@gentoo.org> | 2018-02-06 15:30:21 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2018-02-07 15:12:41 +0000 |
| commit | 3d4ab15670079aa8e898f80a650b3be941230486 (patch) | |
| tree | b218e2a866138db6e9fbdbbd9ba78e4cfeec54c0 /m4 | |
| parent | 8d35c34d5156aa14f2899c8cac74f845f278b635 (diff) | |
Change libseccomp logic to not be automagic only
Introduce --without-libseccomp configure option so that users can
disable seccomp even if libseccomp is available on the system.
The default is unchanged from before this patch. If no
--with(out)-libseccomp has been given on the command line, the macro
looks for presence of libseccomp and uses that if found.
* m4/man-libseccomp.m4: Guard pkg-config test with a command-line
option.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/man-libseccomp.m4 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/m4/man-libseccomp.m4 b/m4/man-libseccomp.m4 index a9377317..c90e3aa4 100644 --- a/m4/man-libseccomp.m4 +++ b/m4/man-libseccomp.m4 @@ -1,9 +1,18 @@ -# man-libseccomp.m4 serial 1 +# man-libseccomp.m4 serial 2 dnl MAN_LIBSECCOMP -dnl Check for the libseccomp library. +dnl Add a --without-libseccomp option; check for the libseccomp library. AC_DEFUN([MAN_LIBSECCOMP], -[PKG_CHECK_MODULES([libseccomp], [libseccomp], - [AC_DEFINE([HAVE_LIBSECCOMP], [1], - [Define to 1 if you have the `libseccomp' library.])], - [:]) + [AC_ARG_WITH([libseccomp], + [AS_HELP_STRING([--without-libseccomp], + [do not confine subprocesses using seccomp])], + [], + [with_libseccomp=check]) + if test "x$with_libseccomp" != "xno"; then + PKG_CHECK_MODULES([libseccomp], [libseccomp], + [AC_DEFINE([HAVE_LIBSECCOMP], [1], + [Define to 1 if you have the `libseccomp' library.])], + [if test "x$with_libseccomp" = "xyes"; then + AC_MSG_ERROR([--with-libseccomp given but cannot find libseccomp]) + fi]) + fi ]) # MAN_LIBSECCOMP |