diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:15 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:30:40 -0700 |
| commit | 459c6da0f907ba33d733c7e62a116184ba2f14e5 (patch) | |
| tree | e262554b4119e2ffc272c8ab0f2d7e7ea641cc5e /glx | |
| parent | b905d87ba0a9b045ea41bb1ad36a4f9f1170a1b8 (diff) | |
Move DRI1 from external module to built-in
Rather than building the tiny amount of code required for XFree86-DRI as
an external module, build it in if it's enabled at configure time.
v2: Fix test/Makefile.am to only link libdri.la if DRI is set
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
fixup for DRI1 move
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/glx/Makefile.am b/glx/Makefile.am index ced78b76a..591c4ac66 100644 --- a/glx/Makefile.am +++ b/glx/Makefile.am @@ -7,10 +7,8 @@ noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY) AM_CFLAGS = \ @DIX_CFLAGS@ \ @GL_CFLAGS@ \ - @DRI_CFLAGS@ \ @XLIB_CFLAGS@ \ @LIBDRM_CFLAGS@ \ - @DRIPROTO_CFLAGS@ \ @GLX_DEFINES@ \ @GLX_ARCH_DEFINES@ |