25 # shall not be used in advertising or otherwise to promote the sale, use |
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 |
26 # or other dealings in this Software without prior written authorization |
27 # of the copyright holder. |
27 # of the copyright holder. |
28 |
28 |
29 diff -urp -x '*~' -x '*.orig' configure.ac configure.ac |
29 diff -urp -x '*~' -x '*.orig' configure.ac configure.ac |
30 --- configure.ac 2008-08-25 18:28:31.000000000 -0700 |
30 --- configure.ac 2009-01-21 11:55:53.000000000 -0800 |
31 +++ configure.ac 2009-01-10 20:01:38.516058000 -0800 |
31 +++ configure.ac 2009-05-08 20:47:52.030497000 -0700 |
32 @@ -37,7 +37,7 @@ AM_MAINTAINER_MODE |
32 @@ -37,7 +37,7 @@ AM_MAINTAINER_MODE |
33 # Checks for programs. |
33 # Checks for programs. |
34 AC_DISABLE_STATIC |
34 AC_DISABLE_STATIC |
35 AC_PROG_LIBTOOL |
35 AC_PROG_LIBTOOL |
36 -DOLT |
36 -DOLT |
37 +#DOLT |
37 +#DOLT |
38 AC_PROG_CC |
38 AC_PROG_CC |
39 AM_PROG_CC_C_O |
39 AM_PROG_CC_C_O |
40 |
40 |
41 @@ -84,7 +84,11 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex |
41 @@ -84,9 +84,14 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex |
42 |
42 |
43 # Checks for pkg-config packages |
43 # Checks for pkg-config packages |
44 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) |
44 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) |
|
45 -PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=yes], [BUILD_UXA=no]) |
|
46 +PKG_CHECK_MODULES(UXA, [xorg-server >= 1.5], [BUILD_UXA=no], [BUILD_UXA=no]) |
|
47 + |
|
48 +AC_ARG_WITH(xorg-sdk-dir, |
|
49 + AC_HELP_STRING([--with-xorg-sdk-dir=DIR], |
|
50 + [Default xorg sdk include directory [[default is taken from pkgconfig]]]), |
|
51 + [sdkdir="$withval"], |
|
52 + [sdkdir=$(pkg-config --variable=sdkdir xorg-server)]) |
|
53 |
45 -sdkdir=$(pkg-config --variable=sdkdir xorg-server) |
54 -sdkdir=$(pkg-config --variable=sdkdir xorg-server) |
46 +AC_ARG_WITH(xorg-sdk-dir, |
55 drm_cflags=$(pkg-config --cflags libdrm) |
47 + AC_HELP_STRING([--with-xorg-sdk-dir=DIR], |
|
48 + [Default xorg sdk include directory [[default is taken from pkgconfig]]]), |
|
49 + [sdkdir="$withval"], |
|
50 + [sdkdir=$(pkg-config --variable=sdkdir xorg-server)]) |
|
51 |
56 |
52 # Checks for libraries. |
57 # Checks for libraries. |
|
58 @@ -222,7 +227,7 @@ fi |
53 |
59 |
|
60 dnl exaGetPixmapDriverPrivate required for DRM_MODE. |
|
61 PKG_CHECK_MODULES(DRM_MODE, [xorg-server >= 1.5], |
|
62 - [DRM_MODE=yes], [DRM_MODE=no]) |
|
63 + [DRM_MODE=no], [DRM_MODE=no]) |
|
64 if test "x$DRM_MODE" = xyes; then |
|
65 AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting]) |
|
66 fi |