about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-06-21 22:32:18 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-06-21 22:32:18 +0000
commite6b07f017511df16cb2bab8ce8012c24a7dcb0c9 (patch)
treed5a578f050635b234f246b5f11ee7dd2d1b25f2d
parent67195565d6462a277143e4ef30c2563372a84982 (diff)
downloadnetpbm-mirror-e6b07f017511df16cb2bab8ce8012c24a7dcb0c9.tar.gz
netpbm-mirror-e6b07f017511df16cb2bab8ce8012c24a7dcb0c9.tar.xz
netpbm-mirror-e6b07f017511df16cb2bab8ce8012c24a7dcb0c9.zip
Add configure perl bug workaround to 10.35.85
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1698 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-xbuildtools/configure.pl6
-rw-r--r--doc/HISTORY5
2 files changed, 8 insertions, 3 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 2904f4a4..ed8fce8a 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -1060,7 +1060,9 @@ 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') == 0) {
+        } elsif (system('ldconfig -p | grep libvga >/dev/null 2>&1') == 0) {
+            # &>/dev/null should work above, but on 12.03.26, it caused the
+            # return value of system() always to be zero!
             $default = 'libvga.so';
         } else {
             $default = 'none';
@@ -2004,7 +2006,7 @@ if (!$flex_result) {
     # make rules for Thinkjettopbm for information on our experiences
     # with Lexes besides Flex.
 
-    my $systemRc = system('lex </dev/null &>/dev/null');
+    my $systemRc = system('lex </dev/null >/dev/null 2>&1');
 
     if ($systemRc >> 8 == 127) {
         print("\n");
diff --git a/doc/HISTORY b/doc/HISTORY
index 42fc17a7..3f8aaf15 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,7 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
-12.02.21 BJH  Release 10.35.85
+12.06.21 BJH  Release 10.35.85
+
+              configure: work around Perl bug that causes 'configure' to
+              falsely conclude Svgalib is installed.
 
               Build: move -lm to end of -l's.  Broken at least since 10.35.