[43783] trunk/base/src/port1.0/portconfigure.tcl

raimue at macports.org raimue at macports.org
Sun Dec 14 19:18:43 PST 2008


Revision: 43783
          http://trac.macports.org/changeset/43783
Author:   raimue at macports.org
Date:     2008-12-14 19:18:43 -0800 (Sun, 14 Dec 2008)
Log Message:
-----------
port1.0/portconfigure.tcl:
Add correct dependencies for the different tools which can
be selected with use_*. Inspired by r43782.

Modified Paths:
--------------
    trunk/base/src/port1.0/portconfigure.tcl

Modified: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl	2008-12-15 00:58:10 UTC (rev 43782)
+++ trunk/base/src/port1.0/portconfigure.tcl	2008-12-15 03:18:43 UTC (rev 43783)
@@ -54,6 +54,34 @@
 default xmkmf.dir           {${worksrcpath}}
 default use_configure       yes
 
+option_proc use_autoreconf  set_configure_type
+option_proc use_automake    set_configure_type
+option_proc use_autoconf    set_configure_type
+option_proc use_xmkmf       set_configure_type
+option_proc use_libtool     set_configure_type
+
+proc set_configure_type {option action args} {
+    if {[string equal ${action} "set"] && [tbool args]} {
+        switch $option {
+            use_autoreconf {
+                depends_build-append bin:autoreconf:automake
+            }
+            use_automake {
+                depends_build-append bin:autoreconf:automake
+            }
+            use_autoconf {
+                depends_build-append bin:autoreconf:autoconf
+            }
+            use_xmkmf {
+                depends_build-append bin:xmkmf:imake
+            }
+            use_libtool {
+                depends_build-append bin:libtool:libtool
+            }
+        }
+    }
+}
+
 # Configure special environment variables.
 # We could have m32/m64/march/mtune be global configurable at some point.
 options configure.m32 configure.m64 configure.march configure.mtune
@@ -406,28 +434,24 @@
     global configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac
     
     if {[tbool use_autoreconf]} {
-        # XXX depend on autoreconf
         if {[catch {command_exec autoreconf} result]} {
             return -code error "[format [msgcat::mc "%s failure: %s"] autoreconf $result]"
         }
     }
     
     if {[tbool use_automake]} {
-        # XXX depend on automake
         if {[catch {command_exec automake} result]} {
             return -code error "[format [msgcat::mc "%s failure: %s"] automake $result]"
         }
     }
     
     if {[tbool use_autoconf]} {
-        # XXX depend on autoconf
         if {[catch {command_exec autoconf} result]} {
             return -code error "[format [msgcat::mc "%s failure: %s"] autoconf $result]"
         }
     }
 
     if {[tbool use_xmkmf]} {
-        # XXX depend on xmkmf
         if {[catch {command_exec xmkmf} result]} {
             return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]"
         } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081214/8f6ff24c/attachment.html>


More information about the macports-changes mailing list