xserver mesa xkbcomp git update 7 nov 2012

xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834

1 files changed, 49 insertions, 49 deletions

diff --git a/xorg-server/xorg-server.m4 b/xorg-server/xorg-server.m4
index 80d6da01e..18255b91a 100644
--- a/xorg-server/xorg-server.m4
+++ b/xorg-server/xorg-server.m4
@@ -1,49 +1,49 @@
-dnl Copyright 2005 Red Hat, Inc

-dnl 

-dnl Permission to use, copy, modify, distribute, and sell this software and its

-dnl documentation for any purpose is hereby granted without fee, provided that

-dnl the above copyright notice appear in all copies and that both that

-dnl copyright notice and this permission notice appear in supporting

-dnl documentation.

-dnl 

-dnl The above copyright notice and this permission notice shall be included

-dnl in all copies or substantial portions of the Software.

-dnl 

-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

-dnl OTHER DEALINGS IN THE SOFTWARE.

-dnl 

-dnl Except as contained in this notice, the name of the copyright holders shall

-dnl not be used in advertising or otherwise to promote the sale, use or

-dnl other dealings in this Software without prior written authorization

-dnl from the copyright holders.

-dnl 

-

-# XORG_DRIVER_CHECK_EXT()

-# --------------------------

-# Checks for the $1 define in xorg-server.h (from the sdk).  If it

-# is defined, then add $1 to $REQUIRED_MODULES.

-

-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[

-	AC_REQUIRE([PKG_PROG_PKG_CONFIG])

-	SAVE_CFLAGS="$CFLAGS"

-	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"

-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

-#include "xorg-server.h"

-#if !defined $1

-#error $1 not defined

-#endif

-		]])],

-		[_EXT_CHECK=yes],

-		[_EXT_CHECK=no])

-	CFLAGS="$SAVE_CFLAGS"

-	AC_MSG_CHECKING([if $1 is defined])

-	AC_MSG_RESULT([$_EXT_CHECK])

-	if test "$_EXT_CHECK" != no; then

-		REQUIRED_MODULES="$REQUIRED_MODULES $2"

-	fi

-])

+dnl Copyright 2005 Red Hat, Inc
+dnl 
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation.
+dnl 
+dnl The above copyright notice and this permission notice shall be included
+dnl in all copies or substantial portions of the Software.
+dnl 
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+dnl OTHER DEALINGS IN THE SOFTWARE.
+dnl 
+dnl Except as contained in this notice, the name of the copyright holders shall
+dnl not be used in advertising or otherwise to promote the sale, use or
+dnl other dealings in this Software without prior written authorization
+dnl from the copyright holders.
+dnl 
+
+# XORG_DRIVER_CHECK_EXT(MACRO, PROTO)
+# --------------------------
+# Checks for the MACRO define in xorg-server.h (from the sdk).  If it
+# is defined, then add the given PROTO to $REQUIRED_MODULES.
+
+AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include "xorg-server.h"
+#if !defined $1
+#error $1 not defined
+#endif
+		]])],
+		[_EXT_CHECK=yes],
+		[_EXT_CHECK=no])
+	CFLAGS="$SAVE_CFLAGS"
+	AC_MSG_CHECKING([if $1 is defined])
+	AC_MSG_RESULT([$_EXT_CHECK])
+	if test "$_EXT_CHECK" != no; then
+		REQUIRED_MODULES="$REQUIRED_MODULES $2"
+	fi
+])