# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

# Use subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

#

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

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

diff -urp -x '*~' -x '*.orig' configure.ac configure.ac

--- configure.ac 2009-01-21 11:55:53.000000000 -0800

+++ configure.ac 2009-05-08 20:47:52.030497000 -0700

@@ -37,7 +37,7 @@ AM_MAINTAINER_MODE

# Checks for programs.

AC_DISABLE_STATIC

AC_PROG_LIBTOOL

-DOLT

+#DOLT

AC_PROG_CC

AM_PROG_CC_C_O

@@ -84,9 +84,14 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex

# Checks for pkg-config packages

PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])

-PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no])

+PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=no], [BUILD_UXA=no])

+

+AC_ARG_WITH(xorg-sdk-dir,

+ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],

+ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),

+ [sdkdir="$withval"],

+ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])

-sdkdir=$(pkg-config --variable=sdkdir xorg-server)

drm_cflags=$(pkg-config --cflags libdrm)

# Checks for libraries.

@@ -222,7 +227,7 @@ fi

dnl exaGetPixmapDriverPrivate required for DRM_MODE.

PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5],

- [DRM_MODE=yes], [DRM_MODE=no])

+ [DRM_MODE=no], [DRM_MODE=no])

if test "x$DRM_MODE" = xyes; then

AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])

fi