*** Magick.tmpl.orig	Sat Apr  8 18:18:31 1995
--- Magick.tmpl	Sun Apr 16 16:04:18 1995
***************
*** 32,42 ****
  XCOMM Define HasShape if your X server supports the Shape Extension.  Define
  XCOMM HasSharedMemory if your X server supports the Shared Memory Extension.
! XCOMM
! XCOMM EXTENSIONS_DEFINES= -DHasShape -DHasSharedMemory
  
  XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
  XCOMM libraries.
! XCOMM
! XCOMM #define DoSharedLib  HasSharedLibraries
  
  XCOMM If you have the HDF, JPEG, MPEG, PNG, TIFF, or XPM libraries define
--- 32,42 ----
  XCOMM Define HasShape if your X server supports the Shape Extension.  Define
  XCOMM HasSharedMemory if your X server supports the Shared Memory Extension.
! 
! EXTENSIONS_DEFINES= -DHasShape -DHasSharedMemory
  
  XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
  XCOMM libraries.
! 
! #define DoSharedLib  HasSharedLibraries
  
  XCOMM If you have the HDF, JPEG, MPEG, PNG, TIFF, or XPM libraries define
***************
*** 44,53 ****
  XCOMM sure the path names are correct.  See README for more details.
  XCOMM
! XCOMM #define HasHDF
! XCOMM #define HasJPEG
! XCOMM #define HasMPEG
! XCOMM #define HasPNG
! XCOMM #define HasTIFF
! XCOMM #define HasXPM
  
  #ifdef HasHDF
--- 44,52 ----
  XCOMM sure the path names are correct.  See README for more details.
  XCOMM
! 
! #define HasJPEG
! #define HasMPEG
! #define HasTIFF
! #define HasXPM
  
  #ifdef HasHDF
***************
*** 59,70 ****
  #ifdef HasJPEG
  JPEG_DEFINES= -DHasJPEG
! JPEG_INCLUDES= -I$(TOP)/jpeg
! JPEG_LIBRARIES= -L$(TOP)/jpeg -ljpeg
  #endif
  
  #ifdef HasMPEG
  MPEG_DEFINES= -DHasMPEG
! MPEG_INCLUDES= -I$(TOP)/mpeg
! MPEG_LIBRARIES= -L$(TOP)/mpeg -lmpeg
  #endif
  
--- 58,69 ----
  #ifdef HasJPEG
  JPEG_DEFINES= -DHasJPEG
! JPEG_INCLUDES= -I/usr/local/include
! JPEG_LIBRARIES= -L/usr/local/lib -ljpeg
  #endif
  
  #ifdef HasMPEG
  MPEG_DEFINES= -DHasMPEG
! MPEG_INCLUDES= -I/usr/local/include
! MPEG_LIBRARIES= -L/usr/local/lib -lmpeg
  #endif
  
***************
*** 77,88 ****
  #ifdef HasTIFF
  TIFF_DEFINES= -DHasTIFF
! TIFF_INCLUDES= -I$(TOP)/tiff
! TIFF_LIBRARIES= -L$(TOP)/tiff -ltiff
  #endif
  
  #ifdef HasXPM
  XPM_DEFINES= -DHasXPM
! XPM_INCLUDES= -I$(TOP)/xpm
! XPM_LIBRARIES= -L$(TOP)/xpm -lXpm
  #endif
  
--- 76,87 ----
  #ifdef HasTIFF
  TIFF_DEFINES= -DHasTIFF
! TIFF_INCLUDES= -I/usr/local/include
! TIFF_LIBRARIES= -L/usr/local/lib -ltiff
  #endif
  
  #ifdef HasXPM
  XPM_DEFINES= -DHasXPM
! XPM_INCLUDES= -I/usr/X11R6/include/X11
! XPM_LIBRARIES= -L/usr/X11R6/lib -lXpm
  #endif
  
***************
*** 97,103 ****
  LOCALDIR= /usr/local/bin
  LOCALINC= /usr/local/include
  LOCALLIB= /usr/local/lib
! LOCALMAN= /usr/local/man/mann
  
  MAGICK_INCLUDES= -I$(TOP)/magick
  MAGICK_LIBRARIES= -L$(TOP)/magick -lMagick
--- 96,102 ----
  LOCALDIR= /usr/local/bin
  LOCALINC= /usr/local/include
  LOCALLIB= /usr/local/lib
! LOCALMAN= /usr/local/man/man1
  
  MAGICK_INCLUDES= -I$(TOP)/magick
  MAGICK_LIBRARIES= -L$(TOP)/magick -lMagick