Changeset 14427

Timestamp:

Aug 7, 2007, 4:39:18 PM (19 years ago)

Author:

eugene

Message:

adding -force options

File:

• trunk/psconfig/pschecklibs.pl (modified) (5 diffs)

trunk/psconfig/pschecklibs.pl

@@ -4 +4 @@
 
 # default system library locations
-# @libpath = ( "/lib", "/usr/lib", "/usr/X11R6/lib", "/usr/local/lib" );
-@libpath = ( "/lib/foo");
 @binpath = ( );
+@libpath = ( "/lib", "/usr/lib", "/usr/X11R6/lib", "/usr/local/lib" );
 @incpath = ( "/usr/include", "/usr/local/include", "/usr/X11R6/include" );
 
 $version = "";
 $build = 0;
+$force = "";
 @tARGV = ();
 for (; @ARGV > 0; ) {
@@ -20 +20 @@
         $build = 1;
         shift; next;
+    }
+    if ($ARGV[0] eq "-force") {
+        if (@ARGV < 2) { die "-force must be coupled to a library name\n"; }
+        $force = $ARGV[1];
+        shift; shift; next;
     }
     if ($ARGV[0] eq "-h")     { &usage (); }
@@ -118 +123 @@
     ($type, $name, $altnames, $altpaths, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = split (" ", $line);
     if (($use_equals ne "Y") && ($use_equals ne "N")) { die "invalid value for use_equals field\n"; }
+
+    if ($force ne "") {
+        if ($force eq $name) {
+            &buildlib ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts);
+            exit 0;
+        }
+        next;
+    }
 
     ## check for the C library
@@ -143 +156 @@
         next;
     }
+    &buildlib ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts);
+}
+if ($build) { exit 0; }
+print "\n";
+
+if (@faillibs > 0) {
+    print "The following C libraries are missing from your system\n";
+    foreach $name (@faillibs) {
+        print "  $name\n";
+    }
+    print "\n";
+    print "you may install them in your local path by re-running pschecklibs with -build\n";
+} else {
+    print "no C libraries are missing from your system\n";
+}
+exit 0;
+
+sub buildlib {
+    my ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = @_;
 
     if ($tarball eq "NONE") {
@@ -192 +224 @@
 
     chdir $homedir;
-}
-if ($build) { exit 0; }
-print "\n";
-
-if (@faillibs > 0) {
-    print "The following C libraries are missing from your system\n";
-    foreach $name (@faillibs) {
-        print "  $name\n";
-    }
-    print "\n";
-    print "you may install them in your local path by re-running pschecklibs with -build\n";
-} else {
-    print "no C libraries are missing from your system\n";
-}
-exit 0;
+    return 1;
+}
 
 sub checklib {