--- Makefile.old	Mon Nov 29 18:32:05 1999
+++ Makefile	Mon Nov 29 18:35:26 1999
@@ -30,31 +30,32 @@
 # uncomment the following two lines if you want to include X11 support
 # (mpeg2decode)
 
-#USE_DISP = -DDISPLAY
+USE_DISP = -DDISPLAY
 #LIBS = -lX11
 
 # uncomment the following two lines if you want to use shared memory
 # (faster display if server and client run on the same machine)
 # (mpeg2decode)
 
-#USE_SHMEM = -DSH_MEM
-#LIBS = -lXext -lX11
+USE_SHMEM = -DSH_MEM
+LIBS = -lXext -lX11
 
 # if your X11 include files / libraries are in a non standard location:
 # set INCLUDEDIR to -I followed by the appropriate include file path and
 # set LIBRARYDIR to -L followed by the appropriate library path
 # (mpeg2decode)
 
-#INCLUDEDIR = -I/usr/openwin/include
-#LIBRARYDIR = -L/usr/openwin/lib
+INCLUDEDIR = -I${X11BASE}/include
+LIBRARYDIR = -L${X11BASE}/lib
 
 # select one of the following CC CFLAGS settings
 
 #
 # GNU gcc
 #
+.ifndef CC
 CC = gcc
-CFLAGS = -O2
+.endif
 
 all: mpeg2decode mpeg2encode