diff options
| author | Kusanagi Kouichi <[email protected]> | 2014-02-15 11:53:00 +0900 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-02-17 21:14:16 +0000 |
| commit | 6ba4392da265b0b33e3516e85b2fdcfa9c169c39 (patch) | |
| tree | c43566de942fb35bcb1556b47b1722938ae2035d | |
| parent | 61f6cddef72a49d87e2b31ed49cdbc941d3b1efc (diff) | |
configure: Try pkg-config first for libselinux
v2 (Emil) Add SELINUX_CFLAGS in the respective locations
Signed-off-by: Kusanagi Kouichi <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]> (v1)
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/mapi/glapi/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mapi/vgapi/Makefile.am | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e3a72bdc9ac..d839476827c 100644 --- a/configure.ac +++ b/configure.ac @@ -506,13 +506,15 @@ AC_ARG_ENABLE([selinux], [MESA_SELINUX="$enableval"], [MESA_SELINUX=no]) if test "x$enable_selinux" = "xyes"; then - AC_CHECK_HEADER([selinux/selinux.h],[], - [AC_MSG_ERROR([SELinux headers not found])]) - AC_CHECK_LIB([selinux],[is_selinux_enabled],[], - [AC_MSG_ERROR([SELinux library not found])]) - SELINUX_LIBS="-lselinux" + PKG_CHECK_MODULES([SELINUX], [libselinux], [], + [AC_CHECK_HEADER([selinux/selinux.h],[], + [AC_MSG_ERROR([SELinux headers not found])]) + AC_CHECK_LIB([selinux],[is_selinux_enabled],[], + [AC_MSG_ERROR([SELinux library not found])]) + SELINUX_LIBS="-lselinux"]) DEFINES="$DEFINES -DMESA_SELINUX" fi +AC_SUBST([SELINUX_CFLAGS]) AC_SUBST([SELINUX_LIBS]) dnl Options for APIs diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am index bf653a30543..e425baceacf 100644 --- a/src/mapi/glapi/Makefile.am +++ b/src/mapi/glapi/Makefile.am @@ -27,6 +27,7 @@ include ../Makefile.sources AM_CPPFLAGS = \ $(DEFINES) \ + $(SELINUX_CFLAGS) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_builddir)/src/mapi \ diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am index b4703be010d..8d8b4dd783c 100644 --- a/src/mapi/shared-glapi/Makefile.am +++ b/src/mapi/shared-glapi/Makefile.am @@ -21,6 +21,7 @@ CLEANFILES = $(BUILT_SOURCES) AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ $(DEFINES) \ + $(SELINUX_CFLAGS) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_builddir)/src/mapi \ diff --git a/src/mapi/vgapi/Makefile.am b/src/mapi/vgapi/Makefile.am index 8952df01af3..197f19f7d95 100644 --- a/src/mapi/vgapi/Makefile.am +++ b/src/mapi/vgapi/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = \ $(DEFINES) \ + $(SELINUX_CFLAGS) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -DMAPI_ABI_HEADER=\"vgapi_tmp.h\" |