[50868] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 50868
          http://trac.macports.org/changeset/50868
Author:   jmr at macports.org
Date:     2009-05-11 18:28:34 -0700 (Mon, 11 May 2009)
Log Message:
-----------
Enable readline when selfupdating unless readline bits are found in /usr/local (#19035)

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-05-11 23:53:08 UTC (rev 50867)
+++ trunk/base/src/macports1.0/macports.tcl	2009-05-12 01:28:34 UTC (rev 50868)
@@ -2120,9 +2120,18 @@
                 set tclpackage $libpath
             }
             
+            set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
+            # too many users have an incompatible readline in /usr/local, see ticket #10651
+            if {$tcl_platform(os) != "Darwin" || $prefix == "/usr/local"
+                || ([glob -nocomplain "/usr/local/lib/lib{readline,history}*"] == "" && [glob -nocomplain "/usr/local/include/readline/*.h"] == "")} {
+                append configure_args " --enable-readline"
+            } else {
+                ui_warn "Disabling readline support due to readline in /usr/local"
+            }
+            
             # do the actual configure, build and installation of new base
             ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"
-            if { [catch { system "cd $mp_source_path && ./configure --prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms && make && make install" } result] } {
+            if { [catch { system "cd $mp_source_path && ./configure $configure_args && make && make install" } result] } {
                 return -code error "Error installing new MacPorts base: $result"
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090511/c85d7069/attachment-0001.html>