about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 16:26:11 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-13 16:26:11 +0000
commit2cb8507bf2c8e1f9571cade04aaa9d2d52bc0f3a (patch)
treee8c308f4161a5fe0106acb1960b037897dc4e1ce
parent048ea12dfc53107fece47283c3db7ee2897134f8 (diff)
downloadnetpbm-mirror-2cb8507bf2c8e1f9571cade04aaa9d2d52bc0f3a.tar.gz
netpbm-mirror-2cb8507bf2c8e1f9571cade04aaa9d2d52bc0f3a.tar.xz
netpbm-mirror-2cb8507bf2c8e1f9571cade04aaa9d2d52bc0f3a.zip
Release 10.35.15
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@130 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY6
3 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.version b/Makefile.version
index 5549aa5b..11c27df6 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 14
+NETPBM_POINT_RELEASE = 15
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 93bd020a..e061b13b 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1001,8 +1001,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 ca3e2d0f..7aee47d6 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,9 +4,13 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.11.13 BJH  Release 10.35.15
+
+              Configure: fix default for X library location.
+
 06.11.13 BJH  Release 10.35.14
 
-              Configure: fix libX11 location default.
+              Configure: fix default for X library location.
 
 06.11.13 BJH  Release 10.35.13