diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-08-16 18:07:49 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-08-25 19:46:55 -0700 |
| commit | af7e62a913c3c5b9639b4557b31537853f3f58bb (patch) | |
| tree | 313daa38e8d90da221b90d0b23b31bbf64d356a5 | |
| parent | 397f7c42cd775f1dbfced58bc1dfaead48e86440 (diff) | |
xfree86: Link libselinux with Xorg system libraries
Put the reference to -lselinux in XORG_SYS_LIBS so it isn't added as a
make dependency for libxorg.la. Otherwise, make goes looking for a file
-lselinux in the current directory, which it obviously won't find.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Justin P. Mattock <justinmattock@gmail.com>
(cherry picked from commit c73cd3b265c301b8a54ffe484d6c696f2abefb46)
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index fe7978ff9..b8a3385b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1239,7 +1239,7 @@ if test "x$XORG" = xyes; then XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" - XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $SELINUX_LIB" + XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB" PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) SAVE_LIBS=$LIBS @@ -1250,7 +1250,7 @@ if test "x$XORG" = xyes; then AC_CHECK_FUNCS([pci_device_enable]) LIBS=$SAVE_LIBS CFLAGS=$SAVE_CFLAGS - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS" + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB" XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" case $host_os in |