diff options
| author | Keith Packard <keithp@koto.keithp.com> | 2007-10-17 10:50:22 +0800 |
|---|---|---|
| committer | Keith Packard <keithp@koto.keithp.com> | 2007-10-17 10:51:02 +0800 |
| commit | f2da10f7bc2ddb6ad2f18b793afc10d04b97c51c (patch) | |
| tree | e4c4e2ec49482cbea778fe5c20a6620be142fabd | |
| parent | 9dde53ed179336c7b483c9a94a97182ad1777dfb (diff) | |
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | hw/kdrive/fbdev/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 59dcde7f6..fb88773b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1872,7 +1872,7 @@ if test "$KDRIVE" = yes; then KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS $XV_CFLAGS" - KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $XV_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' case $host_os in *linux*) @@ -1884,7 +1884,7 @@ if test "$KDRIVE" = yes; then KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" - KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVERLIBS_LIBS" + KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVERLIBS_LIBS $XV_LIBS" # check if we can build Xephyr PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index 1ce4833a7..420855b8d 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -20,7 +20,7 @@ Xfbdev_LDADD = \ Xfbdev_DEPENDENCIES = \ libfbdev.a \ - @KDRIVE_LOCAL_LIBS@ + $(KDRIVE_PURE_LIBS) relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) |