diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/Makefile.am | 12 |
2 files changed, 7 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index c1c10f781..21c1d91c4 100644 --- a/configure.ac +++ b/configure.ac @@ -1917,6 +1917,10 @@ if test "$KDRIVE" = yes; then if test "x$XV" = xyes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv" fi + if test "x$DRI" = xyes && test "x$GLX" = xyes; then + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS gl libdrm" + fi + PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) if test "x$XEPHYR" = xauto; then XEPHYR=$xephyr @@ -1924,10 +1928,6 @@ if test "$KDRIVE" = yes; then XEPHYR_DRI=no if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then XEPHYR_DRI=yes - XEPHYR_DRI_LIBS=-lGL - AC_SUBST(XEPHYR_DRI_LIBS) - fi - if test x$XEPHYR_DRI = xyes ; then AC_DEFINE(XEPHYR_DRI,1,[enable DRI extension in xephyr]) fi @@ -1965,9 +1965,6 @@ if test "$KDRIVE" = yes; then KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" - # check if we can build Xephyr - PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) - AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) AC_SUBST([XSDL_LIBS]) diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index dc0144a0a..d13bbae1f 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -2,15 +2,11 @@ INCLUDES = \ @KDRIVE_INCS@ \ @KDRIVE_CFLAGS@ \ @XEPHYR_INCS@ \ + @XEPHYR_CFLAGS@ \ + @DRIPROTO_CFLAGS@ \ -I$(top_srcdir) \ -I$(top_srcdir)/exa -if XEPHYR_HAS_DRI -INCLUDES += \ - @LIBDRM_CFLAGS@ \ - @DRIPROTO_CFLAGS@ -endif - if XV LIBXEPHYR_HOSTXV=libxephyr-hostxv.a endif @@ -76,9 +72,7 @@ Xephyr_LDADD = \ $(LIBXEPHYR_HOSTDRI) \ $(top_builddir)/exa/libexa.la \ @KDRIVE_LIBS@ \ - @XEPHYR_LIBS@ \ - @LIBDRM_LIBS@ \ - @XEPHYR_DRI_LIBS@ + @XEPHYR_LIBS@ Xephyr_DEPENDENCIES = \ libxephyr.a \ |