Release 10.35.79

git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1392 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 11 insertions, 3 deletions

diff --git a/Makefile.version b/Makefile.version
index 0aa3df04..62df8a7a 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 78
+NETPBM_POINT_RELEASE = 79
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 4089596a..2904f4a4 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1007,7 +1007,7 @@ sub getX11Library($@) {
 
         if (-d('/usr/link/X11')) {
             $default = '/usr/link/X11/libX11' . libSuffix($platform);
-        } elsif (-d('/usr/X11R6')) {
+        } elsif (-d('/usr/X11R6/lib')) {
             $default = '/usr/X11R6/lib/libX11' . libSuffix($platform);
         } else {
             $default = "libX11" . libSuffix($platform);
diff --git a/converter/other/pngtopnm.c b/converter/other/pngtopnm.c
index 0ee08ede..90d8705c 100644
--- a/converter/other/pngtopnm.c
+++ b/converter/other/pngtopnm.c
@@ -438,7 +438,7 @@ dump_png_info(png_info *info_ptr) {
     else
         pm_message("bKGD chunk: not present");
 
-    if (info_ptr->valid & PNG_INFO_PLTE)
+    if (info_ptr->valid & PNG_INFO_hIST)
         pm_message("hIST chunk: present");
     else
         pm_message("hIST chunk: not present");
diff --git a/doc/HISTORY b/doc/HISTORY
index cf488d5e..3f329b93 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+11.01.15 BJH  Release 10.35.79
+
+              configure: don't default to /usr/X11R6/lib/libX11.so just because
+              /usr/X11R6 exists.  /usr/X11R6/lib must exist.
+
+              pngtopnm: fix bug: -verbose reports history chunk present when
+              it's really a palette.
+
 10.12.10 BJH  Release 10.35.78
 
               bmptopnm: Don't crash on invalid zero value of image height in