diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-08-04 17:04:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-13 10:30:16 +1000 |
| commit | 33243ae971db90477a29dfb0e51cc00c95e561bc (patch) | |
| tree | f98e9d78927d1d991b937ae4eaa2432386d341a4 | |
| parent | 2d46678762b12c9746fc8f89821c15705680ba35 (diff) | |
dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | 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) |