about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 16:24:37 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 16:24:37 +0000
commitdfb411eadb846aba73ff8a5fea55e08555459bad (patch)
tree7c5a8c92589a6e18329b77bd8a2d79148e8685d0
parentb5c098d41aeb5d2670c481e240b434b1c0785641 (diff)
downloadnetpbm-mirror-dfb411eadb846aba73ff8a5fea55e08555459bad.tar.gz
netpbm-mirror-dfb411eadb846aba73ff8a5fea55e08555459bad.tar.xz
netpbm-mirror-dfb411eadb846aba73ff8a5fea55e08555459bad.zip
Release 10.36.10
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@129 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY4
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version
index 1f0aadd1..9f959ecb 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 36
-NETPBM_POINT_RELEASE = 09
+NETPBM_POINT_RELEASE = 10
 
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index f57d437b..b3dd3ca9 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1028,8 +1028,6 @@ sub getX11Library($@) {
 
         if (-d('/usr/link/X11')) {
             $default = '/usr/link/X11/libX11' . libSuffix($platform);
-        } elsif (-d('/usr/lib/X11')) {
-            $default = '/usr/lib/X11/libX11' . libSuffix($platform);
         } elsif (-d('/usr/X11R6')) {
             $default = '/usr/X11R6/lib/libX11' . libSuffix($platform);
         } else {
diff --git a/doc/HISTORY b/doc/HISTORY
index 9e247c67..1df7f48c 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.11.13 BJH  Release 10.36.10
+
+              Configure: fix libX11 location default.
+
 06.11.13 BJH  Release 10.36.09
 
               Configure: fix libX11 location default.