Changeset 25027 for branches/pap/psconfig/pscheckperl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/pscheckperl (modified) (2 diffs)

branches/pap/psconfig/pscheckperl

@@ -57 +57 @@
 $homedir = `pwd`; chomp $homedir;
 
+# Astro::FITS::CFITSIO requires this to be set correctly...
+$ENV{'CFITSIO'} = $prefix;
+
 print "psconfig version: $version\n";
 print "prefix: $prefix\n";
@@ -78 +81 @@
     if ($modver eq "") { $modver = 0; } 
     system ("pscheckmods $module $modver");
-    if ($? == 0) { 
+    if (($? == 0) and not defined $force{$module} and not defined $force{'all'}) { 
         # print "$module: found\n";
         next; 
     }
 
-    print "$module: missing\n";
+    if (defined $force{$module}) {
+        print "$module: force\n";
+    } else {
+        print "$module: missing\n";
+    }
     unless ($build or defined $force{$module} or defined $force{'all'}) { 
         $Nmissing ++;