diff options
| -rwxr-xr-x | buildtools/configure.pl | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 29887642..11c662fd 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1135,6 +1135,8 @@ sub getLinuxsvgaLibrary($@) { $default = '/usr/lib/svgalib/libvga.so'; } elsif (system('ldconfig -p | grep libvga &>/dev/null') == 0) { $default = 'libvga.so'; + } elsif (-f('/usr/lib/libvga.a')) { + $default = '/usr/lib/libvga.a'; } else { $default = 'none'; } diff --git a/doc/HISTORY b/doc/HISTORY index ad751b84..2cce87d1 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -11,6 +11,9 @@ not yet BJH Release 10.48.00 Add pbmtocis, cistopbm. Thanks John Elliott <jce@seasip.demon.co.uk>. + Build: Configure recognizes libvga.a installed without + libvga.so and offers that as default. + Build: fix failure of a merge build on a system that doesn't have the PNG library. |