plugsin/x11 compile error

[Steven M. Schultz]

Greetings -

	After a 'cvs update' of vlc the build went smoothly up to
	where the plugins/x11/vout_xvideo.c module was compiled.

gmake[1]: Entering directory `/usr/local/src/vlc-cvs/plugins/x11'
gcc -I../../include -I../../extras -finline-limit-30000 -DSYS_BSDI -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98  -DLOCALEDIR=\"/usr/local/share/locale\"   -Iinclude -Iextras -Wall -Winline -pipe -D_REENTRANT -D_GNU_SOURCE -pthread -O3 -ffast-math -funroll-loops -fomit-frame-pointer -mcpu=pentiumpro  -DBUILTIN -DMODULE_NAME=xvideo -c -o BUILTIN_XVIDEO_vout_xvideo.o vout_xvideo.c
vout_xvideo.c:51: X11/Xlib.h: No such file or directory
vout_xvideo.c:52: X11/Xutil.h: No such file or directory
vout_xvideo.c:53: X11/keysym.h: No such file or directory
vout_xvideo.c:54: X11/extensions/XShm.h: No such file or directory
vout_xvideo.c:55: X11/extensions/Xv.h: No such file or directory
vout_xvideo.c:56: X11/extensions/Xvlib.h: No such file or directory
vout_xvideo.c:57: X11/extensions/dpms.h: No such file or directory
In file included from vout_xvideo.c:67:
vout_common.h:42: syntax error before `Display'
vout_common.h:47: syntax error before `Window'
vout_common.h:63: syntax error before `Atom'
vout_common.h:78: syntax error before `Cursor'
vout_common.h:91: syntax error before `XvImage'
vout_xvideo.c:93: syntax error before `*'
vout_xvideo.c:93: syntax error before `*'
	...

	The problem seems to be that "-I/usr/X11R6/include" was not added
	to the CFLAGS.

	This is on BSD/OS 4.3.   VLC has been building for some time without
	trouble so error above is a recent event.

	If I look in Makefile.opts I see that the X11 paths are present:

Makefile.opts:CFLAGS_X11 = -I/usr/X11R6/include

	How should plugins/x11/Makefile be changed to use CFLAGS_X11?

	Thanks.

	Steven Schultz
	sms at to.gd-es.com