[PATCH 2/2] configure: move SELINUX_LIBS to XSERVER_SYS_LIBS
Dan Nicholson
dbn.lists at gmail.com
Fri Feb 26 05:57:04 PST 2010
On Thu, Feb 25, 2010 at 5:44 PM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> All ddxs require linking against selinux if enabled.
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> configure.ac | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 7d6944d..0579551 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1432,7 +1432,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
> #
> XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
> XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
> -XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
> +XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SELINUX_LIBS}"
> AC_SUBST([XSERVER_LIBS])
> AC_SUBST([XSERVER_SYS_LIBS])
>
> @@ -1580,7 +1580,7 @@ if test "x$XORG" = xyes; then
> AC_CHECK_FUNCS([pci_device_vgaarb_init])
> LIBS=$SAVE_LIBS
> CFLAGS=$SAVE_CFLAGS
> - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIBS"
> + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"
> XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
>
> case $host_os in
Looking at this patch reminds me how absolutely messy this whole setup is.
This actually doesn't change the status quo, but why aren't we using
SELINUX_CFLAGS? I'm guessing it should go in XSERVER_CFLAGS since
there oddly isn't a XSERVER_SYS_CFLAGS to balance the _LIBS one.
Anyway, this should patch get things working again.
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
More information about the xorg-devel
mailing list