fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-05-09 09:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libdrm: make libdrm_nouveau conditional, disabled by default

Browse source 
libdrm isn't supposed to ship APIs not present in a released kernel.
This commit is contained in:
Ben Skeggs 2009-02-11 14:18:03 +10:00
parent eb78c53aa1
commit 7e5c512104
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -42,6 +42,10 @@ AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev],
[Enable support for using udev instead of mknod (default: disabled)]),
[UDEV=$enableval], [UDEV=no])
AC_ARG_ENABLE(nouveau-experimental-api,
AS_HELP_STRING([--enable-nouveau-experimental-api],
[Enable support for nouveau's experimental API (default: disabled)]),
[NOUVEAU=$enableval], [NOUVEAU=no])
dnl ===========================================================================
dnl check compiler flags
@ -119,6 +123,11 @@ if test "x$UDEV" = xyes; then
AC_DEFINE(UDEV, 1, [Have UDEV support])
fi
if test "x$NOUVEAU" = xyes; then
NOUVEAU_SUBDIR="nouveau"
AC_SUBST(NOUVEAU_SUBDIR)
fi
PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])
if test "x$HAVE_CAIRO" = xyes; then
AC_DEFINE(HAVE_CAIRO, 1, [Have cairo support])

2
libdrm/Makefile.am
View file

@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = . intel nouveau
SUBDIRS = . intel @NOUVEAU_SUBDIR@
libdrm_la_LTLIBRARIES = libdrm.la
libdrm_ladir = $(libdir)