diff options
| author | Kevin E Martin <kem@redhat.com> | 2009-09-26 13:09:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-27 20:18:06 +1000 |
| commit | 72f0194be1558f244bad85197ccc50e17561df50 (patch) | |
| tree | 3f6d7ff16adef5768d4831d6ae286bc7880ddf6c | |
| parent | e4edb4f2e6ca960b68629783459920faa86d8671 (diff) | |
dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit fc9d733bab3ff0e4e51b19c73b66196dca563a70)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/dmx/Makefile.am | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6cdb8cf95..422ef0bf7 100644 --- a/configure.ac +++ b/configure.ac @@ -1805,7 +1805,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 $FIXES_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_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 b31fbb85c..3c59320e1 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -84,10 +84,7 @@ XDMX_LIBS = \ @XDMX_LIBS@ \ $(GLX_LIBS) \ input/libdmxinput.a \ - config/libdmxconfig.a \ - $(MAIN_LIB) \ - $(XSERVER_LIBS) \ - $(top_builddir)/xfixes/libxfixes.la + config/libdmxconfig.a Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) Xdmx_DEPENDENCIES= $(XDMX_LIBS) |