From 46641785764d952eae9a9393aa7bcf6d128cb486 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sat, 28 Aug 2010 18:01:59 +0000
Subject: fix PNGVER

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1278 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 GNUmakefile              | 4 ++--
 converter/other/Makefile | 8 ++++----
 doc/HISTORY              | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 780ec870..cc90672c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -270,10 +270,10 @@ ifneq ($(X11LIB),NONE)
   MERGELIBS += $(X11LIB)
 endif
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   PNGLD = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB))
 else
-  PNGLD = $(shell libpng-config --ldflags)
+  PNGLD = $(shell libpng$(PNGVER)-config --ldflags)
 endif
 
 ifeq ($(shell xml2-config --version),)
diff --git a/converter/other/Makefile b/converter/other/Makefile
index 1417cd3a..954f96d2 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -26,7 +26,7 @@ ifneq ($(TIFFLIB),NONE)
   endif
 endif
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   ifneq ($(PNGLIB),NONE)
     HAVE_PNGLIB = Y
     ifneq ($(PNGHDR_DIR)x,x)
@@ -38,7 +38,7 @@ ifeq ($(shell libpng-config --version),)
   endif
 else
   HAVE_PNGLIB = Y
-  EXTERN_INCLUDES += $(shell libpng-config --cflags)
+  EXTERN_INCLUDES += $(shell libpng$(PNGVER)-config --cflags)
 endif
 
 ifneq ($(JPEGLIB),NONE)
@@ -153,10 +153,10 @@ tifftopnm pamtotiff pnmtotiffcmyk: %: %.o tiff.o $(NETPBMLIB) $(LIBOPT)
 	$(LD) -o $@ $@.o tiff.o \
 	  $(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB))
 else
-  PNGLIB_LIBOPTS = $(shell libpng-config --ldflags)
+  PNGLIB_LIBOPTS = $(shell libpng$(PNGVER)-config --ldflags)
 endif
 
 pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT)
diff --git a/doc/HISTORY b/doc/HISTORY
index 906af96a..9617eaf9 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -21,6 +21,9 @@ not yet  BJH  Release 10.52.00
 
               Build: don't use <strings.h> or bzero().
 
+              Build: fix PNGVER.  Thanks Matthew Fischer
+              <futhark@users.sourceforge.net>.
+
 10.06.27 BJH  Release 10.51.00
 
               Add ppmtoascii.  Thanks "Frank Ch. Eigler" <fche@elastic.org>.
-- 
cgit 1.4.1