[PATCH] configure.ac: Remove unreachable check for VM86 headers.

[Gaetan Nadon]

On Wed, 2011-09-14 at 10:07 -0500, Jamey Sharp wrote:

> "configure --with-int10=yes" is not a valid configuration, and the check

It depends what is the definition of "valid" in this context. Running
"./configure --with-int10" will set "INT10" to "yes". You may choose to
ignore this value. I can only guess that current code checked for "yes"
as a means to provide a default value when no backend was specified.

        --with-int10=BACKEND    int10 backend: vm86, x86emu or stub
        
> for sys/vm86.h and sys/io.h is not used. Delete it.

I agree with ignoring "yes". I don't recall any other module using it in
that way. Just be prepared in the case where someone did use it. It's
not really dead code, but close enough.

The default value is either x86emu or stub for FreeBSD on a PowerPC. Any
unrecognized value (such as yes, no or vn86) will not build any int10
backend. No warnings or errors. Hopefully the builder will have some way
of finding out why it does not work. The library builds with just the
common code.

Suggestion:

        AS_HELP_STRING([--with-int10=BACKEND], [vm86, x86emu or stub (default:auto)]),
        
        AC_MSG_ERROR if no valid value is given
        
        Verify if there is a need to check for the headers. The code as
        it is was probably the result of changes around it rather than
        the intention of the developer.



> 
> Signed-off-by: Jamey Sharp <jamey at minilop.net>
> ---
>  configure.ac            |    4 ----
>  include/dix-config.h.in |    6 ------
>  2 files changed, 0 insertions(+), 10 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 93cd6a9..06cf9bf 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -702,10 +702,6 @@ AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])
>  AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])
>  AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])
>  AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])
> -if test "x$INT10" = xyes; then
> -	dnl VM86 headers
> -	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
> -fi
>  
>  dnl Handle installing libxf86config
>  AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
> diff --git a/include/dix-config.h.in b/include/dix-config.h.in
> index 4710ef8..5facb11 100644
> --- a/include/dix-config.h.in
> +++ b/include/dix-config.h.in
> @@ -209,9 +209,6 @@
>     */
>  #undef HAVE_SYS_DIR_H
>  
> -/* Define to 1 if you have the <sys/io.h> header file. */
> -#undef HAVE_SYS_IO_H
> -
>  /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
>     */
>  #undef HAVE_SYS_NDIR_H
> @@ -225,9 +222,6 @@
>  /* Define to 1 if you have the <sys/utsname.h> header file. */
>  #undef HAVE_SYS_UTSNAME_H
>  
> -/* Define to 1 if you have the <sys/vm86.h> header file. */
> -#undef HAVE_SYS_VM86_H
> -
>  /* Define to 1 if you have the <tslib.h> header file. */
>  #undef HAVE_TSLIB_H
>  


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/9fbb8864/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/9fbb8864/attachment.pgp>