[RFC PATCH:xf86-video-mach64 12/15] Link with modules needed to build with no-undefined linking

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 configure.ac    |    2 +-
 src/Makefile.am |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2b2d41a..d20068f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto pciaccess pixman-1 $REQUIRED_MODULES])
 PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
                   HAVE_XEXTPROTO_71="no")
diff --git a/src/Makefile.am b/src/Makefile.am
index 7331cb1..7c7aec0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@
 
 if DRI
 ATIMISC_DRI_SRCS = atidri.c
+ATIMISC_DRI_LIBS = $(DRI_LIBS) -L$(moduledir)/extensions -ldri -lglx
 endif
 
 if ATIMISC_CPIO
@@ -40,12 +41,16 @@ endif
 
 if USE_EXA
 ATIMISC_EXA_SOURCES = atimach64exa.c
+ATIMISC_EXA_LIBS = -lexa
 endif
 
 AM_CFLAGS = $(CWARNFLAGS) @XORG_CFLAGS@ @DRI_CFLAGS@
 
 mach64_drv_la_LTLIBRARIES = mach64_drv.la
 mach64_drv_la_LDFLAGS = -module -avoid-version
+mach64_drv_la_LIBADD = $(XORG_LIBS) $(PCIACCESS_LIBS) $(PIXMAN_LIBS)
+mach64_drv_la_LIBADD += -L$(moduledir) -lxaa -lfb -lshadowfb -lvbe -lint10
+mach64_drv_la_LIBADD += $(ATIMISC_DRI_LIBS) $(ATIMISC_EXA_LIBS)
 mach64_drv_ladir = @moduledir@/drivers
 mach64_drv_la_SOURCES = \
 	atibus.c atichip.c atiprobe.c atividmem.c \
-- 
1.7.9.2