* [PATCH] Add a configure option for SELinux support
@ 2017-01-13 8:02 Sergey Kvachonok
2017-01-13 19:05 ` Jaegeuk Kim
0 siblings, 1 reply; 2+ messages in thread
From: Sergey Kvachonok @ 2017-01-13 8:02 UTC (permalink / raw)
To: linux-f2fs-devel
./configure --without-selinux :: unconditionally disable SELinux support
./configure --with-selinux :: enable SELinux support and abort if
libselinux is not found
When no configure option is specified the current libselinux
autodetection behaviour is preserved.
Signed-off-by: Sergey Kvachonok <ravenexp@gmail.com>
---
configure.ac | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8781af1..b855afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,12 @@ AC_CHECK_HEADERS_ONCE([
sys/mount.h
])
+# Test configure options.
+AC_ARG_WITH([selinux],
+ AS_HELP_STRING([--without-selinux],
+ [Ignore presence of libselinux and disable selinux support])
+)
+
# Checks for programs.
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -54,9 +60,19 @@ AC_PATH_PROG([LDCONFIG], [ldconfig],
# Checks for libraries.
PKG_CHECK_MODULES([libuuid], [uuid])
-PKG_CHECK_MODULES([libselinux], [libselinux],
+
+AS_IF([test "x$with_selinux" != "xno"],
+ [PKG_CHECK_MODULES([libselinux], [libselinux],
+ [have_selinux=yes], [have_selinux=no])],
+ [have_selinux=no]
+)
+
+AS_IF([test "x$have_selinux" = "xyes"],
[AC_DEFINE([HAVE_LIBSELINUX], [1], [Use libselinux])],
- [AC_MSG_NOTICE([libselinux not found])])
+ [AS_IF([test "x$with_selinux" = "xyes"],
+ [AC_MSG_ERROR([selinux support requested but libselinux not found])]
+ )]
+)
# Checks for header files.
AC_CHECK_HEADERS([linux/fs.h linux/blkzoned.h fcntl.h mntent.h stdlib.h string.h \
--
2.11.0
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Add a configure option for SELinux support
2017-01-13 8:02 [PATCH] Add a configure option for SELinux support Sergey Kvachonok
@ 2017-01-13 19:05 ` Jaegeuk Kim
0 siblings, 0 replies; 2+ messages in thread
From: Jaegeuk Kim @ 2017-01-13 19:05 UTC (permalink / raw)
To: Sergey Kvachonok; +Cc: linux-f2fs-devel
Merged, thank you for the patch.
On 01/13, Sergey Kvachonok wrote:
> ./configure --without-selinux :: unconditionally disable SELinux support
>
> ./configure --with-selinux :: enable SELinux support and abort if
> libselinux is not found
>
> When no configure option is specified the current libselinux
> autodetection behaviour is preserved.
>
> Signed-off-by: Sergey Kvachonok <ravenexp@gmail.com>
> ---
> configure.ac | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 8781af1..b855afe 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -45,6 +45,12 @@ AC_CHECK_HEADERS_ONCE([
> sys/mount.h
> ])
>
> +# Test configure options.
> +AC_ARG_WITH([selinux],
> + AS_HELP_STRING([--without-selinux],
> + [Ignore presence of libselinux and disable selinux support])
> +)
> +
> # Checks for programs.
> AC_PROG_CC
> AC_PROG_LIBTOOL
> @@ -54,9 +60,19 @@ AC_PATH_PROG([LDCONFIG], [ldconfig],
>
> # Checks for libraries.
> PKG_CHECK_MODULES([libuuid], [uuid])
> -PKG_CHECK_MODULES([libselinux], [libselinux],
> +
> +AS_IF([test "x$with_selinux" != "xno"],
> + [PKG_CHECK_MODULES([libselinux], [libselinux],
> + [have_selinux=yes], [have_selinux=no])],
> + [have_selinux=no]
> +)
> +
> +AS_IF([test "x$have_selinux" = "xyes"],
> [AC_DEFINE([HAVE_LIBSELINUX], [1], [Use libselinux])],
> - [AC_MSG_NOTICE([libselinux not found])])
> + [AS_IF([test "x$with_selinux" = "xyes"],
> + [AC_MSG_ERROR([selinux support requested but libselinux not found])]
> + )]
> +)
>
> # Checks for header files.
> AC_CHECK_HEADERS([linux/fs.h linux/blkzoned.h fcntl.h mntent.h stdlib.h string.h \
> --
> 2.11.0
>
>
> ------------------------------------------------------------------------------
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-13 19:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-13 8:02 [PATCH] Add a configure option for SELinux support Sergey Kvachonok
2017-01-13 19:05 ` Jaegeuk Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).