summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-05-25 18:49:33 (GMT)
committerhobbs <hobbs>2005-05-25 18:49:33 (GMT)
commitaa1be7ab30d1c2ca8e670adf84553da846c1fc07 (patch)
tree95ec1eb66b12a99c5f22d0d70cd10664ed9064c9 /unix/configure
parent4b323ede98d36524442f50fe67966fbe2e0c91b8 (diff)
downloadtk-aa1be7ab30d1c2ca8e670adf84553da846c1fc07.zip
tk-aa1be7ab30d1c2ca8e670adf84553da846c1fc07.tar.gz
tk-aa1be7ab30d1c2ca8e670adf84553da846c1fc07.tar.bz2
* unix/configure, unix/configure.in: ensure false Tcl.framework is
only created with --enable-framework
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure17
1 files changed, 9 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure
index 5788eb3..7c834e4 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6312,17 +6312,18 @@ rm -f conftest.s*
EOF
cat >> $CONFIG_STATUS <<EOF
-VERSION=${TK_VERSION} && tk_aqua=${tk_aqua}
+VERSION=${TK_VERSION} FRAMEWORK_BUILD=${FRAMEWORK_BUILD}
+ tk_aqua=${tk_aqua}
EOF
cat >> $CONFIG_STATUS <<\EOF
-n=Tk && 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 &&
- if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
- unset n f v
+test "$FRAMEWORK_BUILD" = "1" &&
+ n=Tk && 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 &&
+ if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
+ unset n f v
exit 0