*** converter/other/jpeg2000/Makefile.ORIG	Thu May  8 11:50:36 2008
--- converter/other/jpeg2000/Makefile	Thu May  8 11:50:30 2008
***************
*** 5,11 ****
  SUBDIR = converter/other/jpeg2000
  VPATH=.:$(SRCDIR)/$(SUBDIR)
  
! SUBDIRS = libjasper
  
  include $(BUILDDIR)/Makefile.config
  
--- 5,11 ----
  SUBDIR = converter/other/jpeg2000
  VPATH=.:$(SRCDIR)/$(SUBDIR)
  
! SUBDIRS =
  
  include $(BUILDDIR)/Makefile.config
  
*** Makefile.config.in.ORIG	Thu May  8 17:12:06 2008
--- Makefile.config.in	Thu May  8 20:32:24 2008
***************
*** 218,224 ****
  # a new libjpeg in /usr/local/lib.
  #LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib
  #AIX:
! #LDFLAGS += -L /usr/pubsw/lib
  #HP-UX:
  #LDFLAGS += -Wl,+b,/usr/pubsw/lib
  #IRIX:
--- 218,224 ----
  # a new libjpeg in /usr/local/lib.
  #LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib
  #AIX:
! LDFLAGS += -L /opt/freeware/lib
  #HP-UX:
  #LDFLAGS += -Wl,+b,/usr/pubsw/lib
  #IRIX:
***************
*** 442,449 ****
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
! JASPERLIB = $(INTERNAL_JASPERLIB)
! JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
--- 442,449 ----
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
! JASPERLIB = /opt/freeware/lib/libjasper.a
! JASPERHDR_DIR = /opt/freeware/include/jasper
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.