File xawtv-3.95.patch of Package xawtv

--- Makefile.in
+++ Makefile.in
@@ -29,7 +29,7 @@
 # for CFLAGS
 WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 LFS_FLAGS	:= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS	:= @X_CFLAGS@ @XFT_FLAGS@ -I/usr/include/X11/fonts
 LIB_FLAGS	:= -I. -I./vbistuff -I./x11 \
 		   -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
 		   -I$(srcdir)/x11 -I$(srcdir)/structs \
@@ -49,7 +49,7 @@
 VBI_LIBS	:= @LIBZVBI@
 GL_LIBS		:= @LIBGL@
 DV_LIBS		:= @LIBDV@
-FS_LIBS		:= -L@x_libraries@ @FSLIB@
+FS_LIBS		:= @X_LIBS@ @FSLIB@
 DLFLAGS		:= @DLFLAGS@
 
 # stuff configure has found
--- common/channel.c
+++ common/channel.c
@@ -181,6 +181,9 @@
     {  -1, NULL,     },
 };
 
+extern struct STRTAB booltab[];
+extern struct STRTAB captab[];
+
 /* just malloc memory for a new channel ... */
 struct CHANNEL*
 add_channel(char *name)
--- common/channel.h
+++ common/channel.h
@@ -90,8 +90,5 @@
 
 /* ----------------------------------------------------------------------- */
 
-extern struct STRTAB booltab[];
-extern struct STRTAB captab[];
-
 int str_to_int(char *str, struct STRTAB *tab);
 const char* int_to_str(int n, struct STRTAB *tab);
--- common/commands.c
+++ common/commands.c
@@ -162,6 +162,9 @@
 
 static int keypad_state = -1;
 
+extern struct STRTAB booltab[];
+extern struct STRTAB captab[];
+
 /* ----------------------------------------------------------------------- */
 
 void add_attrs(struct ng_attribute *new)
--- configure.ac
+++ configure.ac
@@ -295,7 +295,7 @@
 AC_SUBST(x11conf)
 
 AC_MSG_CHECKING(for X11 app-defaults directory)
-resdir=/usr/X11R6/lib/X11
+resdir=/usr/share/X11
 if test -d /etc/X11/app-defaults; then
 	resdir=/etc/X11
 fi