[51243] trunk/base

[toby at macports.org]

Revision: 51243
          http://trac.macports.org/changeset/51243
Author:   toby at macports.org
Date:     2009-05-21 10:14:51 -0700 (Thu, 21 May 2009)
Log Message:
-----------
unhook tclobjc1.0

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac
    trunk/base/src/Makefile.in

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-05-21 17:02:14 UTC (rev 51242)
+++ trunk/base/configure	2009-05-21 17:14:51 UTC (rev 51243)
@@ -645,7 +645,6 @@
 MPCONFIGDIR_EXPANDED
 prefix_expanded
 OUR_INCLUDED_PACKAGES
-CONDITIONAL_PACKAGES
 TCL_CC
 TCL_DEFS
 SHLIB_SUFFIX
@@ -4981,9 +4980,6 @@
 
 
 
-# Determine if we want to install conditional packages
-CONDITIONAL_PACKAGES=
-
 # Foundation checks
 
 
@@ -6864,12 +6860,7 @@
 
 
 
-# tclobjc requires objc (runtime and foundation) support
-if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
-	CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
-fi
 
-
 	FRAMEWORK_LIBS="-framework CoreFoundation"
 
 	{ $as_echo "$as_me:$LINENO: checking for CoreFoundation framework" >&5
@@ -10595,7 +10586,6 @@
 
 
 
-
 # misc variables that need to be expanded for substitution into tcl
 
 oldprefix=$prefix
@@ -10617,7 +10607,7 @@
 
 
 # Output
-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
 
 
 cat >confcache <<\_ACEOF
@@ -11226,7 +11216,6 @@
     "portmgr/fedora/macports.spec") CONFIG_FILES="$CONFIG_FILES portmgr/fedora/macports.spec" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
-    "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
     "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
     "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
     "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2009-05-21 17:02:14 UTC (rev 51242)
+++ trunk/base/configure.ac	2009-05-21 17:14:51 UTC (rev 51243)
@@ -134,19 +134,11 @@
 MP_COMPILER_ATTRIBUTE_UNUSED
 MP_COMPILER_ATTRIBUTE_LF_PRIVATE
 
-# Determine if we want to install conditional packages
-CONDITIONAL_PACKAGES=
-
 # Foundation checks
 ACX_PTHREAD
 MP_OBJC_RUNTIME
 MP_OBJC_FOUNDATION
 
-# tclobjc requires objc (runtime and foundation) support
-if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
-	CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
-fi
-
 MP_PROG_DAEMONDO
 
 AC_SUBST(REPLACEMENT_PROGS)
@@ -352,7 +344,6 @@
 AC_SUBST(TCL_DEFS)
 AC_SUBST(TCL_STUB_LIB_SPEC)
 AC_SUBST(TCL_CC)
-AC_SUBST(CONDITIONAL_PACKAGES)
 AC_SUBST(OUR_INCLUDED_PACKAGES)
 
 # misc variables that need to be expanded for substitution into tcl
@@ -390,7 +381,6 @@
 	portmgr/fedora/macports.spec
 	src/Makefile
 	src/macports1.0/macports_autoconf.tcl
-	src/tclobjc1.0/Makefile
 	src/port1.0/port_autoconf.tcl
 	src/registry1.0/registry_autoconf.tcl
 	src/programs/Makefile

Modified: trunk/base/src/Makefile.in
===================================================================
--- trunk/base/src/Makefile.in	2009-05-21 17:02:14 UTC (rev 51242)
+++ trunk/base/src/Makefile.in	2009-05-21 17:14:51 UTC (rev 51243)
@@ -6,8 +6,7 @@
 			pextlib1.0 \
 			registry1.0 \
 			registry2.0 \
-			darwintracelib1.0 \
-			@CONDITIONAL_PACKAGES@
+			darwintracelib1.0
 SUBDIR=		${TCLPKG} port programs
 
 all::
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090521/b77bf4e9/attachment.html>