xserver: Branch 'master'

[Keith Packard]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fd976e4051e15ab2d01ec0bf89ff26926d4ed04e
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Dec 1 16:24:12 2011 -0500

    config: conftest needs an include directive to locate X11/Xfuncproto.h
    
    The compiler option -fvisibility=hidden is erroneously missing
    due to a faulty configuration test. The gcc command is unable to
    locate X11/Xfuncproto.h unless the build occurs on a
    system where X11 development headers are installed.
    
    configure:21294: checking for symbol visibility support
    configure:21323: gcc -std=gnu99 -c -g -O2 -fvisibility=hidden  conftest.c >&5
    conftest.c:144:28: fatal error: X11/Xfuncproto.h: No such file or directory
    
    The solution is to add an include directive to obtain the location
    of X11/Xfuncproto.h which may or may not be the system installed headers.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index e4fcba4..3d5414f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1558,7 +1558,8 @@ if test "x$XORG" = xyes; then
 	    fi
 	    if test x$have_visibility != xno; then
 		save_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+		proto_inc=`$PKG_CONFIG --cflags xproto`
+		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS $proto_inc"
 		AC_TRY_COMPILE(
 		    [#include <X11/Xfuncproto.h>
 		     extern _X_HIDDEN int hidden_int;