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 /hw/xfree86/loader | |
| 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 'hw/xfree86/loader')
| -rw-r--r-- | hw/xfree86/loader/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index ebe0c813a..660504202 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libloader.la INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \ -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \ - -I$(srcdir)/../ramdac + -I$(srcdir)/../ramdac -I$(srcdir)/../dri #AM_LDFLAGS = -r AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 1ec4ff00b..1ef8791f3 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -836,6 +836,7 @@ static const char *compiled_in_modules[] = { "dbe", "record", "extmod", + "dri", NULL }; |