[PATCH] config/APM: Add option to disable building of APM support on Linux

[Keith Packard]

Egbert Eich <eich at freedesktop.org> writes:

>     APM support in the Xserver was used to restore the console mode
>     prior to a power management event. This was to ensure the mode
>     upon suspend/resume was one that the system firmware or kernel
>     could deal with.
>     APM support is now largely obsolete, KMS drivers don't require a
>     mode restoration anyhow. Therefore it should be possible to disable
>     this feature.
>
> Signed-off-by: Egbert Eich <eich at freedesktop.org>

Tested-by: Keith Packard <keithp at keithp.com>
Acked-by: Keith Packard <keithp at keithp.com>

> ---
>  configure.ac | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 715840d..2ad1af5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -228,10 +228,6 @@ dnl AGPGART headers
>  AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
>  AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
>  
> -dnl APM header
> -AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)
> -AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])
> -
>  dnl fbdev header
>  AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)
>  AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])
> @@ -636,6 +632,7 @@ AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with
>  AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
>  AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
>  AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes])
> +AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes])
>  
>  dnl DDXes.
>  AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
> @@ -1718,6 +1715,8 @@ if test "x$XORG" = xyes; then
>  		  *)
>  			;;
>  		esac
> +		dnl APM header
> +		AC_CHECK_HEADERS([linux/apm_bios.h], [linux_apm=$enable_linux_apm])
>  		;;
>  	  freebsd* | kfreebsd*-gnu | dragonfly*)
>  		XORG_OS_SUBDIR="bsd"
> @@ -1880,6 +1879,7 @@ AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
>  AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
>  AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
>  AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
> +AM_CONDITIONAL(LNXAPM, [test "x$linux_apm" = xyes])
>  AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
>  AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
>  AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
> -- 
> 1.8.1.4
>

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130909/3570a09a/attachment.pgp>