diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | unix/configure | 14 | ||||
| -rw-r--r-- | unix/configure.in | 16 |
3 files changed, 22 insertions, 17 deletions
@@ -1,7 +1,12 @@ +2005-05-25 Jeff Hobbs <jeffh@ActiveState.com> + + * unix/configure.in: ensure false Tcl.framework is only created + with --enable-framework + 2005-05-24 Daniel Steffen <das@users.sourceforge.net> - * tests/env.test: added DYLD_FRAMEWORK_PATH to the list of env vars - that need to be handled specially. + * tests/env.test: added DYLD_FRAMEWORK_PATH to the list of env vars + that need to be handled specially. * macosx/Makefile: * macosx/README: diff --git a/unix/configure b/unix/configure index c1f4759..a37fbfb 100755 --- a/unix/configure +++ b/unix/configure @@ -8188,16 +8188,16 @@ rm -f conftest.s* EOF cat >> $CONFIG_STATUS <<EOF -VERSION=${TCL_VERSION} +VERSION=${TCL_VERSION} FRAMEWORK_BUILD=${FRAMEWORK_BUILD} EOF cat >> $CONFIG_STATUS <<\EOF -n=Tcl && echo "creating $n.framework" && - f=$n.framework && v=Versions/$VERSION && - rm -rf $f && mkdir -p $f/$v/Resources && - ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v && - ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist && - unset n f v +test "$FRAMEWORK_BUILD" = "1" && + n=Tcl && f=$n.framework && v=Versions/$VERSION && + echo "creating $f" && rm -rf $f && mkdir -p $f/$v/Resources && + ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v && + ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist && + unset n f v exit 0 diff --git a/unix/configure.in b/unix/configure.in index e56f3f1..b2d1793 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.106.2.14 2005/05/24 04:20:12 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.106.2.15 2005/05/25 18:49:28 hobbs Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.13) @@ -479,13 +479,13 @@ if test "$FRAMEWORK_BUILD" = "1" ; then tcl_config_files="${tcl_config_files} [Tcl-Info.plist:../macosx/Tcl-Info.plist.in]" # Construct a fake local framework structure to make linking with # '-framework Tcl' and running of tcltest work - AC_OUTPUT_COMMANDS([n=Tcl && echo "creating $n.framework" && - f=$n.framework && v=Versions/$VERSION && - rm -rf $f && mkdir -p $f/$v/Resources && - ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v && - ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist && - unset n f v - ], VERSION=${TCL_VERSION}) + AC_OUTPUT_COMMANDS([test "$FRAMEWORK_BUILD" = "1" && + n=Tcl && f=$n.framework && v=Versions/$VERSION && + echo "creating $f" && rm -rf $f && mkdir -p $f/$v/Resources && + ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v && + ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist && + unset n f v + ], [VERSION=${TCL_VERSION} FRAMEWORK_BUILD=${FRAMEWORK_BUILD}]) LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH" if test "${libdir}" = '${exec_prefix}/lib'; then # override libdir default |