--- Imakefile.orig	Sun Mar 21 16:36:26 1999
+++ Imakefile	Sat Jun 19 19:23:26 1999
@@ -116,12 +116,12 @@
 XCOMM XA_DLL_DEF = -DXA_DLL
 XCOMM
 XCOMM ### You may need this library.
-XA_DLL_LIB = -ldl
+XCOMM XA_DLL_LIB = -ldl
 XCOMM
 XCOMM If you'd like to change the default directory that XAnim searches while
 XCOMM looking for dlls, then change the directory below.
 XCOMM
-XA_DLL_PATH = /usr/local/xanim/mods
+XA_DLL_PATH = $(LIBDIR)/xanim
 
 
 
@@ -190,7 +190,7 @@
 XCOMM XA_CVID_DEF = -DXA_CVID
 XCOMM XA_CYUV_DEF = -DXA_CYUV
 XCOMM 
-XCOMM XA_IV32_LIB = mods/xa2.1_iv32_linuxELF.o
+XCOMM XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
 XCOMM XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
 XCOMM XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
 XCOMM 
@@ -267,8 +267,8 @@
 XCOMM  XA_AUDIO_DEFS =
 XCOMM 
 XCOMM ## -- Linux PCs ---------------------------------------------------------
-XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-XA_AUDIO_LIBS = -lc
+XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+XCOMM XA_AUDIO_LIBS = -lc
 XCOMM 
 XCOMM  -- Linux PC's with OLD Rev sound drivers -------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
@@ -314,8 +314,10 @@
 XCOMM  XA_AUDIO_LIBS = -lc
 XCOMM  
 XCOMM  -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
-XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
-XCOMM  XA_AUDIO_LIBS = -lc
+#ifdef i386Architecture
+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+XA_AUDIO_LIBS = -lc
+#endif
 XCOMM 
 XCOMM  -- TOWNS Linux 16 bit PCM ----------------------------------------------
 XCOMM  XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
@@ -442,7 +444,7 @@
 XCOMM    -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
 XCOMM    --  XmbufCreateBuffers).
 XCOMM    -- NOTE_8: HP-UX machines need to comment this out.
-XCOMM  XA_MULTIBUF = -DXMBUF
+XA_MULTIBUF = -DXMBUF
 XCOMM 
 XCOMM ###########
 XCOMM 
@@ -465,7 +467,7 @@
 
 PROGRAMS = $(XANIM)
 
-INCLUDES = -I$(INCDIR) $(XA_INCS)
+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
 
    LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
 DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)