libX11: Changes to 'master'

[Alan Coopersmith]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 18d3c3e9de19e936281b111d5a82acfb3a3f552e
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Sat Nov 6 21:58:10 2010 +0000

    config: Check host string when deciding architecture to build for
    
    When checking for the OS/2 platform, $target_os is used. However, unless
    building a cross compiler, the $host* strings contain the platform
    details for the build system. See:
    
    http://www.gnu.org/software/automake/manual/automake.html#Cross_002dCompilation
    
    $host_os is already being used to determine the transport and threading
    options.
    
    Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit affc2488a7f2660a74dc8354fc3e0bff2c4f879c
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Sat Nov 6 21:58:09 2010 +0000

    config: Fix architecture check for OS/2 to skip nios2 cpu
    
    The OS/2 platform requires some utility functions as well as having a
    non-32 bit wchar_t. Fix the configure check so that it doesn't also
    affect the nios2 cpu, which wouldn't influence these operating system
    issues.
    
    Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
    Tested-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>