about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-07-24 02:57:41 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-07-24 02:57:41 +0000
commitaf2e161faad9599ce5846969b4292e129feffb57 (patch)
tree048d5eee61edf6f3a3c689971efd67b5d06e8db8
parentcbb6f7ecd89ab80aa9c12f8147aeafd08388c0d4 (diff)
downloadnetpbm-mirror-af2e161faad9599ce5846969b4292e129feffb57.tar.gz
netpbm-mirror-af2e161faad9599ce5846969b4292e129feffb57.tar.xz
netpbm-mirror-af2e161faad9599ce5846969b4292e129feffb57.zip
Recognize libvga.a when there is no libvga.so
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@958 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY3
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.