*** xv.h.orig	Mon Jan 23 12:22:23 1995
--- xv.h	Mon Feb  6 20:20:06 1995
***************
*** 100,105 ****
--- 100,106 ----
  
  
  /* include files */
+ #include <sys/param.h>	/* To get BSD macro definition */
  #include <stdio.h>
  #include <math.h>
  #include <ctype.h>
***************
*** 115,121 ****
  #ifndef VMS
  #  include <errno.h>
     extern int   errno;             /* SHOULD be in errno.h, but often isn't */
! #  ifndef __NetBSD__
       extern char *sys_errlist[];     /* this too... */
  #  endif
  #endif
--- 116,124 ----
  #ifndef VMS
  #  include <errno.h>
     extern int   errno;             /* SHOULD be in errno.h, but often isn't */
! #  if (defined(BSD) && (BSD >= 199306))
!      extern const char *const sys_errlist[];
! #  else
       extern char *sys_errlist[];     /* this too... */
  #  endif
  #endif
***************
*** 157,162 ****
--- 160,166 ----
       !defined(pyr)                       && \
       !defined(__UMAXV__)                 && \
       !defined(bsd43)                     && \
+      !(defined(BSD) && (BSD >= 199103))  && \
       !defined(aux)                       && \
       !defined(__bsdi__)                  && \
       !defined(sequent)
*** Imakefile.orig	Fri Jan 13 12:24:01 1995
--- Imakefile	Mon Feb  6 20:12:55 1995
***************
*** 6,18 ****
  /* if, for whatever reason, you're unable to get the JPEG library to compile
   * on your machine, *COMMENT OUT* the following line
   */
! #define HaveJpeg
  
  
  /* if, for whatever reason, you're unable to get the TIFF library to compile
   * on your machine, *COMMENT OUT* the following line
   */
! #define HaveTiff
  
  
  /* if, for whatever reason, you're unable to get the PDS/VICAR support
--- 6,20 ----
  /* if, for whatever reason, you're unable to get the JPEG library to compile
   * on your machine, *COMMENT OUT* the following line
   */
! /* #define HaveJpeg */
! #define UseInstalledJpeg
  
  
  /* if, for whatever reason, you're unable to get the TIFF library to compile
   * on your machine, *COMMENT OUT* the following line
   */
! /* #define HaveTiff */
! #define UseInstalledTiff
  
  
  /* if, for whatever reason, you're unable to get the PDS/VICAR support
***************
*** 119,134 ****
--- 121,150 ----
  JPEG = -DDOJPEG
  JPEGDIR = jpeg
  LIBJPEG = $(JPEGDIR)/libjpeg.a
+ DEPLIBJPEG = $(LIBJPEG)
  JPEGINCLUDE = -I$(JPEGDIR)
  #endif
  
+ #ifdef UseInstalledJpeg
+ JPEG = -DDOJPEG
+ LIBJPEG = -L/usr/local/lib -ljpeg
+ JPEGINCLUDE = -I/usr/local/include
+ #endif
+ 
  #ifdef HaveTiff
  TIFF = -DDOTIFF
  TIFFDIR = tiff
  LIBTIFF = $(TIFFDIR)/libtiff.a
+ DEPLIBTIFF = $(LIBTIFF)
  TIFFINCLUDE = -I$(TIFFDIR)
  #endif
  
+ #ifdef UseInstalledTiff
+ TIFF = -DDOTIFF
+ LIBTIFF = -L/usr/local/lib -ltiff
+ TIFFINCLUDE = -I/usr/local/include
+ #endif
+ 
  #ifdef HavePDS
  PDS = -DDOPDS
  #endif
***************
*** 142,149 ****
  #endif
  
  
! DEPLIBS = $(LIBJPEG) $(LIBTIFF)
! LOCAL_LIBRARIES = $(XLIB) $(DEPLIBS)
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
  	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
--- 158,165 ----
  #endif
  
  
! DEPLIBS = $(DEPLIBJPEG) $(DEPLIBTIFF)
! LOCAL_LIBRARIES = $(XLIB) $(LIBJPEG) $(LIBTIFF)
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
  	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \