about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2007-05-09 15:56:09 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2007-05-09 15:56:09 +0000
commitea150b72628d2391a1e49c42130ee35e100c1881 (patch)
tree4788f87e7462fe1cf280c1ede7fc5de45d869f83
parent43d5e7b140301a8ef7ba24b1c9909cc3a65285a1 (diff)
downloadnetpbm-mirror-ea150b72628d2391a1e49c42130ee35e100c1881.tar.gz
netpbm-mirror-ea150b72628d2391a1e49c42130ee35e100c1881.tar.xz
netpbm-mirror-ea150b72628d2391a1e49c42130ee35e100c1881.zip
Fix bug detecting presence of libvga with ldconfig
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@293 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-xbuildtools/configure.pl2
-rw-r--r--doc/HISTORY11
2 files changed, 8 insertions, 5 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 16ee575a..97e3c33f 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1091,7 +1091,7 @@ sub getLinuxsvgaLibrary($@) {
             $default = '/usr/link/svgalib/libvga.so';
         } elsif (-d('/usr/lib/svgalib')) {
             $default = '/usr/lib/svgalib/libvga.so';
-        } elsif (system('ldconfig -p | grep libvga &>/dev/null')) {
+        } elsif (system('ldconfig -p | grep libvga &>/dev/null') == 0) {
             $default = 'libvga.so';
         } else {
             $default = 'none';
diff --git a/doc/HISTORY b/doc/HISTORY
index 7787af3a..ea55e8c8 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -8,17 +8,20 @@ not yet  BJH  Release 10.39.00
 
               Add pamundice.
 
+              pbmtext: improve error messages about fonts.
+
               Configure: do test compile for missing Libxml2 and too old
               Libxml2.
 
-              pbmtext: improve error messages about fonts.
-
-              Build: don't use 'uint' type.  Mac OSX apparently doesn't
-              have it.
+              Configure: fix bug detecting presence of libvga with
+              Ldconfig.
 
               Configure: build properly for Mac OSX when user says
               libnetpbm will be in the default search path.
 
+              Build: don't use 'uint' type.  Mac OSX apparently doesn't
+              have it.
+
 07.03.30 BJH  Release 10.38.0
     
               Add pamfixtrunc.