diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-05-04 18:39:10 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-05-04 18:39:10 +0200 |
| commit | 4f881efe2ec8ae4def01014f9acf7400e93a807f (patch) | |
| tree | dcf36c004bb698d94e5d9652a547f29bf5643771 | |
| parent | 330e87f2a5c26aedc9b8f204a7e713f0a3aa3773 (diff) | |
Remove DRI remnants from build system
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 1 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 5a10b35..10cd570 100644 --- a/configure.ac +++ b/configure.ac @@ -53,11 +53,6 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), - [DRI="$enableval"], - [DRI=auto]) - # Checks for extensions XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) @@ -72,37 +67,8 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC -if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -fi - -AC_MSG_CHECKING([whether to include DRI support]) -if test x$DRI = xauto; then - if test "$have_dri_h" = yes -a \ - "$have_sarea_h" = yes -a \ - "$have_dristruct_h" = yes; then - DRI="yes" - else - DRI="no" - fi -fi -AC_MSG_RESULT([$DRI]) - -AM_CONDITIONAL(DRI, test x$DRI = xyes) -if test "$DRI" = yes; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) - AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) -fi - AM_CONDITIONAL(SPARC, test x$SPARC = xyes) -AC_SUBST([DRI_CFLAGS]) AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) diff --git a/src/Makefile.am b/src/Makefile.am index 3e10f3a..198aac1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ sunffb_drv_la_LTLIBRARIES = sunffb_drv.la sunffb_drv_la_LDFLAGS = -module -avoid-version sunffb_drv_ladir = @moduledir@/drivers |