Changeset 17490

Timestamp:

Apr 29, 2008, 7:18:58 AM (18 years ago)

Author:

Paul Price

Message:

Allowing force all, and turning off building zlib, since it won't build under psconfig.

Location:

trunk/psconfig

Files:

• pschecklibs (modified) (2 diffs)
• pscheckperl (modified) (3 diffs)

trunk/psconfig/pschecklibs

@@ -131 +131 @@
 
     if ($force ne "") {
-        if ($force eq $name) {
+        if ($force eq $name or (lc($force) eq "all" and lc($tarball) ne "none")) {
             &buildlib ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts);
-            exit 0;
+#           exit 0;
         }
         next;
@@ -182 +182 @@
 sub buildlib {
     my ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = @_;
+
+    if ($name eq "libz") {
+        print "zlib doesn't like psconfigure --- you have to build this yourself.";
+        return 1;
+    }
 
     if ($tarball eq "NONE") {

trunk/psconfig/pscheckperl

@@ -5 +5 @@
 $version = "";
 $build = 0;
+my %force;   # Names of module to force build
 @tARGV = ();
 for (; @ARGV > 0; ) {
@@ -14 +15 @@
         $build = 1;
         shift; next;
+    }
+    if ($ARGV[0] eq "-force") {
+        $force{$ARGV[1]} = 1;
+        shift; shift; next;
     }
     if ($ARGV[0] eq "-h")     { &usage (); }
@@ -79 +84 @@
 
     print "$module: missing\n";
-    if (!$build) { 
+    unless ($build or defined $force{$module} or defined $force{'all'}) { 
         $Nmissing ++;
         push @missing, $module;