diff options
| author | Sven Joachim <svenjoac@gmx.de> | 2013-06-13 20:41:53 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-06-17 13:39:23 +0200 |
| commit | 779b8d44b5ff84b87b52600a2f010ac19cd396ad (patch) | |
| tree | 8f0c212b8921ff8b9a97ba2b1a998f04a3abc6fa | |
| parent | e96ae2b129df2a50d1d3839084df4fb1868d914d (diff) | |
Link against libdrm
The DDX uses symbols from libdrm but currently does not link against
it, but rather relies on indirect linkage from libdrm_nouveau. This
could lead to insufficient dependencies in distribution packages, seen
in http://bugs.debian.org/633786.
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6f7f870..b54b8cd 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) XORG_DRIVER_CHECK_EXT(DRI2, [dri2proto >= 2.6]) # Checks for pkg-config packages +PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.17]) PKG_CHECK_MODULES(LIBDRM_NOUVEAU, [libdrm_nouveau >= 2.4.25]) AC_SUBST(LIBDRM_NOUVEAU_CFLAGS) AC_SUBST(LIBDRM_NOUVEAU_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am index f54e135..5836ead 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,10 +23,10 @@ # -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@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ +AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @LIBDRM_NOUVEAU_CFLAGS@ @LIBDRM_CFLAGS@ nouveau_drv_la_LTLIBRARIES = nouveau_drv.la nouveau_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_NOUVEAU_LIBS@ \ - @LIBUDEV_LIBS@ + @LIBUDEV_LIBS@ @LIBDRM_LIBS@ nouveau_drv_ladir = @moduledir@/drivers nouveau_drv_la_SOURCES = \ |