summaryrefslogtreecommitdiff
authorKevin E Martin <kem@redhat.com>2009-09-26 03:09:52 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-09-26 03:09:52 (GMT)
commitfc9d733bab3ff0e4e51b19c73b66196dca563a70 (patch) (side-by-side diff)
treee27a011292ffb6150e92a3f23e36df0657d58ff6
parente7c2598f565e8252dd66ee3e6212b310856476cb (diff)
downloadxserver-fc9d733bab3ff0e4e51b19c73b66196dca563a70.zip
xserver-fc9d733bab3ff0e4e51b19c73b66196dca563a70.tar.gz
dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--hw/dmx/Makefile.am5
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 82d86db..2754d92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1807,7 +1807,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 b31fbb8..3c59320 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)