summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--unix/Makefile.in4
-rwxr-xr-xunix/configure5
-rw-r--r--unix/tcl.m44
4 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f0a183a..447c9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+ * unix/Makefile.in: added MAC_OSX_OBJS variable.
+
2004-07-29 Don Porter <dgp@users.sourceforge.net>
* library/package.tcl: [::pkg::create] is now an alias. Test
diff --git a/unix/Makefile.in b/unix/Makefile.in
index ad7f4da..1e24d6e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.141 2004/07/20 10:23:14 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.142 2004/07/30 08:31:21 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -321,6 +321,8 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS}
+MAC_OSX_OBJS = tclMacOSXBundle.o tclMacOSXFCmd.o
+
OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ @PLAT_OBJS@
diff --git a/unix/configure b/unix/configure
index 9cd9554..29bfcb9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5669,7 +5669,6 @@ fi
# Add the threads support libraries
-
LIBS="$LIBS$THREADS_LIBS"
@@ -7167,7 +7166,7 @@ rm -f conftest*
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
- PLAT_OBJS="tclMacOSXBundle.o tclMacOSXFCmd.o"
+ PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
LDFLAGS="$LDFLAGS -prebind"
CC_SEARCH_FLAGS=""
@@ -7186,7 +7185,7 @@ _ACEOF
#define USE_VFORK 1
_ACEOF
- cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define TCL_DEFAULT_ENCODING "utf-8"
_ACEOF
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c285b42..8ad4867 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1328,7 +1328,7 @@ dnl AC_CHECK_TOOL(AR, ar)
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".dylib"
DL_OBJS="tclLoadDyld.o"
- PLAT_OBJS="tclMacOSXBundle.o tclMacOSXFCmd.o"
+ PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
LDFLAGS="$LDFLAGS -prebind"
CC_SEARCH_FLAGS=""
@@ -1338,7 +1338,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-*)