1 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.

     2 # Use subject to license terms.

     3 #

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

     5 # copy of this software and associated documentation files (the

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

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

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

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

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

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

    12 # permission notice appear in supporting documentation.

    13 # 

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

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

    16 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

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

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

    19 # INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

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

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

    22 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

    23 # 

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

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

    26 # or other dealings in this Software without prior written authorization

    27 # of the copyright holder.

    28 

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

    30 --- configure.ac	2007-04-19 20:00:18.000000000 -0700

    31 +++ configure.ac	2007-06-15 17:45:43.059034000 -0700

    32 @@ -85,7 +85,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex

    33  

    34  # Checks for pkg-config packages

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

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

    37 +AC_ARG_WITH(xorg-sdk-dir,

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

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

    40 +            [sdkdir="$withval"],

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

    42  

    43  PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0], have_pciaccess=yes, have_pciaccess=no)

    44  AM_CONDITIONAL(HAVE_PCIACCESS, test "x$have_pciaccess" = xyes)