From d5c5f7883cdda73328292a5cfcb4ca619205fc31 Mon Sep 17 00:00:00 2001 From: das Date: Fri, 30 Jul 2004 08:31:41 +0000 Subject: * 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. --- ChangeLog | 6 ++++++ unix/configure | 4 ++-- unix/tcl.m4 | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index df6f133..396f238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-30 Daniel Steffen + + * 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 George Peter Staplin * generic/tkEvent.c (TkQueueEventForAllChildren): Code from the diff --git a/unix/configure b/unix/configure index 0d117cc..04517b0 100755 --- a/unix/configure +++ b/unix/configure @@ -5226,7 +5226,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="" @@ -5245,7 +5245,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 9f6f4f8..67e8984 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-*) -- cgit v0.12