From 33243ae971db90477a29dfb0e51cc00c95e561bc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Aug 2009 17:04:08 +1000 Subject: [PATCH] dmx: include xfixes lib, reshuffle include order to resolve linker errors. Signed-off-by: Peter Hutterer --- configure.ac | 2 +- hw/dmx/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6345fd994..f6284ad5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1736,7 +1736,7 @@ if test "x$DMX" = xyes; then fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC" XDMX_CFLAGS="$DMXMODULES_CFLAGS" - XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB" + XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $FIXES_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB" XDMX_SYS_LIBS="$DMXMODULES_LIBS" AC_SUBST([XDMX_CFLAGS]) AC_SUBST([XDMX_LIBS]) diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 9e9b39a19..095c54223 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -86,7 +86,8 @@ XDMX_LIBS = \ input/libdmxinput.a \ config/libdmxconfig.a \ $(MAIN_LIB) \ - $(XSERVER_LIBS) + $(XSERVER_LIBS) \ + $(top_srcdir)/xfixes/libxfixes.la Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xdmx_DEPENDENCIES= $(XDMX_LIBS)