build-dri.patch revision 567
567N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
567N/A# Use subject to license terms.
567N/A#
567N/A# Permission is hereby granted, free of charge, to any person obtaining a
567N/A# copy of this software and associated documentation files (the
567N/A# "Software"), to deal in the Software without restriction, including
567N/A# without limitation the rights to use, copy, modify, merge, publish,
567N/A# distribute, and/or sell copies of the Software, and to permit persons
567N/A# to whom the Software is furnished to do so, provided that the above
567N/A# copyright notice(s) and this permission notice appear in all copies of
567N/A# the Software and that both the above copyright notice(s) and this
567N/A# permission notice appear in supporting documentation.
567N/A#
567N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
567N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
567N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
567N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
567N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
567N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
567N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
567N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
567N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
567N/A#
567N/A# Except as contained in this notice, the name of a copyright holder
567N/A# shall not be used in advertising or otherwise to promote the sale, use
567N/A# or other dealings in this Software without prior written authorization
567N/A# of the copyright holder.
567N/A
567N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac
567N/A--- configure.ac 2007-04-19 20:00:18.000000000 -0700
567N/A+++ configure.ac 2007-06-15 17:45:43.059034000 -0700
567N/A@@ -85,7 +85,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
567N/A
567N/A # Checks for pkg-config packages
567N/A PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES])
567N/A-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
567N/A+AC_ARG_WITH(xorg-sdk-dir,
567N/A+ AC_HELP_STRING([--with-xorg-sdk-dir=DIR],
567N/A+ [Default xorg sdk include directory [[default is taken from pkgconfig]]]),
567N/A+ [sdkdir="$withval"],
567N/A+ [sdkdir=$(pkg-config --variable=sdkdir xorg-server)])
567N/A
567N/A PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0], have_pciaccess=yes, have_pciaccess=no)
567N/A AM_CONDITIONAL(HAVE_PCIACCESS, test "x$have_pciaccess" = xyes)