summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2004-07-30 08:32:14 (GMT)
committerdas <das>2004-07-30 08:32:14 (GMT)
commitf2f0fbb9996fd7cdade4548cccfa9dd2e3ade578 (patch)
treecbdc174fabd0cdd9cf8d40c27c89cad0323d451a
parent4e5f121eb24abae229a568bf40a5ff0ccd542571 (diff)
downloadtcl-f2f0fbb9996fd7cdade4548cccfa9dd2e3ade578.zip
tcl-f2f0fbb9996fd7cdade4548cccfa9dd2e3ade578.tar.gz
tcl-f2f0fbb9996fd7cdade4548cccfa9dd2e3ade578.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. * unix/Makefile.in: added MAC_OSX_OBJS variable.
-rw-r--r--ChangeLog7
-rw-r--r--unix/Makefile.in4
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
4 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d460a5..f05e644 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-28 Don Porter <dgp@users.sourceforge.net>
* generic/tclMain.c (Tcl_Main, StdinProc): Append newline only
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6a0aad0..561e1d6 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.121.2.5 2004/07/19 20:12:24 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.121.2.6 2004/07/30 08:32:15 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -319,6 +319,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
+
OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ @PLAT_OBJS@
diff --git a/unix/configure b/unix/configure
index 2c76f5b..bc54665 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2907,7 +2907,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=""
@@ -2926,7 +2926,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-*)