--- Imakefile.orig	Tue May 29 12:32:11 2001
+++ Imakefile	Fri Jul 19 16:46:08 2002
@@ -47,8 +47,8 @@ XCOMM You must have version 5b or newer 
 
 #ifdef USEJPEG
 #ifdef USEINSTALLEDJPEG
-JPEGLIBDIR = /usr/local/lib
-JPEGINCDIR = /usr/include/X11
+JPEGLIBDIR = ${LOCALBASE}/lib
+JPEGINCDIR = ${LOCALBASE}/include
 #else
 JPEGLIBDIR = ../jpeg
 JPEGINCDIR = $(JPEGLIBDIR)
@@ -72,12 +72,12 @@ XCOMM   in /contrib/libraries.
 XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
 XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
 
-XCOMM #define USEXPM
-XCOMM #define USEXPM_ICON
+#define USEXPM
+#define USEXPM_ICON
 
 #ifdef USEXPM
-XPMLIBDIR = $(USRLIBDIR)
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = ${X11BASE}/lib
+XPMINC = -I${X11BASE}/include/X11
 #endif
 
 XCOMM Uncomment the following definiton if you want to use the small icons
@@ -120,18 +120,20 @@ XCOMM Uncomment the next line if you wan
 XCOMM If your setlocale() dosen't support the locale, you should
 XCOMM add -DSETLOCALE to I18N_DEFS.
 
-XCOMM #define I18N
+#define I18N
 
 XCOMM If using an input tablet uncomment the following
 
+#if BuildInputExt == YES
 TABLIB = $(XILIB)
 USETAB = -DUSE_TAB
+#endif
 
 XCOMM uncomment the following line if your compiler supports
 XCOMM inline functions. With the "INLINE" keyword, you should notice that
 XCOMM the display will be a bit faster in complex figures
 
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
 
 XCOMM use (and change) the following if you want the multi-key data base file
 XCOMM somewhere other than the standard X11 library directory
@@ -220,7 +222,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
 #endif /* USEJPEG */
 
 #ifdef I18N
-I18N_DEFS = -DI18N -DSETLOCALE
+I18N_DEFS = -DI18N #-DSETLOCALE
 I18N_SRC = w_i18n.c
 I18N_OBJ = w_i18n.o
 #endif
@@ -256,6 +258,7 @@ READJPEGO = f_readjpg.o
 #ifdef USEPNG
 DUSEPNG = -DUSE_PNG
 PNGLIBS = -lpng -lz
+PNGINC = -I${LOCALBASE}/include/libpng
 READPNGS = f_readpng.c
 READPNGO = f_readpng.o
 #endif /* USEPNG */
@@ -325,7 +328,7 @@ MAINDEPFILES =  patchlevel.h version.h
 SRCS = $(XFIGSRC)
 OBJS = $(XFIGOBJ)
 
-EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC)
+EXTRA_INCLUDES = $(JPEGINC) $(XPMINC) $(XAW3DINC) $(PNGINC)
 DEPLIBS = XawClientDepLibs
 
 LOCAL_LIBRARIES = 	$(JPEGLIB)