From d7252e2e0781b61583d8e33fd2dc1a5116eaa062 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Thu, 23 Jul 2009 01:47:52 +0000
Subject: Release 10.35.66

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@955 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 Makefile.version         | 2 +-
 converter/other/Makefile | 5 ++++-
 doc/HISTORY              | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile.version b/Makefile.version
index f4246bc8..01adb604 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 65
+NETPBM_POINT_RELEASE = 66
diff --git a/converter/other/Makefile b/converter/other/Makefile
index 81e1da14..756ba8e3 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -113,7 +113,10 @@ endif
 
 MERGEBINARIES = $(BINARIES)
 
-EXTRA_OBJECTS = exif.o rast.o pngtxt.o bmepsoe.o
+EXTRA_OBJECTS = exif.o rast.o bmepsoe.o
+ifeq ($(HAVE_PNGLIB),Y)
+  EXTRA_OBJECTS += pngtxt.o
+endif
 ifneq ($(JPEGLIB),NONE)
   EXTRA_OBJECTS += jpegdatasource.o
 endif
diff --git a/doc/HISTORY b/doc/HISTORY
index 7a0e7235..56ba54d9 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+09.07.23 BJH  Release 10.35.66
+
+              Build: fix failure of a merge build on a system that doesn't
+              have the PNG library.
+
 09.06.26 BJH  Release 10.35.65
 
               configure: offer Gcc as an optional compiler for HP-UX.
-- 
cgit 1.4.1