2 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index f382018d49..e1ddebb048 100755
--- a/configure
+++ b/configure
@@ -2754,8 +2754,13 @@ test "$_debug" && _def_debug='#define MP_DEBUG 1'
 _def_linux='#undef TARGET_LINUX'
 linux && _def_linux='#define TARGET_LINUX 1'
 
+# TODO cleanup the vidix stuff here
 _def_vidix='#define CONFIG_VIDIX 1'
 test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX'
+if test "$_vidix" = yes && test "$_x11" = yes; then
+  _vosrc="$_vosrc vo_xvidux.c"
+  _vomodules="xvidix $_vomodules"
+fi
 echo Checking for vidix ... "$_vidix"
 #############################################################################
 echo "Creating config.mak"
diff --git a/libvo/Makefile b/libvo/Makefile
index 2aec540037..194cd3cb46 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -7,7 +7,7 @@ SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c
 OBJS=$(SRCS:.c=.o)
 
 ifeq ($(VIDIX),yes)
-SRCS += vosub_vidix.c vo_xvidix.c
+SRCS += vosub_vidix.c
 endif
 
 CFLAGS  = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall