Bug #6916: Build fix for non-Linux. (Matthieu Herrb)

This commit is contained in:
Adam Jackson 2006-05-15 17:53:59 +00:00
parent d654dde3e0
commit 7dfd0bee62
2 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2006-05-15 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
Bug #6916: Build fix for non-Linux. (Matthieu Herrb)
2006-05-12 Adam Jackson <ajax@freedesktop.org>
* configure.ac:

View file

@ -1054,11 +1054,11 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
XORG_OS_SUBDIR="linux"
XORG_OS_KBD="Lnx"
xorg_bus_linuxpci="yes"
AM_CONDITIONAL(LNXACPI,false)
linux_acpi="no"
case $host_cpu in
ia64*)
linux_ia64=yes
AM_CONDITIONAL(LNXACPI,true)
linux_acpi="yes"
;;
alpha*)
linux_alpha=yes
@ -1066,7 +1066,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
xorg_bus_linuxpci="no"
;;
x86*)
AM_CONDITIONAL(LNXACPI,true)
linux_acpi="yes"
;;
*)
;;
@ -1283,6 +1283,7 @@ AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])