From 9dcd30ba6d1b74f75d70460650e2ec92763b07fe Mon Sep 17 00:00:00 2001
From: hobbs <hobbs@noemail.net>
Date: Wed, 25 May 2005 18:49:33 +0000
Subject: * unix/configure, unix/configure.in: ensure false
Tcl.framework is only created with --enable-framework
FossilOrigin-Name: 23db78d11a7ee6967b97d9289ebe18a2dff6709b
---
ChangeLog | 3 +++
unix/configure | 17 +++++++++--------
unix/configure.in | 19 ++++++++++---------
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8edc7ae..a5492c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-05-25 Jeff Hobbs <jeffh@ActiveState.com>
+ * unix/configure, unix/configure.in: ensure false Tcl.framework is
+ only created with --enable-framework
+
* unix/Makefile.in (install-libraries): protect possible empty
list in for with list= trick for older shells.
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
diff --git a/unix/configure.in b/unix/configure.in
index 94a4ee1..9905d35 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 Tk installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.83.2.15 2005/05/24 04:21:34 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.83.2.16 2005/05/25 18:49:49 hobbs Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.13)
@@ -415,14 +415,15 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
tk_config_files="${tk_config_files} [Tk-Info.plist:../macosx/Tk-Info.plist.in]"
# Construct a fake local framework structure to make linking with
# '-framework Tk' and running of tktest work
- AC_OUTPUT_COMMANDS([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
- ], VERSION=${TK_VERSION} && tk_aqua=${tk_aqua})
+ AC_OUTPUT_COMMANDS([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
+ ], [VERSION=${TK_VERSION} FRAMEWORK_BUILD=${FRAMEWORK_BUILD}
+ tk_aqua=${tk_aqua}])
LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
if test "${libdir}" = '${exec_prefix}/lib'; then
# override libdir default
--
cgit v0.12