libX11: Changes to 'master'

[Alan Coopersmith]

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

New commits:
commit 94b45db93058cffa25598fe27dd3e385ace9d305
Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Thu Jan 14 08:04:28 2010 -0800

    Fix configure.ac PKG_ macro calls
    
    If the first call to PKG_CHECK_MODULES() may not be called during execution
    which is the case here since its inside a case statement, call
    PKG_PROG_PKG_CONFIG() to ensure things worked correctly.
    
    Fixes a configure failure introduced by commit
    87529c039050ce3336ff9ce00f1b5a21d15690da when xcb is enabled.
    
    http://bugs.freedesktop.org/show_bug.cgi?id=26041
    
    Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

commit df559d8bc2238a2c369152fcb06e5b5ab132a5dc
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Jan 12 09:18:15 2010 -0800

    Raise xorg-macros requirement to 1.4
    
    Needed since the changes in 464390f16d7ed4aa5bf80f89863ba92273075ec2
    depend on the INSTALL file delivered in xorg-macros 1.4
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>