configure.ac: fix code misplacing for KDRIVE_{KBD, MOUSE, EVDEV} auto-detection
KDrive input drivers "kbd", "mouse", and "evdev" should be automatically built for linux systems. However, due to a code misplacing in configure.ac, the auto-detection test is being performed AFTER the corresponding AC_DEFINEs' calls, so that the drivers are NOT being built, regardless the test result. This bug should be affecting previous xorg-server releases. Please consider backporting this patch to all maintained ones! Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
f4c3cac010
commit
8c86dd5160
53
configure.ac
53
configure.ac
@ -2337,6 +2337,33 @@ if test "$KDRIVE" = yes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
case $host_os in
|
||||
*linux*)
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
|
||||
KDRIVELINUX=yes
|
||||
if test "x$KDRIVE_EVDEV" = xauto; then
|
||||
KDRIVE_EVDEV=yes
|
||||
fi
|
||||
if test "x$KDRIVE_KBD" = xauto; then
|
||||
KDRIVE_KBD=yes
|
||||
fi
|
||||
if test "x$KDRIVE_MOUSE" = xauto; then
|
||||
KDRIVE_MOUSE=yes
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if test "x$KDRIVE_EVDEV" = xauto; then
|
||||
KDRIVE_EVDEV=no
|
||||
fi
|
||||
if test "x$KDRIVE_KBD" = xauto; then
|
||||
KDRIVE_KBD=no
|
||||
fi
|
||||
if test "x$KDRIVE_MOUSE" = xauto; then
|
||||
KDRIVE_MOUSE=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "x$KDRIVE_KBD" = xyes; then
|
||||
AC_DEFINE(KDRIVE_KBD, 1, [Enable KDrive kbd driver])
|
||||
fi
|
||||
@ -2378,32 +2405,6 @@ if test "$KDRIVE" = yes; then
|
||||
|
||||
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
|
||||
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
|
||||
case $host_os in
|
||||
*linux*)
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
|
||||
KDRIVELINUX=yes
|
||||
if test "x$KDRIVE_EVDEV" = xauto; then
|
||||
KDRIVE_EVDEV=yes
|
||||
fi
|
||||
if test "x$KDRIVE_KBD" = xauto; then
|
||||
KDRIVE_KBD=yes
|
||||
fi
|
||||
if test "x$KDRIVE_MOUSE" = xauto; then
|
||||
KDRIVE_MOUSE=yes
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if test "x$KDRIVE_EVDEV" = xauto; then
|
||||
KDRIVE_EVDEV=no
|
||||
fi
|
||||
if test "x$KDRIVE_KBD" = xauto; then
|
||||
KDRIVE_KBD=no
|
||||
fi
|
||||
if test "x$KDRIVE_MOUSE" = xauto; then
|
||||
KDRIVE_MOUSE=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
KDRIVE_MAIN_LIB="$MAIN_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB"
|
||||
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
|
||||
|
Loading…
Reference in New Issue
Block a user