From 947a2e26e4217531e612a5110e6f95296c94614f Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Thu, 24 Jan 2008 16:02:34 -0500 Subject: [PATCH] Add SELinux extension support, disabled by default. --- Makefile.am | 3 +++ configure.ac | 4 +++- src/.gitignore | 1 + src/Makefile.am | 10 ++++++++++ xcb-xselinux.pc.in | 11 +++++++++++ 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 xcb-xselinux.pc.in diff --git a/Makefile.am b/Makefile.am index a18ef5d..2bf2d0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,9 @@ endif if BUILD_XPRINT pkgconfig_DATA += xcb-xprint.pc endif +if BUILD_SELINUX +pkgconfig_DATA += xcb-xselinux.pc +endif if BUILD_XTEST pkgconfig_DATA += xcb-xtest.pc endif diff --git a/configure.ac b/configure.ac index d411620..2fd3887 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,8 @@ AC_ARG_ENABLE(xinput, AS_HELP_STRING([--enable-xinput], [Build XCB XInput Extens AM_CONDITIONAL(BUILD_XINPUT, [test "x$BUILD_XINPUT" = xyes]) AC_ARG_ENABLE(xprint, AS_HELP_STRING([--enable-xprint], [Build XCB Xprint Extension (default: yes)]), [BUILD_XPRINT=$enableval], [BUILD_XPRINT=yes]) AM_CONDITIONAL(BUILD_XPRINT, [test "x$BUILD_XPRINT" = xyes]) +AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--enable-xselinux], [Build XCB SELinux Extension (default: no)]), [BUILD_SELINUX=$enableval], [BUILD_SELINUX=no]) +AM_CONDITIONAL(BUILD_SELINUX, [test "x$BUILD_SELINUX" = xyes]) AC_ARG_ENABLE(xtest, AS_HELP_STRING([--enable-xtest], [Build XCB XTEST Extension (default: yes)]), [BUILD_XTEST=$enableval], [BUILD_XTEST=yes]) AM_CONDITIONAL(BUILD_XTEST, [test "x$BUILD_XTEST" = xyes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv], [Build XCB Xv Extension (default: yes)]), [BUILD_XV=$enableval], [BUILD_XV=yes]) @@ -131,7 +133,7 @@ AM_CONDITIONAL(BUILD_XVMC, [test "x$BUILD_XVMC" = xyes]) AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile]) -AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xinput.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc]) +AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xinput.pc xcb-xprint.pc xcb-xselinux.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc]) AC_CONFIG_FILES([doc/xcb.doxygen]) AC_OUTPUT diff --git a/src/.gitignore b/src/.gitignore index 2793eb7..86d9b9c 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -18,6 +18,7 @@ xfixes.* xinerama.* xinput.* xprint.* +xselinux.* xtest.* xv.* xvmc.* diff --git a/src/Makefile.am b/src/Makefile.am index c4f6880..ae7f511 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -215,6 +215,16 @@ libxcb_xprint_la_LIBADD = $(XCB_LIBS) libxcb_xprint_la_SOURCES = xprint.c xprint.h endif +if BUILD_SELINUX +lib_LTLIBRARIES += libxcb-xselinux.la +EXTHEADERS += xselinux.h +EXTSOURCES += xselinux.c +EXTENSION_XML += xselinux.xml +libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 +libxcb_xselinux_la_LIBADD = $(XCB_LIBS) +libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h +endif + if BUILD_XTEST lib_LTLIBRARIES += libxcb-xtest.la EXTHEADERS += xtest.h diff --git a/xcb-xselinux.pc.in b/xcb-xselinux.pc.in new file mode 100644 index 0000000..6a71f73 --- /dev/null +++ b/xcb-xselinux.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCB SELinux +Description: XCB SELinux Extension +Version: @PACKAGE_VERSION@ +Requires: xcb +Libs: -L${libdir} -lxcb-xselinux +Cflags: -I${includedir} -- 2.34.1