about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 06:04:03 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 06:04:03 +0000
commit048ea12dfc53107fece47283c3db7ee2897134f8 (patch)
tree29bb8fd4787e269e5a1e9373b08e6cc1edd0b837
parent243bdd81a10d517f5f955f3f29f8c0b4b4ab5b7f (diff)
downloadnetpbm-mirror-048ea12dfc53107fece47283c3db7ee2897134f8.tar.gz
netpbm-mirror-048ea12dfc53107fece47283c3db7ee2897134f8.tar.xz
netpbm-mirror-048ea12dfc53107fece47283c3db7ee2897134f8.zip
Release 10.35.14
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@126 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY4
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version
index 6a9953db..5549aa5b 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 13
+NETPBM_POINT_RELEASE = 14
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 258d01b8..93bd020a 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1002,7 +1002,7 @@ sub getX11Library($@) {
         if (-d('/usr/link/X11')) {
             $default = '/usr/link/X11/libX11' . libSuffix($platform);
         } elsif (-d('/usr/lib/X11')) {
-            $default = '/usr/lib/libX11' . libSuffix($platform);
+            $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 6a02f18e..ca3e2d0f 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.11.13 BJH  Release 10.35.14
+
+              Configure: fix libX11 location default.
+
 06.11.13 BJH  Release 10.35.13
 
               Build: fix Darwin build.