Changeset 25027 for branches/pap/psconfig/pschecklibs

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/pschecklibs (modified) (2 diffs)

branches/pap/psconfig/pschecklibs

@@ -25 +25 @@
     if ($ARGV[0] eq "-force") {
         if (@ARGV < 2) { die "-force must be coupled to a library name\n"; }
-        $force{lc($ARGV[1])} = 1;
+        if (lc($ARGV[1]) eq 'build') {
+            $force{'autoconf'} = 1;
+            $force{'automake'} = 1;
+            $force{'libtool'} = 1;
+            $force{'pkg-config'} = 1;
+        } else {
+            $force{lc($ARGV[1])} = 1;
+        }
         shift; shift; next;
     }
@@ -93 +100 @@
 # search for, and drop, existing libdir entry in libpath?
 unshift @libpath, $libdir;
+
+# XXX a temporary hack for libreadline (this failed... needed to modify libreadline/support/shobj-conf
+# $shlib_libs = $ENV{'SHLIB_LIBS'};
+# unless ($shlib_libs =~ m|-lncurses|) {
+#     $shlib_libs .= " -lncurses";
+# }
+# $ENV{'SHLIB_LIBS'} = $shlib_libs;
 
 # add the path defined by PATH