Index: configure.ac
===================================================================
RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
retrieving revision 1.195
diff -u -r1.195 configure.ac
--- configure.ac	9 May 2006 18:04:29 -0000	1.195
+++ configure.ac	14 May 2006 15:18:34 -0000
@@ -1053,11 +1053,11 @@
 		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
@@ -1065,7 +1065,7 @@
 			xorg_bus_linuxpci="no"
 			;;
 		  x86*)
-			AM_CONDITIONAL(LNXACPI,true)
+			linux_acpi="yes"
 			;;
 		  *)
 			;;
@@ -1282,6 +1282,7 @@
 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])