Changeset 17597 for trunk/psconfig/pschecklibs

Timestamp:

May 8, 2008, 4:40:22 PM (18 years ago)

Author:

Paul Price

Message:

Adjusting behaviour for building zlib.

File:

• trunk/psconfig/pschecklibs (modified) (1 diff)

trunk/psconfig/pschecklibs

@@ -183 +183 @@
     my ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = @_;
 
+    if ($tarball eq "NONE") {
+        print "No tarball available for $name.  You'll have to build it yourself.\n";
+        exit 1;
+    }
+
     if ($name eq "libz") {
-        print "zlib doesn't like psconfigure --- you have to build this yourself.";
-        return 1;
-    }
-
-    if ($tarball eq "NONE") {
-        print "ERROR: require tarball for $name\n";
-        exit 1;
-    }
-
-    $psconfigure = `csh psconfig.csh --psconfigure $version`; chomp $psconfigure;
+        # zlib doesn't like the full list of arguments to configure
+        $psconfigure = "./configure --prefix=$prefix";
+    } else {
+        $psconfigure = `csh psconfig.csh --psconfigure $version`; chomp $psconfigure;
+    }
+
     print "psconfigure: $psconfigure";