summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2004-07-30 08:32:37 (GMT)
committerdas <das>2004-07-30 08:32:37 (GMT)
commit03b9fee066b977ceafb7bfa4c585c62438c98c1b (patch)
treeba78246d8629815d1a371ae33d9128e288a1a832
parent193cdf789da0a17ce98c75f0cf3c83db293577bf (diff)
downloadtk-03b9fee066b977ceafb7bfa4c585c62438c98c1b.zip
tk-03b9fee066b977ceafb7bfa4c585c62438c98c1b.tar.gz
tk-03b9fee066b977ceafb7bfa4c585c62438c98c1b.tar.bz2
* unix/configure:
* unix/tcl.m4 (SC_CONFIG_CFLAGS): Darwin: instead of setting PLAT_OBJS to explict object files in tcl.m4, refer to MAC_OSX_OBJS makefile var.
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e74cf7b..ceb9641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-30 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/configure:
+ * unix/tcl.m4 (SC_CONFIG_CFLAGS): Darwin: instead of setting PLAT_OBJS
+ to explict object files in tcl.m4, refer to MAC_OSX_OBJS makefile var.
+
2004-07-29 Don Porter <dgp@users.sourceforge.net>
*** 8.4.7 TAGGED FOR RELEASE ***
diff --git a/unix/configure b/unix/configure
index 0fb47cf..27e1ac2 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2619,7 +2619,7 @@ rm -f conftest*
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
- PLAT_OBJS="tclMacOSXBundle.o"
+ PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
LDFLAGS="$LDFLAGS -prebind"
CC_SEARCH_FLAGS=""
@@ -2638,7 +2638,7 @@ EOF
#define USE_VFORK 1
EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
#define TCL_DEFAULT_ENCODING "utf-8"
EOF
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4a9fac1..8b125b0 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1313,7 +1313,7 @@ dnl AC_CHECK_TOOL(AR, ar)
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
- PLAT_OBJS="tclMacOSXBundle.o"
+ PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
LDFLAGS="$LDFLAGS -prebind"
CC_SEARCH_FLAGS=""
@@ -1323,7 +1323,7 @@ dnl AC_CHECK_TOOL(AR, ar)
AC_DEFINE(MAC_OSX_TCL)
AC_DEFINE(HAVE_CFBUNDLE)
AC_DEFINE(USE_VFORK)
- AC_DEFINE_UNQUOTED(TCL_DEFAULT_ENCODING,"utf-8")
+ AC_DEFINE(TCL_DEFAULT_ENCODING,"utf-8")
LIBS="$LIBS -framework CoreFoundation"
;;
NEXTSTEP-*)