From d7e14787c49408da8bc52359699dfd06b200d8b5 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 2 May 2015 02:28:29 +0000
Subject: Don't build and install libjjbig, libjasper if we are using external
 versions

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2477 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/jbig/Makefile     | 3 ++-
 converter/other/jpeg2000/Makefile | 3 ++-
 doc/HISTORY                       | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/converter/other/jbig/Makefile b/converter/other/jbig/Makefile
index 946cb732..c4d7e9d6 100644
--- a/converter/other/jbig/Makefile
+++ b/converter/other/jbig/Makefile
@@ -5,7 +5,7 @@ endif
 SUBDIR = converter/other/jbig
 VPATH=.:$(SRCDIR)/$(SUBDIR)
 
-SUBDIRS = libjbig
+SUBDIRS =
 
 include $(BUILDDIR)/config.mk
 
@@ -35,6 +35,7 @@ SCRIPTS =
 
 ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
   JBIGLIB_DEP = $(JBIGLIB)
+  SUBDIRS += libjbig
 else
   # It's not our internal version; user's on his own to make sure it's built
 endif
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile
index 009232d7..6e5af8e7 100644
--- a/converter/other/jpeg2000/Makefile
+++ b/converter/other/jpeg2000/Makefile
@@ -5,7 +5,7 @@ endif
 SUBDIR = converter/other/jpeg2000
 VPATH=.:$(SRCDIR)/$(SUBDIR)
 
-SUBDIRS = libjasper
+SUBDIRS =
 
 include $(BUILDDIR)/config.mk
 
@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB))
   # MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
   # be relative to the current directory.
   MERGE_OBJECTS += $(JASPERLIB)
+  SUBDIRS += libjasper
 endif
 MERGEBINARIES = $(BINARIES)
 
diff --git a/doc/HISTORY b/doc/HISTORY
index fcacf727..364f16f5 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,10 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.71.00
 
+              pbmtomacp: fix wild pointer dereference with -b larger than
+              image height.  Always broken.  (pbmtomacp was new in X.V11R3
+              (March 1988).
+
               pnmconvol: Fix bug: wrong output for pixels that convolve to
               negative values (should be clipped to zero).  Introduced in
               Netpbm 10.68 (September 2014).
@@ -28,6 +32,9 @@ not yet  BJH  Release 10.71.00
               makeman: deal properly with backlash in source.  Thanks Willem
               van Schaik <willem@schaik.com>.
 
+              Build: don't build and install libjpeg and libjasper if we
+              are using external versions of them instead.
+
               Build: work around bug in GCC < 4.2 related to SSE2 builtins
               that causes compile of pamflip to fail.
 
-- 
cgit 1.4.1