diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-12-30 03:19:13 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-12-30 03:19:13 +0000 |
| commit | d883d56d58908f25b194b8725189f01be4b5379f (patch) | |
| tree | 023034252e59624298c3073d89057b789672ff0e | |
| parent | ac6a588b0244ee9f61e300b821f9d9ae9b203426 (diff) | |
| download | netpbm-mirror-d883d56d58908f25b194b8725189f01be4b5379f.tar.gz netpbm-mirror-d883d56d58908f25b194b8725189f01be4b5379f.tar.xz netpbm-mirror-d883d56d58908f25b194b8725189f01be4b5379f.zip | |
Release 10.47.24
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1378 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rwxr-xr-x | buildtools/configure.pl | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 08d38098..dd08511f 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1080,7 +1080,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/doc/HISTORY b/doc/HISTORY index c1f2db89..9d18f778 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +10.12.30 BJH Release 10.47.24 + + configure: don't default to /usr/X11R6/lib/libX11.so just because + /usr/X11R6 exists. /usr/X11R6/lib must exist. + 10.12.10 BJH Release 10.47.23 bmptopnm: Don't crash on invalid zero value of image height in diff --git a/version.mk b/version.mk index 8e77d543..0a51a17f 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 23 +NETPBM_POINT_RELEASE = 24 |